Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: import should write overrideTemplate to assembly.outdir #29509

Closed
wants to merge 7 commits into from
Closed

fix: import should write overrideTemplate to assembly.outdir #29509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c332aff
fix: import should write overrideTemplate to assembly.outdir
nburtsev Mar 15, 2024
8d73b83
Merge branch 'main' into main
nburtsev Mar 15, 2024
b91e06a
Merge branch 'main' into fix/cdk-import-template-path
nburtsev Mar 18, 2024
8b5e5cb
fix: update cli import test to ensure template tiss larger than 50kb
nburtsev Mar 23, 2024
16f3529
Merge branch 'main' into fix/cdk-import-template-path
nburtsev Mar 23, 2024
b798c93
Merge branch 'main' into fix/cdk-import-template-path
nburtsev Mar 26, 2024
3f3f730
Merge branch 'main' into fix/cdk-import-template-path
nburtsev Apr 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions packages/@aws-cdk-testing/cli-integ/resources/cdk-apps/app/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,15 @@ class MigrateStack extends cdk.Stack {
value: queue.node.defaultChild.logicalId,
});
}

if (process.env.LARGE_TEMPLATE) {
for (let i = 0; i < 70; i++) {
const q = new sqs.Queue(this, `cdk-import-queue-test${i}`, {
enforceSSL: true,
});
}
}

if (process.env.SAMPLE_RESOURCES) {
const myTopic = new sns.Topic(this, 'migratetopic1', {
removalPolicy: cdk.RemovalPolicy.DESTROY,
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1431,7 +1431,7 @@ integTest('test resource import', withDefaultFixture(async (fixture) => {

// Initial deploy
await fixture.cdkDeploy('importable-stack', {
modEnv: { ORPHAN_TOPIC: '1' },
modEnv: { ORPHAN_TOPIC: '1', LARGE_TEMPLATE: '1' },
options: ['--outputs-file', outputsFile],
});

Expand All @@ -1442,7 +1442,7 @@ integTest('test resource import', withDefaultFixture(async (fixture) => {
try {
// Deploy again, orphaning the queue
await fixture.cdkDeploy('importable-stack', {
modEnv: { OMIT_TOPIC: '1' },
modEnv: { OMIT_TOPIC: '1', LARGE_TEMPLATE: '1' },
});

// Write a resource mapping file based on the ID from step one, then run an import
Expand Down
4 changes: 3 additions & 1 deletion packages/aws-cdk/lib/api/util/template-body-parameter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import * as path from 'path';
import * as cxapi from '@aws-cdk/cx-api';
import * as chalk from 'chalk';
import * as fs from 'fs-extra';
Expand Down Expand Up @@ -68,7 +69,8 @@ export async function makeBodyParameter(
if (overrideTemplate) {
// Add a variant of this template
templateFile = `${stack.templateFile}-${templateHash}.yaml`;
await fs.writeFile(templateFile, templateJson, { encoding: 'utf-8' });
const templateFilePath = path.join(stack.assembly.directory, templateFile);
await fs.writeFile(templateFilePath, templateJson, { encoding: 'utf-8' });
}

assetManifest.addFileAsset(templateHash, {
Expand Down
Loading