towk/makeshift
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

generator: added warn when default generator not found and fix error messages

Browse source
This commit is contained in:
David Allen 2024-11-14 13:45:19 -07:00
parent e93bef79f2
commit 2a9e7c72dc
Signed by: towk
GPG key ID: 793B2924A49B3A3F
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/generator/generator.go
View file

@ -12,6 +12,7 @@ import (
"github.com/OpenCHAMI/configurator/pkg/util"
"github.com/nikolalohinski/gonja/v2"
"github.com/nikolalohinski/gonja/v2/exec"
"github.com/rs/zerolog/log"
)
type (
@ -440,6 +441,7 @@ func GenerateWithTarget(config *configurator.Config, params Params) (FileMap, er
generator, ok = DefaultGenerators[params.Target]
if !ok {
// only load the plugin needed for this target if we don't find default
log.Error().Msg("did not find target in default generators")
generator, err = LoadPlugin(target.PluginPath)
if err != nil {
return nil, fmt.Errorf("failed to load plugin: %w", err)

10
pkg/server/server.go
View file

@ -76,7 +76,7 @@ func (s *Server) Serve() error {
var err error
tokenAuth, err = configurator.FetchPublicKeyFromURL(s.Config.Server.Jwks.Uri)
if err != nil {
logrus.Errorf("failed to fetch JWKS: %w", err)
logrus.Errorf("failed to fetch JWKS: %v", err)
continue
}
break
@ -138,7 +138,7 @@ func (s *Server) Generate(w http.ResponseWriter, r *http.Request) {
// generate a new config file from supplied params
outputs, err := generator.GenerateWithTarget(s.Config, s.GeneratorParams)
if err != nil {
writeErrorResponse(w, "failed to generate file: %w", err)
writeErrorResponse(w, "failed to generate file: %v", err)
return
}
@ -146,12 +146,12 @@ func (s *Server) Generate(w http.ResponseWriter, r *http.Request) {
tmp := generator.ConvertContentsToString(outputs)
b, err := json.Marshal(tmp)
if err != nil {
writeErrorResponse(w, "failed to marshal output: %w", err)
writeErrorResponse(w, "failed to marshal output: %v", err)
return
}
_, err = w.Write(b)
if err != nil {
writeErrorResponse(w, "failed to write response: %w", err)
writeErrorResponse(w, "failed to write response: %v", err)
return
}
}
@ -163,7 +163,7 @@ func (s *Server) Generate(w http.ResponseWriter, r *http.Request) {
func (s *Server) ManageTemplates(w http.ResponseWriter, r *http.Request) {
_, err := w.Write([]byte("this is not implemented yet"))
if err != nil {
writeErrorResponse(w, "failed to write response: %w", err)
writeErrorResponse(w, "failed to write response: %v", err)
return
}
}