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

server: fixed error message handling

Browse source
This commit is contained in:
David Allen 2024-12-16 15:24:52 -07:00
parent cccf6321cc
commit 34bbd1ce85
Signed by: towk
GPG key ID: 793B2924A49B3A3F
2 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cmd/fetch.go
View file

@ -24,6 +24,11 @@ var fetchCmd = &cobra.Command{
return
}
// check if we actually have any targets to run
if len(targets) <= 0 {
log.Error().Msg("must specify a target")
}
// check to see if an access token is available from env
if conf.AccessToken == "" {
// check if OCHAMI_ACCESS_TOKEN env var is set if no access token is provided and use that instead
@ -49,14 +54,13 @@ var fetchCmd = &cobra.Command{
url := fmt.Sprintf("%s/generate?target=%s", remoteHost, target)
res, body, err := util.MakeRequest(url, http.MethodGet, nil, headers)
if err != nil {
log.Error().Err(err).Msg("failed to make request")
log.Error().Err(err).Msg("failed to fetch files")
return
}
// handle getting other error codes other than a 200
if res != nil {
if res.StatusCode == http.StatusOK {
log.Info().Msgf("%s\n", string(body))
}
// NOTE: the server responses are already marshaled to JSON
fmt.Print(string(body))
}
}
},

35
pkg/server/server.go
View file

@ -145,7 +145,7 @@ func (s *Server) Generate(opts ...client.Option) func(w http.ResponseWriter, r *
)
s.GeneratorParams = parseGeneratorParams(r, opts...)
if targetParam == "" {
writeErrorResponse(w, "must specify a target")
writeErrorResponse(w, true, "must specify a target")
return
}
@ -159,7 +159,8 @@ func (s *Server) Generate(opts ...client.Option) func(w http.ResponseWriter, r *
// try and generate a new config file from supplied params
outputs, err = generator.GenerateWithTarget(s.Config, targetParam)
if err != nil {
writeErrorResponse(w, "failed to generate file: %v", err)
writeErrorResponse(w, false, "failed to generate file")
log.Error().Err(err).Msg("failed to generate file")
return
}
}
@ -168,12 +169,12 @@ func (s *Server) Generate(opts ...client.Option) func(w http.ResponseWriter, r *
tmp := generator.ConvertContentsToString(outputs)
b, err := json.Marshal(tmp)
if err != nil {
writeErrorResponse(w, "failed to marshal output: %v", err)
writeErrorResponse(w, true, "failed to marshal output: %v", err)
return
}
_, err = w.Write(b)
if err != nil {
writeErrorResponse(w, "failed to write response: %v", err)
writeErrorResponse(w, true, "failed to write response: %v", err)
return
}
}
@ -193,34 +194,34 @@ func (s *Server) createTarget(w http.ResponseWriter, r *http.Request) {
err error
)
if r == nil {
writeErrorResponse(w, "request is invalid")
writeErrorResponse(w, true, "request is invalid")
return
}
bytes, err = io.ReadAll(r.Body)
if err != nil {
writeErrorResponse(w, "failed to read response body: %v", err)
writeErrorResponse(w, true, "failed to read response body: %v", err)
return
}
defer r.Body.Close()
err = json.Unmarshal(bytes, &target)
if err != nil {
writeErrorResponse(w, "failed to unmarshal target: %v", err)
writeErrorResponse(w, true, "failed to unmarshal target: %v", err)
return
}
// make sure a plugin and at least one template is supplied
if target.Name == "" {
writeErrorResponse(w, "target name is required")
writeErrorResponse(w, true, "target name is required")
return
}
if target.PluginPath == "" {
writeErrorResponse(w, "must supply a generator name")
writeErrorResponse(w, true, "must supply a generator name")
return
}
if len(target.Templates) <= 0 {
writeErrorResponse(w, "must provided at least one template")
writeErrorResponse(w, true, "must provided at least one template")
return
}
@ -238,10 +239,18 @@ func (s *Server) getTarget(target string) *Target {
// Wrapper function to simplify writting error message responses. This function
// is only intended to be used with the service and nothing else.
func writeErrorResponse(w http.ResponseWriter, format string, a ...any) error {
func writeErrorResponse(w http.ResponseWriter, logServer bool, format string, a ...any) error {
errmsg := fmt.Sprintf(format, a...)
log.Error().Msg(errmsg)
http.Error(w, errmsg, http.StatusInternalServerError)
if logServer {
log.Error().Msg(errmsg)
}
bytes, _ := json.Marshal(map[string]any{
"level": "error",
"time": time.Now().Unix(),
"message": errmsg,
})
http.Error(w, string(bytes), http.StatusInternalServerError)
return fmt.Errorf(errmsg)
}