Improve error handling for metering command

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
self-actuated · Nov 7, 2024 · 0c4b9e9 · 0c4b9e9
1 parent 40ac180
commit 0c4b9e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/cmd/metering.go b/cmd/metering.go
@@ -74,12 +74,11 @@ func runMeteringE(cmd *cobra.Command, args []string) error {
 	c := pkg.NewClient(http.DefaultClient, os.Getenv("ACTUATED_URL"))
 
 	res, status, err := c.GetMetering(pat, owner, host, id, staff)
-
 	if err != nil {
 		return err
 	}
 
-	if status != http.StatusAccepted {
+	if status != http.StatusAccepted && status != http.StatusOK {
 		return fmt.Errorf("unexpected status code: %d, body: %s", status, res)
 	}
 

diff --git a/pkg/client.go b/pkg/client.go
@@ -346,6 +346,11 @@ func (c *Client) GetMetering(patStr, owner, host, id string, staff bool) (string
 		body, _ = io.ReadAll(res.Body)
 	}
 
+	if res.StatusCode != http.StatusOK &&
+		res.StatusCode != http.StatusAccepted {
+		return string(body), res.StatusCode, nil
+	}
+
 	var prettyJSON bytes.Buffer
 
 	if err = json.Indent(&prettyJSON, []byte(body), "", "  "); err != nil {