Merged branch 'main' into 'github'

aws · Aug 3, 2022 · a8b850e · a8b850e
2 parents 427253a + 230c4a1
commit a8b850e
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 12 deletions.
diff --git a/source/infrastructure/cfn-sample-tenant-component.yaml b/source/infrastructure/cfn-sample-tenant-component.yaml
@@ -47,6 +47,10 @@ Resources:
     Type: AWS::S3::Bucket
     Properties:
       BucketName: !Sub "cdf-tenant-${AWS::AccountId}-artifacts-${AWS::Region}"
+      BucketEncryption:
+        ServerSideEncryptionConfiguration:
+          - ServerSideEncryptionByDefault:
+              SSEAlgorithm: AES256
       PublicAccessBlockConfiguration:
         BlockPublicAcls: true
         BlockPublicPolicy: true
@@ -69,7 +73,6 @@ Resources:
       Type: String
       Value: !Ref CDFTenantKmsKey
 
-
   TenantAccountBus:
     Type: AWS::Events::EventBus
     Properties:
@@ -107,11 +110,11 @@ Resources:
       Description: !Sub "Cross account rule created by Account ${AWS::AccountId}"
       EventBusName:
         !Join [
-            ":",
+          ":",
           [
             !Sub "arn:aws:events:${AWS::Region}",
-            !Select [ 4, !Split [ ":", !Ref ControlPlaneBusName ] ],
-            !Select [ 5, !Split [ ":", !Ref ControlPlaneBusName ] ],
+            !Select [4, !Split [":", !Ref ControlPlaneBusName]],
+            !Select [5, !Split [":", !Ref ControlPlaneBusName]],
           ],
         ]
       EventPattern:
@@ -191,4 +194,4 @@ Resources:
               }
             }
           ]
-        }
+        }
diff --git a/source/packages/integration-tests/package.json b/source/packages/integration-tests/package.json
@@ -24,7 +24,7 @@
     "@cdf/errors": "^4.0.0",
     "@cdf/greengrass2-provisioning-client": "^1.0.6",
     "@cdf/lambda-invoke": "^3.0.2",
-    "@cdf/organizationmanager-client": "^0.2.0",
+    "@cdf/organizationmanager-client": "^0.2.1",
     "@cdf/logger": "^4.0.0",
     "@cdf/notifications-client": "^4.0.5",
     "@cdf/provisioning-client": "^5.2.0",

diff --git a/source/packages/libraries/clients/organizationmanager-client/CHANGELOG.json b/source/packages/libraries/clients/organizationmanager-client/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@cdf/organizationmanager-client",
   "entries": [
+    {
+      "version": "0.2.1",
+      "tag": "@cdf/organizationmanager-client_v0.2.1",
+      "date": "Wed, 03 Aug 2022 02:00:13 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "update aws-sdk version"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.0",
       "tag": "@cdf/organizationmanager-client_v0.2.0",

diff --git a/source/packages/libraries/clients/organizationmanager-client/CHANGELOG.md b/source/packages/libraries/clients/organizationmanager-client/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @cdf/organizationmanager-client
 
-This log was last generated on Fri, 29 Jul 2022 02:59:14 GMT and should not be manually modified.
+This log was last generated on Wed, 03 Aug 2022 02:00:13 GMT and should not be manually modified.
+
+## 0.2.1
+Wed, 03 Aug 2022 02:00:13 GMT
+
+### Patches
+
+- update aws-sdk version
 
 ## 0.2.0
 Fri, 29 Jul 2022 02:59:14 GMT

diff --git a/source/packages/libraries/clients/organizationmanager-client/package.json b/source/packages/libraries/clients/organizationmanager-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cdf/organizationmanager-client",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "CDF Organization Manager Client",
   "author": "William Sia",
   "main": "dist/index.js",

diff --git a/source/packages/services/assetlibrary-export/CHANGELOG.json b/source/packages/services/assetlibrary-export/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@cdf/assetlibrary-export",
   "entries": [
+    {
+      "version": "3.1.4",
+      "tag": "@cdf/assetlibrary-export_v3.1.4",
+      "date": "Wed, 03 Aug 2022 02:00:13 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "update momentjs dependencies"
+          }
+        ]
+      }
+    },
     {
       "version": "3.1.3",
       "tag": "@cdf/assetlibrary-export_v3.1.3",

diff --git a/source/packages/services/assetlibrary-export/CHANGELOG.md b/source/packages/services/assetlibrary-export/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @cdf/assetlibrary-export
 
-This log was last generated on Fri, 24 Jun 2022 21:00:45 GMT and should not be manually modified.
+This log was last generated on Wed, 03 Aug 2022 02:00:13 GMT and should not be manually modified.
+
+## 3.1.4
+Wed, 03 Aug 2022 02:00:13 GMT
+
+### Patches
+
+- update momentjs dependencies
 
 ## 3.1.3
 Fri, 24 Jun 2022 21:00:45 GMT

diff --git a/source/packages/services/assetlibrary-export/package.json b/source/packages/services/assetlibrary-export/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cdf/assetlibrary-export",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "description": "CDF Asset Library Export Service",
   "author": "Hassan Khokhar",
   "scripts": {

diff --git a/source/packages/services/organization-manager/CHANGELOG.json b/source/packages/services/organization-manager/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@cdf/organization-manager",
   "entries": [
+    {
+      "version": "0.1.1",
+      "tag": "@cdf/organization-manager_v0.1.1",
+      "date": "Wed, 03 Aug 2022 02:00:13 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "update aws-sdk version"
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.0",
       "tag": "@cdf/organization-manager_v0.1.0",

diff --git a/source/packages/services/organization-manager/CHANGELOG.md b/source/packages/services/organization-manager/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @cdf/organization-manager
 
-This log was last generated on Fri, 29 Jul 2022 02:59:14 GMT and should not be manually modified.
+This log was last generated on Wed, 03 Aug 2022 02:00:13 GMT and should not be manually modified.
+
+## 0.1.1
+Wed, 03 Aug 2022 02:00:13 GMT
+
+### Patches
+
+- update aws-sdk version
 
 ## 0.1.0
 Fri, 29 Jul 2022 02:59:14 GMT

diff --git a/source/packages/services/organization-manager/package.json b/source/packages/services/organization-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cdf/organization-manager",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "This module associates cdf components with organizational units and uses this association to create control-tower-customization manifest file",
   "author": "William Sia",
   "config": {