30 tests done

Author: meyertst-aws

python/example_code/s3/s3_basics/test/test_s3_express_getting_started.py

@@ -20,16 +20,33 @@
 sys.path.append(os.path.join(script_dir, ".."))
 import s3_express_getting_started
 
+number_of_uploads = 10
 
-@pytest.mark.parametrize(
-    "error_code, stop_on_index",
-    [
+stop_on_index = [
         ("TESTERROR-stub_create_vpc", 0),
         ("TESTERROR-stub_describe_route_tables", 1),
         ("TESTERROR-stub_create_vpc_endpoint", 2),
         ("TESTERROR-stub_create_stack", 3),
         ("TESTERROR-stub_describe_stacks", 4),
-    ],
+        ("TESTERROR-stub_create_access_key_regular", 5),
+        ("TESTERROR-stub_create_access_key_directory", 6),
+        ("TESTERROR-stub_describe_availability_zones", 7),
+        ("TESTERROR-stub_create_bucket_directory", 8),
+        ("TESTERROR-stub_create_bucket_regular", 9),
+        ("TESTERROR-stub_put_object", 10),
+        ("TESTERROR-stub_create_session", 11),
+        ("TESTERROR-stub_copy_object", 12),
+    ]
+
+for i in range(len(stop_on_index), len(stop_on_index) + number_of_uploads):
+    stop_on_index.append((f"TESTERROR-stub_get_object_directory", i))
+
+for i in range(len(stop_on_index), len(stop_on_index) + number_of_uploads):
+    stop_on_index.append((f"TESTERROR-stub_get_object_regular", i))
+
+@pytest.mark.parametrize(
+    "error_code, stop_on_index",
+    stop_on_index,
 )
 def test_s3_express_scenario(
     make_stubber, stub_runner, error_code   , stop_on_index, monkeypatch
@@ -67,8 +84,26 @@ def test_s3_express_scenario(
         {"OutputKey": "ExpressUser", "OutputValue": express_user_name},
     ]
 
+    availability_zone_filter = [{"Name": "region-name", "Values": [region]}]
+    availability_zone_ids = ["use1-az2"]
+
+    bucket_name_prefix = "amzn-s3-demo-bucket"
+    directory_bucket_name = f"{bucket_name_prefix}-{my_uuid}--{availability_zone_ids[0]}--x-s3"
+    regular_bucket_name = f"{bucket_name_prefix}-regular-{my_uuid}"
+
+    directory_bucket_configuration = { 'Bucket': { 'Type' : 'Directory',
+                                      'DataRedundancy' : 'SingleAvailabilityZone'},
+                          'Location' : { 'Name' : availability_zone_ids[0],
+                                         'Type' :  'AvailabilityZone'}
+                          }
+
+    object_name = "basic-text-object"
     inputs = [
         "y",
+        bucket_name_prefix,
+        "1",
+        "y",
+        number_of_uploads
     ]
     monkeypatch.setattr("builtins.input", lambda x: inputs.pop(0))
 
@@ -81,6 +116,20 @@ def test_s3_express_scenario(
         runner.add(ec2_stubber.stub_create_vpc_endpoint, vpc_id, route_table_id, service_name)
         runner.add(cloud_formation_stubber.stub_create_stack, stack_name, template, ["CAPABILITY_NAMED_IAM"], stack_id)
         runner.add(cloud_formation_stubber.stub_describe_stacks, stack_name, "CREATE_COMPLETE", outputs)
+        runner.add(iam_stubber.stub_create_access_key, regular_user_name)
+        runner.add(iam_stubber.stub_create_access_key, express_user_name)
+        runner.add(ec2_stubber.stub_describe_availability_zones, availability_zone_ids, availability_zone_filter, availability_zone_ids)
+        runner.add(s3_stubber.stub_create_bucket, directory_bucket_name, bucket_configuration = directory_bucket_configuration)
+        runner.add(s3_stubber.stub_create_bucket, regular_bucket_name)
+        runner.add (s3_stubber.stub_put_object, regular_bucket_name, object_name, "Look Ma, I'm a bucket!")
+        runner.add(s3_stubber.stub_create_session, directory_bucket_name)
+        runner.add (s3_stubber.stub_copy_object, regular_bucket_name, object_name, directory_bucket_name, object_name)
+
+        for _ in range(number_of_uploads):
+            runner.add (s3_stubber.stub_get_object, directory_bucket_name, object_name)
+
+        for _ in range(number_of_uploads):
+            runner.add(s3_stubber.stub_get_object, regular_bucket_name, object_name)
 
     def mock_wait(self, **kwargs):
         return

python/test_tools/ec2_stubber.py

@@ -388,9 +388,22 @@ def stub_delete_launch_template(self, template_name, error_code=None):
             "delete_launch_template", expected_params, response, error_code=error_code
         )
 
-    def stub_describe_availability_zones(self, zones, error_code=None):
+    def stub_describe_availability_zones(
+        self, zones, filters=None, zone_ids=None, error_code=None
+    ):
         expected_params = {}
-        response = {"AvailabilityZones": [{"ZoneName": zone} for zone in zones]}
+        if filters is not None:
+            expected_params["Filters"] = filters
+
+        availability_zones = []
+        for i, zone in enumerate(zones):
+            zone_info = {"ZoneName": zone}
+            if zone_ids and i < len(zone_ids):
+                zone_info["ZoneId"] = zone_ids[i]
+            availability_zones.append(zone_info)
+
+        response = {"AvailabilityZones": availability_zones}
+
         self._stub_bifurcator(
             "describe_availability_zones",
             expected_params,
@@ -469,7 +482,9 @@ def stub_create_vpc(self, cidr, vpc_id, error_code=None):
             "create_vpc", expected_params, response, error_code=error_code
         )
 
-    def stub_describe_route_tables(self, filters, vpc_id, route_table_id, error_code=None):
+    def stub_describe_route_tables(
+        self, filters, vpc_id, route_table_id, error_code=None
+    ):
         expected_params = {"Filters": filters}
         response = {
             "RouteTables": [
@@ -522,8 +537,10 @@ def stub_describe_route_tables(self, filters, vpc_id, route_table_id, error_code
         self._stub_bifurcator(
             "describe_route_tables", expected_params, response, error_code=error_code
         )
-    
-    def stub_create_vpc_endpoint(self, vpc_id, route_table_id, service_name, error_code=None):
+
+    def stub_create_vpc_endpoint(
+        self, vpc_id, route_table_id, service_name, error_code=None
+    ):
         expected_params = {
             "VpcId": vpc_id,
             "RouteTableIds": [route_table_id],

python/test_tools/s3_stubber.py

@@ -9,6 +9,7 @@
 """
 
 import io
+import datetime
 import json
 from botocore.stub import ANY
 
@@ -45,9 +46,13 @@ def make_version(key, version_id, is_latest=None, last_modified=None):
             version["LastModified"] = last_modified
         return version
 
-    def stub_create_bucket(self, bucket_name, region_name=None, error_code=None):
+    def stub_create_bucket(
+        self, bucket_name, region_name=None, bucket_configuration=None, error_code=None
+    ):
         expected_params = {"Bucket": bucket_name}
-        if region_name is not None:
+        if bucket_configuration is not None:
+            expected_params["CreateBucketConfiguration"] = bucket_configuration
+        elif region_name is not None:
             expected_params["CreateBucketConfiguration"] = {
                 "LocationConstraint": region_name
             }
@@ -448,3 +453,24 @@ def stub_generate_presigned_url(
         self._stub_bifurcator(
             "generate_presigned_url", expected_params, response, error_code=error_code
         )
+
+    def stub_create_session(self, bucket_name, error_code=None):
+        expected_params = {
+            "Bucket": bucket_name,
+        }
+
+        response = {
+            "Credentials": {
+                "AccessKeyId": "string",
+                "SecretAccessKey": "string",
+                "SessionToken": "string",
+                "Expiration": datetime.datetime(2015, 1, 1),
+            },
+        }
+
+        self._stub_bifurcator(
+            "create_session",
+            expected_params=expected_params,
+            response=response,
+            error_code=error_code,
+        )