cleanup

Signed-off-by: Austin Liu <[email protected]>

flyteadmin/pkg/errors/errors_test.go

@@ -3,9 +3,11 @@ package errors
 import (
 	"context"
 	"errors"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/wI2L/jsondiff"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
@@ -54,6 +56,27 @@ func TestNewIncompatibleClusterError(t *testing.T) {
 	assert.True(t, ok)
 }
 
+func TestJsonDifferError(t *testing.T) {
+	oldSpec := map[string]int{
+		"one":   1,
+		"two":   2,
+		"three": 3,
+		"four":  4,
+		"five":  5,
+	}
+	newSpec := map[string]int{
+		"five":  5,
+		"four":  0,
+		"three": 3,
+		"two":   2,
+		"one":   1,
+	}
+	diff, _ := jsondiff.Compare(oldSpec, newSpec)
+	rdiff, _ := jsondiff.Compare(newSpec, oldSpec)
+	rs := compareJsons(diff, rdiff)
+	assert.Equal(t, "\t\t- /four: 4 -> 0", strings.Join(rs, "\n"))
+}
+
 func TestNewTaskExistsDifferentStructureError(t *testing.T) {
 	req := &admin.TaskCreateRequest{
 		Id: &identifier,

flyteadmin/pkg/manager/impl/launch_plan_manager.go

@@ -90,9 +90,10 @@ func (m *LaunchPlanManager) CreateLaunchPlan(
 		if bytes.Equal(existingLaunchPlanModel.Digest, launchPlanDigest) {
 			return nil, errors.NewLaunchPlanExistsIdenticalStructureError(ctx, &request)
 		}
-		existingLaunchPlan, err2 := transformers.FromLaunchPlanModel(existingLaunchPlanModel)
-		if err2 != nil {
-			return nil, err2
+		existingLaunchPlan, transformerErr := transformers.FromLaunchPlanModel(existingLaunchPlanModel)
+		if transformerErr != nil {
+			logger.Errorf(ctx, "failed to transform launch plan from launch plan model")
+			return nil, transformerErr
 		}
 		// A launch plan exists with different structure
 		return nil, errors.NewLaunchPlanExistsDifferentStructureError(ctx, &request, existingLaunchPlan.Spec, launchPlan.Spec)

flyteadmin/pkg/manager/impl/task_manager.go

@@ -94,9 +94,10 @@ func (t *TaskManager) CreateTask(
 		if bytes.Equal(taskDigest, existingTaskModel.Digest) {
 			return nil, errors.NewTaskExistsIdenticalStructureError(ctx, &request)
 		}
-		existingTask, err2 := transformers.FromTaskModel(*existingTaskModel)
-		if err2 != nil {
-			return nil, err2
+		existingTask, transformerErr := transformers.FromTaskModel(*existingTaskModel)
+		if transformerErr != nil {
+			logger.Errorf(ctx, "failed to transform task from task model")
+			return nil, transformerErr
 		}
 		return nil, errors.NewTaskExistsDifferentStructureError(ctx, &request, existingTask.Closure.GetCompiledTask(), compiledTask)
 	}

flyteadmin/pkg/manager/impl/workflow_manager.go

@@ -168,9 +168,10 @@ func (w *WorkflowManager) CreateWorkflow(
 		if bytes.Equal(workflowDigest, existingWorkflowModel.Digest) {
 			return nil, errors.NewWorkflowExistsIdenticalStructureError(ctx, &request)
 		}
-		existingWorkflow, err2 := transformers.FromWorkflowModel(existingWorkflowModel)
-		if err2 != nil {
-			return nil, err2
+		existingWorkflow, transformerErr := transformers.FromWorkflowModel(existingWorkflowModel)
+		if transformerErr != nil {
+			logger.Errorf(ctx, "failed to transform workflow from workflow model")
+			return nil, transformerErr
 		}
 		// A workflow exists with different structure
 		return nil, errors.NewWorkflowExistsDifferentStructureError(ctx, &request, existingWorkflow.Closure.GetCompiledWorkflow(), workflowClosure.GetCompiledWorkflow())