Merge branch 'main' into merge-back/2.39.1

Author: mergify[bot]

packages/@aws-cdk-containers/ecs-service-extensions/test/integ.assign-public-ip.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import { SubnetType, Vpc } from '@aws-cdk/aws-ec2';
 import { ContainerImage } from '@aws-cdk/aws-ecs';
 import { CnameRecord, PublicHostedZone } from '@aws-cdk/aws-route53';

packages/@aws-cdk-containers/ecs-service-extensions/test/integ.imported-environment.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import { Vpc } from '@aws-cdk/aws-ec2';
 import { Cluster, ContainerImage } from '@aws-cdk/aws-ecs';
 import { App, NestedStack, Stack } from '@aws-cdk/core';

packages/@aws-cdk/aws-amplify/test/integ.app-asset-deployment.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import * as path from 'path';
 import { Asset } from '@aws-cdk/aws-s3-assets';
 import { App, Stack, StackProps } from '@aws-cdk/core';

packages/@aws-cdk/aws-apigateway/test/authorizers/integ.request-authorizer.lit.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import * as path from 'path';
 import * as lambda from '@aws-cdk/aws-lambda';
 import { App, Stack } from '@aws-cdk/core';

packages/@aws-cdk/aws-apigateway/test/authorizers/integ.token-authorizer-iam-role.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import * as path from 'path';
 import * as iam from '@aws-cdk/aws-iam';
 import * as lambda from '@aws-cdk/aws-lambda';

packages/@aws-cdk/aws-apigateway/test/authorizers/integ.token-authorizer.lit.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import * as path from 'path';
 import * as lambda from '@aws-cdk/aws-lambda';
 import { App, Stack } from '@aws-cdk/core';

packages/@aws-cdk/aws-apigateway/test/integ.cors.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import * as path from 'path';
 import * as lambda from '@aws-cdk/aws-lambda';
 import { App, Stack, StackProps } from '@aws-cdk/core';

packages/@aws-cdk/aws-apigatewayv2-authorizers/test/http/integ.user-pool.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import * as path from 'path';
 import { HttpApi, HttpMethod } from '@aws-cdk/aws-apigatewayv2';
 import { HttpLambdaIntegration } from '@aws-cdk/aws-apigatewayv2-integrations';

packages/@aws-cdk/aws-chatbot/test/integ.chatbot-logretention.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import * as iam from '@aws-cdk/aws-iam';
 import * as logs from '@aws-cdk/aws-logs';
 import * as cdk from '@aws-cdk/core';
@@ -31,4 +30,3 @@ const app = new cdk.App();
 new ChatbotLogRetentionInteg(app, 'ChatbotLogRetentionInteg');
 
 app.synth();
-

packages/@aws-cdk/aws-cloudformation/test/integ.core-custom-resources.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 /*
  * Stack verification steps:
  * - Deploy with `--no-clean`

packages/@aws-cdk/aws-cloudformation/test/integ.nested-stacks-assets.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import * as path from 'path';
 import * as lambda from '@aws-cdk/aws-lambda';
 import { App, NestedStack, Stack } from '@aws-cdk/core';

packages/@aws-cdk/aws-cloudformation/test/integ.nested-stacks-multi-refs.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import * as sns from '@aws-cdk/aws-sns';
 import { App, Fn, NestedStack, Stack } from '@aws-cdk/core';
 

packages/@aws-cdk/aws-cloudformation/test/integ.nested-stacks-multi.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import * as sns from '@aws-cdk/aws-sns';
 import { App, NestedStack, Stack } from '@aws-cdk/core';
 import { Construct } from 'constructs';

packages/@aws-cdk/aws-cognito/test/integ.user-pool-domain-cfdist.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import { App, CfnOutput, RemovalPolicy, Stack } from '@aws-cdk/core';
 import { UserPool } from '../lib';
 
@@ -26,4 +25,4 @@ new CfnOutput(stack, 'Domain', {
 
 new CfnOutput(stack, 'CloudFrontDomainName', {
   value: domain.cloudFrontDomainName,
-});
+});

packages/@aws-cdk/aws-dynamodb/test/integ.global-replicas-provisioned.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import * as cdk from '@aws-cdk/core';
 import * as dynamodb from '../lib';
 

packages/@aws-cdk/aws-dynamodb/test/integ.global.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import { App, RemovalPolicy, Stack, StackProps } from '@aws-cdk/core';
 import { Construct } from 'constructs';
 import * as dynamodb from '../lib';

packages/@aws-cdk/aws-ecr/test/integ.imagescan.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import * as cdk from '@aws-cdk/core';
 import * as ecr from '../lib';
 

packages/@aws-cdk/aws-ecs/README.md

@@ -868,13 +868,15 @@ taskDefinition.addContainer('TheContainer', {
 ### splunk Log Driver
 
 ```ts
+declare const secret: secretsmanager.Secret;
+
 // Create a Task Definition for the container to start
 const taskDefinition = new ecs.Ec2TaskDefinition(this, 'TaskDef');
 taskDefinition.addContainer('TheContainer', {
   image: ecs.ContainerImage.fromRegistry('example-image'),
   memoryLimitMiB: 256,
   logging: ecs.LogDrivers.splunk({
-    token: SecretValue.secretsManager('my-splunk-token'),
+    secretToken: secret,
     url: 'my-splunk-url',
   }),
 });

packages/@aws-cdk/aws-ecs/lib/log-drivers/splunk-log-driver.ts

@@ -37,11 +37,8 @@ export interface SplunkLogDriverProps extends BaseLogDriverProps {
    *
    * The splunk-token is added to the SecretOptions property of the Log Driver Configuration. So the secret value will not be
    * resolved or viewable as plain text.
-   *
-   * Please provide at least one of `token` or `secretToken`.
-   * @default - If secret token is not provided, then the value provided in `token` will be used.
    */
-  readonly secretToken?: Secret;
+  readonly secretToken: Secret;
 
   /**
    * Path to your Splunk Enterprise, self-service Splunk Cloud instance, or Splunk

packages/@aws-cdk/aws-ecs/test/splunk-log-driver.test.ts

@@ -209,16 +209,4 @@ describe('splunk log driver', () => {
       ],
     });
   });
-
-  test('throws when neither token nor secret token are provided', () => {
-    expect(() => {
-      td.addContainer('Container', {
-        image,
-        logging: ecs.LogDrivers.splunk({
-          url: 'my-splunk-url',
-        }),
-        memoryLimitMiB: 128,
-      });
-    }).toThrow('Please provide either token or secretToken.');
-  });
 });

packages/@aws-cdk/aws-eks/test/integ.alb-controller.ts

@@ -1,4 +1,4 @@
-/// !cdk-integ pragma:ignore-assets pragma:disable-update-workflow
+/// !cdk-integ pragma:disable-update-workflow
 import * as ec2 from '@aws-cdk/aws-ec2';
 import { App, CfnOutput, Duration, Stack } from '@aws-cdk/core';
 import * as cdk8s from 'cdk8s';

packages/@aws-cdk/aws-eks/test/integ.eks-bottlerocket-ng.ts

@@ -1,4 +1,4 @@
-/// !cdk-integ pragma:ignore-assets pragma:disable-update-workflow
+/// !cdk-integ pragma:disable-update-workflow
 import * as ec2 from '@aws-cdk/aws-ec2';
 import * as iam from '@aws-cdk/aws-iam';
 import { App, Stack } from '@aws-cdk/core';

packages/@aws-cdk/aws-eks/test/integ.eks-cluster-handlers-vpc.ts

@@ -1,4 +1,4 @@
-/// !cdk-integ pragma:ignore-assets pragma:disable-update-workflow
+/// !cdk-integ pragma:disable-update-workflow
 import { App, Stack } from '@aws-cdk/core';
 import * as eks from '../lib';
 

packages/@aws-cdk/aws-eks/test/integ.eks-cluster-private-endpoint.ts

@@ -1,4 +1,4 @@
-/// !cdk-integ pragma:ignore-assets pragma:disable-update-workflow
+/// !cdk-integ pragma:disable-update-workflow
 import * as ec2 from '@aws-cdk/aws-ec2';
 import * as iam from '@aws-cdk/aws-iam';
 import { App, Stack } from '@aws-cdk/core';

packages/@aws-cdk/aws-eks/test/integ.eks-cluster.ts

@@ -1,4 +1,4 @@
-/// !cdk-integ pragma:ignore-assets pragma:disable-update-workflow
+/// !cdk-integ pragma:disable-update-workflow
 import * as path from 'path';
 import * as ec2 from '@aws-cdk/aws-ec2';
 import * as iam from '@aws-cdk/aws-iam';

packages/@aws-cdk/aws-eks/test/integ.eks-inference.ts

@@ -1,4 +1,4 @@
-/// !cdk-integ pragma:ignore-assets pragma:disable-update-workflow
+/// !cdk-integ pragma:disable-update-workflow
 import * as ec2 from '@aws-cdk/aws-ec2';
 import { App, Stack } from '@aws-cdk/core';
 import * as eks from '../lib';

packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import { App, Stack } from '@aws-cdk/core';
 import * as eks from '../lib';
 

packages/@aws-cdk/aws-eks/test/integ.fargate-cluster.ts

@@ -1,4 +1,4 @@
-/// !cdk-integ pragma:ignore-assets pragma:disable-update-workflow
+/// !cdk-integ pragma:disable-update-workflow
 import { App, Stack } from '@aws-cdk/core';
 import * as eks from '../lib';
 

packages/@aws-cdk/aws-elasticsearch/test/integ.elasticsearch.custom-kms-key.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import { EbsDeviceVolumeType } from '@aws-cdk/aws-ec2';
 import * as iam from '@aws-cdk/aws-iam';
 import * as kms from '@aws-cdk/aws-kms';

packages/@aws-cdk/aws-elasticsearch/test/integ.elasticsearch.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import { EbsDeviceVolumeType } from '@aws-cdk/aws-ec2';
 import * as iam from '@aws-cdk/aws-iam';
 import { App, RemovalPolicy, Stack, StackProps } from '@aws-cdk/core';

packages/@aws-cdk/aws-elasticsearch/test/integ.elasticsearch.unsignedbasicauth.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import { App, RemovalPolicy, Stack, StackProps } from '@aws-cdk/core';
 import { Construct } from 'constructs';
 import * as es from '../lib';

packages/@aws-cdk/aws-events-targets/test/aws-api/integ.aws-api.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import * as events from '@aws-cdk/aws-events';
 import * as cdk from '@aws-cdk/core';
 import * as targets from '../../lib';

packages/@aws-cdk/aws-events-targets/test/event-bus/integ.event-bus.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import * as events from '@aws-cdk/aws-events';
 import * as sqs from '@aws-cdk/aws-sqs';
 import * as cdk from '@aws-cdk/core';

packages/@aws-cdk/aws-events-targets/test/logs/integ.log-group.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import * as events from '@aws-cdk/aws-events';
 import * as logs from '@aws-cdk/aws-logs';
 import * as sqs from '@aws-cdk/aws-sqs';
@@ -86,4 +85,3 @@ logEvents.node.addDependency(putEvent);
 logEvents.assertAtPath('events.0.message', ExpectedResult.stringLikeRegexp(expectedValue));
 
 app.synth();
-

packages/@aws-cdk/aws-globalaccelerator-endpoints/test/integ.globalaccelerator.ts

@@ -1,4 +1,3 @@
-/// !cdk-integ pragma:ignore-assets
 import * as ec2 from '@aws-cdk/aws-ec2';
 import * as elbv2 from '@aws-cdk/aws-elasticloadbalancingv2';
 import * as ga from '@aws-cdk/aws-globalaccelerator';

packages/@aws-cdk/aws-glue/README.md

@@ -72,7 +72,11 @@ new glue.Job(this, 'PythonSparkStreamingJob', {
 ### Python Shell Jobs
 
 A Python shell job runs Python scripts as a shell and supports a Python version that depends on the AWS Glue version you are using.
-This can be used to schedule and run tasks that don't require an Apache Spark environment.
+This can be used to schedule and run tasks that don't require an Apache Spark environment. Currently, three flavors are supported:
+
+* PythonVersion.TWO (2.7; EOL)
+* PythonVersion.THREE (3.6)
+* PythonVersion.THREE_NINE (3.9)
 
 ```ts
 declare const bucket: s3.Bucket;

packages/@aws-cdk/aws-glue/lib/job-executable.ts

@@ -75,6 +75,11 @@ export enum PythonVersion {
    * Python 3 (the exact version depends on GlueVersion and JobCommand used)
    */
   THREE = '3',
+
+  /**
+   * Python 3.9 (the exact version depends on GlueVersion and JobCommand used)
+   */
+  THREE_NINE = '3.9',
 }
 
 /**
@@ -300,6 +305,9 @@ export class JobExecutable {
     if (JobLanguage.PYTHON !== config.language && config.extraPythonFiles) {
       throw new Error('extraPythonFiles is not supported for languages other than JobLanguage.PYTHON');
     }
+    if (config.pythonVersion === PythonVersion.THREE_NINE && config.type !== JobType.PYTHON_SHELL) {
+      throw new Error('Specified PythonVersion PythonVersion.THREE_NINE is only supported for JobType Python Shell');
+    }
     this.config = config;
   }
 

packages/@aws-cdk/aws-glue/test/integ.job.ts

@@ -86,4 +86,20 @@ new glue.Job(stack, 'ShellJob', {
   },
 });
 
+new glue.Job(stack, 'ShellJob39', {
+  jobName: 'ShellJob39',
+  executable: glue.JobExecutable.pythonShell({
+    glueVersion: glue.GlueVersion.V1_0,
+    pythonVersion: glue.PythonVersion.THREE_NINE,
+    script,
+  }),
+  defaultArguments: {
+    arg1: 'value1',
+    arg2: 'value2',
+  },
+  tags: {
+    key: 'value',
+  },
+});
+
 app.synth();

packages/@aws-cdk/aws-glue/test/job-executable.test.ts

@@ -14,6 +14,14 @@ describe('GlueVersion', () => {
   test('of(customVersion) should set the name correctly', () => expect(glue.GlueVersion.of('CustomVersion').name).toEqual('CustomVersion'));
 });
 
+describe('PythonVersion', () => {
+  test('.TWO should set the name correctly', () => expect(glue.PythonVersion.TWO).toEqual('2'));
+
+  test('.THREE should set the name correctly', () => expect(glue.PythonVersion.THREE).toEqual('3'));
+
+  test('.THREE_NINE should set the name correctly', () => expect(glue.PythonVersion.THREE_NINE).toEqual('3.9'));
+});
+
 describe('JobType', () => {
   test('.ETL should set the name correctly', () => expect(glue.JobType.ETL.name).toEqual('glueetl'));
 
@@ -102,5 +110,25 @@ describe('JobExecutable', () => {
         })).toThrow(`Specified GlueVersion ${glueVersion.name} does not support PythonVersion 2`);
       });
     });
+
+    test('with PythonVersion set to PythonVersion.THREE_NINE and JobType not pythonshell should throw', () => {
+      expect(() => glue.JobExecutable.of({
+        type: glue.JobType.ETL,
+        language: glue.JobLanguage.PYTHON,
+        pythonVersion: glue.PythonVersion.THREE_NINE,
+        script,
+        glueVersion: glue.GlueVersion.V1_0,
+      })).toThrow('Specified PythonVersion PythonVersion.THREE_NINE is only supported for JobType Python Shell');
+    });
+
+    test('with PythonVersion PythonVersion.THREE_NINE and JobType pythonshell should succeed', () => {
+      expect(glue.JobExecutable.of({
+        type: glue.JobType.PYTHON_SHELL,
+        glueVersion: glue.GlueVersion.V1_0,
+        language: glue.JobLanguage.PYTHON,
+        pythonVersion: glue.PythonVersion.THREE_NINE,
+        script,
+      })).toBeDefined();
+    });
   });
 });

packages/@aws-cdk/aws-glue/test/job.integ.snapshot/aws-glue-job.assets.json

@@ -1,5 +1,5 @@
 {
-  "version": "17.0.0",
+  "version": "20.0.0",
   "files": {
     "432033e3218068a915d2532fa9be7858a12b228a2ae6e5c10faccd9097b1e855": {
       "source": {
@@ -14,15 +14,15 @@
         }
       }
     },
-    "9621659bccc489f1130729575d70f1c13a90dc7584eac90773642d7ad0cc1914": {
+    "a44de72f7ea39efc17f8c7abc7e0c595ae4651b3e239851c49461fecf09bb151": {
       "source": {
         "path": "aws-glue-job.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "9621659bccc489f1130729575d70f1c13a90dc7584eac90773642d7ad0cc1914.json",
+          "objectKey": "a44de72f7ea39efc17f8c7abc7e0c595ae4651b3e239851c49461fecf09bb151.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }