Merge pull request #1162 from awslabs/bump/2.64.0

chore(release): 2.64.0
awslabs · Jul 31, 2024 · b75d774 · b75d774
2 parents 858dea3 + 3fff2c2
commit b75d774
Show file tree

Hide file tree

Showing 97 changed files with 1,018 additions and 909 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.64.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.63.0...v2.64.0) (2024-07-31)
+
+Built on CDK v2.150.0
+
+* **aws-alb-lambda** allow vpc in loadBalancerProps when specifying subnets ([#1161](https://github.com/awslabs/aws-solutions-constructs/issues/1161))
+
 ## [2.63.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.62.0...v2.63.0) (2024-07-19)
 
-Built on CDK v2.147.3
+Built on CDK v2.150.0
 
 * **aws-apigatewayv2websockets-sqs:** New construct! ([#1140](https://github.com/awslabs/aws-solutions-constructs/pull/1140))
 

diff --git a/deployment/v2/align-version.js b/deployment/v2/align-version.js
@@ -10,7 +10,7 @@ const nullVersionMarker = process.argv[2];
 const targetSolutionsConstructsVersion = process.argv[3];
 
 // these versions need to be sourced from a config file
-const awsCdkLibVersion = '2.149.0';
+const awsCdkLibVersion = '2.150.0';
 
 for (const file of process.argv.splice(4)) {
   const pkg = JSON.parse(fs.readFileSync(file).toString());

diff --git a/source/lerna.json b/source/lerna.json
@@ -6,5 +6,5 @@
     "./patterns/@aws-solutions-constructs/*"
   ],
   "rejectCycles": "true",
-  "version": "2.63.0"
+  "version": "2.64.0"
 }
diff --git a/source/package.json b/source/package.json
@@ -60,6 +60,6 @@
   },
   "peerDependencies": {
     "constructs": "^10.0.0",
-    "aws-cdk-lib": "^0.0.0"
+    "aws-cdk-lib": "0.0.0"
   }
 }
diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-fargate/package.json b/source/patterns/@aws-solutions-constructs/aws-alb-fargate/package.json
@@ -81,7 +81,7 @@
   "peerDependencies": {
     "@aws-solutions-constructs/core": "0.0.0",
     "constructs": "^10.0.0",
-    "aws-cdk-lib": "^0.0.0"
+    "aws-cdk-lib": "0.0.0"
   },
   "keywords": [
     "aws",

diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/alb-fargate.test.ts b/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/alb-fargate.test.ts
@@ -519,3 +519,35 @@ test('Confirm that CheckAlbProps is called', () => {
   // Assertion
   expect(app).toThrowError('Error - Either provide loadBalancerProps or existingLoadBalancerObj, but not both.\n');
 });
+
+test('Test sending VPC in loadBalancerProps error', () => {
+  const props = {
+    loadBalancerProps: {
+      vpc: { val: 'placeholder' }
+    }
+  };
+
+  const app = () => {
+    defaults.CheckAlbProps(props);
+  };
+
+  expect(app).toThrowError("Any existing VPC must be defined in the construct props (props.existingVpc). A VPC specified in the loadBalancerProps must be the same VPC");
+});
+
+test('WHen providing VPC in construct and resource props, the vpcId must match', () => {
+  const fakeVpcOne = {vpcId: 'one'};
+  const fakeVpcTwo = {vpcId: 'two'};
+
+  const props = {
+    existingVpc: fakeVpcOne,
+    loadBalancerProps: {
+      vpc: fakeVpcTwo
+    }
+  };
+
+  const app = () => {
+    defaults.CheckAlbProps(props);
+  };
+
+  expect(app).toThrowError("Any existing VPC must be defined in the construct props (props.existingVpc). A VPC specified in the loadBalancerProps must be the same VPC");
+});
diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-lambda/package.json b/source/patterns/@aws-solutions-constructs/aws-alb-lambda/package.json
@@ -81,7 +81,7 @@
   "peerDependencies": {
     "@aws-solutions-constructs/core": "0.0.0",
     "constructs": "^10.0.0",
-    "aws-cdk-lib": "^0.0.0"
+    "aws-cdk-lib": "0.0.0"
   },
   "keywords": [
     "aws",

diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/alb-lambda.test.ts b/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/alb-lambda.test.ts
@@ -1050,3 +1050,35 @@ test('Confirm that CheckAlbProps is called', () => {
   // Assertion
   expect(app).toThrowError('Error - Either provide loadBalancerProps or existingLoadBalancerObj, but not both.\n');
 });
+
+test('Test sending VPC in loadBalancerProps error', () => {
+  const props = {
+    loadBalancerProps: {
+      vpc: { val: 'placeholder' }
+    }
+  };
+
+  const app = () => {
+    defaults.CheckAlbProps(props);
+  };
+
+  expect(app).toThrowError("Any existing VPC must be defined in the construct props (props.existingVpc). A VPC specified in the loadBalancerProps must be the same VPC");
+});
+
+test('WHen providing VPC in construct and resource props, the vpcId must match', () => {
+  const fakeVpcOne = {vpcId: 'one'};
+  const fakeVpcTwo = {vpcId: 'two'};
+
+  const props = {
+    existingVpc: fakeVpcOne,
+    loadBalancerProps: {
+      vpc: fakeVpcTwo
+    }
+  };
+
+  const app = () => {
+    defaults.CheckAlbProps(props);
+  };
+
+  expect(app).toThrowError("Any existing VPC must be defined in the construct props (props.existingVpc). A VPC specified in the loadBalancerProps must be the same VPC");
+});
diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/package.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/package.json
@@ -80,7 +80,7 @@
   "peerDependencies": {
     "@aws-solutions-constructs/core": "0.0.0",
     "constructs": "^10.0.0",
-    "aws-cdk-lib": "^0.0.0"
+    "aws-cdk-lib": "0.0.0"
   },
   "keywords": [
     "aws",

diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/package.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/package.json
@@ -80,7 +80,7 @@
   "peerDependencies": {
     "@aws-solutions-constructs/core": "0.0.0",
     "constructs": "^10.0.0",
-    "aws-cdk-lib": "^0.0.0"
+    "aws-cdk-lib": "0.0.0"
   },
   "keywords": [
     "aws",

diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/package.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/package.json
@@ -80,7 +80,7 @@
   "peerDependencies": {
     "@aws-solutions-constructs/core": "0.0.0",
     "constructs": "^10.0.0",
-    "aws-cdk-lib": "^0.0.0"
+    "aws-cdk-lib": "0.0.0"
   },
   "keywords": [
     "aws",

diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/package.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/package.json
@@ -80,7 +80,7 @@
   "peerDependencies": {
     "@aws-solutions-constructs/core": "0.0.0",
     "constructs": "^10.0.0",
-    "aws-cdk-lib": "^0.0.0"
+    "aws-cdk-lib": "0.0.0"
   },
   "keywords": [
     "aws",

diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/package.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/package.json
@@ -80,7 +80,7 @@
   "peerDependencies": {
     "@aws-solutions-constructs/core": "0.0.0",
     "constructs": "^10.0.0",
-    "aws-cdk-lib": "^0.0.0"
+    "aws-cdk-lib": "0.0.0"
   },
   "keywords": [
     "aws",

diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/package.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/package.json
@@ -80,7 +80,7 @@
   "peerDependencies": {
     "@aws-solutions-constructs/core": "0.0.0",
     "constructs": "^10.0.0",
-    "aws-cdk-lib": "^0.0.0"
+    "aws-cdk-lib": "0.0.0"
   },
   "keywords": [
     "aws",

diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/package.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/package.json
@@ -82,7 +82,7 @@
     "@aws-solutions-constructs/core": "0.0.0",
     "@aws-solutions-constructs/aws-cloudfront-apigateway": "0.0.0",
     "constructs": "^10.0.0",
-    "aws-cdk-lib": "^0.0.0"
+    "aws-cdk-lib": "0.0.0"
   },
   "keywords": [
     "aws",

diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/package.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/package.json
@@ -80,7 +80,7 @@
   "peerDependencies": {
     "@aws-solutions-constructs/core": "0.0.0",
     "constructs": "^10.0.0",
-    "aws-cdk-lib": "^0.0.0"
+    "aws-cdk-lib": "0.0.0"
   },
   "keywords": [
     "aws",

diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/package.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/package.json
@@ -80,7 +80,7 @@
   "peerDependencies": {
     "@aws-solutions-constructs/core": "0.0.0",
     "constructs": "^10.0.0",
-    "aws-cdk-lib": "^0.0.0"
+    "aws-cdk-lib": "0.0.0"
   },
   "keywords": [
     "aws",

diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/package.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/package.json
@@ -82,7 +82,7 @@
     "@aws-solutions-constructs/core": "0.0.0",
     "@aws-solutions-constructs/resources": "0.0.0",
     "constructs": "^10.0.0",
-    "aws-cdk-lib": "^0.0.0"
+    "aws-cdk-lib": "0.0.0"
   },
   "keywords": [
     "aws",

diff --git a/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/package.json b/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/package.json
@@ -80,7 +80,7 @@
   "peerDependencies": {
     "@aws-solutions-constructs/core": "0.0.0",
     "constructs": "^10.0.0",
-    "aws-cdk-lib": "^0.0.0"
+    "aws-cdk-lib": "0.0.0"
   },
   "keywords": [
     "aws",

diff --git a/...s-constructs-factories/test/stepfunctions/integ.facstp-defaults.js.snapshot/manifest.json b/...s-constructs-factories/test/stepfunctions/integ.facstp-defaults.js.snapshot/manifest.json
@@ -129,24 +129,6 @@
             "type": "aws:cdk:logicalId",
             "data": "CheckBootstrapVersion"
           }
-        ],
-        "Eval41256dc5445742738ed917bc818694e5ServiceRoleA1AB6027": [
-          {
-            "type": "aws:cdk:logicalId",
-            "data": "Eval41256dc5445742738ed917bc818694e5ServiceRoleA1AB6027",
-            "trace": [
-              "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
-            ]
-          }
-        ],
-        "Eval41256dc5445742738ed917bc818694e54EB1134F": [
-          {
-            "type": "aws:cdk:logicalId",
-            "data": "Eval41256dc5445742738ed917bc818694e54EB1134F",
-            "trace": [
-              "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
-            ]
-          }
         ]
       },
       "displayName": "facstp-defaults"