chore(deps): bumping the version of the cloudformation data collectio…

…n stacks
appvia · Dec 4, 2024 · 2aa0935 · 2aa0935
1 parent babff5a
commit 2aa0935
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 3 deletions.
diff --git a/modules/destination/assets/cloudformation/cudos/deploy-data-collection.yaml b/modules/destination/assets/cloudformation/cudos/deploy-data-collection.yaml
@@ -2,7 +2,7 @@
 ##  https://raw.githubusercontent.com/awslabs/cid-framework/main/data-collection/deploy/deploy-data-collection.yaml
 #
 AWSTemplateFormatVersion: "2010-09-09"
-Description: CID Data Collection Stack v3.4.5
+Description: CID Data Collection Stack v3.5.0
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:
@@ -38,6 +38,7 @@ Metadata:
           - IncludeAWSFeedsModule
           - IncludeLicenseManagerModule
           - IncludeQuickSightModule
+          - IncludeServiceQuotasModule
     ParameterLabels:
       DestinationBucket:
         default: "Destination S3 bucket prefix"
@@ -89,6 +90,8 @@ Metadata:
         default: "Include AWS Health Events Module"
       IncludeLicenseManagerModule:
         default: "Include Marketplace Licensing Collection"
+      IncludeServiceQuotasModule:
+        default: "Include Service Quota Data Collection"
       IncludeQuickSightModule:
         default: "Include QuickSight User Collection Module"
 
@@ -265,6 +268,11 @@ Parameters:
     Description: Collects Marketplace Licenses and Grants
     AllowedValues: ["yes", "no"]
     Default: "no"
+  IncludeServiceQuotasModule:
+    Type: String
+    Description: Collects AWS Service Quotas data
+    AllowedValues: ["yes", "no"]
+    Default: "no"
 
 Conditions:
   DeployTAModule: !Equals [!Ref IncludeTAModule, "yes"]
@@ -285,6 +293,7 @@ Conditions:
   DeployHealthEventsModule: !Equals [!Ref IncludeHealthEventsModule, "yes"]
   DeployLicenseManagerModule: !Equals [!Ref IncludeLicenseManagerModule, "yes"]
   DeployQuickSightModule: !Equals [!Ref IncludeQuickSightModule, "yes"]
+  DeployServiceQuotasModule: !Equals [!Ref IncludeServiceQuotasModule, "yes"]
   DeployPricingModule: !Or
     - !Condition DeployInventoryCollectorModule
     - !Condition DeployRDSUtilizationModule
@@ -306,6 +315,7 @@ Conditions:
         - !Condition DeployHealthEventsModule
         - !Condition DeployLicenseManagerModule
         - !Condition DeployQuickSightModule
+        - !Condition DeployServiceQuotasModule
   RegionsInScopeIsEmpty: !Equals
     - !Join ["", !Split [" ", !Ref RegionsInScope]] # remove spaces
     - ""
@@ -1354,6 +1364,37 @@ Resources:
         StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
         SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
 
+  ServiceQuotasModule:
+    Type: AWS::CloudFormation::Stack
+    Condition: DeployServiceQuotasModule
+    Properties:
+      TemplateURL: !Sub "https://${CFNSourceBucket}.s3.amazonaws.com/cfn/data-collection/module-service-quotas.yaml"
+      Parameters:
+        DatabaseName: !Ref DatabaseName
+        DestinationBucket: !Ref S3Bucket
+        DestinationBucketARN: !GetAtt S3Bucket.Arn
+        MultiAccountRoleName: !Sub "${ResourcePrefix}${MultiAccountRoleName}"
+        Schedule: !Ref ScheduleFrequent
+        GlueRoleARN: !GetAtt GlueRole.Arn
+        ResourcePrefix: !Ref ResourcePrefix
+        LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
+        AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
+        CodeBucket:
+          !If [
+            ProdCFNTemplateUsed,
+            !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket],
+            !Ref CFNSourceBucket,
+          ]
+        StepFunctionTemplate:
+          !FindInMap [StepFunctionCode, main-v3, TemplatePath]
+        StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
+        SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
+        RegionsInScope:
+          Fn::If:
+            - RegionsInScopeIsEmpty
+            - !Sub "${AWS::Region}"
+            - !Join ["", !Split [" ", !Ref RegionsInScope]] # remove spaces
+
   QuickSightModule:
     Type: AWS::CloudFormation::Stack
     Condition: DeployQuickSightModule

diff --git a/modules/source/assets/cloudformation/cudos/deploy-data-read-permissions.yaml b/modules/source/assets/cloudformation/cudos/deploy-data-read-permissions.yaml
@@ -2,7 +2,7 @@
 ## https://github.com/awslabs/cid-framework/blob/main/data-collection/deploy/deploy-data-read-permissions.yaml
 #
 AWSTemplateFormatVersion: "2010-09-09"
-Description: CID Data Collection - All-in-One for Management Account v3.4.5
+Description: CID Data Collection - All-in-One for Management Account v3.5.0
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:
@@ -32,6 +32,7 @@ Metadata:
           - IncludeTAModule
           - IncludeTransitGatewayModule
           - IncludeLicenseManagerModule
+          - IncludeServiceQuotasModule
     ParameterLabels:
       ManagementAccountRole:
         default: "Management account role"
@@ -73,6 +74,8 @@ Metadata:
         default: "Include AWS Health Events Module"
       IncludeLicenseManagerModule:
         default: "Include Marketplace Licensing Module"
+      IncludeServiceQuotasModule:
+        default: "Include Service Quotas Module"
 Parameters:
   ManagementAccountRole:
     Type: String
@@ -168,6 +171,11 @@ Parameters:
     Description: Collects Marketplace Licensing information
     AllowedValues: ["yes", "no"]
     Default: "no"
+  IncludeServiceQuotasModule:
+    Type: String
+    Description: Collects Service Quotas information
+    AllowedValues: ["yes", "no"]
+    Default: "no"
 
 Conditions:
   DeployModuleReadInMgmt: !Equals [!Ref AllowModuleReadInMgmt, "yes"]
@@ -188,6 +196,7 @@ Resources:
         IncludeBackupModule: !Ref IncludeBackupModule
         IncludeHealthEventsModule: !Ref IncludeHealthEventsModule
         IncludeLicenseManagerModule: !Ref IncludeLicenseManagerModule
+        IncludeServiceQuotasModule: !Ref IncludeServiceQuotasModule
   DataCollectorMgmtAccountModulesReadStack:
     Type: AWS::CloudFormation::Stack
     Condition: DeployModuleReadInMgmt
@@ -204,10 +213,11 @@ Resources:
         IncludeRDSUtilizationModule: !Ref IncludeRDSUtilizationModule
         IncludeBudgetsModule: !Ref IncludeBudgetsModule
         IncludeTransitGatewayModule: !Ref IncludeTransitGatewayModule
+        IncludeServiceQuotasModule: !Ref IncludeServiceQuotasModule
   DataCollectorOrgAccountModulesReadStackSet:
     Type: AWS::CloudFormation::StackSet
     Properties:
-      Description: "StackSet in charge of deploying read roles across organization accounts v3.4.5"
+      Description: "StackSet in charge of deploying read roles across organization accounts v3.5.0"
       PermissionModel: SERVICE_MANAGED
       AutoDeployment:
         Enabled: true
@@ -239,6 +249,8 @@ Resources:
           ParameterValue: !Ref IncludeBudgetsModule
         - ParameterKey: IncludeTransitGatewayModule
           ParameterValue: !Ref IncludeTransitGatewayModule
+        - ParameterKey: IncludeServiceQuotasModule
+          ParameterValue: !Ref IncludeServiceQuotasModule
       StackInstancesGroup:
         - DeploymentTargets:
             OrganizationalUnitIds: !Split [",", !Ref OrganizationalUnitIds]