Merge branch 'main' into s3tosf

awslabs · Dec 16, 2021 · 492ee67 · 492ee67
2 parents ddcd313 + 5d79b76
commit 492ee67
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 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.
 
+## [1.131.0](https://github.com/awslabs/aws-solutions-constructs/compare/v1.130.0...v1.131.0) (2021-12-15)
+
+* Upgraded all patterns to CDK v1.131.0
+
 ## [1.130.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.0.0...v1.130.0) (2021-12-15)
 
 * Upgraded all patterns to CDK v1.130.0

diff --git a/source/lerna.json b/source/lerna.json
@@ -6,5 +6,5 @@
     "./patterns/@aws-solutions-constructs/*"
   ],
   "rejectCycles": "true",
-  "version": "1.130.0"
+  "version": "1.131.0"
 }
diff --git a/...aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.no-arguments.expected.json b/...aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.no-arguments.expected.json
@@ -164,7 +164,7 @@
                       {
                         "Ref": "AWS::Partition"
                       },
-                      ":s3:::.4d6b6e64d28273dfb8ab06e43c8c5d13e10c44ea56a2996de4b2f693adbe2b95.py"
+                      ":s3:::fakelocation/fakefile.py"
                     ]
                   ]
                 },
@@ -176,7 +176,7 @@
                       {
                         "Ref": "AWS::Partition"
                       },
-                      ":s3:::.4d6b6e64d28273dfb8ab06e43c8c5d13e10c44ea56a2996de4b2f693adbe2b95.py/*"
+                      ":s3:::fakelocation/fakefile.py/*"
                     ]
                   ]
                 }
@@ -374,7 +374,7 @@
         "Command": {
           "Name": "gluestreaming",
           "PythonVersion": "3",
-          "ScriptLocation": "asset.4d6b6e64d28273dfb8ab06e43c8c5d13e10c44ea56a2996de4b2f693adbe2b95.py"
+          "ScriptLocation": "s3://fakelocation/fakefile.py"
         },
         "Role": {
           "Fn::GetAtt": [

diff --git a/.../patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.no-arguments.ts b/.../patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.no-arguments.ts
@@ -16,7 +16,7 @@ import { CfnTable } from '@aws-cdk/aws-glue';
 import { App, Stack } from '@aws-cdk/core';
 import { KinesisstreamsToGluejob } from '../lib';
 import { generateIntegStackName } from '@aws-solutions-constructs/core';
-import { Asset } from '@aws-cdk/aws-s3-assets';
+// import { Asset } from '@aws-cdk/aws-s3-assets';
 
 // Setup
 const app = new App();
@@ -46,9 +46,12 @@ new KinesisstreamsToGluejob(stack, 'test-kinesisstreams-lambda', {
     command: {
       name: 'gluestreaming',
       pythonVersion: '3',
-      scriptLocation: new Asset(stack, 'ScriptLocation', {
-        path: `${__dirname}/transform.py`
-      }).assetPath
+      scriptLocation: 's3://fakelocation/fakefile.py'
+      // Our version of cdk-integ crashes when misinterpreting the bucket name
+      // After we refresh cdk-integ we should try this code again
+      // scriptLocation: new Asset(stack, 'ScriptLocation', {
+      //   path: `${__dirname}/transform.py`
+      // }).assetPath
     }
   },
   fieldSchema

diff --git a/source/patterns/@aws-solutions-constructs/core/test/glue-job-helper.test.ts b/source/patterns/@aws-solutions-constructs/core/test/glue-job-helper.test.ts
@@ -86,7 +86,7 @@ test('Create a Glue Job outside the construct', () => {
     command: {
       name: 'pythonshell',
       pythonVersion: '2',
-      scriptLocation: 's3://existingFakeLocation/existingScript'
+      scriptLocation: 's3://existingfakelocation/existingScript'
     },
     role: new Role(stack, 'ExistingJobRole', {
       assumedBy: new ServicePrincipal('glue.amazon.com'),
@@ -122,7 +122,7 @@ test('Create a Glue Job outside the construct', () => {
       Command: {
         Name: "pythonshell",
         PythonVersion: "2",
-        ScriptLocation: "s3://existingFakeLocation/existingScript",
+        ScriptLocation: "s3://existingfakelocation/existingScript",
       },
       GlueVersion: "1",
       MaxCapacity: 4,
@@ -150,7 +150,7 @@ test('Test custom deployment properties', () => {
     command: {
       name: _commandName,
       pythonVersion: '3',
-      scriptLocation: 's3://existingFakeLocation/existingScript'
+      scriptLocation: 's3://existingfakelocation/existingScript'
     },
     role: new Role(stack, 'ExistingJobRole', {
       assumedBy: new ServicePrincipal('glue.amazon.com'),
@@ -182,7 +182,7 @@ test('Test custom deployment properties', () => {
       Command: {
         Name: "glueetl",
         PythonVersion: "3",
-        ScriptLocation: "s3://existingFakeLocation/existingScript",
+        ScriptLocation: "s3://existingfakelocation/existingScript",
       },
       GlueVersion: "1",
       NumberOfWorkers: 2,