Merge branch 'main' into cloudfront-functions-30028

aws · May 1, 2024 · a5c0e20 · a5c0e20
2 parents 2a75636 + cbf130e
commit a5c0e20
Show file tree

Hide file tree

Showing 27 changed files with 1,053 additions and 769 deletions.
diff --git a/package.json b/package.json
@@ -20,16 +20,16 @@
     "@types/prettier": "2.6.0",
     "@yarnpkg/lockfile": "^1.1.0",
     "aws-sdk-js-codemod": "^0.28.2",
-    "cdk-generate-synthetic-examples": "^0.2.0",
+    "cdk-generate-synthetic-examples": "^0.2.1",
     "conventional-changelog-cli": "^2.2.2",
     "fs-extra": "^9.1.0",
     "graceful-fs": "^4.2.11",
     "jest-junit": "^13.2.0",
-    "jsii-diff": "1.97.0",
-    "jsii-pacmak": "1.97.0",
-    "jsii-reflect": "1.97.0",
+    "jsii-diff": "1.98.0",
+    "jsii-pacmak": "1.98.0",
+    "jsii-reflect": "1.98.0",
     "lerna": "^8.1.2",
-    "nx": "^18.3.3",
+    "nx": "^18.3.4",
     "patch-package": "^6.5.1",
     "semver": "^7.6.0",
     "standard-version": "^9.5.0",

diff --git a/packages/@aws-cdk-testing/cli-integ/package.json b/packages/@aws-cdk-testing/cli-integ/package.json
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@octokit/rest": "^18.12.0",
-    "aws-sdk": "^2.1605.0",
+    "aws-sdk": "^2.1610.0",
     "axios": "^1.6.8",
     "fs-extra": "^9.1.0",
     "glob": "^7.2.3",

diff --git a/packages/@aws-cdk-testing/framework-integ/package.json b/packages/@aws-cdk-testing/framework-integ/package.json
@@ -42,10 +42,10 @@
     "@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
     "@aws-cdk/lambda-layer-kubectl-v29": "^2.0.0",
     "aws-cdk-lib": "0.0.0",
-    "aws-sdk": "^2.1605.0",
+    "aws-sdk": "^2.1610.0",
     "aws-sdk-mock": "5.6.0",
-    "cdk8s": "2.68.61",
-    "cdk8s-plus-27": "2.9.0",
+    "cdk8s": "2.68.65",
+    "cdk8s-plus-27": "2.9.1",
     "constructs": "^10.0.0"
   },
   "repository": {

diff --git a/.../asset.4554b47be6f57b68c6c7a7391dcc73894866d2377fe174883351e7639097f292/__entrypoint__.js b/.../asset.4554b47be6f57b68c6c7a7391dcc73894866d2377fe174883351e7639097f292/__entrypoint__.js
diff --git a/.../asset.bde7b5c89cb43285f884c94f0b9e17cdb0f5eb5345005114dd60342e0b8a85a1/__entrypoint__.js b/.../asset.bde7b5c89cb43285f884c94f0b9e17cdb0f5eb5345005114dd60342e0b8a85a1/__entrypoint__.js
diff --git a/...4866d2377fe174883351e7639097f292/index.js → ...b0f5eb5345005114dd60342e0b8a85a1/index.js b/...4866d2377fe174883351e7639097f292/index.js → ...b0f5eb5345005114dd60342e0b8a85a1/index.js
diff --git a/...framework-integ/test/aws-efs/test/integ.efs-filesystem-one-zone.js.snapshot/manifest.json b/...framework-integ/test/aws-efs/test/integ.efs-filesystem-one-zone.js.snapshot/manifest.json
diff --git a/...ws-efs/test/integ.efs-filesystem-one-zone.js.snapshot/test-efs-one-zone-integ.assets.json b/...ws-efs/test/integ.efs-filesystem-one-zone.js.snapshot/test-efs-one-zone-integ.assets.json
diff --git a/...-efs/test/integ.efs-filesystem-one-zone.js.snapshot/test-efs-one-zone-integ.template.json b/...-efs/test/integ.efs-filesystem-one-zone.js.snapshot/test-efs-one-zone-integ.template.json
@@ -489,7 +489,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "4554b47be6f57b68c6c7a7391dcc73894866d2377fe174883351e7639097f292.zip"
+     "S3Key": "bde7b5c89cb43285f884c94f0b9e17cdb0f5eb5345005114dd60342e0b8a85a1.zip"
     },
     "Timeout": 900,
     "MemorySize": 128,
@@ -589,6 +589,89 @@
      "Ref": "VpcPrivateSubnet1Subnet536B997A"
     }
    }
+  },
+  "FileSystem2C84D7800": {
+   "Type": "AWS::EFS::FileSystem",
+   "Properties": {
+    "AvailabilityZoneName": {
+     "Fn::Select": [
+      1,
+      {
+       "Fn::GetAZs": ""
+      }
+     ]
+    },
+    "Encrypted": true,
+    "FileSystemPolicy": {
+     "Statement": [
+      {
+       "Action": [
+        "elasticfilesystem:ClientRootAccess",
+        "elasticfilesystem:ClientWrite"
+       ],
+       "Condition": {
+        "Bool": {
+         "elasticfilesystem:AccessedViaMountTarget": "true"
+        }
+       },
+       "Effect": "Allow",
+       "Principal": {
+        "AWS": "*"
+       }
+      }
+     ],
+     "Version": "2012-10-17"
+    },
+    "FileSystemTags": [
+     {
+      "Key": "Name",
+      "Value": "test-efs-one-zone-integ/FileSystem2"
+     }
+    ]
+   },
+   "UpdateReplacePolicy": "Retain",
+   "DeletionPolicy": "Retain"
+  },
+  "FileSystem2EfsSecurityGroup2AF8F758": {
+   "Type": "AWS::EC2::SecurityGroup",
+   "Properties": {
+    "GroupDescription": "test-efs-one-zone-integ/FileSystem2/EfsSecurityGroup",
+    "SecurityGroupEgress": [
+     {
+      "CidrIp": "0.0.0.0/0",
+      "Description": "Allow all outbound traffic by default",
+      "IpProtocol": "-1"
+     }
+    ],
+    "Tags": [
+     {
+      "Key": "Name",
+      "Value": "test-efs-one-zone-integ/FileSystem2"
+     }
+    ],
+    "VpcId": {
+     "Ref": "Vpc8378EB38"
+    }
+   }
+  },
+  "FileSystem2EfsMountTargetPrivateSubnet26E5947D6": {
+   "Type": "AWS::EFS::MountTarget",
+   "Properties": {
+    "FileSystemId": {
+     "Ref": "FileSystem2C84D7800"
+    },
+    "SecurityGroups": [
+     {
+      "Fn::GetAtt": [
+       "FileSystem2EfsSecurityGroup2AF8F758",
+       "GroupId"
+      ]
+     }
+    ],
+    "SubnetId": {
+     "Ref": "VpcPrivateSubnet2Subnet3788AAA1"
+    }
+   }
   }
  },
  "Parameters": {