Merge pull request #48 from devtron-labs/expose-with-grpc

introduces some minor refac around error handling

Author: prakash100198

DockerfileMVC app/DockerfileMVC

@@ -25,7 +25,7 @@ func NewGrpcHandlerImpl(
 }
 
 func (impl *GrpcHandlerImpl) GetClusterUpgradeSummaryValidationResult(ctx context.Context, request *grpc.ClusterUpgradeRequest) (*grpc.ClusterUpgradeResponse, error) {
-	impl.logger.Infow("scan cluster resources compatibility for k8s version upgrade request", "request", request)
+	impl.logger.Infow("scan cluster resources compatibility for k8s version upgrade request", "clusterId", request.ClusterConfig.ClusterId, "clusterName", request.ClusterConfig.ClusterName, "serverUrl", request.ClusterConfig.ApiServerUrl)
 	summaryValidationResult, err := impl.clusterUpgradeReadService.GetClusterUpgradeSummaryValidationResult(request.TargetK8SVersion, request.ClusterConfig)
 	if err != nil {
 		impl.logger.Errorw("error in getting cluster upgrade summary validation result", "targetK8sVersion", request.TargetK8SVersion, "err", err)

app/api/GrpcHandler.go

@@ -9,6 +9,7 @@ import (
 	"github.com/devtron-labs/silver-surfer/app/grpc"
 	"github.com/devtron-labs/silver-surfer/kubedd"
 	"github.com/devtron-labs/silver-surfer/pkg"
+	errors2 "github.com/devtron-labs/silver-surfer/pkg/errors"
 	"go.uber.org/zap"
 	"k8s.io/client-go/rest"
 )
@@ -45,8 +46,8 @@ func (impl *ClusterUpgradeReadServiceImpl) GetClusterUpgradeSummaryValidationRes
 	results, err := kubedd.ValidateCluster(cluster, &pkg.Config{TargetKubernetesVersion: targetK8sVersion})
 	if err != nil {
 		impl.logger.Errorw("error in ValidateCluster", "err", err)
-		if err.Error() == fmt.Sprintf(pkg.OpenApiSpecNotFoundError, targetK8sVersion) {
-			return nil, errors.New(fmt.Sprintf(pkg.OpenApiSpecNotFoundError, targetK8sVersion))
+		if errors.Is(err, errors2.ErrOpenApiSpecNotFound) {
+			return nil, errors.New(fmt.Sprintf(errors2.OpenApiSpecNotFoundError, targetK8sVersion))
 		}
 		return nil, err
 	}

app/service/ClusterUpgradeReadService.go

@@ -20,8 +20,8 @@ package pkg
 import (
 	"bytes"
 	"context"
-	"errors"
 	"fmt"
+	"github.com/devtron-labs/silver-surfer/pkg/errors"
 	"github.com/getkin/kin-openapi/openapi2"
 	"github.com/getkin/kin-openapi/openapi2conv"
 	"github.com/getkin/kin-openapi/openapi3"
@@ -116,7 +116,7 @@ func (k *kubeCheckerImpl) downloadFile(releaseVersion string) ([]byte, error) {
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode == http.StatusNotFound {
-		return []byte{}, errors.New(fmt.Sprintf(OpenApiSpecNotFoundError, releaseVersion))
+		return []byte{}, errors.ErrOpenApiSpecNotFound
 	}
 	var out bytes.Buffer
 	_, err = io.Copy(&out, resp.Body)

pkg/K8sSchemaParser.go

@@ -30,8 +30,6 @@ import (
 const (
 	gvFormat  = "%s/%s"
 	gvkFormat = "%s/%s/%s"
-
-	OpenApiSpecNotFoundError = "openapi-spec not found for the k8s version %s"
 )
 
 func getKeyForGV(msg json.RawMessage) (string, error) {

pkg/Util.go

@@ -0,0 +1,9 @@
+package errors
+
+import (
+	"errors"
+)
+
+const OpenApiSpecNotFoundError = "openapi-spec not found for the k8s version %s"
+
+var ErrOpenApiSpecNotFound = errors.New(OpenApiSpecNotFoundError)