Fix up CRD auto-generated code

flyteadmin/pkg/common/mocks/storage.go

@@ -83,6 +83,10 @@ func (t *TestDataStore) Delete(ctx context.Context, reference storage.DataRefere
 	return t.DeleteCb(ctx, reference)
 }
 
+func (t *TestDataStore) DeepCopyReferenceConstructor() storage.ReferenceConstructor {
+	return nil
+}
+
 func GetMockStorageClient() *storage.DataStore {
 	mockStorageClient := TestDataStore{
 		Store: make(map[storage.DataReference][]byte),

flyteadmin/pkg/workflowengine/impl/prepare_execution.go

@@ -28,7 +28,7 @@ func addPermissions(securityCtx *core.SecurityContext, roleNameKey string, flyte
 	if securityCtx == nil || securityCtx.RunAs == nil {
 		return
 	}
-	flyteWf.SecurityContext = *securityCtx
+	flyteWf.SecurityContext = v1alpha1.SecurityContext{SecurityContext: *securityCtx}
 	if len(securityCtx.RunAs.IamRole) > 0 {
 		if flyteWf.Annotations == nil {
 			flyteWf.Annotations = map[string]string{}

flytepropeller/Makefile

@@ -37,7 +37,7 @@ cross_compile:
 	go build -o bin/cross/kubectl-flyte ./cmd/kubectl-flyte/main.go
 
 op_code_generate:
-	@RESOURCE_NAME=flyteworkflow OPERATOR_PKG=github.com/flyteorg/flytepropeller ./hack/update-codegen.sh
+	@RESOURCE_NAME=flyteworkflow OPERATOR_PKG=github.com/flyteorg/flyte/flytepropeller ./hack/update-codegen.sh
 
 benchmark:
 	mkdir -p ./bin/benchmark

flytepropeller/hack/update-codegen.sh

@@ -36,7 +36,7 @@ bash ${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \
   ${OPERATOR_PKG}/pkg/client \
   ${OPERATOR_PKG}/pkg/apis \
   ${RESOURCE_NAME}:v1alpha1 \
-  --output-base "$(dirname ${BASH_SOURCE})/../../../.." \
+  --output-base "$(dirname ${BASH_SOURCE})/../../../../.." \
   --go-header-file ${SCRIPT_ROOT}/hack/boilerplate.go.txt
 
 # To use your own boilerplate text use:

flytepropeller/pkg/apis/flyteworkflow/v1alpha1/branch.go

@@ -4,6 +4,7 @@
 	"bytes"
 
 	"github.com/golang/protobuf/jsonpb"
+	"google.golang.org/protobuf/proto"
 
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
 )
@@ -31,9 +32,7 @@
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *BooleanExpression) DeepCopyInto(out *BooleanExpression) {
-	*out = *in
-	// We do not manipulate the object, so its ok
-	// Once we figure out the autogenerate story we can replace this
+	out.BooleanExpression = proto.Clone(in.BooleanExpression).(*core.BooleanExpression)
 }
 
 type IfBlock struct {
@@ -49,11 +48,35 @@
 	return in.ThenNode
 }
 
+type Error struct {
+	*core.Error
+}
+
+func (in *Error) UnmarshalJSON(b []byte) error {
+	in.Error = &core.Error{}
+	return jsonpb.Unmarshal(bytes.NewReader(b), in.Error)
+}
+
+func (in Error) MarshalJSON() ([]byte, error) {
+	if in.Error == nil {
+		return nilJSON, nil
+	}
+	var buf bytes.Buffer
+	if err := marshaler.Marshal(&buf, in.Error); err != nil {
+		return nil, err
+	}
+	return buf.Bytes(), nil
+}
+
+func (in *Error) DeepCopyInto(out *Error) {
+	out.Error = proto.Clone(in.Error).(*core.Error)
+}
+
 type BranchNodeSpec struct {
-	If       IfBlock     `json:"if"`
-	ElseIf   []*IfBlock  `json:"elseIf,omitempty"`
-	Else     *NodeID     `json:"else,omitempty"`
-	ElseFail *core.Error `json:"elseFail,omitempty"`
+	If       IfBlock    `json:"if"`
+	ElseIf   []*IfBlock `json:"elseIf,omitempty"`
+	Else     *NodeID    `json:"else,omitempty"`
+	ElseFail *Error     `json:"elseFail,omitempty"`
 }
 
 func (in *BranchNodeSpec) GetIf() ExecutableIfBlock {
@@ -73,5 +96,8 @@
 }
 
 func (in *BranchNodeSpec) GetElseFail() *core.Error {
-	return in.ElseFail
+	if in.ElseFail == nil {
+		return nil
+	}
+	return in.ElseFail.Error
 }

flytepropeller/pkg/apis/flyteworkflow/v1alpha1/branch_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"google.golang.org/protobuf/proto"
 
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
 )
@@ -30,8 +31,10 @@ func TestBranchNodeSpecMethods(t *testing.T) {
 	boolExpr := &core.BooleanExpression{}
 
 	// Creating an Error instance for testing
-	errorMessage := &core.Error{
-		Message: "Test error",
+	errorMessage := &Error{
+		Error: &core.Error{
+			Message: "Test error",
+		},
 	}
 
 	ifNode := NodeID("ifNode")
@@ -71,8 +74,73 @@ func TestBranchNodeSpecMethods(t *testing.T) {
 	assert.Equal(t, boolExpr, elifs[0].GetCondition())
 	assert.Equal(t, &elifNode, elifs[0].GetThenNode())
 
-	assert.Equal(t, errorMessage, branchNodeSpec.GetElseFail())
+	assert.True(t, proto.Equal(errorMessage.Error, branchNodeSpec.GetElseFail()))
 
 	branchNodeSpec.ElseFail = nil
 	assert.Nil(t, branchNodeSpec.GetElseFail())
 }
+
+func TestWrappedBooleanExpressionDeepCopy(t *testing.T) {
+	// 1. Set up proto
+	protoBoolExpr := &core.BooleanExpression{
+		Expr: &core.BooleanExpression_Comparison{
+			Comparison: &core.ComparisonExpression{
+				Operator: core.ComparisonExpression_GT,
+				LeftValue: &core.Operand{
+					Val: &core.Operand_Primitive{
+						Primitive: &core.Primitive{
+							Value: &core.Primitive_Integer{
+								Integer: 10,
+							},
+						},
+					},
+				},
+				RightValue: &core.Operand{
+					Val: &core.Operand_Primitive{
+						Primitive: &core.Primitive{
+							Value: &core.Primitive_Integer{
+								Integer: 11,
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	// 2. Define the wrapper object
+	boolExpr := BooleanExpression{
+		BooleanExpression: protoBoolExpr,
+	}
+
+	// 3. Deep copy the wrapper object
+	copyBoolExpr := boolExpr.DeepCopy()
+
+	// 4. Compare the pointers and the actual values
+	// Assert that the pointers are different
+	assert.True(t, boolExpr.BooleanExpression != copyBoolExpr.BooleanExpression)
+
+	// Assert that the values stored in the proto messages are equal
+	assert.True(t, proto.Equal(boolExpr.BooleanExpression, copyBoolExpr.BooleanExpression))
+}
+
+func TestWrappedErrorDeepCopy(t *testing.T) {
+	// 1. Set up proto
+	protoError := &core.Error{
+		Message: "an error",
+	}
+
+	// 2. Define the wrapper object
+	error := Error{
+		Error: protoError,
+	}
+
+	// 3. Deep copy the wrapper object
+	errorCopy := error.DeepCopy()
+
+	// 4. Assert that the pointers are different
+	assert.True(t, error.Error != errorCopy.Error)
+
+	// 5. Assert that the values stored in the proto messages are equal
+	assert.True(t, proto.Equal(error.Error, errorCopy.Error))
+}

flytepropeller/pkg/apis/flyteworkflow/v1alpha1/error.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 
 	"github.com/golang/protobuf/jsonpb"
+	"google.golang.org/protobuf/proto"
 
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
 )
@@ -30,5 +31,5 @@ func (in *ExecutionError) MarshalJSON() ([]byte, error) {
 }
 
 func (in *ExecutionError) DeepCopyInto(out *ExecutionError) {
-	*out = *in
+	out.ExecutionError = proto.Clone(in.ExecutionError).(*core.ExecutionError)
 }

flytepropeller/pkg/apis/flyteworkflow/v1alpha1/error_test.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
+	"github.com/golang/protobuf/proto"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
@@ -28,3 +29,20 @@ func TestExecutionErrorJSONMarshalling(t *testing.T) {
 	assert.Equal(t, execError.Message, newExecErr.ExecutionError.Message)
 	assert.Equal(t, execError.ErrorUri, newExecErr.ExecutionError.ErrorUri)
 }
+
+func TestExecutionErrorDeepCopy(t *testing.T) {
+	execError := &core.ExecutionError{
+		Code:     "TestCode",
+		Message:  "Test error message",
+		ErrorUri: "Test error uri",
+	}
+
+	execErr := &ExecutionError{ExecutionError: execError}
+	newExecErr := execErr.DeepCopy()
+
+	// 4. Compare the pointers and the actual values
+	// Assert that the pointers are different
+	assert.True(t, execErr.ExecutionError != newExecErr.ExecutionError)
+	// Assert that the values stored in the proto messages are equal
+	assert.True(t, proto.Equal(execErr.ExecutionError, newExecErr.ExecutionError))
+}

flytepropeller/pkg/apis/flyteworkflow/v1alpha1/execution_config.go

@@ -1,6 +1,7 @@
 package v1alpha1
 
 import (
+	"google.golang.org/protobuf/proto"
 	"k8s.io/apimachinery/pkg/api/resource"
 
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
@@ -15,7 +16,7 @@ type RawOutputDataConfig struct {
 }
 
 func (in *RawOutputDataConfig) DeepCopyInto(out *RawOutputDataConfig) {
-	*out = *in
+	out.RawOutputDataConfig = proto.Clone(in.RawOutputDataConfig).(*admin.RawOutputDataConfig)
 }
 
 // This contains workflow-execution specifications and overrides.

flytepropeller/pkg/apis/flyteworkflow/v1alpha1/execution_config_test.go

@@ -4,8 +4,11 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"google.golang.org/protobuf/proto"
+	"k8s.io/apimachinery/pkg/api/resource"
 
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
+	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
 )
 
 func TestRawOutputConfig(t *testing.T) {
@@ -14,3 +17,55 @@ func TestRawOutputConfig(t *testing.T) {
 	}}
 	assert.Equal(t, "s3://bucket", r.OutputLocationPrefix)
 }
+
+func TestWrappedRawOutputConfigDeepCopy(t *testing.T) {
+	rawOutputDataConfig := RawOutputDataConfig{&admin.RawOutputDataConfig{
+		OutputLocationPrefix: "s3://bucket",
+	}}
+	rawOutputDataConfigCopy := rawOutputDataConfig.DeepCopy()
+
+	assert.True(t, rawOutputDataConfig.RawOutputDataConfig != rawOutputDataConfigCopy.RawOutputDataConfig)
+	assert.True(t, proto.Equal(rawOutputDataConfig.RawOutputDataConfig, rawOutputDataConfigCopy.RawOutputDataConfig))
+}
+
+func TestExecutionConfigDeepCopy(t *testing.T) {
+	// 1. Create an ExecutionConfig object (including the wrapper object - WorkflowExecutionIdentifier)
+	interruptible := true
+	executionConfig := &ExecutionConfig{
+		TaskPluginImpls: map[string]TaskPluginOverride{},
+		MaxParallelism:  32,
+		RecoveryExecution: WorkflowExecutionIdentifier{
+			WorkflowExecutionIdentifier: &core.WorkflowExecutionIdentifier{
+				Project: "project",
+				Domain:  "domain",
+				Org:     "organization",
+				Name:    "name",
+			},
+		},
+		TaskResources: TaskResources{
+			Requests: TaskResourceSpec{
+				CPU: resource.Quantity{
+					Format: "1",
+				},
+				Memory: resource.Quantity{
+					Format: "1Gi",
+				},
+			},
+		},
+		Interruptible:  &interruptible,
+		OverwriteCache: false,
+		EnvironmentVariables: map[string]string{
+			"key": "value",
+		},
+	}
+
+	// 2. Deep copy the wrapper object
+	executionConfigCopy := executionConfig.DeepCopy()
+
+	// 3. Assert that the pointers are different
+	assert.True(t, executionConfig.RecoveryExecution.WorkflowExecutionIdentifier != executionConfigCopy.RecoveryExecution.WorkflowExecutionIdentifier)
+
+	// 4. Assert that the values are the same
+	assert.True(t, proto.Equal(executionConfig.RecoveryExecution.WorkflowExecutionIdentifier, executionConfigCopy.RecoveryExecution.WorkflowExecutionIdentifier))
+	assert.Equal(t, executionConfig, executionConfigCopy)
+}

flytepropeller/pkg/apis/flyteworkflow/v1alpha1/gate.go

@@ -4,6 +4,7 @@
 	"bytes"
 
 	"github.com/golang/protobuf/jsonpb"
+	"google.golang.org/protobuf/proto"
 
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
 )
@@ -36,6 +37,10 @@
 	return buf.Bytes(), nil
 }
 
+func (in *ApproveCondition) DeepCopyInto(out *ApproveCondition) {
+	out.ApproveCondition = proto.Clone(in.ApproveCondition).(*core.ApproveCondition)
+}
+
 func (in *ApproveCondition) UnmarshalJSON(b []byte) error {
 	in.ApproveCondition = &core.ApproveCondition{}
 	return jsonpb.Unmarshal(bytes.NewReader(b), in.ApproveCondition)
@@ -62,6 +67,10 @@
 	return jsonpb.Unmarshal(bytes.NewReader(b), in.SignalCondition)
 }
 
+func (in *SignalCondition) DeepCopyInto(out *SignalCondition) {
+	out.SignalCondition = proto.Clone(in.SignalCondition).(*core.SignalCondition)
+}
+
 type SleepCondition struct {
 	*core.SleepCondition
 }
@@ -83,6 +92,10 @@
 	return jsonpb.Unmarshal(bytes.NewReader(b), in.SleepCondition)
 }
 
+func (in *SleepCondition) DeepCopyInto(out *SleepCondition) {
+	out.SleepCondition = proto.Clone(in.SleepCondition).(*core.SleepCondition)
+}
+
 type GateNodeSpec struct {
 	Kind    ConditionKind     `json:"kind"`
 	Approve *ApproveCondition `json:"approve,omitempty"`