Merge branch 'master' into feature/altidstrategy

# Conflicts: # RESOURCE_COVERAGE.md
iann0036 · Feb 15, 2020 · 58cb9b2 · 58cb9b2
2 parents ec08e7b + 196f566
commit 58cb9b2
Show file tree

Hide file tree

Showing 5 changed files with 515 additions and 8 deletions.
diff --git a/RESOURCE_COVERAGE.md b/RESOURCE_COVERAGE.md
@@ -1,6 +1,6 @@
 ## CloudFormation Resource Coverage
 
-**497/503 (98%)** Resources Covered
+**503/503 (100%)** Resources Covered
 
 | Type | Coverage |
 | --- | --- |
@@ -127,10 +127,10 @@
 | *AWS::Config::ConfigRule* | :thumbsup: |
 | *AWS::Config::ConfigurationAggregator* | :thumbsup: |
 | *AWS::Config::ConfigurationRecorder* | :thumbsup: |
-| *AWS::Config::ConformancePack* |  |
+| *AWS::Config::ConformancePack* | :thumbsup: |
 | *AWS::Config::DeliveryChannel* | :thumbsup: |
 | *AWS::Config::OrganizationConfigRule* | :thumbsup: |
-| *AWS::Config::OrganizationConformancePack* |  |
+| *AWS::Config::OrganizationConformancePack* | :thumbsup: |
 | *AWS::Config::RemediationConfiguration* | :thumbsup: |
 | *AWS::DAX::Cluster* | :thumbsup: |
 | *AWS::DAX::ParameterGroup* | :thumbsup: |
@@ -167,8 +167,8 @@
 | *AWS::EC2::Instance* | :thumbsup: |
 | *AWS::EC2::InternetGateway* | :thumbsup: |
 | *AWS::EC2::LaunchTemplate* | :thumbsup: |
-| *AWS::EC2::LocalGatewayRoute* |  |
-| *AWS::EC2::LocalGatewayRouteTableVPCAssociation* |  |
+| *AWS::EC2::LocalGatewayRoute* | :thumbsup: |
+| *AWS::EC2::LocalGatewayRouteTableVPCAssociation* | :thumbsup: |
 | *AWS::EC2::NatGateway* | :thumbsup: |
 | *AWS::EC2::NetworkAcl* | :thumbsup: |
 | *AWS::EC2::NetworkAclEntry* | :thumbsup: |
@@ -249,8 +249,8 @@
 | *AWS::Events::EventBus* | :thumbsup: |
 | *AWS::Events::EventBusPolicy* | :thumbsup: |
 | *AWS::Events::Rule* | :thumbsup: |
-| *AWS::FMS::NotificationChannel* |  |
-| *AWS::FMS::Policy* |  |
+| *AWS::FMS::NotificationChannel* | :thumbsup: |
+| *AWS::FMS::Policy* | :thumbsup: |
 | *AWS::FSx::FileSystem* | :thumbsup: |
 | *AWS::GameLift::Alias* | :thumbsup: |
 | *AWS::GameLift::Build* | :thumbsup: |

diff --git a/cli/package.json b/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "former2",
-  "version": "0.2.24",
+  "version": "0.2.25",
   "description": "Command-line interface for the Former2.com tool",
   "keywords": [
     "aws",

diff --git a/js/services/config.js b/js/services/config.js
@@ -333,6 +333,98 @@ sections.push({
                     }
                 ]
             ]
+        },
+        'Conformance Packs': {
+            'columns': [
+                [
+                    {
+                        field: 'state',
+                        checkbox: true,
+                        rowspan: 2,
+                        align: 'center',
+                        valign: 'middle'
+                    },
+                    {
+                        title: 'Name',
+                        field: 'name',
+                        rowspan: 2,
+                        align: 'center',
+                        valign: 'middle',
+                        sortable: true,
+                        formatter: primaryFieldFormatter,
+                        footerFormatter: textFormatter
+                    },
+                    {
+                        title: 'Properties',
+                        colspan: 4,
+                        align: 'center'
+                    }
+                ],
+                [
+                    {
+                        field: 'deliverybucket',
+                        title: 'Delivery Bucket',
+                        sortable: true,
+                        editable: true,
+                        footerFormatter: textFormatter,
+                        align: 'center'
+                    },
+                    {
+                        field: 'deliverykeyprefix',
+                        title: 'Delivery Key Prefix',
+                        sortable: true,
+                        editable: true,
+                        footerFormatter: textFormatter,
+                        align: 'center'
+                    }
+                ]
+            ]
+        },
+        'Organization Conformance Packs': {
+            'columns': [
+                [
+                    {
+                        field: 'state',
+                        checkbox: true,
+                        rowspan: 2,
+                        align: 'center',
+                        valign: 'middle'
+                    },
+                    {
+                        title: 'Name',
+                        field: 'name',
+                        rowspan: 2,
+                        align: 'center',
+                        valign: 'middle',
+                        sortable: true,
+                        formatter: primaryFieldFormatter,
+                        footerFormatter: textFormatter
+                    },
+                    {
+                        title: 'Properties',
+                        colspan: 4,
+                        align: 'center'
+                    }
+                ],
+                [
+                    {
+                        field: 'deliverybucket',
+                        title: 'Delivery Bucket',
+                        sortable: true,
+                        editable: true,
+                        footerFormatter: textFormatter,
+                        align: 'center'
+                    },
+                    {
+                        field: 'deliverykeyprefix',
+                        title: 'Delivery Key Prefix',
+                        sortable: true,
+                        editable: true,
+                        footerFormatter: textFormatter,
+                        align: 'center'
+                    }
+                ]
+            ]
         }
     }
 });
@@ -345,6 +437,7 @@ async function updateDatatableManagementAndGovernanceConfig() {
     blockUI('#section-managementandgovernance-config-configurationrecorder-datatable');
     blockUI('#section-managementandgovernance-config-aggregationauthorizations-datatable');
     blockUI('#section-managementandgovernance-config-deliverychannels-datatable');
+    blockUI('#section-managementandgovernance-config-conformancepacks-datatable');
 
     await sdkcall("ConfigService", "describeConfigRules", {
         // no params
@@ -485,6 +578,46 @@ async function updateDatatableManagementAndGovernanceConfig() {
 
         unblockUI('#section-managementandgovernance-config-deliverychannels-datatable');
     });
+
+    await sdkcall("ConfigService", "describeConformancePacks", {
+        // no params
+    }, true).then((data) => {
+        $('#section-managementandgovernance-config-conformancepacks-datatable').bootstrapTable('removeAll');
+
+        data.ConformancePackDetails.forEach(conformancepack => {
+            $('#section-managementandgovernance-config-conformancepacks-datatable').bootstrapTable('append', [{
+                f2id: conformancepack.ConformancePackArn,
+                f2type: 'config.conformancepack',
+                f2data: conformancepack,
+                f2region: region,
+                name: conformancepack.ConformancePackName,
+                deliverybucket: conformancepack.DeliveryS3Bucket,
+                deliverykeyprefix: conformancepack.DeliveryS3KeyPrefix
+            }]);
+        });
+
+        unblockUI('#section-managementandgovernance-config-conformancepacks-datatable');
+    });
+
+    await sdkcall("ConfigService", "describeOrganizationConformancePacks", {
+        // no params
+    }, true).then((data) => {
+        $('#section-managementandgovernance-config-organizationconformancepacks-datatable').bootstrapTable('removeAll');
+
+        data.OrganizationConformancePackDetails.forEach(conformancepack => {
+            $('#section-managementandgovernance-config-organizationconformancepacks-datatable').bootstrapTable('append', [{
+                f2id: conformancepack.OrganizationConformancePackArn,
+                f2type: 'config.organizationconformancepack',
+                f2data: conformancepack,
+                f2region: region,
+                name: conformancepack.OrganizationConformancePackName,
+                deliverybucket: conformancepack.DeliveryS3Bucket,
+                deliverykeyprefix: conformancepack.DeliveryS3KeyPrefix
+            }]);
+        });
+
+        unblockUI('#section-managementandgovernance-config-organizationconformancepacks-datatable');
+    });
 }
 
 service_mapping_functions.push(function(reqParams, obj, tracked_resources){
@@ -680,6 +813,47 @@ service_mapping_functions.push(function(reqParams, obj, tracked_resources){
             'type': 'AWS::Config::OrganizationConfigRule',
             'options': reqParams
         });
+    } else if (obj.type == "config.conformancepack") {
+        reqParams.cfn['ConformancePackName'] = obj.data.ConformancePackName;
+        reqParams.cfn['DeliveryS3Bucket'] = obj.data.DeliveryS3Bucket;
+        reqParams.cfn['DeliveryS3KeyPrefix'] = obj.data.DeliveryS3KeyPrefix;
+        reqParams.cfn['ConformancePackInputParameters'] = obj.data.ConformancePackInputParameters;
+
+        /*
+        TODO:
+        TemplateBody: String
+        TemplateS3Uri: String
+        */
+
+        tracked_resources.push({
+            'obj': obj,
+            'logicalId': getResourceName('config', obj.id),
+            'region': obj.region,
+            'service': 'config',
+            'type': 'AWS::Config::ConformancePack',
+            'options': reqParams
+        });
+    } else if (obj.type == "config.organizationnconformancepack") {
+        reqParams.cfn['OrganizationConformancePackName'] = obj.data.OrganizationConformancePackName;
+        reqParams.cfn['DeliveryS3Bucket'] = obj.data.DeliveryS3Bucket;
+        reqParams.cfn['DeliveryS3KeyPrefix'] = obj.data.DeliveryS3KeyPrefix;
+        reqParams.cfn['ConformancePackInputParameters'] = obj.data.ConformancePackInputParameters;
+        reqParams.cfn['ExcludedAccounts'] = obj.data.ExcludedAccounts;
+
+        /*
+        TODO:
+        TemplateBody: String
+        TemplateS3Uri: String
+        */
+
+        tracked_resources.push({
+            'obj': obj,
+            'logicalId': getResourceName('config', obj.id),
+            'region': obj.region,
+            'service': 'config',
+            'type': 'AWS::Config::OrganizationConformancePack',
+            'options': reqParams
+        });
     } else {
         return false;
     }