refactor(sdk): return error messages on ascode import (#6165)

ovh · May 9, 2022 · 0c58c4b · 0c58c4b
1 parent b2b2dbc
commit 0c58c4b
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 23 deletions.
diff --git a/cli/cdsctl/workflow_transform_as_code.go b/cli/cdsctl/workflow_transform_as_code.go
@@ -33,7 +33,7 @@ func workflowTransformAsCodeRun(v cli.Values) (interface{}, error) {
 		return nil, err
 	}
 	if w.FromRepository != "" {
-		return nil, sdk.ErrWorkflowAlreadyAsCode
+		return nil, sdk.WithStack(sdk.ErrWorkflowAlreadyAsCode)
 	}
 
 	noInteractive := v.GetBool("no-interactive")

diff --git a/engine/api/application/application_vunerability.go b/engine/api/application/application_vunerability.go
@@ -88,7 +88,7 @@ func LoadVulnerability(db gorp.SqlExecutor, appID int64, vulnID int64) (sdk.Vuln
 		if err != sql.ErrNoRows {
 			return sdk.Vulnerability{}, sdk.WrapError(err, "unable to load vulnerability %d for application %d", vulnID, appID)
 		}
-		return sdk.Vulnerability{}, sdk.ErrNotFound
+		return sdk.Vulnerability{}, sdk.WithStack(sdk.ErrNotFound)
 	}
 	return sdk.Vulnerability(dbVuln), nil
 }

diff --git a/engine/api/application_import.go b/engine/api/application_import.go
@@ -69,7 +69,7 @@ func (api *API) postApplicationImportHandler() service.Handler {
 				return globalError
 			}
 			sdkErr := sdk.ExtractHTTPError(globalError)
-			return service.WriteJSON(w, append(msgListString, sdkErr.Message), sdkErr.Status)
+			return service.WriteJSON(w, append(msgListString, sdkErr.Error()), sdkErr.Status)
 		}
 
 		if err := tx.Commit(); err != nil {

diff --git a/engine/api/environment_import.go b/engine/api/environment_import.go
@@ -66,7 +66,7 @@ func (api *API) postEnvironmentImportHandler() service.Handler {
 				return globalError
 			}
 			sdkErr := sdk.ExtractHTTPError(globalError)
-			return service.WriteJSON(w, append(msgListString, sdkErr.Message), sdkErr.Status)
+			return service.WriteJSON(w, append(msgListString, sdkErr.Error()), sdkErr.Status)
 		}
 
 		if err := tx.Commit(); err != nil {

diff --git a/engine/api/keys/parse.go b/engine/api/keys/parse.go
@@ -59,7 +59,7 @@ func Parse(ctx context.Context, db gorp.SqlExecutor, projID int64, kname string,
 			}
 			k.Public = string(pubBytes)
 		default:
-			return nil, sdk.ErrUnknownKeyType
+			return nil, sdk.WithStack(sdk.ErrUnknownKeyType)
 		}
 	} else if kval.Regen == nil || *kval.Regen == true {
 		ktemp, err := GenerateKey(kname, k.Type)

diff --git a/engine/api/pipeline/pipeline_parser.go b/engine/api/pipeline/pipeline_parser.go
@@ -61,7 +61,7 @@ func ParseAndImport(ctx context.Context, db gorp.SqlExecutor, cache cache.Store,
 
 	var globalError error
 	if exist && !opts.Force {
-		return pip, nil, sdk.ErrPipelineAlreadyExists
+		return pip, nil, sdk.WithStack(sdk.ErrPipelineAlreadyExists)
 	} else if exist {
 		globalError = ImportUpdate(ctx, db, proj, pip, msgChan, opts)
 	} else {

diff --git a/engine/api/pipeline_import.go b/engine/api/pipeline_import.go
@@ -94,7 +94,7 @@ func (api *API) importPipelineHandler() service.Handler {
 				return globalError
 			}
 			sdkErr := sdk.ExtractHTTPError(globalError)
-			return service.WriteJSON(w, append(msgListString, sdkErr.Message), sdkErr.Status)
+			return service.WriteJSON(w, append(msgListString, sdkErr.Error()), sdkErr.Status)
 		}
 
 		if err := tx.Commit(); err != nil {

diff --git a/engine/api/workflow_import.go b/engine/api/workflow_import.go
@@ -162,7 +162,7 @@ func (api *API) postWorkflowImportHandler() service.Handler {
 		if globalError != nil {
 			if len(msgListString) != 0 {
 				sdkErr := sdk.ExtractHTTPError(globalError)
-				return service.WriteJSON(w, append(msgListString, sdkErr.Message), sdkErr.Status)
+				return service.WriteJSON(w, append(msgListString, sdkErr.Error()), sdkErr.Status)
 			}
 			return sdk.WrapError(globalError, "Unable to import workflow %s", ew.GetName())
 		}

diff --git a/sdk/cdsclient/client_import.go b/sdk/cdsclient/client_import.go
@@ -14,39 +14,27 @@ func (c *client) PipelineImport(projectKey string, content io.Reader, mods ...Re
 	url := fmt.Sprintf("/project/%s/import/pipeline", projectKey)
 
 	btes, _, _, err := c.Request(context.Background(), "POST", url, content, mods...)
-	if err != nil {
-		return nil, err
-	}
-
 	messages := []string{}
 	_ = sdk.JSONUnmarshal(btes, &messages)
-	return messages, nil
+	return messages, err
 }
 
 func (c *client) ApplicationImport(projectKey string, content io.Reader, mods ...RequestModifier) ([]string, error) {
 	url := fmt.Sprintf("/project/%s/import/application", projectKey)
 
 	btes, _, _, err := c.Request(context.Background(), "POST", url, content, mods...)
-	if err != nil {
-		return nil, err
-	}
-
 	messages := []string{}
 	_ = sdk.JSONUnmarshal(btes, &messages)
-	return messages, nil
+	return messages, err
 }
 
 func (c *client) EnvironmentImport(projectKey string, content io.Reader, mods ...RequestModifier) ([]string, error) {
 	url := fmt.Sprintf("/project/%s/import/environment", projectKey)
 
 	btes, _, _, err := c.Request(context.Background(), "POST", url, content, mods...)
-	if err != nil {
-		return nil, err
-	}
-
 	messages := []string{}
 	_ = sdk.JSONUnmarshal(btes, &messages)
-	return messages, nil
+	return messages, err
 }
 
 // WorkerModelImport import a worker model via as code