Merge branch 'main' into huijbers/version-update-fixes

.github/workflows/issue-label-assign.yml

@@ -282,5 +282,7 @@ env:
  {"area":"@aws-cdk/yaml-cfn","keywords":["aws-yaml-cfn","yaml-cfn"],"labels":["@aws-cdk/aws-yaml-cfn"],"assignees":["kaizencc"]},
  {"area":"@aws-cdk/aws-lightsail","keywords":["lightsail","aws-lightsail"],"labels":["@aws-cdk/aws-lightsail"],"assignees":["corymhall"]},
  {"area":"@aws-cdk/aws-aps","keywords":["aps","aws-aps","prometheus"],"labels":["@aws-cdk/aws-aps"],"assignees":["corymhall"]},
- {"area":"@aws-cdk/triggers","keywords":["trigger","triggers"],"labels":["@aws-cdk/triggers"],"assignees":["otaviomacedo"]}
+ {"area":"@aws-cdk/triggers","keywords":["trigger","triggers"],"labels":["@aws-cdk/triggers"],"assignees":["otaviomacedo"]},
+ {"area":"@aws-cdk/integ-tests","keywords":["integ-tests", "integ"],"labels":["@aws-cdk/integ-tests"],"assignees":["corymhall"]},
+ {"area":"@aws-cdk/integ-runner","keywords":["integ-runner"],"labels":["@aws-cdk/integ-runner"],"assignees":["corymhall"]}
  ]

.mergify.yml

@@ -95,6 +95,7 @@ pull_request_rules:
  - base=main
  - -merged
  - -closed
+ - changes-requested-reviews-by!=aws-cdk-automation
  - name: if fails conventional commits
  actions:
  comment:

packages/@aws-cdk/assertions/lib/template.ts

@@ -52,7 +52,7 @@ export class Template {
 
  private readonly template: TemplateType;
 
- private constructor(template: { [key: string]: any }, templateParsingOptions?: TemplateParsingOptions) {
+ private constructor(template: { [key: string]: any }, templateParsingOptions: TemplateParsingOptions = {}) {
  this.template = template as TemplateType;
  if (!templateParsingOptions?.skipCyclicalDependenciesCheck ?? true) {
  checkTemplateForCyclicDependencies(this.template);
@@ -259,9 +259,10 @@ export interface TemplateParsingOptions {
  /**
  * If set to true, will skip checking for cyclical / circular dependencies. Should be set to false other than for
  * templates that are valid despite containing cycles, such as unprocessed transform stacks.
- * default: false if TemplateParsingOptions is not provided.
+ *
+ * @default false
  */
- readonly skipCyclicalDependenciesCheck: boolean
+ readonly skipCyclicalDependenciesCheck?: boolean;
 }
 
 function toTemplate(stack: Stack): any {
@@ -276,4 +277,4 @@ function toTemplate(stack: Stack): any {
  return JSON.parse(fs.readFileSync(path.join(assembly.directory, stack.templateFile)).toString('utf-8'));
  }
  return assembly.getStackArtifact(stack.artifactId).template;
-}
+}

packages/@aws-cdk/aws-appsync/lib/data-source.ts

@@ -5,7 +5,7 @@ import { IFunction } from '@aws-cdk/aws-lambda';
 import { IDomain as IOpenSearchDomain } from '@aws-cdk/aws-opensearchservice';
 import { IServerlessCluster } from '@aws-cdk/aws-rds';
 import { ISecret } from '@aws-cdk/aws-secretsmanager';
-import { IResolvable, Lazy, Stack } from '@aws-cdk/core';
+import { IResolvable, Lazy, Stack, Token } from '@aws-cdk/core';
 import { Construct } from 'constructs';
 import { BaseAppsyncFunctionProps, AppsyncFunction } from './appsync-function';
 import { CfnDataSource } from './appsync.generated';
@@ -116,10 +116,11 @@ export abstract class BaseDataSource extends Construct {
  this.serviceRole = props.serviceRole || new Role(this, 'ServiceRole', { assumedBy: new ServicePrincipal('appsync') });
  }
  // Replace unsupported characters from DataSource name. The only allowed pattern is: {[_A-Za-z][_0-9A-Za-z]*}
- const name = (props.name ?? id).replace(/[\W]+/g, '');
+ const name = (props.name ?? id);
+ const supportedName = Token.isUnresolved(name) ? name : name.replace(/[\W]+/g, '');
  this.ds = new CfnDataSource(this, 'Resource', {
  apiId: props.api.apiId,
- name: name,
+ name: supportedName,
  description: props.description,
  serviceRoleArn: this.serviceRole?.roleArn,
  ...extended,

packages/@aws-cdk/aws-appsync/test/appsync-none.integ.snapshot/apiDefaultTestDeployAssert018781F2.assets.json

@@ -0,0 +1,19 @@
+{
+ "version": "21.0.0",
+ "files": {
+ "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
+ "source": {
+ "path": "apiDefaultTestDeployAssert018781F2.template.json",
+ "packaging": "file"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ }
+ },
+ "dockerImages": {}
+}

packages/@aws-cdk/aws-appsync/test/appsync-none.integ.snapshot/apiDefaultTestDeployAssert018781F2.template.json

@@ -0,0 +1,36 @@
+{
+ "Parameters": {
+ "BootstrapVersion": {
+ "Type": "AWS::SSM::Parameter::Value<String>",
+ "Default": "/cdk-bootstrap/hnb659fds/version",
+ "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+ }
+ },
+ "Rules": {
+ "CheckBootstrapVersion": {
+ "Assertions": [
+ {
+ "Assert": {
+ "Fn::Not": [
+ {
+ "Fn::Contains": [
+ [
+ "1",
+ "2",
+ "3",
+ "4",
+ "5"
+ ],
+ {
+ "Ref": "BootstrapVersion"
+ }
+ ]
+ }
+ ]
+ },
+ "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+ }
+ ]
+ }
+ }
+}

packages/@aws-cdk/aws-appsync/test/appsync-none.integ.snapshot/cdk.out

@@ -0,0 +1 @@
+{"version":"21.0.0"}

packages/@aws-cdk/aws-appsync/test/appsync-none.integ.snapshot/integ.json

@@ -0,0 +1,12 @@
+{
+ "version": "21.0.0",
+ "testCases": {
+ "api/DefaultTest": {
+ "stacks": [
+ "stack"
+ ],
+ "assertionStack": "api/DefaultTest/DeployAssert",
+ "assertionStackName": "apiDefaultTestDeployAssert018781F2"
+ }
+ }
+}

packages/@aws-cdk/aws-appsync/test/appsync-none.integ.snapshot/manifest.json

@@ -0,0 +1,129 @@
+{
+ "version": "21.0.0",
+ "artifacts": {
+ "Tree": {
+ "type": "cdk:tree",
+ "properties": {
+ "file": "tree.json"
+ }
+ },
+ "stack.assets": {
+ "type": "cdk:asset-manifest",
+ "properties": {
+ "file": "stack.assets.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "stack": {
+ "type": "aws:cloudformation:stack",
+ "environment": "aws://unknown-account/unknown-region",
+ "properties": {
+ "templateFile": "stack.template.json",
+ "validateOnSynth": false,
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
+ "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f042b3cf231d4b437b4eaeb1389edd958e4640394bc53a918ce5c08751499411.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
+ "additionalDependencies": [
+ "stack.assets"
+ ],
+ "lookupRole": {
+ "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
+ "requiresBootstrapStackVersion": 8,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "dependencies": [
+ "stack.assets"
+ ],
+ "metadata": {
+ "/stack/NoneAPI/Resource": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "NoneAPI55E3D0D9"
+ }
+ ],
+ "/stack/NoneAPI/Schema": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "NoneAPISchema60A29796"
+ }
+ ],
+ "/stack/NoneAPI/DefaultApiKey": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "NoneAPIDefaultApiKey67B964CA"
+ }
+ ],
+ "/stack/NoneAPI/NoneDS/Resource": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "NoneAPINoneDSCC0A2012"
+ }
+ ],
+ "/stack/BootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "BootstrapVersion"
+ }
+ ],
+ "/stack/CheckBootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "CheckBootstrapVersion"
+ }
+ ]
+ },
+ "displayName": "stack"
+ },
+ "apiDefaultTestDeployAssert018781F2.assets": {
+ "type": "cdk:asset-manifest",
+ "properties": {
+ "file": "apiDefaultTestDeployAssert018781F2.assets.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "apiDefaultTestDeployAssert018781F2": {
+ "type": "aws:cloudformation:stack",
+ "environment": "aws://unknown-account/unknown-region",
+ "properties": {
+ "templateFile": "apiDefaultTestDeployAssert018781F2.template.json",
+ "validateOnSynth": false,
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
+ "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
+ "additionalDependencies": [
+ "apiDefaultTestDeployAssert018781F2.assets"
+ ],
+ "lookupRole": {
+ "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
+ "requiresBootstrapStackVersion": 8,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "dependencies": [
+ "apiDefaultTestDeployAssert018781F2.assets"
+ ],
+ "metadata": {
+ "/api/DefaultTest/DeployAssert/BootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "BootstrapVersion"
+ }
+ ],
+ "/api/DefaultTest/DeployAssert/CheckBootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "CheckBootstrapVersion"
+ }
+ ]
+ },
+ "displayName": "api/DefaultTest/DeployAssert"
+ }
+ }
+}

packages/@aws-cdk/aws-appsync/test/appsync-none.integ.snapshot/stack.assets.json

@@ -0,0 +1,19 @@
+{
+ "version": "21.0.0",
+ "files": {
+ "f042b3cf231d4b437b4eaeb1389edd958e4640394bc53a918ce5c08751499411": {
+ "source": {
+ "path": "stack.template.json",
+ "packaging": "file"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "f042b3cf231d4b437b4eaeb1389edd958e4640394bc53a918ce5c08751499411.json",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ }
+ },
+ "dockerImages": {}
+}

packages/@aws-cdk/aws-appsync/test/appsync-none.integ.snapshot/stack.template.json

@@ -0,0 +1,84 @@
+{
+ "Resources": {
+ "NoneAPI55E3D0D9": {
+ "Type": "AWS::AppSync::GraphQLApi",
+ "Properties": {
+ "AuthenticationType": "API_KEY",
+ "Name": "NoneAPI"
+ }
+ },
+ "NoneAPISchema60A29796": {
+ "Type": "AWS::AppSync::GraphQLSchema",
+ "Properties": {
+ "ApiId": {
+ "Fn::GetAtt": [
+ "NoneAPI55E3D0D9",
+ "ApiId"
+ ]
+ },
+ "Definition": "type test {\n version: String!\n}\ntype Query {\n getTests: [test]!\n}\ntype Mutation {\n addTest(version: String!): test\n}\n"
+ }
+ },
+ "NoneAPIDefaultApiKey67B964CA": {
+ "Type": "AWS::AppSync::ApiKey",
+ "Properties": {
+ "ApiId": {
+ "Fn::GetAtt": [
+ "NoneAPI55E3D0D9",
+ "ApiId"
+ ]
+ }
+ },
+ "DependsOn": [
+ "NoneAPISchema60A29796"
+ ]
+ },
+ "NoneAPINoneDSCC0A2012": {
+ "Type": "AWS::AppSync::DataSource",
+ "Properties": {
+ "ApiId": {
+ "Fn::GetAtt": [
+ "NoneAPI55E3D0D9",
+ "ApiId"
+ ]
+ },
+ "Name": "NoneDS",
+ "Type": "NONE"
+ }
+ }
+ },
+ "Parameters": {
+ "BootstrapVersion": {
+ "Type": "AWS::SSM::Parameter::Value<String>",
+ "Default": "/cdk-bootstrap/hnb659fds/version",
+ "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+ }
+ },
+ "Rules": {
+ "CheckBootstrapVersion": {
+ "Assertions": [
+ {
+ "Assert": {
+ "Fn::Not": [
+ {
+ "Fn::Contains": [
+ [
+ "1",
+ "2",
+ "3",
+ "4",
+ "5"
+ ],
+ {
+ "Ref": "BootstrapVersion"
+ }
+ ]
+ }
+ ]
+ },
+ "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+ }
+ ]
+ }
+ }
+}