Merge pull request #27 from safesoftware/error-invalid-backup-file

Catch 500 errors when uploading files and improve error message.

cmd/deploymentparameters.go

@@ -50,8 +50,8 @@ func newDeploymentParametersCmd() *cobra.Command {
 	# List a single deployment parameter
 	fmeserver deploymentparameters --name testParameter
 	
-	# Output all repositories in json format
-	fmeserver repositories --json`,
+	# Output all deploymentparameters in json format
+	fmeserver deploymentparameters --json`,
 		Args: NoArgs,
 		RunE: deploymentParametersRun(&f),
 	}
@@ -102,7 +102,7 @@ func deploymentParametersRun(f *deploymentparametersFlags) func(cmd *cobra.Comma
 				if err := json.Unmarshal(responseData, &responseMessage); err == nil {
 
 					// if json output is requested, output the JSON to stdout before erroring
-					if jsonOutput {
+					if f.outputType == "json" {
 						prettyJSON, err := prettyPrintJSON(responseData)
 						if err == nil {
 							fmt.Fprintln(cmd.OutOrStdout(), prettyJSON)

cmd/project_upload.go → cmd/projects_upload.go

@@ -105,7 +105,11 @@ func projectUploadRun(f *projectUploadFlags) func(cmd *cobra.Command, args []str
 		if err != nil {
 			return err
 		} else if response.StatusCode != http.StatusOK {
-			return errors.New(response.Status)
+			if response.StatusCode == http.StatusInternalServerError {
+				return fmt.Errorf("%w: check that the file specified is a valid project file", errors.New(response.Status))
+			} else {
+				return errors.New(response.Status)
+			}
 		}
 
 		responseData, err := io.ReadAll(response.Body)

cmd/projects_upload_test.go

@@ -32,7 +32,7 @@ func TestProjectUpload(t *testing.T) {
 		{
 			name:        "500 bad status code",
 			statusCode:  http.StatusInternalServerError,
-			wantErrText: "500 Internal Server Error",
+			wantErrText: "500 Internal Server Error: check that the file specified is a valid project file",
 			args:        []string{"projects", "upload", "--file", f.Name()},
 		},
 		{

cmd/restore.go

@@ -155,11 +155,17 @@ func restoreRun(f *restoreFlags) func(cmd *cobra.Command, args []string) error {
 		if err != nil {
 			return err
 		} else if !f.resource && response.StatusCode != http.StatusOK {
-			return errors.New(response.Status)
+			if response.StatusCode == http.StatusInternalServerError {
+				return fmt.Errorf("%w: check that the file specified is a valid backup file", errors.New(response.Status))
+			} else {
+				return errors.New(response.Status)
+			}
+
 		} else if f.resource && response.StatusCode != http.StatusAccepted {
 			if response.StatusCode == http.StatusUnprocessableEntity {
 				return fmt.Errorf("%w: check that the specified shared resource and file exist", errors.New(response.Status))
 			}
+
 			return errors.New(response.Status)
 		}
 

cmd/restore_test.go

@@ -32,7 +32,7 @@ func TestRestore(t *testing.T) {
 		{
 			name:        "500 bad status code",
 			statusCode:  http.StatusInternalServerError,
-			wantErrText: "500 Internal Server Error",
+			wantErrText: "500 Internal Server Error: check that the file specified is a valid backup file",
 			args:        []string{"restore", "--file", f.Name()},
 		},
 		{