minor fixes

Author: iakov-gan

data-collection/deploy/deploy-data-collection.yaml

@@ -1477,14 +1477,14 @@ Resources:
     Type: AWS::CloudFormation::Stack
     Condition: DeployResilienceHubModule
     Properties:
-      TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-resilience-hub.yaml"
+      TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-resilience-hub.yaml"
       Parameters:
-        DestinationBucket: !Ref S3Bucket
+        DestinationBucket: !Ref S3Bucket # this includes account id
+        BucketPrefix:  !Ref DestinationBucket # this is just a prefix
         MultiAccountRoleName: !Sub "${ResourcePrefix}${MultiAccountRoleName}"
         DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
         Schedule: !Ref ScheduleFrequent
         ResourcePrefix: !Ref ResourcePrefix
-        BucketPrefix:  !Ref DestinationBucket
         RegionsInScope:
           Fn::If:
             - RegionsInScopeIsEmpty

data-collection/deploy/module-resilience-hub.yaml

@@ -422,4 +422,3 @@ Resources:
 #          Parameters:
  #           EXTERNAL: "TRUE"
  #           skip.header.line.count: "1"
- 

test/utils.py

@@ -202,7 +202,7 @@ def initial_deploy_stacks(cloudformation, account_id, org_unit_id, bucket):
             {'ParameterKey': 'IncludeHealthEventsModule',       'ParameterValue': "yes"},
             {'ParameterKey': 'IncludeLicenseManagerModule',     'ParameterValue': "yes"},
             {'ParameterKey': 'IncludeServiceQuotasModule',      'ParameterValue': "yes"},
-            {'ParameterKey': 'IncludeResiliencyHubModule',      'ParameterValue': "yes"},
+            {'ParameterKey': 'IncludeResilienceHubModule',      'ParameterValue': "yes"},
        ]
     )
 
@@ -239,7 +239,7 @@ def initial_deploy_stacks(cloudformation, account_id, org_unit_id, bucket):
             {'ParameterKey': 'IncludeQuickSightModule',         'ParameterValue': "yes"},
             {'ParameterKey': 'IncludeServiceQuotasModule',      'ParameterValue': "yes"},
             {'ParameterKey': 'IncludeEUCUtilizationModule',     'ParameterValue': "yes"},
-            {'ParameterKey': 'IncludeResiliencyHubModule',      'ParameterValue': "yes"},
+            {'ParameterKey': 'IncludeResilienceHubModule',      'ParameterValue': "yes"},
         ]
     )