chore: add more specific api error handling

wundergraph · Sep 16, 2024 · 44191ac · 44191ac
1 parent fabbe31
commit 44191ac
Show file tree

Hide file tree

Showing 10 changed files with 135 additions and 70 deletions.
diff --git a/internal/api/errors.go b/internal/api/errors.go
@@ -0,0 +1,34 @@
+package api
+
+import (
+	"fmt"
+
+	"github.com/wundergraph/cosmo/connect-go/gen/proto/wg/cosmo/common"
+)
+
+var (
+	ErrEmptyMsg                  = fmt.Errorf("empty message")
+	ErrNotFound                  = fmt.Errorf("resource not found")
+	ErrSubgraphCompositionFailed = fmt.Errorf("subgraph composition failed")
+)
+
+func IsNotFoundError(err error) bool {
+	return err == ErrNotFound
+}
+
+func IsSubgraphCompositionFailedError(err error) bool {
+	return err == ErrSubgraphCompositionFailed
+}
+
+func handleErrorCodes(statusCode common.EnumStatusCode) error {
+	switch statusCode {
+	case common.EnumStatusCode_OK:
+		return nil
+	case common.EnumStatusCode_ERR_SUBGRAPH_COMPOSITION_FAILED:
+		return ErrSubgraphCompositionFailed
+	case common.EnumStatusCode_ERR_NOT_FOUND:
+		return ErrNotFound
+	default:
+		return fmt.Errorf("failed to create resource: %s", statusCode.String())
+	}
+}
diff --git a/internal/api/federated_graph.go b/internal/api/federated_graph.go
@@ -2,10 +2,8 @@ package api
 
 import (
 	"context"
-	"fmt"
 
 	"connectrpc.com/connect"
-	"github.com/wundergraph/cosmo/connect-go/gen/proto/wg/cosmo/common"
 	platformv1 "github.com/wundergraph/cosmo/connect-go/gen/proto/wg/cosmo/platform/v1"
 )
 
@@ -33,11 +31,12 @@ func (p *PlatformClient) CreateFederatedGraph(ctx context.Context, admissionWebh
 	}
 
 	if response.Msg == nil {
-		return nil, fmt.Errorf("failed to create federated graph: %s, the server response is nil", graph.Name)
+		return nil, ErrEmptyMsg
 	}
 
-	if response.Msg.GetResponse().Code != common.EnumStatusCode_OK {
-		return nil, fmt.Errorf("failed to create federated graph: %s", response.Msg.GetResponse().GetDetails())
+	err = handleErrorCodes(response.Msg.GetResponse().Code)
+	if err != nil {
+		return nil, err
 	}
 
 	return response.Msg, nil
@@ -65,11 +64,12 @@ func (p *PlatformClient) UpdateFederatedGraph(ctx context.Context, admissionWebh
 	}
 
 	if response.Msg == nil {
-		return nil, fmt.Errorf("failed to create federated graph: %s, the server response is nil", graph.Name)
+		return nil, ErrEmptyMsg
 	}
 
-	if response.Msg.GetResponse().Code != common.EnumStatusCode_OK {
-		return nil, fmt.Errorf("failed to update federated graph: %s", response.Msg)
+	err = handleErrorCodes(response.Msg.GetResponse().Code)
+	if err != nil {
+		return nil, err
 	}
 
 	return response.Msg, nil
@@ -87,11 +87,12 @@ func (p *PlatformClient) DeleteFederatedGraph(ctx context.Context, name, namespa
 	}
 
 	if response.Msg == nil {
-		return fmt.Errorf("failed to delete federated graph: %s, the server response is nil", name)
+		return ErrEmptyMsg
 	}
 
-	if response.Msg.GetResponse().Code != common.EnumStatusCode_OK {
-		return fmt.Errorf("failed to delete federated graph: %s", response.Msg)
+	err = handleErrorCodes(response.Msg.GetResponse().Code)
+	if err != nil {
+		return err
 	}
 
 	return nil
@@ -109,11 +110,12 @@ func (p *PlatformClient) GetFederatedGraph(ctx context.Context, name, namespace
 	}
 
 	if response.Msg == nil {
-		return nil, fmt.Errorf("failed to get federated graph: %s, the server response is nil", name)
+		return nil, ErrEmptyMsg
 	}
 
-	if response.Msg.GetResponse().Code != common.EnumStatusCode_OK {
-		return nil, fmt.Errorf("failed to get federated graph: %s", response.Msg)
+	err = handleErrorCodes(response.Msg.GetResponse().Code)
+	if err != nil {
+		return nil, err
 	}
 
 	return response.Msg, nil

diff --git a/internal/api/monograph.go b/internal/api/monograph.go
@@ -2,10 +2,8 @@ package api
 
 import (
 	"context"
-	"fmt"
 
 	"connectrpc.com/connect"
-	"github.com/wundergraph/cosmo/connect-go/gen/proto/wg/cosmo/common"
 	platformv1 "github.com/wundergraph/cosmo/connect-go/gen/proto/wg/cosmo/platform/v1"
 )
 
@@ -28,11 +26,12 @@ func (p PlatformClient) CreateMonograph(ctx context.Context, name string, namesp
 	}
 
 	if response.Msg == nil {
-		return fmt.Errorf("failed to create monograph: %s, the server response is nil", name)
+		return ErrEmptyMsg
 	}
 
-	if response.Msg.GetResponse().Code != common.EnumStatusCode_OK {
-		return fmt.Errorf("failed to create monograph: %s", response.Msg)
+	err = handleErrorCodes(response.Msg.GetResponse().Code)
+	if err != nil {
+		return err
 	}
 
 	return nil
@@ -57,11 +56,12 @@ func (p PlatformClient) UpdateMonograph(ctx context.Context, name string, namesp
 	}
 
 	if response.Msg == nil {
-		return fmt.Errorf("failed to update monograph: %s, the server response is nil", name)
+		return ErrEmptyMsg
 	}
 
-	if response.Msg.GetResponse().Code != common.EnumStatusCode_OK {
-		return fmt.Errorf("failed to update monograph: %s", response.Msg)
+	err = handleErrorCodes(response.Msg.GetResponse().Code)
+	if err != nil {
+		return err
 	}
 
 	return nil
@@ -78,11 +78,12 @@ func (p PlatformClient) DeleteMonograph(ctx context.Context, name string, namesp
 	}
 
 	if response.Msg == nil {
-		return fmt.Errorf("failed to delete monograph: %s, the server response is nil", name)
+		return ErrEmptyMsg
 	}
 
-	if response.Msg.GetResponse().Code != common.EnumStatusCode_OK {
-		return fmt.Errorf("failed to delete monograph: %s", response.Msg)
+	err = handleErrorCodes(response.Msg.GetResponse().Code)
+	if err != nil {
+		return err
 	}
 
 	return nil
@@ -99,11 +100,12 @@ func (p PlatformClient) GetMonograph(ctx context.Context, name string, namespace
 	}
 
 	if response.Msg == nil {
-		return nil, fmt.Errorf("failed to get monograph: %s, the server response is nil", name)
+		return nil, ErrEmptyMsg
 	}
 
-	if response.Msg.GetResponse().Code != common.EnumStatusCode_OK {
-		return nil, fmt.Errorf("failed to get monograph: %s", response.Msg)
+	err = handleErrorCodes(response.Msg.GetResponse().Code)
+	if err != nil {
+		return nil, err
 	}
 
 	return response.Msg.Graph, nil

diff --git a/internal/api/namespace.go b/internal/api/namespace.go
@@ -2,11 +2,9 @@ package api
 
 import (
 	"context"
-	"fmt"
 
 	"connectrpc.com/connect"
 
-	"github.com/wundergraph/cosmo/connect-go/gen/proto/wg/cosmo/common"
 	platformv1 "github.com/wundergraph/cosmo/connect-go/gen/proto/wg/cosmo/platform/v1"
 )
 
@@ -18,11 +16,12 @@ func (p PlatformClient) CreateNamespace(ctx context.Context, name string) error
 	}
 
 	if response.Msg == nil {
-		return fmt.Errorf("failed to create namespace: %s, the server response is nil", name)
+		return ErrEmptyMsg
 	}
 
-	if response.Msg.GetResponse().Code != common.EnumStatusCode_OK {
-		return fmt.Errorf("failed to create namespace: %s", response.Msg)
+	err = handleErrorCodes(response.Msg.GetResponse().Code)
+	if err != nil {
+		return err
 	}
 
 	return err
@@ -39,13 +38,15 @@ func (p PlatformClient) RenameNamespace(ctx context.Context, oldName, newName st
 	}
 
 	if response.Msg == nil {
-		return fmt.Errorf("failed to rename the namespace: %s, the server response is nil", oldName)
+		return ErrEmptyMsg
 	}
 
-	if response.Msg.GetResponse().Code != common.EnumStatusCode_OK {
-		return fmt.Errorf("failed to rename the namespace: %s", response.Msg)
+	err = handleErrorCodes(response.Msg.GetResponse().Code)
+	if err != nil {
+		return err
 	}
-	return err
+
+	return nil
 }
 
 func (p PlatformClient) DeleteNamespace(ctx context.Context, name string) error {
@@ -56,13 +57,15 @@ func (p PlatformClient) DeleteNamespace(ctx context.Context, name string) error
 	}
 
 	if response.Msg == nil {
-		return fmt.Errorf("failed to delete namespace: %s, the server response is nil", name)
+		return ErrEmptyMsg
 	}
 
-	if response.Msg.GetResponse().Code != common.EnumStatusCode_OK {
-		return fmt.Errorf("failed to delete namespace: %s", response.Msg)
+	err = handleErrorCodes(response.Msg.GetResponse().Code)
+	if err != nil {
+		return err
 	}
-	return err
+
+	return nil
 }
 
 func (p PlatformClient) ListNamespaces(ctx context.Context) ([]*platformv1.Namespace, error) {
@@ -73,11 +76,12 @@ func (p PlatformClient) ListNamespaces(ctx context.Context) ([]*platformv1.Names
 	}
 
 	if response.Msg == nil {
-		return nil, fmt.Errorf("failed to list namespaces, the server response is nil")
+		return nil, ErrEmptyMsg
 	}
 
-	if response.Msg.GetResponse().Code != common.EnumStatusCode_OK {
-		return nil, fmt.Errorf("failed to list namespaces: %s", response.Msg)
+	err = handleErrorCodes(response.Msg.GetResponse().Code)
+	if err != nil {
+		return nil, err
 	}
 
 	return response.Msg.Namespaces, nil

diff --git a/internal/api/subgraph.go b/internal/api/subgraph.go
@@ -2,10 +2,8 @@ package api
 
 import (
 	"context"
-	"fmt"
 
 	"connectrpc.com/connect"
-	"github.com/wundergraph/cosmo/connect-go/gen/proto/wg/cosmo/common"
 	platformv1 "github.com/wundergraph/cosmo/connect-go/gen/proto/wg/cosmo/platform/v1"
 )
 
@@ -29,11 +27,12 @@ func (p PlatformClient) CreateSubgraph(ctx context.Context, name string, namespa
 	}
 
 	if response.Msg == nil {
-		return fmt.Errorf("failed to create subgraph: %s, the server response is nil", name)
+		return ErrEmptyMsg
 	}
 
-	if response.Msg.GetResponse().Code != common.EnumStatusCode_OK {
-		return fmt.Errorf("failed to create subgraph: %s", response.Msg)
+	err = handleErrorCodes(response.Msg.GetResponse().Code)
+	if err != nil {
+		return err
 	}
 
 	return nil
@@ -59,7 +58,12 @@ func (p PlatformClient) UpdateSubgraph(ctx context.Context, name, namespace, rou
 	}
 
 	if response.Msg == nil {
-		return fmt.Errorf("failed to update subgraph: %s, the server response is nil", name)
+		return ErrEmptyMsg
+	}
+
+	err = handleErrorCodes(response.Msg.GetResponse().Code)
+	if err != nil {
+		return err
 	}
 
 	return nil
@@ -76,11 +80,12 @@ func (p PlatformClient) DeleteSubgraph(ctx context.Context, name, namespace stri
 	}
 
 	if response.Msg == nil {
-		return fmt.Errorf("failed to delete subgraph: %s, the server response is nil", name)
+		return ErrEmptyMsg
 	}
 
-	if response.Msg.GetResponse().Code != common.EnumStatusCode_OK {
-		return fmt.Errorf("failed to delete subgraph: %s", response.Msg)
+	err = handleErrorCodes(response.Msg.GetResponse().Code)
+	if err != nil {
+		return err
 	}
 
 	return nil
@@ -97,21 +102,15 @@ func (p PlatformClient) GetSubgraph(ctx context.Context, name, namespace string)
 	}
 
 	if response.Msg == nil {
-		return nil, fmt.Errorf("failed to get subgraph: %s, the server response is nil", name)
-	}
-
-	if response.Msg.Graph == nil {
-		return nil, fmt.Errorf("failed to get subgraph: %s", name)
+		return nil, ErrEmptyMsg
 	}
 
-	subgraph := &platformv1.Subgraph{
-		Id:         response.Msg.Graph.Id,
-		Name:       response.Msg.Graph.Name,
-		Namespace:  response.Msg.Graph.Namespace,
-		RoutingURL: response.Msg.Graph.RoutingURL,
+	err = handleErrorCodes(response.Msg.GetResponse().Code)
+	if err != nil {
+		return nil, err
 	}
 
-	return subgraph, nil
+	return response.Msg.GetGraph(), nil
 }
 
 func (p PlatformClient) PublishSubgraph(ctx context.Context, name, namespace, schema string) (*platformv1.PublishFederatedSubgraphResponse, error) {
@@ -126,7 +125,7 @@ func (p PlatformClient) PublishSubgraph(ctx context.Context, name, namespace, sc
 	}
 
 	if response.Msg == nil {
-		return nil, fmt.Errorf("failed to publish subgraph: %s, the server response is nil", name)
+		return nil, ErrEmptyMsg
 	}
 
 	return response.Msg, nil

diff --git a/internal/service/federated-graph/resource_cosmo_federated_graph.go b/internal/service/federated-graph/resource_cosmo_federated_graph.go
@@ -169,7 +169,12 @@ func (r *FederatedGraphResource) Read(ctx context.Context, req resource.ReadRequ
 
 	apiResponse, err := r.client.GetFederatedGraph(ctx, data.Name.ValueString(), data.Namespace.ValueString())
 	if err != nil {
-		utils.AddDiagnosticError(resp, ErrReadingGraph, fmt.Sprintf("Could not read federated graph: %s, graph name: %s, graph namespace: %s", err, data.Name.ValueString(), data.Namespace.ValueString()))
+		if api.IsNotFoundError(err) {
+			utils.AddDiagnosticWarning(resp, "Graph not found", fmt.Sprintf("Graph '%s' not found will be recreated", data.Name.ValueString()))
+			resp.State.RemoveResource(ctx)
+			return
+		}
+		utils.AddDiagnosticError(resp, ErrReadingGraph, fmt.Sprintf("Could not fetch subgraph '%s': %s", data.Name.ValueString(), err))
 		return
 	}
 

diff --git a/internal/service/federated-graph/resource_cosmo_federated_graph_test.go b/internal/service/federated-graph/resource_cosmo_federated_graph_test.go
@@ -59,7 +59,7 @@ func TestAccFederatedGraphResourceInvalidConfig(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config:      testAccFederatedGraphResourceConfig(name, namespace, "invalid-url", ""),
-				ExpectError: regexp.MustCompile(`.*URL is not a valid URL*`),
+				ExpectError: regexp.MustCompile(`.*failed to create resource*`),
 			},
 		},
 	})

diff --git a/internal/service/monograph/resource_cosmo_monograph.go b/internal/service/monograph/resource_cosmo_monograph.go
@@ -180,6 +180,11 @@ func (r *MonographResource) Read(ctx context.Context, req resource.ReadRequest,
 
 	monograph, err := r.client.GetMonograph(ctx, data.Name.ValueString(), data.Namespace.ValueString())
 	if err != nil {
+		if api.IsNotFoundError(err) {
+			utils.AddDiagnosticWarning(resp, "Monograph not found", fmt.Sprintf("Monograph '%s' not found will be recreated", data.Name.ValueString()))
+			resp.State.RemoveResource(ctx)
+			return
+		}
 		utils.AddDiagnosticError(resp, ErrReadingMonograph, fmt.Sprintf("Could not read monograph: %s, name: %s, namespace: %s", err, data.Name.ValueString(), data.Namespace.ValueString()))
 		return
 	}