Handle verbose errors

Emyrk · Emyrk · commit 649b4689a17d · 2021-03-09T19:17:31.000Z
diff --git a/internal/cmd/envs.go b/internal/cmd/envs.go
@@ -355,7 +355,7 @@ coder envs create-from-config -f coder.yaml`,
 
 			tpl, err := client.ParseTemplate(ctx, req)
 			if err != nil {
-				return handleTemplateError(err)
+				return handleAPIError(err)
 			}
 
 			provider, err := coderutil.DefaultWorkspaceProvider(ctx, client)
@@ -370,7 +370,7 @@ coder envs create-from-config -f coder.yaml`,
 				Namespace:      provider.DefaultNamespace,
 			})
 			if err != nil {
-				return xerrors.Errorf("create environment: %w", err)
+				return handleAPIError(err)
 			}
 
 			if follow {
@@ -397,50 +397,6 @@ coder envs create-from-config -f coder.yaml`,
 	return cmd
 }
 
-// handleTemplateError attempts to convert the basic error into a more detailed clog error.
-func handleTemplateError(origError error) error {
-	var httpError *coder.HTTPError
-	if !xerrors.As(origError, &httpError) {
-		return origError // Return the original
-	}
-
-	ae, err := httpError.Payload()
-	if err != nil {
-		return origError // Return the original
-	}
-
-	// TODO: Handle verbose case here too?
-	switch ae.Err.Code {
-	case "wac_template":
-		type templatePayload struct {
-			ErrorType string   `json:"error_type"`
-			Msgs      []string `json:"messages"`
-		}
-
-		var p templatePayload
-		err := json.Unmarshal(ae.Err.Details, &p)
-		if err != nil {
-			return origError
-		}
-
-		return clog.Error(p.ErrorType, p.Msgs...)
-	case "verbose":
-		// TODO: We should move this to some general spot to decode this
-		type verbosePayload struct {
-			Verbose string `json:"verbose"`
-		}
-		var p verbosePayload
-		err := json.Unmarshal(ae.Err.Details, &p)
-		if err != nil {
-			return origError
-		}
-
-		return clog.Error(origError.Error(), p.Verbose)
-	}
-
-	return origError // Return the original
-}
-
 func editEnvCmd() *cobra.Command {
 	var (
 		org    string
diff --git a/internal/cmd/errors.go b/internal/cmd/errors.go
@@ -0,0 +1,52 @@
+package cmd
+
+import (
+	"encoding/json"
+
+	"cdr.dev/coder-cli/coder-sdk"
+	"cdr.dev/coder-cli/pkg/clog"
+	"golang.org/x/xerrors"
+)
+
+// handleAPIError attempts to convert an api error into a more detailed clog error.
+// If it cannot, it will return the original error
+func handleAPIError(origError error) error {
+	var httpError *coder.HTTPError
+	if !xerrors.As(origError, &httpError) {
+		return origError // Return the original
+	}
+
+	ae, err := httpError.Payload()
+	if err != nil {
+		return origError // Return the original
+	}
+
+	switch ae.Err.Code {
+	case "wac_template": // template parse errors
+		type templatePayload struct {
+			ErrorType string   `json:"error_type"`
+			Msgs      []string `json:"messages"`
+		}
+
+		var p templatePayload
+		err := json.Unmarshal(ae.Err.Details, &p)
+		if err != nil {
+			return origError
+		}
+
+		return clog.Error(p.ErrorType, p.Msgs...)
+	case "verbose":
+		type verbosePayload struct {
+			Verbose string `json:"verbose"`
+		}
+		var p verbosePayload
+		err := json.Unmarshal(ae.Err.Details, &p)
+		if err != nil {
+			return origError
+		}
+
+		return clog.Error(origError.Error(), p.Verbose)
+	}
+
+	return origError // Return the original
+}
