diff --git a/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.ts b/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.ts index cac58e7461528..e666cec182ade 100644 --- a/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.ts +++ b/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.ts @@ -476,7 +476,7 @@ function addBootstrapVersionRule(stack: Stack, requiredVersion: number, qualifie const param = new CfnParameter(stack, 'BootstrapVersion', { type: 'AWS::SSM::Parameter::Value', description: 'Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store.', - default: `/aws-cdk-bootstrap/${qualifier}/version`, + default: `/cdk-bootstrap/${qualifier}/version`, }); // There is no >= check in CloudFormation, so we have to check the number @@ -499,4 +499,4 @@ function range(startIncl: number, endExcl: number) { ret.push(i); } return ret; -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/core/test/stack-synthesis/test.new-style-synthesis.ts b/packages/@aws-cdk/core/test/stack-synthesis/test.new-style-synthesis.ts index 79c852d494247..7d88ce7c0be49 100644 --- a/packages/@aws-cdk/core/test/stack-synthesis/test.new-style-synthesis.ts +++ b/packages/@aws-cdk/core/test/stack-synthesis/test.new-style-synthesis.ts @@ -36,7 +36,7 @@ export = { // THEN -- the S3 url is advertised on the stack artifact const stackArtifact = asm.getStackArtifact('Stack'); - const templateHash = '19e1e8612660f79362e091714ab7b3583961936d762c75be8b8083c3af40850a'; + const templateHash = '040a6374d4c48c0db867f1d4f95c69b12d28e69c3b8a9903a1db1ec651dcf480'; test.equals(stackArtifact.stackTemplateAssetObjectUrl, `s3://cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}/${templateHash}`); @@ -70,7 +70,7 @@ export = { // THEN const template = app.synth().getStackByName('Stack').template; test.deepEqual(template?.Parameters?.BootstrapVersion?.Type, 'AWS::SSM::Parameter::Value'); - test.deepEqual(template?.Parameters?.BootstrapVersion?.Default, '/aws-cdk-bootstrap/hnb659fds/version'); + test.deepEqual(template?.Parameters?.BootstrapVersion?.Default, '/cdk-bootstrap/hnb659fds/version'); const assertions = template?.Rules?.CheckBootstrapVersion?.Assertions ?? []; test.deepEqual(assertions.length, 1); @@ -220,4 +220,4 @@ function readAssetManifest(asm: cxapi.CloudAssembly): cxschema.AssetManifest { if (!manifestArtifact) { throw new Error('no asset manifest in assembly'); } return JSON.parse(fs.readFileSync(manifestArtifact.file, { encoding: 'utf-8' })); -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.expected.json b/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.expected.json index 0f87f89024dbb..bf0e04a7f96b9 100644 --- a/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.expected.json +++ b/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.expected.json @@ -2,7 +2,7 @@ "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", - "Default": "/aws-cdk-bootstrap/hnb659fds/version", + "Default": "/cdk-bootstrap/hnb659fds/version", "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store." } }, @@ -1694,4 +1694,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/pipelines/test/integ.pipeline.expected.json b/packages/@aws-cdk/pipelines/test/integ.pipeline.expected.json index 336c2494b3f00..d608c7a22b842 100644 --- a/packages/@aws-cdk/pipelines/test/integ.pipeline.expected.json +++ b/packages/@aws-cdk/pipelines/test/integ.pipeline.expected.json @@ -2,7 +2,7 @@ "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", - "Default": "/aws-cdk-bootstrap/hnb659fds/version", + "Default": "/cdk-bootstrap/hnb659fds/version", "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store." } }, @@ -1390,4 +1390,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/aws-cdk/lib/api/bootstrap/bootstrap-template.yaml b/packages/aws-cdk/lib/api/bootstrap/bootstrap-template.yaml index eb90045569e8b..91a2a606341f4 100644 --- a/packages/aws-cdk/lib/api/bootstrap/bootstrap-template.yaml +++ b/packages/aws-cdk/lib/api/bootstrap/bootstrap-template.yaml @@ -368,7 +368,7 @@ Resources: Properties: Type: String Name: - Fn::Sub: '/aws-cdk-bootstrap/${Qualifier}/version' + Fn::Sub: '/cdk-bootstrap/${Qualifier}/version' Value: 4 Outputs: BucketName: @@ -401,4 +401,4 @@ Outputs: Description: The version of the bootstrap resources that are currently mastered in this stack Value: - Fn::GetAtt: [CdkBootstrapVersion, Value] \ No newline at end of file + Fn::GetAtt: [CdkBootstrapVersion, Value]