Merge branch 'main' into jwt-cognito

Author: badmintoncryer

.github/workflows/spec-update.yml

@@ -58,8 +58,13 @@ jobs:
       # Build @aws-cdk/spec2cdk and run L1 gen script to generate base files for new modules
       - name: Build @aws-cdk/spec2cdk
         run: lerna run build --stream --no-progress --skip-nx-cache --scope @aws-cdk/spec2cdk
-      - name: Generate code
-        run: lerna run gen --stream --no-progress --skip-nx-cache --scope aws-cdk-lib --scope @aws-cdk/mixins-preview
+      # Generate L1 code for aws-cdk-lib first — this updates scope-map.json with new services.
+      # mixins-preview and cfn-property-mixins read scope-map.json during their gen, so they
+      # must run after aws-cdk-lib to see the new service entries.
+      - name: Generate L1 code
+        run: lerna run gen --stream --no-progress --skip-nx-cache --scope aws-cdk-lib
+      - name: Generate mixins
+        run: lerna run gen --stream --no-progress --skip-nx-cache --scope @aws-cdk/mixins-preview --scope @aws-cdk/cfn-property-mixins
 
       # Next, create and upload the changes as a patch file. This will later be downloaded to create a pull request
       # Creating a pull request requires write permissions and it's best to keep write privileges isolated.

packages/@aws-cdk-testing/framework-integ/package.json

@@ -9,7 +9,7 @@
     "lint": "cdk-lint",
     "pkglint": "pkglint -f",
     "test": "cdk-test",
-    "integ": "integ-runner --unstable=toolkit-lib-engine --language javascript",
+    "integ": "env JSII_DEPRECATED=fail integ-runner --unstable=toolkit-lib-engine --language javascript",
     "package": "cdk-package",
     "build+test": "yarn build && yarn test",
     "build+extract": "yarn build",

packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/integ.stepfunctions-api-without-default-method-responses.ts

@@ -13,7 +13,7 @@ class SfnRestApiWithoutDefaultMethodResponsesStack extends cdk.Stack {
     });
 
     const stateMachine = new sfn.StateMachine(this, 'StateMachine', {
-      definition: passTask,
+      definitionBody: sfn.DefinitionBody.fromChainable(passTask),
       stateMachineType: sfn.StateMachineType.EXPRESS,
     });
 

packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/integ.stepfunctions-api.ts

@@ -20,7 +20,7 @@ class StepFunctionsRestApiDeploymentStack extends cdk.Stack {
     });
 
     const stateMachine = new sfn.StateMachine(this, 'StateMachine', {
-      definition: passTask,
+      definitionBody: sfn.DefinitionBody.fromChainable(passTask),
       stateMachineType: sfn.StateMachineType.EXPRESS,
     });
 

packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2-integrations/test/http/integ.stepfunctions.ts

@@ -8,10 +8,10 @@ const app = new App();
 const stack = new Stack(app, 'stepfunctions-integration');
 
 const stateMachine = new sfn.StateMachine(stack, 'RouteStateMachine', {
-  definition: new sfn.Pass(stack, 'Pass1'),
+  definitionBody: sfn.DefinitionBody.fromChainable(new sfn.Pass(stack, 'Pass1')),
 });
 const expressStateMachine = new sfn.StateMachine(stack, 'ExpressStateMachine', {
-  definition: new sfn.Pass(stack, 'Pass2'),
+  definitionBody: sfn.DefinitionBody.fromChainable(new sfn.Pass(stack, 'Pass2')),
   stateMachineType: sfn.StateMachineType.EXPRESS,
 });
 

packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.api-import.ts

@@ -24,7 +24,9 @@ const baseStack = new cdk.Stack(app, 'baseStack');
 
 const baseApi = new appsync.GraphqlApi(baseStack, 'baseApi', {
   name: 'baseApi',
-  schema: appsync.SchemaFile.fromAsset(path.join(__dirname, 'appsync.test.graphql')),
+  definition: {
+    schema: appsync.SchemaFile.fromAsset(path.join(__dirname, 'appsync.test.graphql')),
+  },
 });
 
 const stack = new cdk.Stack(app, 'stack');

packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.appsync-disable-introspection.ts

@@ -8,7 +8,9 @@ const stack = new cdk.Stack(app, 'stack');
 
 const api = new appsync.GraphqlApi(stack, 'DisableIntrospection', {
   name: 'DisableIntrospection',
-  schema: appsync.SchemaFile.fromAsset(path.join(__dirname, 'appsync.test.graphql')),
+  definition: {
+    schema: appsync.SchemaFile.fromAsset(path.join(__dirname, 'appsync.test.graphql')),
+  },
   introspectionConfig: appsync.IntrospectionConfig.DISABLED,
 });
 

packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.appsync-eventbridge.ts

@@ -9,7 +9,9 @@ const stack = new cdk.Stack(app, 'stack');
 
 const api = new appsync.GraphqlApi(stack, 'EventBridgeApi', {
   name: 'EventBridgeApi',
-  schema: appsync.SchemaFile.fromAsset(path.join(__dirname, 'appsync.eventbridge.graphql')),
+  definition: {
+    schema: appsync.SchemaFile.fromAsset(path.join(__dirname, 'appsync.eventbridge.graphql')),
+  },
 });
 
 const bus = new events.EventBus(stack, 'DestinationEventBus', {});

packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.appsync-function-max-batch-size.ts

@@ -14,7 +14,9 @@ const stack = new cdk.Stack(app, 'aws-cdk-appsync-function-max-batch-size');
 
 const api = new appsync.GraphqlApi(stack, 'LambdaAPI', {
   name: 'LambdaAPI',
-  schema: appsync.SchemaFile.fromAsset(path.join(__dirname, 'appsync.lambda.graphql')),
+  definition: {
+    schema: appsync.SchemaFile.fromAsset(path.join(__dirname, 'appsync.lambda.graphql')),
+  },
 });
 
 const func = new lambda.Function(stack, 'func', {

packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.appsync-global-api.ts

@@ -8,7 +8,9 @@ const stack = new cdk.Stack(app, 'stack');
 
 const api = new appsync.GraphqlApi(stack, 'GlobalApi', {
   name: 'GlobalApi',
-  schema: appsync.SchemaFile.fromAsset(path.join(__dirname, 'appsync.test.graphql')),
+  definition: {
+    schema: appsync.SchemaFile.fromAsset(path.join(__dirname, 'appsync.test.graphql')),
+  },
   visibility: appsync.Visibility.GLOBAL,
 });