Merge branch 'main' into gh-26532

aws · Aug 22, 2023 · 2e50523 · 2e50523
2 parents 57b9b6c + 26dcc1e
commit 2e50523
Show file tree

Hide file tree

Showing 288 changed files with 15,778 additions and 11,319 deletions.
diff --git a/nx.json b/nx.json
@@ -5,6 +5,7 @@
         "^build"
       ],
       "inputs": [
+        "{projectRoot}/**/bin/!(*.d|*.generated).ts",
         "{projectRoot}/**/lib/!(*.d|*.generated).ts",
         "{projectRoot}/**/test/!(*.d).ts",
         "!{workspaceRoot}/**/tsconfig.json",
@@ -33,6 +34,9 @@
     "test": {
       "dependsOn": [
         "build"
+      ],
+      "inputs": [
+        "{projectRoot}/**/test/!(*.d|*.generated).ts"
       ]
     }
   },

diff --git a/package.json b/package.json
@@ -96,6 +96,8 @@
       "@aws-cdk/assertions-alpha/fs-extra/**",
       "@aws-cdk/assertions/fs-extra",
       "@aws-cdk/assertions/fs-extra/**",
+      "@aws-cdk/aws-appconfig-alpha/mime-types",
+      "@aws-cdk/aws-appconfig-alpha/mime-types/**",
       "@aws-cdk/aws-codebuild/yaml",
       "@aws-cdk/aws-codebuild/yaml/**",
       "@aws-cdk/aws-codepipeline-actions/case",

diff --git a/...ting/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/cdk-backup.assets.json b/...ting/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/cdk-backup.assets.json
@@ -1,15 +1,15 @@
 {
   "version": "32.0.0",
   "files": {
-    "cf2d89a4eac2c90005b9a1e142f1cac80cf9cd29d1b8f98f002b9f3a1849454c": {
+    "0c52c355c71ac95690274d7987110017ff9cd1a1bc79fa4206fda2f55d6b62d5": {
       "source": {
         "path": "cdk-backup.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "cf2d89a4eac2c90005b9a1e142f1cac80cf9cd29d1b8f98f002b9f3a1849454c.json",
+          "objectKey": "0c52c355c71ac95690274d7987110017ff9cd1a1bc79fa4206fda2f55d6b62d5.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...ng/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/cdk-backup.template.json b/...ng/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/cdk-backup.template.json
@@ -3,16 +3,16 @@
   "TableCD117FA1": {
    "Type": "AWS::DynamoDB::Table",
    "Properties": {
-    "KeySchema": [
+    "AttributeDefinitions": [
      {
       "AttributeName": "id",
-      "KeyType": "HASH"
+      "AttributeType": "S"
      }
     ],
-    "AttributeDefinitions": [
+    "KeySchema": [
      {
       "AttributeName": "id",
-      "AttributeType": "S"
+      "KeyType": "HASH"
      }
     ],
     "ProvisionedThroughput": {
@@ -50,6 +50,27 @@
    "UpdateReplacePolicy": "Delete",
    "DeletionPolicy": "Delete"
   },
+  "ThirdVault3441C01E": {
+   "Type": "AWS::Backup::BackupVault",
+   "Properties": {
+    "BackupVaultName": {
+     "Fn::Join": [
+      "",
+      [
+       "backupVault-",
+       {
+        "Ref": "Env"
+       }
+      ]
+     ]
+    },
+    "LockConfiguration": {
+     "MinRetentionDays": 5
+    }
+   },
+   "UpdateReplacePolicy": "Delete",
+   "DeletionPolicy": "Delete"
+  },
   "PlanDAF4E53A": {
    "Type": "AWS::Backup::BackupPlan",
    "Properties": {
@@ -234,6 +255,11 @@
   }
  },
  "Parameters": {
+  "Env": {
+   "Type": "String",
+   "Default": "test",
+   "Description": "Env"
+  },
   "BootstrapVersion": {
    "Type": "AWS::SSM::Parameter::Value<String>",
    "Default": "/cdk-bootstrap/hnb659fds/version",

diff --git a/...@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/integ.json b/...@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/integ.json
@@ -1,5 +1,5 @@
 {
-  "version": "32.0.0",
+  "version": "33.0.0",
   "testCases": {
     "integ.backup": {
       "stacks": [

diff --git a/...s-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/manifest.json b/...s-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/manifest.json
@@ -1,5 +1,5 @@
 {
-  "version": "32.0.0",
+  "version": "33.0.0",
   "artifacts": {
     "cdk-backup.assets": {
       "type": "cdk:asset-manifest",
@@ -17,7 +17,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/cf2d89a4eac2c90005b9a1e142f1cac80cf9cd29d1b8f98f002b9f3a1849454c.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0c52c355c71ac95690274d7987110017ff9cd1a1bc79fa4206fda2f55d6b62d5.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -57,6 +57,18 @@
             "data": "SecondaryVault67665B5E"
           }
         ],
+        "/cdk-backup/Env": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "Env"
+          }
+        ],
+        "/cdk-backup/ThirdVault/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "ThirdVault3441C01E"
+          }
+        ],
         "/cdk-backup/Plan/Resource": [
           {
             "type": "aws:cdk:logicalId",