Rewrite Bucket tests to patch for each test (#43)

Description of changes:
- Update to new E2E test bootstrapping method (no bootstrap resources, so no noticeable change for tests)
- Patch each of the `Put` fields onto a single bucket, so we can test diff, update and delete properties individually

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Author: RedbackThomson

test/e2e/.gitignore

@@ -1,3 +1,3 @@
 __pycache__/
 *.py[cod]
-**/bootstrap.yaml
+**/bootstrap.pkl

test/e2e/__init__.py

@@ -15,7 +15,7 @@
 from typing import Dict, Any
 from pathlib import Path
 
-from acktest.k8s import resource
+from acktest.k8s.resource import load_and_create_resource
 from acktest.resources import load_resource_file
 
 SERVICE_NAME = "s3"
@@ -40,7 +40,7 @@ def create_s3_resource(
     Wrapper around k8s.load_and_create_resource to create an S3 resource
     """
 
-    reference, spec, resource = resource.load_and_create_resource(
+    reference, spec, resource = load_and_create_resource(
         resource_directory,
         CRD_GROUP,
         CRD_VERSION,

test/e2e/bootstrap.yaml

@@ -0,0 +1 @@
+{}

test/e2e/bootstrap_resources.py

@@ -10,24 +10,28 @@
 # on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
+
 """Declares the structure of the bootstrapped resources and provides a loader
 for them.
 """
-from dataclasses import dataclass
 
+from dataclasses import dataclass
+from acktest.bootstrapping import Resources
+from acktest.bootstrapping.iam import Role
+from acktest.bootstrapping.s3 import Bucket
+from acktest.bootstrapping.sns import Topic
 from e2e import bootstrap_directory
-from acktest.resources import read_bootstrap_config
 
 @dataclass
-class TestBootstrapResources:
-    pass
+class BootstrapResources(Resources):
+    ReplicationBucket: Bucket
+    ReplicationRole: Role
+    NotificationTopic: Topic
 
 _bootstrap_resources = None
 
-def get_bootstrap_resources(bootstrap_file_name: str = "bootstrap.yaml"):
+def get_bootstrap_resources(bootstrap_file_name: str = "bootstrap.pkl") -> BootstrapResources:
     global _bootstrap_resources
     if _bootstrap_resources is None:
-        _bootstrap_resources = TestBootstrapResources(
-            **read_bootstrap_config(bootstrap_directory, bootstrap_file_name=bootstrap_file_name),
-        )
-    return _bootstrap_resources
+        _bootstrap_resources = BootstrapResources.deserialize(bootstrap_directory, bootstrap_file_name=bootstrap_file_name)
+    return _bootstrap_resources

test/e2e/conftest.py

@@ -12,6 +12,7 @@
 # permissions and limitations under the License.
 
 import os
+import boto3
 import pytest
 
 from acktest import k8s
@@ -22,9 +23,6 @@ def pytest_addoption(parser):
 
 
 def pytest_configure(config):
-    config.addinivalue_line(
-        "markers", "canary: mark test to also run in canary tests"
-    )
     config.addinivalue_line(
         "markers", "service(arg): mark test associated with a given service"
     )
@@ -44,3 +42,11 @@ def pytest_collection_modifyitems(config, items):
 @pytest.fixture(scope='class')
 def k8s_client():
     return k8s._get_k8s_api_client()
+
+@pytest.fixture(scope='module')
+def s3_client():
+    return boto3.client('s3')
+
+@pytest.fixture(scope='module')
+def s3_resource():
+    return boto3.resource('s3') 

test/e2e/replacement_values.py

@@ -14,6 +14,10 @@
 S3-specific test variables.
 """
 
+from e2e.bootstrap_resources import get_bootstrap_resources
+
 REPLACEMENT_VALUES = {
-    
+    "REPLICATION_ROLE_ARN": get_bootstrap_resources().ReplicationRole.arn,
+    "REPLICATION_BUCKET_NAME": get_bootstrap_resources().ReplicationBucket.name,
+    "NOTIFICATION_TOPIC_ARN": get_bootstrap_resources().NotificationTopic.arn,
 }

test/e2e/requirements.txt

@@ -1 +1 @@
-acktest @ git+https://github.com/aws-controllers-k8s/test-infra.git@955d7831ee374a212250179e95a5f3b75e555fd9
+acktest @ git+https://github.com/aws-controllers-k8s/test-infra.git@5220331d003e3a23de4470e68d02c99b16c81989

test/e2e/resources/bucket_notification.yaml

@@ -7,6 +7,6 @@ spec:
   notification:
     topicConfigurations:
     - id: "Publish new objects to SNS"
-      topicARN: "$SNS_TOPIC_ARN"
+      topicARN: "$NOTIFICATION_TOPIC_ARN"
       events:
       - "s3:ObjectCreated:Put"

test/e2e/service_bootstrap.py

@@ -14,19 +14,70 @@
 """
 
 import logging
+import json
 from pathlib import Path
 
-from acktest import resources
+from acktest.bootstrapping import Resources, BootstrapFailureException
+from acktest.bootstrapping.iam import Role, UserPolicies
+from acktest.bootstrapping.s3 import Bucket
+from acktest.bootstrapping.sns import Topic
 from e2e import bootstrap_directory
-from e2e.bootstrap_resources import TestBootstrapResources
+from e2e.bootstrap_resources import BootstrapResources
 
 
-def service_bootstrap() -> dict:
+def service_bootstrap() -> Resources:
     logging.getLogger().setLevel(logging.INFO)
+    
+    replication_policy = json.dumps({
+        "Version": "2012-10-17",
+        "Statement": [
+            {
+                "Effect": "Allow",
+                "Action": [
+                    "s3:ReplicateObject",
+                    "s3:GetObjectVersionTagging",
+                    "s3:ReplicateTags",
+                    "s3:GetObjectVersionAcl",
+                    "s3:ListBucket",
+                    "s3:GetReplicationConfiguration",
+                    "s3:ReplicateDelete",
+                    "s3:GetObjectVersion"
+                ],
+                "Resource": "*"
+            }
+        ]
+    })
 
-    return TestBootstrapResources(
-    ).__dict__
+    notification_policy = json.dumps({
+        "Version": "2008-10-17",
+        "Statement": [
+            {
+                "Effect": "Allow",
+                "Principal": {
+                    "Service": "s3.amazonaws.com"
+                },
+                "Action": "SNS:Publish",
+                "Resource": "*"
+            }
+        ]
+        })
+
+    resources = BootstrapResources(
+        ReplicationBucket=Bucket("ack-s3-replication", enable_versioning=True),
+        ReplicationRole=Role("ack-s3-replication-role", "s3.amazonaws.com",
+            user_policies=UserPolicies("ack-s3-replication-policy", [replication_policy])
+        ),
+        NotificationTopic=Topic("ack-s3-notification", policy=notification_policy)
+    )
+
+    try:
+        resources.bootstrap()
+    except BootstrapFailureException as ex:
+        exit(254)
+
+    return resources
 
 if __name__ == "__main__":
     config = service_bootstrap()
-    resources.write_bootstrap_config(config, bootstrap_directory)
+    # Write config to current directory by default
+    config.serialize(bootstrap_directory)

test/e2e/service_cleanup.py

@@ -16,17 +16,14 @@
 import logging
 from pathlib import Path
 
-from acktest import resources
+from acktest.bootstrapping import Resources
 from e2e import bootstrap_directory
-from e2e.bootstrap_resources import TestBootstrapResources
 
-def service_cleanup(config: dict):
+def service_cleanup():
     logging.getLogger().setLevel(logging.INFO)
 
-    resources = TestBootstrapResources(
-        **config
-    )
+    resources = Resources.deserialize(bootstrap_directory)
+    resources.cleanup()
 
 if __name__ == "__main__":   
-    bootstrap_config = resources.read_bootstrap_config(bootstrap_directory)
-    service_cleanup(bootstrap_config) 
+    service_cleanup()