Support for passing FunctionRef in Version resource

Create Version resource

Delete functionality

mend

Adding E2E tests

Review changes

Support function reference in Version resource

E2E test for Function Ref

Author: Vandita2020

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2024-01-10T21:05:33Z"
+  build_date: "2024-01-11T18:38:51Z"
   build_hash: 1563ceb2b15ff29ee692b4178d4de5f2cbe0b0f0
   go_version: go1.19
   version: v0.28.0-12-g1563ceb
-api_directory_checksum: 6d988b03425fad3e88d887c1cd4510a07e4be281
+api_directory_checksum: 72bea0d84787d3f6fcaf7bbbc7f576a6d78b4609
 api_version: v1alpha1
 aws_sdk_go_version: v1.44.181
 generator_config_info:
-  file_checksum: 5101c7f40235cfe24d7916bc0cbc95498e1d5e6c
+  file_checksum: 0f86b7a7f2adfe243a9aa055853514f6b4c16645
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/generator.yaml

@@ -218,6 +218,9 @@ resources:
       FunctionName:
         is_required: true
         is_primary_key: true
+        references:
+          resource: Function
+          path: Spec.Name
       Qualifier:
         is_read_only: true
         from:

apis/v1alpha1/version.go

@@ -52,14 +52,25 @@ spec:
                   constraint applies only to the full ARN. If you specify only the
                   function name, it is limited to 64 characters in length."
                 type: string
+              functionRef:
+                description: "AWSResourceReferenceWrapper provides a wrapper around
+                  *AWSResourceReference type to provide more user friendly syntax
+                  for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
+                properties:
+                  from:
+                    description: AWSResourceReference provides all the values necessary
+                      to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                    properties:
+                      name:
+                        type: string
+                    type: object
+                type: object
               revisionID:
                 description: Only update the function if the revision ID matches the
                   ID that's specified. Use this option to avoid publishing a version
                   if the function configuration has changed since you last updated
                   it.
                 type: string
-            required:
-            - functionName
             type: object
           status:
             description: VersionStatus defines the observed state of Version

apis/v1alpha1/zz_generated.deepcopy.go

@@ -218,6 +218,9 @@ resources:
       FunctionName:
         is_required: true
         is_primary_key: true
+        references:
+          resource: Function
+          path: Spec.Name
       Qualifier:
         is_read_only: true
         from:

config/crd/bases/lambda.services.k8s.aws_versions.yaml

@@ -52,14 +52,25 @@ spec:
                   constraint applies only to the full ARN. If you specify only the
                   function name, it is limited to 64 characters in length."
                 type: string
+              functionRef:
+                description: "AWSResourceReferenceWrapper provides a wrapper around
+                  *AWSResourceReference type to provide more user friendly syntax
+                  for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
+                properties:
+                  from:
+                    description: AWSResourceReference provides all the values necessary
+                      to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                    properties:
+                      name:
+                        type: string
+                    type: object
+                type: object
               revisionID:
                 description: Only update the function if the revision ID matches the
                   ID that's specified. Use this option to avoid publishing a version
                   if the function configuration has changed since you last updated
                   it.
                 type: string
-            required:
-            - functionName
             type: object
           status:
             description: VersionStatus defines the observed state of Version

generator.yaml

@@ -0,0 +1,11 @@
+apiVersion: lambda.services.k8s.aws/v1alpha1
+kind: Version
+metadata:
+  name: $VERSION_NAME
+  annotations:
+    services.k8s.aws/region: $AWS_REGION
+spec:
+  functionRef:
+    from:
+      name: $FUNCTION_REF_NAME
+  description: version created by ACK lambda-controller e2e tests

helm/crds/lambda.services.k8s.aws_versions.yaml

@@ -184,4 +184,51 @@ def test_version_with_revision_hash(self, lambda_client, lambda_function):
         time.sleep(DELETE_WAIT_AFTER_SECONDS)
 
         # Check function version doesn't exist
-        assert not lambda_validator.version_exists(lambda_function_name, version_number)
+        assert not lambda_validator.version_exists(lambda_function_name, version_number)
+
+    def test_smoke_ref(self, lambda_client, lambda_function):
+        (_, function_resource) = lambda_function
+        function_resource_name = function_resource["metadata"]["name"]
+
+        resource_name = random_suffix_name("lambda-version", 24)
+        replacements = REPLACEMENT_VALUES.copy()
+        replacements["AWS_REGION"] = get_region()
+        replacements["VERSION_NAME"] = resource_name
+        replacements["FUNCTION_REF_NAME"] = function_resource_name
+
+        # Load alias CR
+        resource_data = load_lambda_resource(
+            "version_ref",
+            additional_replacements=replacements,
+        )
+        logging.debug(resource_data)
+
+        # Create k8s resource
+        ref = k8s.CustomResourceReference(
+            CRD_GROUP, CRD_VERSION, RESOURCE_PLURAL,
+            resource_name, namespace="default",
+        )
+        k8s.create_custom_resource(ref, resource_data)
+        cr = k8s.wait_resource_consumed_by_controller(ref)
+
+        assert cr is not None
+        assert k8s.get_resource_exists(ref)
+
+        time.sleep(CREATE_WAIT_AFTER_SECONDS)
+
+        cr = k8s.wait_resource_consumed_by_controller(ref)
+
+        lambda_validator = LambdaValidator(lambda_client)
+
+        # Check version exists
+        version_number = cr['status']['version']
+        assert lambda_validator.version_exists(function_resource_name, version_number)
+
+        # Delete k8s resource
+        _, deleted = k8s.delete_custom_resource(ref)
+        assert deleted is True
+
+        time.sleep(DELETE_WAIT_AFTER_SECONDS)
+
+        # Check alias doesn't exist
+        assert not lambda_validator.version_exists(function_resource_name, version_number)