Merge pull request #11 from yoanbernabeu/10-bug-report-cli-doesnt-return-non-zero-exit-code-on-error

10 bug report cli doesnt return non zero exit code on error

Author: yoanbernabeu

.github/workflows/go.yml

@@ -30,5 +30,5 @@ jobs:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         goos: ${{ matrix.goos }}
         goarch: ${{ matrix.goarch }}
-        goversion: "https://dl.google.com/go/go1.18.1.linux-amd64.tar.gz"
+        goversion: "1.24.2"
         binary_name: "GoJelastic"

.gitignore

@@ -1,2 +1,3 @@
 *.json
 .env
+GoJelastic

cmd/root.go

@@ -1,6 +1,5 @@
 /*
 Copyright © 2022 Yoan BERNABEU <yoan.bernabeu@gmail.com>
-
 */
 package cmd
 
@@ -66,7 +65,7 @@ func initConfig() map[string]interface{} {
 	return viper.AllSettings()
 }
 
-//writeConfig writes config file and ENV variables if set.
+// writeConfig writes config file and ENV variables if set.
 func writeConfig(url string, token string) {
 	viper.SetConfigType("env")
 	viper.SetConfigName("gojelastic") // name of config file (without extension)
@@ -96,6 +95,14 @@ func makeHTTPRequest(url string, method string, body string) (*http.Response, er
 	return resp, nil
 }
 
+// JelasticResponse represents the structure of a Jelastic API response
+type JelasticResponse struct {
+	Result int         `json:"result"`
+	Error  string      `json:"error"`
+	Raw    interface{} `json:"raw"`
+	Source string      `json:"source"`
+}
+
 func formatResponse(resp *http.Response) (string, error) {
 	defer resp.Body.Close()
 
@@ -113,7 +120,25 @@ func formatResponse(resp *http.Response) (string, error) {
 	return string(jsonBytes), nil
 }
 
-//makeRequest makes a request to the Jelastic API
+// checkResponseForErrors checks if the Jelastic response contains an error
+// and exits with code 1 if it does
+func checkResponseForErrors(responseJSON string) {
+	var jelasticResp JelasticResponse
+	err := json.Unmarshal([]byte(responseJSON), &jelasticResp)
+	if err != nil {
+		// If we can't parse as JelasticResponse, it might be a different format
+		// In this case, we don't exit as it might be a valid response
+		return
+	}
+
+	// Check if there's an error in the response
+	if jelasticResp.Result != 0 || jelasticResp.Error != "" {
+		fmt.Fprintln(os.Stderr, responseJSON)
+		os.Exit(1)
+	}
+}
+
+// makeRequest makes a request to the Jelastic API
 func makeRequest(url string, method string, body string) string {
 	resp, err := makeHTTPRequest(url, method, body)
 	if err != nil {
@@ -127,5 +152,8 @@ func makeRequest(url string, method string, body string) string {
 		os.Exit(1)
 	}
 
+	// Check for Jelastic API errors and exit with non-zero code if found
+	checkResponseForErrors(formattedResponse)
+
 	return formattedResponse
 }

go.mod

@@ -1,28 +1,29 @@
 module github.com/yoanbernabeu/GoJelastic
 
-go 1.18
+go 1.24.0
 
-require github.com/spf13/cobra v1.6.1
+toolchain go1.24.2
 
 require (
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/inconshreveable/mousetrap v1.0.1 // indirect
-	github.com/magiconair/properties v1.8.6 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
+	github.com/spf13/cobra v1.10.1
+	github.com/spf13/viper v1.21.0
+)
+
+require (
+	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/spf13/afero v1.9.2 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.14.0 // indirect
-	github.com/subosito/gotenv v1.4.1 // indirect
-	golang.org/x/sys v0.0.0-20220908164124-27713097b956 // indirect
-	golang.org/x/text v0.4.0 // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	github.com/sagikazarmark/locafero v0.12.0 // indirect
+	github.com/spf13/afero v1.15.0 // indirect
+	github.com/spf13/cast v1.10.0 // indirect
+	github.com/spf13/pflag v1.0.10 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/text v0.30.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )