Draft: Adding update e2e tests for Layer_version resource

Author: Vandita2020

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,8 +1,8 @@
 ack_generate_info:
-  build_date: "2022-12-08T19:01:42Z"
-  build_hash: 12246c7da82841b351ec7a9e1f139f9338f2784b
-  go_version: go1.17.5
-  version: v0.21.0
+  build_date: "2022-12-12T23:44:43Z"
+  build_hash: 20e82a5acd263bcd13d8278e7efe54cea2b5b084
+  go_version: go1.19
+  version: v0.20.1-12-g20e82a5
 api_directory_checksum: 90c9337a64415662f698cf6cd270706cd560bd16
 api_version: v1alpha1
 aws_sdk_go_version: v1.44.93

config/controller/kustomization.yaml

@@ -6,4 +6,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: public.ecr.aws/aws-controllers-k8s/lambda-controller
-  newTag: v0.1.4
+  newTag: v0.1.3

config/crd/common/bases/services.k8s.aws_adoptedresources.yaml

@@ -1,9 +1,10 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: adoptedresources.services.k8s.aws
 spec:
@@ -169,7 +170,6 @@ spec:
                           - name
                           - uid
                           type: object
-                          x-kubernetes-map-type: atomic
                         type: array
                     type: object
                 required:
@@ -224,3 +224,9 @@ spec:
     storage: true
     subresources:
       status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/common/bases/services.k8s.aws_fieldexports.yaml

@@ -1,9 +1,10 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: fieldexports.services.k8s.aws
 spec:
@@ -132,3 +133,9 @@ spec:
     storage: true
     subresources:
       status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

helm/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
 name: lambda-chart
 description: A Helm chart for the ACK service controller for AWS Lambda (Lambda)
-version: v0.1.4
-appVersion: v0.1.4
+version: v0.1.3
+appVersion: v0.1.3
 home: https://github.com/aws-controllers-k8s/lambda-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:

helm/templates/NOTES.txt

@@ -1,5 +1,5 @@
 {{ .Chart.Name }} has been installed.
-This chart deploys "public.ecr.aws/aws-controllers-k8s/lambda-controller:v0.1.4".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/lambda-controller:v0.1.3".
 
 Check its status by running:
   kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"

helm/values.yaml

@@ -4,7 +4,7 @@
 
 image:
   repository: public.ecr.aws/aws-controllers-k8s/lambda-controller
-  tag: v0.1.4
+  tag: v0.1.3
   pullPolicy: IfNotPresent
   pullSecrets: []
 

test/e2e/resources/layer_version.yaml

@@ -1,13 +1,13 @@
 apiVersion: lambda.services.k8s.aws/v1alpha1
 kind: LayerVersion
 metadata:
-  name: $LAYER_VERSION
-  annotations:
-    services.k8s.aws/region: $AWS_REGION
+  name: v1
+  annotations: 
+    services.k8s.aws/region: us-west-2
 spec:
-  layerName: $LAYER_VERSION
+  layerName: v1
   content:
-    s3Bucket: $BUCKET_NAME
-    s3Key: $LAMBDA_FILE_NAME
+    s3Bucket: 322962841005-lambda-test
+    s3Key: my-deployment-package.zip
   compatibleRuntimes: [nodejs, nodejs16.x, java8, java11, python3.7, python3.8, python3.9, dotnetcore3.1, dotnet6, nodejs4.3-edge, go1.x, ruby2.7, provided, provided.al2]
   description: layer version created by ACK lambda-controller e2e tests

test/e2e/tests/test_layer_version.py

@@ -30,9 +30,9 @@
 
 RESOURCE_PLURAL = "layerversions"
 
-CREATE_WAIT_AFTER_SECONDS = 10
-UPDATE_WAIT_AFTER_SECONDS = 10
-DELETE_WAIT_AFTER_SECONDS = 10
+CREATE_WAIT_AFTER_SECONDS = 30
+UPDATE_WAIT_AFTER_SECONDS = 30
+DELETE_WAIT_AFTER_SECONDS = 30
 
 @service_marker
 @pytest.mark.canary
@@ -79,6 +79,26 @@ def test_smoke(self, lambda_client):
         # Check layer version exists
         assert lambda_validator.layer_version_exists(resource_name, version_number)
 
+        # Update cr
+        new_description = "new description"
+        updates = {
+            "spec": {
+                "description": new_description
+            },
+        }
+
+        #Patch k8s resource
+        k8s.patch_custom_resource(ref, updates)
+        time.sleep(UPDATE_WAIT_AFTER_SECONDS)
+
+        cr = k8s.wait_resource_consumed_by_controller(ref)
+        version_number = cr['status']['versionNumber']
+
+        #Check layer version description
+        layer_version = lambda_validator.get_layer_version(resource_name, version_number)
+        assert layer_version is not None
+        assert layer_version['Description'] == 'new description'
+
         # Delete k8s resource
         _, deleted = k8s.delete_custom_resource(ref)
         assert deleted is True