fix tests with hard coded names

Signed-off-by: smcavallo <smcavallo@hotmail.com>
crossplane-contrib · May 24, 2021 · 61bcbf6 · 61bcbf6
1 parent 8fb646d
commit 61bcbf6
Showing 1 changed file with 22 additions and 43 deletions.
diff --git a/pkg/controller/lambda/function/setup_test.go b/pkg/controller/lambda/function/setup_test.go
@@ -25,6 +25,7 @@ func withSpec(p v1alpha1.FunctionParameters) functionModifier {
 
 func function(m ...functionModifier) *v1alpha1.Function {
 	cr := &v1alpha1.Function{}
+	cr.Name = "test-function-name"
 	for _, f := range m {
 		f(cr)
 	}
@@ -46,7 +47,7 @@ func TestIsUpToDateEnvironment(t *testing.T) {
 	}{
 		"NilSourceNoUpdate": {
 			args: args{
-				cr:  function(withSpec(v1alpha1.FunctionParameters{FunctionName: aws.String("test")})),
+				cr:  function(withSpec(v1alpha1.FunctionParameters{})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{Environment: &svcsdk.EnvironmentResponse{Variables: map[string]*string{}}}},
 			},
 			want: want{
@@ -56,7 +57,7 @@ func TestIsUpToDateEnvironment(t *testing.T) {
 		},
 		"NilSourceNilAwsNoUpdate": {
 			args: args{
-				cr:  function(withSpec(v1alpha1.FunctionParameters{FunctionName: aws.String("test")})),
+				cr:  function(withSpec(v1alpha1.FunctionParameters{})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{}},
 			},
 			want: want{
@@ -67,7 +68,6 @@ func TestIsUpToDateEnvironment(t *testing.T) {
 		"EmptySourceNoUpdate": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName: aws.String("test"),
 					Environment: &v1alpha1.Environment{
 						Variables: map[string]*string{},
 					}})),
@@ -80,7 +80,7 @@ func TestIsUpToDateEnvironment(t *testing.T) {
 		},
 		"NilSourceWithUpdate": {
 			args: args{
-				cr: function(withSpec(v1alpha1.FunctionParameters{FunctionName: aws.String("test")})),
+				cr: function(withSpec(v1alpha1.FunctionParameters{})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{Environment: &svcsdk.EnvironmentResponse{
 					Variables: map[string]*string{"tagKey2": aws.String("tagValue2")}}}},
 			},
@@ -92,7 +92,6 @@ func TestIsUpToDateEnvironment(t *testing.T) {
 		"NilAwsWithUpdate": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName: aws.String("test"),
 					Environment: &v1alpha1.Environment{
 						Variables: map[string]*string{"tagKey1": aws.String("tagValue1")},
 					}})),
@@ -106,7 +105,6 @@ func TestIsUpToDateEnvironment(t *testing.T) {
 		"NeedsUpdate": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName: aws.String("test"),
 					Environment: &v1alpha1.Environment{
 						Variables: map[string]*string{"tagKey1": aws.String("tagValue1")},
 					}})),
@@ -121,7 +119,6 @@ func TestIsUpToDateEnvironment(t *testing.T) {
 		"NoUpdateNeeded": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName: aws.String("test"),
 					Environment: &v1alpha1.Environment{
 						Variables: map[string]*string{"tagKey1": aws.String("tagValue1")},
 					}})),
@@ -136,7 +133,6 @@ func TestIsUpToDateEnvironment(t *testing.T) {
 		"NoUpdateNeededOutOfOrder": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName: aws.String("test"),
 					Environment: &v1alpha1.Environment{
 						Variables: map[string]*string{"tagKey1": aws.String("tagValue1"), "tagKey2": aws.String("tagValue2"), "tagKey3": aws.String("tagValue3")},
 					}})),
@@ -174,7 +170,7 @@ func TestIsUpToDateFileSystemConfigs(t *testing.T) {
 	}{
 		"NilSourceNoUpdate": {
 			args: args{
-				cr:  function(withSpec(v1alpha1.FunctionParameters{FunctionName: aws.String("test")})),
+				cr:  function(withSpec(v1alpha1.FunctionParameters{})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{FileSystemConfigs: []*svcsdk.FileSystemConfig{}}},
 			},
 			want: want{
@@ -184,7 +180,7 @@ func TestIsUpToDateFileSystemConfigs(t *testing.T) {
 		},
 		"NilSourceNilAwsNoUpdate": {
 			args: args{
-				cr:  function(withSpec(v1alpha1.FunctionParameters{FunctionName: aws.String("test")})),
+				cr:  function(withSpec(v1alpha1.FunctionParameters{})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{}},
 			},
 			want: want{
@@ -195,7 +191,6 @@ func TestIsUpToDateFileSystemConfigs(t *testing.T) {
 		"EmptySourceNoUpdate": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName:      aws.String("test"),
 					FileSystemConfigs: []*v1alpha1.FileSystemConfig{}})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{
 					FileSystemConfigs: []*svcsdk.FileSystemConfig{}}},
@@ -207,7 +202,7 @@ func TestIsUpToDateFileSystemConfigs(t *testing.T) {
 		},
 		"NilSourceWithUpdate": {
 			args: args{
-				cr: function(withSpec(v1alpha1.FunctionParameters{FunctionName: aws.String("test")})),
+				cr: function(withSpec(v1alpha1.FunctionParameters{})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{
 					FileSystemConfigs: []*svcsdk.FileSystemConfig{{Arn: aws.String("arn1"), LocalMountPath: aws.String(" localMountPath1")}}}},
 			},
@@ -219,7 +214,6 @@ func TestIsUpToDateFileSystemConfigs(t *testing.T) {
 		"NilAwsWithUpdate": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName:      aws.String("test"),
 					FileSystemConfigs: []*v1alpha1.FileSystemConfig{{ARN: aws.String("arn1"), LocalMountPath: aws.String(" localMountPath1")}}})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{}},
 			},
@@ -231,7 +225,6 @@ func TestIsUpToDateFileSystemConfigs(t *testing.T) {
 		"NeedsUpdateArnAndMounthPath": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName:      aws.String("test"),
 					FileSystemConfigs: []*v1alpha1.FileSystemConfig{{ARN: aws.String("arn1"), LocalMountPath: aws.String(" localMountPath1")}}})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{
 					FileSystemConfigs: []*svcsdk.FileSystemConfig{{Arn: aws.String("arn2"), LocalMountPath: aws.String(" localMountPath2")}}}},
@@ -244,7 +237,6 @@ func TestIsUpToDateFileSystemConfigs(t *testing.T) {
 		"NeedsUpdateArn": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName:      aws.String("test"),
 					FileSystemConfigs: []*v1alpha1.FileSystemConfig{{ARN: aws.String("arn1"), LocalMountPath: aws.String(" localMountPath1")}}})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{
 					FileSystemConfigs: []*svcsdk.FileSystemConfig{{Arn: aws.String("arn2"), LocalMountPath: aws.String(" localMountPath1")}}}},
@@ -257,7 +249,6 @@ func TestIsUpToDateFileSystemConfigs(t *testing.T) {
 		"NeedsUpdateMountPath": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName:      aws.String("test"),
 					FileSystemConfigs: []*v1alpha1.FileSystemConfig{{ARN: aws.String("arn1"), LocalMountPath: aws.String(" localMountPath1")}}})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{
 					FileSystemConfigs: []*svcsdk.FileSystemConfig{{Arn: aws.String("arn1"), LocalMountPath: aws.String(" localMountPath2")}}}},
@@ -270,7 +261,6 @@ func TestIsUpToDateFileSystemConfigs(t *testing.T) {
 		"NoUpdateNeeded": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName:      aws.String("test"),
 					FileSystemConfigs: []*v1alpha1.FileSystemConfig{{ARN: aws.String("arn1"), LocalMountPath: aws.String(" localMountPath1")}}})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{
 					FileSystemConfigs: []*svcsdk.FileSystemConfig{{Arn: aws.String("arn1"), LocalMountPath: aws.String(" localMountPath1")}}}},
@@ -283,7 +273,6 @@ func TestIsUpToDateFileSystemConfigs(t *testing.T) {
 		"NoUpdateNeededSortOrder": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName: aws.String("test"),
 					FileSystemConfigs: []*v1alpha1.FileSystemConfig{{ARN: aws.String("arn1"), LocalMountPath: aws.String(" localMountPath1")},
 						{ARN: aws.String("arn2"), LocalMountPath: aws.String(" localMountPath2")}}})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{
@@ -322,7 +311,7 @@ func TestIsUpToDateTracingConfig(t *testing.T) {
 	}{
 		"NilSourceNoUpdate": {
 			args: args{
-				cr: function(withSpec(v1alpha1.FunctionParameters{FunctionName: aws.String("test")})),
+				cr: function(withSpec(v1alpha1.FunctionParameters{})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{
 					TracingConfig: &svcsdk.TracingConfigResponse{
 						Mode: aws.String(svcsdk.TracingModePassThrough)}}},
@@ -335,7 +324,6 @@ func TestIsUpToDateTracingConfig(t *testing.T) {
 		"EmptySourceNoUpdate": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName:  aws.String("test"),
 					TracingConfig: &v1alpha1.TracingConfig{}})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{
 					TracingConfig: &svcsdk.TracingConfigResponse{
@@ -348,7 +336,7 @@ func TestIsUpToDateTracingConfig(t *testing.T) {
 		},
 		"NilSourceWithUpdate": {
 			args: args{
-				cr: function(withSpec(v1alpha1.FunctionParameters{FunctionName: aws.String("test")})),
+				cr: function(withSpec(v1alpha1.FunctionParameters{})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{
 					TracingConfig: &svcsdk.TracingConfigResponse{
 						Mode: aws.String(svcsdk.TracingModeActive)}}},
@@ -361,7 +349,6 @@ func TestIsUpToDateTracingConfig(t *testing.T) {
 		"NeedsUpdate": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName:  aws.String("test"),
 					TracingConfig: &v1alpha1.TracingConfig{Mode: aws.String(svcsdk.TracingModeActive)}})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{
 					TracingConfig: &svcsdk.TracingConfigResponse{
@@ -375,7 +362,6 @@ func TestIsUpToDateTracingConfig(t *testing.T) {
 		"NoUpdateNeeded": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName:  aws.String("test"),
 					TracingConfig: &v1alpha1.TracingConfig{Mode: aws.String(svcsdk.TracingModeActive)}})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{
 					TracingConfig: &svcsdk.TracingConfigResponse{
@@ -412,7 +398,7 @@ func TestIsUpToDateSecurityGroupIDs(t *testing.T) {
 	}{
 		"NilSourceNoUpdate": {
 			args: args{
-				cr: function(withSpec(v1alpha1.FunctionParameters{FunctionName: aws.String("functionName")})),
+				cr: function(withSpec(v1alpha1.FunctionParameters{})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{
 					VpcConfig: &svcsdk.VpcConfigResponse{SecurityGroupIds: []*string{}}}},
 			},
@@ -423,7 +409,7 @@ func TestIsUpToDateSecurityGroupIDs(t *testing.T) {
 		},
 		"NilSourceNilAwsNoUpdate": {
 			args: args{
-				cr:  function(withSpec(v1alpha1.FunctionParameters{FunctionName: aws.String("functionName")})),
+				cr:  function(withSpec(v1alpha1.FunctionParameters{})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{}},
 			},
 			want: want{
@@ -434,8 +420,7 @@ func TestIsUpToDateSecurityGroupIDs(t *testing.T) {
 		"EmptySourceNoUpdate": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName: aws.String("test"),
-					VPCConfig:    &v1alpha1.VPCConfig{SecurityGroupIDs: []*string{}}})),
+					VPCConfig: &v1alpha1.VPCConfig{SecurityGroupIDs: []*string{}}})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{
 					VpcConfig: &svcsdk.VpcConfigResponse{SecurityGroupIds: []*string{}}}},
 			},
@@ -446,7 +431,7 @@ func TestIsUpToDateSecurityGroupIDs(t *testing.T) {
 		},
 		"NilSourceWithUpdate": {
 			args: args{
-				cr: function(withSpec(v1alpha1.FunctionParameters{FunctionName: aws.String("functionName")})),
+				cr: function(withSpec(v1alpha1.FunctionParameters{})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{
 					VpcConfig: &svcsdk.VpcConfigResponse{SecurityGroupIds: []*string{aws.String("id1")}}}},
 			},
@@ -458,8 +443,7 @@ func TestIsUpToDateSecurityGroupIDs(t *testing.T) {
 		"NilAwsWithUpdate": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName: aws.String("functionName"),
-					VPCConfig:    &v1alpha1.VPCConfig{SecurityGroupIDs: []*string{aws.String("id1")}}})),
+					VPCConfig: &v1alpha1.VPCConfig{SecurityGroupIDs: []*string{aws.String("id1")}}})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{}},
 			},
 			want: want{
@@ -470,8 +454,7 @@ func TestIsUpToDateSecurityGroupIDs(t *testing.T) {
 		"NeedsUpdate": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName: aws.String("functionName"),
-					VPCConfig:    &v1alpha1.VPCConfig{SecurityGroupIDs: []*string{aws.String("id1")}}})),
+					VPCConfig: &v1alpha1.VPCConfig{SecurityGroupIDs: []*string{aws.String("id1")}}})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{
 					VpcConfig: &svcsdk.VpcConfigResponse{SecurityGroupIds: []*string{aws.String("id2")}}}},
 			},
@@ -483,8 +466,7 @@ func TestIsUpToDateSecurityGroupIDs(t *testing.T) {
 		"NoUpdateNeededSortOrderIsDifferent": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName: aws.String("functionName"),
-					VPCConfig:    &v1alpha1.VPCConfig{SecurityGroupIDs: []*string{aws.String("id1"), aws.String("id2")}}})),
+					VPCConfig: &v1alpha1.VPCConfig{SecurityGroupIDs: []*string{aws.String("id1"), aws.String("id2")}}})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{
 					VpcConfig: &svcsdk.VpcConfigResponse{SecurityGroupIds: []*string{aws.String("id2"), aws.String("id1")}}}},
 			},
@@ -496,8 +478,7 @@ func TestIsUpToDateSecurityGroupIDs(t *testing.T) {
 		"NoUpdateNeeded": {
 			args: args{
 				cr: function(withSpec(v1alpha1.FunctionParameters{
-					FunctionName: aws.String("functionName"),
-					VPCConfig:    &v1alpha1.VPCConfig{SecurityGroupIDs: []*string{aws.String("id1")}}})),
+					VPCConfig: &v1alpha1.VPCConfig{SecurityGroupIDs: []*string{aws.String("id1")}}})),
 				obj: &svcsdk.GetFunctionOutput{Configuration: &svcsdk.FunctionConfiguration{
 					VpcConfig: &svcsdk.VpcConfigResponse{SecurityGroupIds: []*string{aws.String("id1")}}}},
 			},
@@ -627,13 +608,12 @@ func TestGenerateUpdateFunctionCodeInput(t *testing.T) {
 	}{
 		"ConvertS3": {
 			args: args{
-				cr: function(withSpec(v1alpha1.FunctionParameters{FunctionName: aws.String("test_function"),
-					Code: &v1alpha1.FunctionCode{ImageURI: aws.String("test_image"),
-						S3Bucket: aws.String("test_bucket"),
-						S3Key:    aws.String("test_key")}}))},
+				cr: function(withSpec(v1alpha1.FunctionParameters{Code: &v1alpha1.FunctionCode{ImageURI: aws.String("test_image"),
+					S3Bucket: aws.String("test_bucket"),
+					S3Key:    aws.String("test_key")}}))},
 			want: want{
 				obj: &svcsdk.UpdateFunctionCodeInput{
-					FunctionName: aws.String("test_function"),
+					FunctionName: aws.String("test-function-name"),
 					ImageUri:     aws.String("test_image"),
 					S3Bucket:     aws.String("test_bucket"),
 					S3Key:        aws.String("test_key")}},
@@ -673,7 +653,6 @@ func TestGenerateUpdateFunctionConfigurationInput(t *testing.T) {
 						Variables: map[string]*string{"tagKey1": aws.String("tagValue1")},
 					},
 					FileSystemConfigs: []*v1alpha1.FileSystemConfig{{ARN: aws.String("arn1")}},
-					FunctionName:      aws.String("test_function"),
 					Handler:           aws.String("test_handler"),
 					KMSKeyARN:         aws.String("test_kms"),
 					MemorySize:        aws.Int64(128),
@@ -691,7 +670,7 @@ func TestGenerateUpdateFunctionConfigurationInput(t *testing.T) {
 						Variables: map[string]*string{"tagKey1": aws.String("tagValue1")},
 					},
 					FileSystemConfigs: []*svcsdk.FileSystemConfig{{Arn: aws.String("arn1")}},
-					FunctionName:      aws.String("test_function"),
+					FunctionName:      aws.String("test-function-name"),
 					Handler:           aws.String("test_handler"),
 					KMSKeyArn:         aws.String("test_kms"),
 					MemorySize:        aws.Int64(128),