Skip to content

Commit 7aab32c

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into feat/rds-aurora-mysql-3-05-1
2 parents 4e6e103 + de0d77b commit 7aab32c

File tree

15 files changed

+2274
-3
lines changed

15 files changed

+2274
-3
lines changed

‎packages/@aws-cdk-testing/cli-integ/tests/init-go/init-go.integtest.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,20 @@ import { integTest, withTemporaryDirectory, ShellHelper, withPackages } from '..
22

33
['app', 'sample-app'].forEach(template => {
44
integTest(`init go ${template}`, withTemporaryDirectory(withPackages(async (context) => {
5+
const isCanary = !!process.env.IS_CANARY;
56
context.packages.assertJsiiPackagesAvailable();
67

78
const shell = ShellHelper.fromContext(context);
89
await context.packages.makeCliAvailable();
910

1011
await shell.shell(['cdk', 'init', '-l', 'go', template]);
11-
await shell.shell(['go', 'mod', 'edit', '-replace', 'github.com/aws/aws-cdk-go/awscdk/v2=$CODEBUILD_SRC_DIR/go/awscdk']);
12+
13+
// Canaries will use the generated go.mod as is
14+
// For pipeline tests we replace the source with the locally build one
15+
if (!isCanary) {
16+
await shell.shell(['go', 'mod', 'edit', '-replace', 'github.com/aws/aws-cdk-go/awscdk/v2=$CODEBUILD_SRC_DIR/go/awscdk']);
17+
}
18+
1219
await shell.shell(['go', 'mod', 'tidy']);
1320
await shell.shell(['go', 'test']);
1421
await shell.shell(['cdk', 'synth']);

‎packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/fargate/integ.custom-task-revision.js.snapshot/EcsCustomTaskRevisionDefaultTestDeployAssert0E9C7509.assets.json‎

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/fargate/integ.custom-task-revision.js.snapshot/EcsCustomTaskRevisionDefaultTestDeployAssert0E9C7509.template.json‎

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/fargate/integ.custom-task-revision.js.snapshot/aws-ecs-integ-custom-task-revision.assets.json‎

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)