Merge pull request #1582 from schroeder-paul/fix-wrong-logic-lambda-c…

…ode-ECR-image Fix wrong logic lambda code ecr image
crossplane-contrib · Nov 24, 2022 · 02b4ddc · 02b4ddc
2 parents 095bdea + 984d15e
commit 02b4ddc
Show file tree

Hide file tree

Showing 3 changed files with 323 additions and 68 deletions.
diff --git a/package/crds/s3.aws.crossplane.io_buckets.yaml b/package/crds/s3.aws.crossplane.io_buckets.yaml
@@ -416,8 +416,8 @@ spec:
                       bucket will be created. It is a required field. Due to AWS API
                       limitations lacking on a proper response, when this field is
                       set to a wrong value, or to non-existent region on bucket creation,
-                      it's impossible forwarding a meaning status message to the user
-                      about the problem, producing some errors related to dial
+                      it's impossible forwarding a meaningful status message to the
+                      user about the problem, producing connection errors instead.
                     type: string
                   loggingConfiguration:
                     description: Specifies logging parameters for an Amazon S3 bucket.

diff --git a/pkg/controller/lambda/function/setup.go b/pkg/controller/lambda/function/setup.go
@@ -30,11 +30,11 @@ const (
 
 	// used in creation
 	packageTypeImage = string(svcapitypes.PackageType_Image)
-	// packageTypeZip   = string(svcapitypes.PackageType_Zip)
+	packageTypeZip   = string(svcapitypes.PackageType_Zip)
 
 	// used in observation
 	repositoryTypeECR = "ECR"
-	// repositoryTypeS3  = "S3"
+	repositoryTypeS3  = "S3"
 )
 
 // SetupFunction adds a controller that reconciles Function.
@@ -224,41 +224,25 @@ func isUpToDateEnvironment(cr *svcapitypes.Function, obj *svcsdk.GetFunctionOutp
 	return cmp.Equal(envVars, awsVars, sortCmp, cmpopts.EquateEmpty())
 }
 
-func actualRepositoryType(obj *svcsdk.GetFunctionOutput) *string {
-	if obj.Code == nil {
-		return nil
-	}
-	return obj.Code.RepositoryType
-}
-
-func actualPackageType(obj *svcsdk.GetFunctionOutput) *string {
+func equalPackageType(cr *svcapitypes.Function, obj *svcsdk.GetFunctionOutput) bool {
 	if obj.Configuration == nil {
-		return nil
+		return false
 	}
-	return obj.Configuration.PackageType
-}
-
-func desiredPackageType(cr *svcapitypes.Function) *string {
-	return cr.Spec.ForProvider.PackageType
+	return aws.StringValue(cr.Spec.ForProvider.PackageType) == aws.StringValue(obj.Configuration.PackageType)
 }
 
-func desiredImageURI(cr *svcapitypes.Function) *string {
-	return cr.Spec.ForProvider.CustomFunctionCodeParameters.ImageURI
-}
-
-func actualImageURI(obj *svcsdk.GetFunctionOutput) *string {
+func isRepositoryType(obj *svcsdk.GetFunctionOutput, repositoryType string) bool {
 	if obj.Code == nil {
-		return nil
+		return false
 	}
-	return obj.Code.ImageUri
-}
-
-func bothPackageTypesNil(cr *svcapitypes.Function, obj *svcsdk.GetFunctionOutput) bool {
-	return desiredPackageType(cr) == nil && actualPackageType(obj) == nil
+	return aws.StringValue(obj.Code.RepositoryType) == repositoryType
 }
 
-func bothImageURI(cr *svcapitypes.Function, obj *svcsdk.GetFunctionOutput) bool {
-	return desiredImageURI(cr) == nil && actualImageURI(obj) == nil
+func equalImageURI(cr *svcapitypes.Function, obj *svcsdk.GetFunctionOutput) bool {
+	if obj.Code == nil {
+		return false
+	}
+	return aws.StringValue(cr.Spec.ForProvider.CustomFunctionCodeParameters.ImageURI) == aws.StringValue(obj.Code.ImageUri)
 }
 
 // isUpToDateCodeImage checks if FunctionConfiguration FunctionCodeLocation (Image) is up-to-date
@@ -267,36 +251,16 @@ func isUpToDateCodeImage(cr *svcapitypes.Function, obj *svcsdk.GetFunctionOutput
 	desired := cr
 	actual := obj
 
-	if *desiredPackageType(desired) != packageTypeImage {
-		// code is not supplied via container image
+	if aws.StringValue(desired.Spec.ForProvider.PackageType) == packageTypeZip {
 		return true
 	}
-
-	if bothPackageTypesNil(desired, actual) {
-		return true
-	}
-
-	if actualPackageType(actual) == nil {
-		return false
-	}
-	if *desiredPackageType(desired) != *actualPackageType(actual) {
-		return false
-	}
-
-	if actualRepositoryType(actual) == nil {
-		return false
-	}
-	if *actualRepositoryType(actual) != repositoryTypeECR {
+	if !equalPackageType(desired, actual) {
 		return false
 	}
-
-	if bothImageURI(desired, actual) {
-		return true
-	}
-	if actualImageURI(actual) == nil {
+	if !isRepositoryType(actual, repositoryTypeECR) {
 		return false
 	}
-	return *desiredImageURI(desired) != *actualImageURI(actual)
+	return equalImageURI(desired, actual)
 }
 
 func isUpToDateFileSystemConfigs(cr *svcapitypes.Function, obj *svcsdk.GetFunctionOutput) bool {