Change partitions for connector integration tests (#243)

* Use AWS Partitions for connector tests

* Revert unintended change

Co-authored-by: Gavin Zhang <[email protected]>

Author: GavinZZ

integration/combination/test_connectors.py

@@ -76,13 +76,20 @@ def test_connector_by_sync_execute_an_state_machine(self, template_file_path):
 
         state_machine_arn = self.get_physical_id_by_logical_id("TriggerStateMachine")
         sfn_client = self.client_provider.sfn_client
+        s3_client = self.client_provider.s3_client
 
         response = sfn_client.start_sync_execution(
             stateMachineArn=state_machine_arn,
         )
         # Without permission, it will be "FAILED"
         self.assertEqual(response.get("status"), "SUCCEEDED")
 
+        # Some tests will create items in S3 Bucket, which result in stack DELETE_FAILED state
+        # manually empty the bucket to allow stacks to be deleted successfully.
+        bucket_name = self.get_physical_id_by_type("AWS::S3::Bucket")
+        if bucket_name:
+            clean_bucket(bucket_name, s3_client)
+
     @parameterized.expand(
         [
             ("combination/connector_sfn_to_sfn_sync",),

integration/resources/templates/combination/connector_bucket_to_function_write.yaml

@@ -77,7 +77,7 @@ Resources:
     Properties:
       Source:
         Type: AWS::S3::Bucket
-        Arn: !Sub arn:aws:s3:::${BucketName}
+        Arn: !Sub arn:${AWS::Partition}:s3:::${BucketName}
       Destination:
         Id: InvokedFunction
       Permissions:

integration/resources/templates/combination/connector_event_rule_to_sfn_write.yaml

@@ -70,7 +70,7 @@ Resources:
         States:
           TryDoSomething:
             Type: Task
-            Resource: arn:aws:states:::sqs:sendMessage
+            Resource: !Sub arn:${AWS::Partition}:states:::sqs:sendMessage
             Parameters:
               QueueUrl: !Ref VerificationQueue
               MessageBody: hello

integration/resources/templates/combination/connector_httpapi_to_function.yaml

@@ -105,7 +105,7 @@ Resources:
       ApiId: !Ref HttpApi
       IntegrationType: AWS_PROXY
       IntegrationUri: !Sub >-
-        arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${ConnectedFunction.Arn}/invocations
+        arn:${AWS::Partition}:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${ConnectedFunction.Arn}/invocations
       IntegrationMethod: POST
       PayloadFormatVersion: '2.0'
 

integration/resources/templates/combination/connector_restapi_to_function.yaml

@@ -111,7 +111,7 @@ Resources:
         Type: AWS_PROXY
         IntegrationHttpMethod: POST
         Uri: !Sub >-
-          arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${ConnectedFunction.Arn}/invocations
+          arn:${AWS::Partition}:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${ConnectedFunction.Arn}/invocations
 
   RestAPIDeployment:
     Type: AWS::ApiGateway::Deployment

integration/resources/templates/combination/connector_sfn_to_bucket_read.yaml

@@ -14,7 +14,7 @@ Resources:
             Type: Task
             Parameters: 
               Bucket: !Ref Bucket
-            Resource: "arn:aws:states:::aws-sdk:s3:listObjectsV2"
+            Resource: !Sub "arn:${AWS::Partition}:states:::aws-sdk:s3:listObjectsV2"
             End: true
       Policies:
         - LambdaInvokePolicy:

integration/resources/templates/combination/connector_sfn_to_bucket_write.yaml

@@ -15,7 +15,7 @@ Resources:
               "Bucket": !Ref Bucket
               "Body": {}
               "Key": "MyData"
-            Resource: "arn:aws:states:::aws-sdk:s3:putObject"
+            Resource: !Sub "arn:${AWS::Partition}:states:::aws-sdk:s3:putObject"
             End: true
       Policies:
         - LambdaInvokePolicy:

integration/resources/templates/combination/connector_sfn_to_eb_custom_write.yaml

@@ -8,7 +8,7 @@ Resources:
         States:
           ReadDDB:
             Type: Task
-            Resource: arn:aws:states:::events:putEvents
+            Resource: !Sub arn:${AWS::Partition}:states:::events:putEvents
             Parameters:
               Entries:
                 - Detail:

integration/resources/templates/combination/connector_sfn_to_eb_default_write.yaml

@@ -8,7 +8,7 @@ Resources:
         States:
           ReadDDB:
             Type: Task
-            Resource: arn:aws:states:::events:putEvents
+            Resource: !Sub arn:${AWS::Partition}:states:::events:putEvents
             Parameters:
               Entries:
                 - Detail:

integration/resources/templates/combination/connector_sfn_to_function_write.yaml

@@ -8,7 +8,7 @@ Resources:
         States:
           TryDoSomething:
             Type: Task
-            Resource: arn:aws:states:::lambda:invoke
+            Resource: !Sub arn:${AWS::Partition}:states:::lambda:invoke
             Parameters:
               FunctionName: !Ref MyFunction
             End: True