Merge branch 'main' into glue_enable_partition_filtering

aws · Jul 12, 2022 · 9dce8d7 · 9dce8d7
2 parents fd63192 + dd9f5c5
commit 9dce8d7
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 55 deletions.
diff --git a/packages/@aws-cdk/aws-neptune/lib/cluster.ts b/packages/@aws-cdk/aws-neptune/lib/cluster.ts
@@ -54,6 +54,10 @@ export class EngineVersion {
    * Neptune engine version 1.1.0.0
    */
   public static readonly V1_1_0_0 = new EngineVersion('1.1.0.0');
+  /**
+   * Neptune engine version 1.1.1.0
+   */
+  public static readonly V1_1_1_0 = new EngineVersion('1.1.1.0');
 
   /**
    * Constructor for specifying a custom engine version

diff --git a/packages/@aws-cdk/aws-neptune/test/cluster.test.ts b/packages/@aws-cdk/aws-neptune/test/cluster.test.ts
@@ -118,6 +118,29 @@ describe('DatabaseCluster', () => {
     });
   });
 
+  test.each([
+    ['1.1.1.0', EngineVersion.V1_1_1_0],
+  ])('can create a cluster for engine version %s', (expected, version) => {
+    // GIVEN
+    const stack = testStack();
+    const vpc = new ec2.Vpc(stack, 'VPC');
+
+    // WHEN
+    new DatabaseCluster(stack, 'Database', {
+      vpc,
+      instanceType: InstanceType.R5_LARGE,
+      engineVersion: version,
+    });
+
+    // THEN
+    Template.fromStack(stack).hasResourceProperties('AWS::Neptune::DBCluster', {
+      EngineVersion: expected,
+      DBSubnetGroupName: { Ref: 'DatabaseSubnets3C9252C9' },
+      VpcSecurityGroupIds: [{ 'Fn::GetAtt': ['DatabaseSecurityGroup5C91FDCB', 'GroupId'] }],
+    });
+  });
+
+
   test('can create a cluster with imported vpc and security group', () => {
     // GIVEN
     const stack = testStack();

diff --git a/packages/@aws-cdk/lambda-layer-awscli/layer/requirements.txt b/packages/@aws-cdk/lambda-layer-awscli/layer/requirements.txt
@@ -1 +1 @@
-awscli==1.25.22
+awscli==1.25.26
diff --git a/packages/aws-cdk/lib/cli.ts b/packages/aws-cdk/lib/cli.ts
@@ -23,7 +23,6 @@ import { data, debug, error, print, setLogLevel, setCI } from '../lib/logging';
 import { displayNotices, refreshNotices } from '../lib/notices';
 import { Command, Configuration, Settings } from '../lib/settings';
 import * as version from '../lib/version';
-import { validateTags } from './util/tags';
 
 // https://github.com/yargs/yargs/issues/1929
 // https://github.com/evanw/esbuild/issues/1492
@@ -435,7 +434,7 @@ async function initCommandLine() {
           force: argv.force,
           toolkitStackName: toolkitStackName,
           execute: args.execute,
-          tags: validateTags(configuration.settings.get(['tags'])),
+          tags: configuration.settings.get(['tags']),
           terminationProtection: args.terminationProtection,
           parameters: {
             bucketName: configuration.settings.get(['toolkitBucket', 'bucketName']),
@@ -465,7 +464,7 @@ async function initCommandLine() {
           notificationArns: args.notificationArns,
           requireApproval: configuration.settings.get(['requireApproval']),
           reuseAssets: args['build-exclude'],
-          tags: validateTags(configuration.settings.get(['tags'])),
+          tags: configuration.settings.get(['tags']),
           execute: args.execute,
           changeSetName: args.changeSetName,
           force: args.force,

diff --git a/packages/aws-cdk/lib/util/tags.ts b/packages/aws-cdk/lib/util/tags.ts
diff --git a/packages/aws-cdk/test/util/tags.test.ts b/packages/aws-cdk/test/util/tags.test.ts