@aws-cdk-testing/cli-integ 3.2.1 → 3.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -7,71 +7,68 @@ const fs_1 = require("fs");
|
|
|
7
7
|
const path = require("path");
|
|
8
8
|
const lib_1 = require("../../../lib");
|
|
9
9
|
jest.setTimeout(2 * 60 * 60000); // Includes the time to acquire locks, worst-case single-threaded runtime
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
(
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
bucketName,
|
|
45
|
-
objectKey: `test-file-${Date.now()}.json`,
|
|
46
|
-
}
|
|
10
|
+
(0, lib_1.integTest)(`cdk-assets smoke test`, (0, lib_1.withDefaultFixture)(async (fixture) => {
|
|
11
|
+
await fixture.shell(['npm', 'init', '-y']);
|
|
12
|
+
await fixture.shell(['npm', 'install', `cdk-assets@latest`]);
|
|
13
|
+
const account = await fixture.aws.account();
|
|
14
|
+
const region = fixture.aws.region;
|
|
15
|
+
const bucketName = `cdk-hnb659fds-assets-${account}-${region}`;
|
|
16
|
+
const repositoryName = `cdk-hnb659fds-container-assets-${account}-${region}`;
|
|
17
|
+
const imageDir = 'imagedir';
|
|
18
|
+
await fs_1.promises.mkdir(path.join(fixture.integTestDir, imageDir), { recursive: true });
|
|
19
|
+
// Write an asset file and a data file for the Docker image
|
|
20
|
+
const assetFile = 'testfile.txt';
|
|
21
|
+
for (const toCreate of [assetFile, `${imageDir}/datafile.txt`]) {
|
|
22
|
+
await fs_1.promises.writeFile(path.join(fixture.integTestDir, toCreate), 'some asset file');
|
|
23
|
+
}
|
|
24
|
+
// Write a Dockerfile for the image build with a data file in it
|
|
25
|
+
await fs_1.promises.writeFile(path.join(fixture.integTestDir, imageDir, 'Dockerfile'), [
|
|
26
|
+
'FROM scratch',
|
|
27
|
+
'ADD datafile.txt datafile.txt',
|
|
28
|
+
].join('\n'));
|
|
29
|
+
// Write an asset JSON file to publish to the bootstrapped environment
|
|
30
|
+
const assetsJson = {
|
|
31
|
+
version: "38.0.1",
|
|
32
|
+
files: {
|
|
33
|
+
testfile: {
|
|
34
|
+
source: {
|
|
35
|
+
path: assetFile,
|
|
36
|
+
packaging: 'file',
|
|
37
|
+
},
|
|
38
|
+
destinations: {
|
|
39
|
+
current: {
|
|
40
|
+
region,
|
|
41
|
+
assumeRoleArn: `arn:\${AWS::Partition}:iam::${account}:role/cdk-hnb659fds-file-publishing-role-${account}-${region}`,
|
|
42
|
+
bucketName,
|
|
43
|
+
objectKey: `test-file-${Date.now()}.json`,
|
|
47
44
|
}
|
|
48
45
|
}
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
46
|
+
}
|
|
47
|
+
},
|
|
48
|
+
dockerImages: {
|
|
49
|
+
testimage: {
|
|
50
|
+
source: {
|
|
51
|
+
directory: imageDir,
|
|
52
|
+
},
|
|
53
|
+
destinations: {
|
|
54
|
+
current: {
|
|
55
|
+
region,
|
|
56
|
+
assumeRoleArn: `arn:\${AWS::Partition}:iam::${account}:role/cdk-hnb659fds-image-publishing-role-${account}-${region}`,
|
|
57
|
+
repositoryName,
|
|
58
|
+
imageTag: `test-image`, // Not fresh on every run because we'll run out of tags too easily
|
|
62
59
|
},
|
|
63
60
|
},
|
|
64
|
-
}
|
|
65
|
-
};
|
|
66
|
-
await fs_1.promises.writeFile(path.join(fixture.integTestDir, 'assets.json'), JSON.stringify(assetsJson, undefined, 2));
|
|
67
|
-
await fixture.shell(['npx', 'cdk-assets', '--path', 'assets.json', '--verbose', 'publish'], {
|
|
68
|
-
modEnv: {
|
|
69
|
-
...fixture.cdkShellEnv(),
|
|
70
|
-
// This is necessary for cdk-assets v2, if the credentials are supplied via
|
|
71
|
-
// config file (which they are on the CodeBuild canaries).
|
|
72
|
-
AWS_SDK_LOAD_CONFIG: '1',
|
|
73
61
|
},
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
|
|
77
|
-
|
|
62
|
+
}
|
|
63
|
+
};
|
|
64
|
+
await fs_1.promises.writeFile(path.join(fixture.integTestDir, 'assets.json'), JSON.stringify(assetsJson, undefined, 2));
|
|
65
|
+
await fixture.shell(['npx', 'cdk-assets', '--path', 'assets.json', '--verbose', 'publish'], {
|
|
66
|
+
modEnv: {
|
|
67
|
+
...fixture.cdkShellEnv(),
|
|
68
|
+
// This is necessary for cdk-assets v2, if the credentials are supplied via
|
|
69
|
+
// config file (which they are on the CodeBuild canaries).
|
|
70
|
+
AWS_SDK_LOAD_CONFIG: '1',
|
|
71
|
+
},
|
|
72
|
+
});
|
|
73
|
+
}));
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21va2V0ZXN0LmludGVndGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNtb2tldGVzdC5pbnRlZ3Rlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQTs7R0FFRztBQUNILDJCQUFvQztBQUNwQyw2QkFBNkI7QUFDN0Isc0NBQTZEO0FBRTdELElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxHQUFHLEVBQUUsR0FBRyxLQUFNLENBQUMsQ0FBQyxDQUFDLHlFQUF5RTtBQUUzRyxJQUFBLGVBQVMsRUFDUCx1QkFBdUIsRUFDdkIsSUFBQSx3QkFBa0IsRUFBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUU7SUFDbkMsTUFBTSxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBQzNDLE1BQU0sT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssRUFBRSxTQUFTLEVBQUUsbUJBQW1CLENBQUMsQ0FBQyxDQUFDO0lBRTdELE1BQU0sT0FBTyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUM1QyxNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQztJQUNsQyxNQUFNLFVBQVUsR0FBRyx3QkFBd0IsT0FBTyxJQUFJLE1BQU0sRUFBRSxDQUFDO0lBQy9ELE1BQU0sY0FBYyxHQUFHLGtDQUFrQyxPQUFPLElBQUksTUFBTSxFQUFFLENBQUM7SUFFN0UsTUFBTSxRQUFRLEdBQUcsVUFBVSxDQUFDO0lBQzVCLE1BQU0sYUFBRSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxZQUFZLEVBQUUsUUFBUSxDQUFDLEVBQUUsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUUvRSwyREFBMkQ7SUFDM0QsTUFBTSxTQUFTLEdBQUcsY0FBYyxDQUFDO0lBQ2pDLEtBQUssTUFBTSxRQUFRLElBQUksQ0FBQyxTQUFTLEVBQUUsR0FBRyxRQUFRLGVBQWUsQ0FBQyxFQUFFLENBQUM7UUFDL0QsTUFBTSxhQUFFLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFlBQVksRUFBRSxRQUFRLENBQUMsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO0lBQ25GLENBQUM7SUFFRCxnRUFBZ0U7SUFDaEUsTUFBTSxhQUFFLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFlBQVksRUFBRSxRQUFRLEVBQUUsWUFBWSxDQUFDLEVBQUU7UUFDMUUsY0FBYztRQUNkLCtCQUErQjtLQUNoQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBRWQsc0VBQXNFO0lBQ3RFLE1BQU0sVUFBVSxHQUFHO1FBQ2pCLE9BQU8sRUFBRSxRQUFRO1FBQ2pCLEtBQUssRUFBRTtZQUNMLFFBQVEsRUFBRTtnQkFDUixNQUFNLEVBQUU7b0JBQ04sSUFBSSxFQUFFLFNBQVM7b0JBQ2YsU0FBUyxFQUFFLE1BQU07aUJBQ2xCO2dCQUNELFlBQVksRUFBRTtvQkFDWixPQUFPLEVBQUU7d0JBQ1AsTUFBTTt3QkFDTixhQUFhLEVBQUUsK0JBQStCLE9BQU8sNENBQTRDLE9BQU8sSUFBSSxNQUFNLEVBQUU7d0JBQ3BILFVBQVU7d0JBQ1YsU0FBUyxFQUFFLGFBQWEsSUFBSSxDQUFDLEdBQUcsRUFBRSxPQUFPO3FCQUMxQztpQkFDRjthQUNGO1NBQ0Y7UUFDRCxZQUFZLEVBQUU7WUFDWixTQUFTLEVBQUU7Z0JBQ1QsTUFBTSxFQUFFO29CQUNOLFNBQVMsRUFBRSxRQUFRO2lCQUNwQjtnQkFDRCxZQUFZLEVBQUU7b0JBQ1osT0FBTyxFQUFFO3dCQUNQLE1BQU07d0JBQ04sYUFBYSxFQUFFLCtCQUErQixPQUFPLDZDQUE2QyxPQUFPLElBQUksTUFBTSxFQUFFO3dCQUNySCxjQUFjO3dCQUNkLFFBQVEsRUFBRSxZQUFZLEVBQUUsa0VBQWtFO3FCQUMzRjtpQkFDRjthQUNGO1NBQ0Y7S0FDRixDQUFDO0lBRUYsTUFBTSxhQUFFLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFlBQVksRUFBRSxhQUFhLENBQUMsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLFVBQVUsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUM3RyxNQUFNLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLEVBQUUsWUFBWSxFQUFFLFFBQVEsRUFBRSxhQUFhLEVBQUUsV0FBVyxFQUFFLFNBQVMsQ0FBQyxFQUFFO1FBQzFGLE1BQU0sRUFBRTtZQUNOLEdBQUcsT0FBTyxDQUFDLFdBQVcsRUFBRTtZQUN4QiwyRUFBMkU7WUFDM0UsMERBQTBEO1lBQzFELG1CQUFtQixFQUFFLEdBQUc7U0FDekI7S0FDRixDQUFDLENBQUM7QUFDTCxDQUFDLENBQUMsQ0FDSCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBUZXN0cyBmb3IgdGhlIHN0YW5kYWxvbmUgY2RrLWFzc2V0cyBleGVjdXRhYmxlLCBhcyB1c2VkIGJ5IENESyBQaXBlbGluZXNcbiAqL1xuaW1wb3J0IHsgcHJvbWlzZXMgYXMgZnMgfSBmcm9tICdmcyc7XG5pbXBvcnQgKiBhcyBwYXRoIGZyb20gJ3BhdGgnO1xuaW1wb3J0IHsgaW50ZWdUZXN0LCB3aXRoRGVmYXVsdEZpeHR1cmUgfSBmcm9tICcuLi8uLi8uLi9saWInO1xuXG5qZXN0LnNldFRpbWVvdXQoMiAqIDYwICogNjBfMDAwKTsgLy8gSW5jbHVkZXMgdGhlIHRpbWUgdG8gYWNxdWlyZSBsb2Nrcywgd29yc3QtY2FzZSBzaW5nbGUtdGhyZWFkZWQgcnVudGltZVxuXG5pbnRlZ1Rlc3QoXG4gIGBjZGstYXNzZXRzIHNtb2tlIHRlc3RgLFxuICB3aXRoRGVmYXVsdEZpeHR1cmUoYXN5bmMgKGZpeHR1cmUpID0+IHtcbiAgICBhd2FpdCBmaXh0dXJlLnNoZWxsKFsnbnBtJywgJ2luaXQnLCAnLXknXSk7XG4gICAgYXdhaXQgZml4dHVyZS5zaGVsbChbJ25wbScsICdpbnN0YWxsJywgYGNkay1hc3NldHNAbGF0ZXN0YF0pO1xuXG4gICAgY29uc3QgYWNjb3VudCA9IGF3YWl0IGZpeHR1cmUuYXdzLmFjY291bnQoKTtcbiAgICBjb25zdCByZWdpb24gPSBmaXh0dXJlLmF3cy5yZWdpb247XG4gICAgY29uc3QgYnVja2V0TmFtZSA9IGBjZGstaG5iNjU5ZmRzLWFzc2V0cy0ke2FjY291bnR9LSR7cmVnaW9ufWA7XG4gICAgY29uc3QgcmVwb3NpdG9yeU5hbWUgPSBgY2RrLWhuYjY1OWZkcy1jb250YWluZXItYXNzZXRzLSR7YWNjb3VudH0tJHtyZWdpb259YDtcblxuICAgIGNvbnN0IGltYWdlRGlyID0gJ2ltYWdlZGlyJztcbiAgICBhd2FpdCBmcy5ta2RpcihwYXRoLmpvaW4oZml4dHVyZS5pbnRlZ1Rlc3REaXIsIGltYWdlRGlyKSwgeyByZWN1cnNpdmU6IHRydWUgfSk7XG5cbiAgICAvLyBXcml0ZSBhbiBhc3NldCBmaWxlIGFuZCBhIGRhdGEgZmlsZSBmb3IgdGhlIERvY2tlciBpbWFnZVxuICAgIGNvbnN0IGFzc2V0RmlsZSA9ICd0ZXN0ZmlsZS50eHQnO1xuICAgIGZvciAoY29uc3QgdG9DcmVhdGUgb2YgW2Fzc2V0RmlsZSwgYCR7aW1hZ2VEaXJ9L2RhdGFmaWxlLnR4dGBdKSB7XG4gICAgICBhd2FpdCBmcy53cml0ZUZpbGUocGF0aC5qb2luKGZpeHR1cmUuaW50ZWdUZXN0RGlyLCB0b0NyZWF0ZSksICdzb21lIGFzc2V0IGZpbGUnKTtcbiAgICB9XG5cbiAgICAvLyBXcml0ZSBhIERvY2tlcmZpbGUgZm9yIHRoZSBpbWFnZSBidWlsZCB3aXRoIGEgZGF0YSBmaWxlIGluIGl0XG4gICAgYXdhaXQgZnMud3JpdGVGaWxlKHBhdGguam9pbihmaXh0dXJlLmludGVnVGVzdERpciwgaW1hZ2VEaXIsICdEb2NrZXJmaWxlJyksIFtcbiAgICAgICdGUk9NIHNjcmF0Y2gnLFxuICAgICAgJ0FERCBkYXRhZmlsZS50eHQgZGF0YWZpbGUudHh0JyxcbiAgICBdLmpvaW4oJ1xcbicpKTtcblxuICAgIC8vIFdyaXRlIGFuIGFzc2V0IEpTT04gZmlsZSB0byBwdWJsaXNoIHRvIHRoZSBib290c3RyYXBwZWQgZW52aXJvbm1lbnRcbiAgICBjb25zdCBhc3NldHNKc29uID0ge1xuICAgICAgdmVyc2lvbjogXCIzOC4wLjFcIixcbiAgICAgIGZpbGVzOiB7XG4gICAgICAgIHRlc3RmaWxlOiB7XG4gICAgICAgICAgc291cmNlOiB7XG4gICAgICAgICAgICBwYXRoOiBhc3NldEZpbGUsXG4gICAgICAgICAgICBwYWNrYWdpbmc6ICdmaWxlJyxcbiAgICAgICAgICB9LFxuICAgICAgICAgIGRlc3RpbmF0aW9uczoge1xuICAgICAgICAgICAgY3VycmVudDoge1xuICAgICAgICAgICAgICByZWdpb24sXG4gICAgICAgICAgICAgIGFzc3VtZVJvbGVBcm46IGBhcm46XFwke0FXUzo6UGFydGl0aW9ufTppYW06OiR7YWNjb3VudH06cm9sZS9jZGstaG5iNjU5ZmRzLWZpbGUtcHVibGlzaGluZy1yb2xlLSR7YWNjb3VudH0tJHtyZWdpb259YCxcbiAgICAgICAgICAgICAgYnVja2V0TmFtZSxcbiAgICAgICAgICAgICAgb2JqZWN0S2V5OiBgdGVzdC1maWxlLSR7RGF0ZS5ub3coKX0uanNvbmAsXG4gICAgICAgICAgICB9XG4gICAgICAgICAgfVxuICAgICAgICB9XG4gICAgICB9LFxuICAgICAgZG9ja2VySW1hZ2VzOiB7XG4gICAgICAgIHRlc3RpbWFnZToge1xuICAgICAgICAgIHNvdXJjZToge1xuICAgICAgICAgICAgZGlyZWN0b3J5OiBpbWFnZURpcixcbiAgICAgICAgICB9LFxuICAgICAgICAgIGRlc3RpbmF0aW9uczoge1xuICAgICAgICAgICAgY3VycmVudDoge1xuICAgICAgICAgICAgICByZWdpb24sXG4gICAgICAgICAgICAgIGFzc3VtZVJvbGVBcm46IGBhcm46XFwke0FXUzo6UGFydGl0aW9ufTppYW06OiR7YWNjb3VudH06cm9sZS9jZGstaG5iNjU5ZmRzLWltYWdlLXB1Ymxpc2hpbmctcm9sZS0ke2FjY291bnR9LSR7cmVnaW9ufWAsXG4gICAgICAgICAgICAgIHJlcG9zaXRvcnlOYW1lLFxuICAgICAgICAgICAgICBpbWFnZVRhZzogYHRlc3QtaW1hZ2VgLCAvLyBOb3QgZnJlc2ggb24gZXZlcnkgcnVuIGJlY2F1c2Ugd2UnbGwgcnVuIG91dCBvZiB0YWdzIHRvbyBlYXNpbHlcbiAgICAgICAgICAgIH0sXG4gICAgICAgICAgfSxcbiAgICAgICAgfSxcbiAgICAgIH1cbiAgICB9O1xuXG4gICAgYXdhaXQgZnMud3JpdGVGaWxlKHBhdGguam9pbihmaXh0dXJlLmludGVnVGVzdERpciwgJ2Fzc2V0cy5qc29uJyksIEpTT04uc3RyaW5naWZ5KGFzc2V0c0pzb24sIHVuZGVmaW5lZCwgMikpO1xuICAgIGF3YWl0IGZpeHR1cmUuc2hlbGwoWyducHgnLCAnY2RrLWFzc2V0cycsICctLXBhdGgnLCAnYXNzZXRzLmpzb24nLCAnLS12ZXJib3NlJywgJ3B1Ymxpc2gnXSwge1xuICAgICAgbW9kRW52OiB7XG4gICAgICAgIC4uLmZpeHR1cmUuY2RrU2hlbGxFbnYoKSxcbiAgICAgICAgLy8gVGhpcyBpcyBuZWNlc3NhcnkgZm9yIGNkay1hc3NldHMgdjIsIGlmIHRoZSBjcmVkZW50aWFscyBhcmUgc3VwcGxpZWQgdmlhXG4gICAgICAgIC8vIGNvbmZpZyBmaWxlICh3aGljaCB0aGV5IGFyZSBvbiB0aGUgQ29kZUJ1aWxkIGNhbmFyaWVzKS5cbiAgICAgICAgQVdTX1NES19MT0FEX0NPTkZJRzogJzEnLFxuICAgICAgfSxcbiAgICB9KTtcbiAgfSksXG4pOyJdfQ==
|
|
@@ -7,80 +7,76 @@ import { integTest, withDefaultFixture } from '../../../lib';
|
|
|
7
7
|
|
|
8
8
|
jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
integTest(
|
|
11
|
+
`cdk-assets smoke test`,
|
|
12
|
+
withDefaultFixture(async (fixture) => {
|
|
13
|
+
await fixture.shell(['npm', 'init', '-y']);
|
|
14
|
+
await fixture.shell(['npm', 'install', `cdk-assets@latest`]);
|
|
11
15
|
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
`cdk-assets
|
|
15
|
-
|
|
16
|
-
await fixture.shell(['npm', 'init', '-y']);
|
|
17
|
-
await fixture.shell(['npm', 'install', `cdk-assets@${MV}`]);
|
|
16
|
+
const account = await fixture.aws.account();
|
|
17
|
+
const region = fixture.aws.region;
|
|
18
|
+
const bucketName = `cdk-hnb659fds-assets-${account}-${region}`;
|
|
19
|
+
const repositoryName = `cdk-hnb659fds-container-assets-${account}-${region}`;
|
|
18
20
|
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
const bucketName = `cdk-hnb659fds-assets-${account}-${region}`;
|
|
22
|
-
const repositoryName = `cdk-hnb659fds-container-assets-${account}-${region}`;
|
|
21
|
+
const imageDir = 'imagedir';
|
|
22
|
+
await fs.mkdir(path.join(fixture.integTestDir, imageDir), { recursive: true });
|
|
23
23
|
|
|
24
|
-
|
|
25
|
-
|
|
24
|
+
// Write an asset file and a data file for the Docker image
|
|
25
|
+
const assetFile = 'testfile.txt';
|
|
26
|
+
for (const toCreate of [assetFile, `${imageDir}/datafile.txt`]) {
|
|
27
|
+
await fs.writeFile(path.join(fixture.integTestDir, toCreate), 'some asset file');
|
|
28
|
+
}
|
|
26
29
|
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
// Write a Dockerfile for the image build with a data file in it
|
|
34
|
-
await fs.writeFile(path.join(fixture.integTestDir, imageDir, 'Dockerfile'), [
|
|
35
|
-
'FROM scratch',
|
|
36
|
-
'ADD datafile.txt datafile.txt',
|
|
37
|
-
].join('\n'));
|
|
30
|
+
// Write a Dockerfile for the image build with a data file in it
|
|
31
|
+
await fs.writeFile(path.join(fixture.integTestDir, imageDir, 'Dockerfile'), [
|
|
32
|
+
'FROM scratch',
|
|
33
|
+
'ADD datafile.txt datafile.txt',
|
|
34
|
+
].join('\n'));
|
|
38
35
|
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
}
|
|
36
|
+
// Write an asset JSON file to publish to the bootstrapped environment
|
|
37
|
+
const assetsJson = {
|
|
38
|
+
version: "38.0.1",
|
|
39
|
+
files: {
|
|
40
|
+
testfile: {
|
|
41
|
+
source: {
|
|
42
|
+
path: assetFile,
|
|
43
|
+
packaging: 'file',
|
|
44
|
+
},
|
|
45
|
+
destinations: {
|
|
46
|
+
current: {
|
|
47
|
+
region,
|
|
48
|
+
assumeRoleArn: `arn:\${AWS::Partition}:iam::${account}:role/cdk-hnb659fds-file-publishing-role-${account}-${region}`,
|
|
49
|
+
bucketName,
|
|
50
|
+
objectKey: `test-file-${Date.now()}.json`,
|
|
55
51
|
}
|
|
56
52
|
}
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
53
|
+
}
|
|
54
|
+
},
|
|
55
|
+
dockerImages: {
|
|
56
|
+
testimage: {
|
|
57
|
+
source: {
|
|
58
|
+
directory: imageDir,
|
|
59
|
+
},
|
|
60
|
+
destinations: {
|
|
61
|
+
current: {
|
|
62
|
+
region,
|
|
63
|
+
assumeRoleArn: `arn:\${AWS::Partition}:iam::${account}:role/cdk-hnb659fds-image-publishing-role-${account}-${region}`,
|
|
64
|
+
repositoryName,
|
|
65
|
+
imageTag: `test-image`, // Not fresh on every run because we'll run out of tags too easily
|
|
70
66
|
},
|
|
71
67
|
},
|
|
72
|
-
}
|
|
73
|
-
};
|
|
74
|
-
|
|
75
|
-
await fs.writeFile(path.join(fixture.integTestDir, 'assets.json'), JSON.stringify(assetsJson, undefined, 2));
|
|
76
|
-
await fixture.shell(['npx', 'cdk-assets', '--path', 'assets.json', '--verbose', 'publish'], {
|
|
77
|
-
modEnv: {
|
|
78
|
-
...fixture.cdkShellEnv(),
|
|
79
|
-
// This is necessary for cdk-assets v2, if the credentials are supplied via
|
|
80
|
-
// config file (which they are on the CodeBuild canaries).
|
|
81
|
-
AWS_SDK_LOAD_CONFIG: '1',
|
|
82
68
|
},
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
|
|
86
|
-
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
|
|
72
|
+
await fs.writeFile(path.join(fixture.integTestDir, 'assets.json'), JSON.stringify(assetsJson, undefined, 2));
|
|
73
|
+
await fixture.shell(['npx', 'cdk-assets', '--path', 'assets.json', '--verbose', 'publish'], {
|
|
74
|
+
modEnv: {
|
|
75
|
+
...fixture.cdkShellEnv(),
|
|
76
|
+
// This is necessary for cdk-assets v2, if the credentials are supplied via
|
|
77
|
+
// config file (which they are on the CodeBuild canaries).
|
|
78
|
+
AWS_SDK_LOAD_CONFIG: '1',
|
|
79
|
+
},
|
|
80
|
+
});
|
|
81
|
+
}),
|
|
82
|
+
);
|
|
@@ -7,11 +7,21 @@ const lib_1 = require("../../lib");
|
|
|
7
7
|
const TIMEOUT = 1800000;
|
|
8
8
|
(0, lib_1.integTest)('amplify integration', (0, with_tool_context_1.withToolContext)(async (context) => {
|
|
9
9
|
const shell = lib_1.ShellHelper.fromContext(context);
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
////////////////////////////////////////////////////////////////////////
|
|
11
|
+
// Make sure that create-amplify installs the right versions of the CLI and framework
|
|
12
|
+
//
|
|
13
|
+
// Install `create-amplify` without running it, then hack the json file with the
|
|
14
|
+
// package versions in it before we execute.
|
|
15
|
+
await shell.shell(['npm', 'init', '-y']);
|
|
16
|
+
await shell.shell(['npm', 'install', '--save-dev', 'create-amplify@latest']);
|
|
12
17
|
// This will create 'package.json' implicating a certain version of the CDK
|
|
13
18
|
await updateCdkDependency(context, context.packages.requestedCliVersion(), context.packages.requestedFrameworkVersion());
|
|
14
|
-
|
|
19
|
+
////////////////////////////////////////////////////////////////////////
|
|
20
|
+
// Run the `npm create` workflow
|
|
21
|
+
//
|
|
22
|
+
// I tested to confirm that this will use the locally installed `create-amplify`
|
|
23
|
+
await shell.shell(['npm', 'create', '-y', 'amplify']);
|
|
24
|
+
await shell.shell(['npx', 'ampx', 'configure', 'telemetry', 'disable']);
|
|
15
25
|
await shell.shell(['npx', 'ampx', 'sandbox', '--once'], {
|
|
16
26
|
modEnv: {
|
|
17
27
|
AWS_REGION: context.aws.region,
|
|
@@ -30,10 +40,46 @@ const TIMEOUT = 1800000;
|
|
|
30
40
|
}
|
|
31
41
|
}), TIMEOUT);
|
|
32
42
|
async function updateCdkDependency(context, cliVersion, libVersion) {
|
|
33
|
-
const filename = path.join(context.integTestDir, '
|
|
43
|
+
const filename = path.join(context.integTestDir, 'node_modules', 'create-amplify', 'lib', 'default_packages.json');
|
|
34
44
|
const pj = JSON.parse(await fs_1.promises.readFile(filename, { encoding: 'utf-8' }));
|
|
35
|
-
|
|
36
|
-
pj
|
|
45
|
+
// Be extra paranoid about the types here, since we don't fully control them
|
|
46
|
+
assertIsObject(pj);
|
|
47
|
+
assertIsStringArray(pj.defaultDevPackages);
|
|
48
|
+
replacePackageVersionIn('aws-cdk', cliVersion, pj.defaultDevPackages);
|
|
49
|
+
replacePackageVersionIn('aws-cdk-lib', libVersion, pj.defaultDevPackages);
|
|
37
50
|
await fs_1.promises.writeFile(filename, JSON.stringify(pj, undefined, 2), { encoding: 'utf-8' });
|
|
38
51
|
}
|
|
39
|
-
|
|
52
|
+
/**
|
|
53
|
+
* Mutably update the given string array, replacing the version of packages with the given name
|
|
54
|
+
*
|
|
55
|
+
* We assume the list of packages is a string array of the form
|
|
56
|
+
*
|
|
57
|
+
* ```
|
|
58
|
+
* ["package@version", "package@version", ...]
|
|
59
|
+
* ```
|
|
60
|
+
*
|
|
61
|
+
* It's a failure if we don't find an entry to update.
|
|
62
|
+
*/
|
|
63
|
+
function replacePackageVersionIn(packName, version, xs) {
|
|
64
|
+
let didUpdate = false;
|
|
65
|
+
for (let i = 0; i < xs.length; i++) {
|
|
66
|
+
if (xs[i].startsWith(`${packName}@`)) {
|
|
67
|
+
xs[i] = `${packName}@${version}`;
|
|
68
|
+
didUpdate = true;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
if (!didUpdate) {
|
|
72
|
+
throw new Error(`Did not find a package version to update for ${packName} in ${JSON.stringify(xs)}`);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
function assertIsObject(xs) {
|
|
76
|
+
if (typeof xs !== 'object' || xs === null) {
|
|
77
|
+
throw new Error(`Expected object, got ${JSON.stringify(xs)}`);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
function assertIsStringArray(xs) {
|
|
81
|
+
if (!Array.isArray(xs) || xs.length === 0 || typeof xs[0] !== 'string') {
|
|
82
|
+
throw new Error(`Expected list of strings, got ${JSON.stringify(xs)}`);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"amplify.integtest.js","sourceRoot":"","sources":["amplify.integtest.ts"],"names":[],"mappings":"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","sourcesContent":["import { promises as fs } from 'fs';\nimport * as path from 'path';\nimport { withToolContext } from './with-tool-context';\nimport { integTest, ShellHelper, TemporaryDirectoryContext } from '../../lib';\n\nconst TIMEOUT = 1800_000;\n\nintegTest('amplify integration', withToolContext(async (context) => {\n  const shell = ShellHelper.fromContext(context);\n\n  ////////////////////////////////////////////////////////////////////////\n  //  Make sure that create-amplify installs the right versions of the CLI and framework\n  //\n\n  // Install `create-amplify` without running it, then hack the json file with the\n  // package versions in it before we execute.\n  await shell.shell(['npm', 'init', '-y']);\n  await shell.shell(['npm', 'install', '--save-dev', 'create-amplify@latest']);\n  // This will create 'package.json' implicating a certain version of the CDK\n  await updateCdkDependency(context, context.packages.requestedCliVersion(), context.packages.requestedFrameworkVersion());\n\n  ////////////////////////////////////////////////////////////////////////\n  //  Run the `npm create` workflow\n  //\n\n  // I tested to confirm that this will use the locally installed `create-amplify`\n  await shell.shell(['npm', 'create', '-y', 'amplify']);\n  await shell.shell(['npx', 'ampx', 'configure', 'telemetry', 'disable']);\n\n  await shell.shell(['npx', 'ampx', 'sandbox', '--once'], {\n    modEnv: {\n      AWS_REGION: context.aws.region,\n    },\n  });\n  try {\n\n    // Future code goes here, putting the try/finally here already so it doesn't\n    // get forgotten.\n\n  } finally {\n    await shell.shell(['npx', 'ampx', 'sandbox', 'delete', '--yes'], {\n      modEnv: {\n        AWS_REGION: context.aws.region,\n      },\n    });\n  }\n}), TIMEOUT);\n\nasync function updateCdkDependency(context: TemporaryDirectoryContext, cliVersion: string, libVersion: string) {\n  const filename = path.join(context.integTestDir, 'node_modules', 'create-amplify', 'lib', 'default_packages.json');\n  const pj: unknown = JSON.parse(await fs.readFile(filename, { encoding: 'utf-8' }));\n\n  // Be extra paranoid about the types here, since we don't fully control them\n  assertIsObject(pj);\n  assertIsStringArray(pj.defaultDevPackages);\n\n  replacePackageVersionIn('aws-cdk', cliVersion, pj.defaultDevPackages);\n  replacePackageVersionIn('aws-cdk-lib', libVersion, pj.defaultDevPackages);\n\n  await fs.writeFile(filename, JSON.stringify(pj, undefined, 2), { encoding: 'utf-8' });\n}\n\n/**\n * Mutably update the given string array, replacing the version of packages with the given name\n *\n * We assume the list of packages is a string array of the form\n *\n * ```\n * [\"package@version\", \"package@version\", ...]\n * ```\n *\n * It's a failure if we don't find an entry to update.\n */\nfunction replacePackageVersionIn(packName: string, version: string, xs: string[]) {\n  let didUpdate = false;\n  for (let i = 0; i < xs.length; i++) {\n    if (xs[i].startsWith(`${packName}@`)) {\n      xs[i] = `${packName}@${version}`;\n      didUpdate = true;\n    }\n  }\n\n  if (!didUpdate) {\n    throw new Error(`Did not find a package version to update for ${packName} in ${JSON.stringify(xs)}`);\n  }\n}\n\nfunction assertIsObject(xs: unknown): asserts xs is Record<string, unknown> {\n  if (typeof xs !== 'object' || xs === null) {\n    throw new Error(`Expected object, got ${JSON.stringify(xs)}`);\n  }\n}\n\nfunction assertIsStringArray(xs: unknown): asserts xs is string[] {\n  if (!Array.isArray(xs) || xs.length === 0 || typeof xs[0] !== 'string') {\n    throw new Error(`Expected list of strings, got ${JSON.stringify(xs)}`);\n  }\n}\n"]}
|
|
@@ -8,12 +8,24 @@ const TIMEOUT = 1800_000;
|
|
|
8
8
|
integTest('amplify integration', withToolContext(async (context) => {
|
|
9
9
|
const shell = ShellHelper.fromContext(context);
|
|
10
10
|
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
////////////////////////////////////////////////////////////////////////
|
|
12
|
+
// Make sure that create-amplify installs the right versions of the CLI and framework
|
|
13
|
+
//
|
|
13
14
|
|
|
15
|
+
// Install `create-amplify` without running it, then hack the json file with the
|
|
16
|
+
// package versions in it before we execute.
|
|
17
|
+
await shell.shell(['npm', 'init', '-y']);
|
|
18
|
+
await shell.shell(['npm', 'install', '--save-dev', 'create-amplify@latest']);
|
|
14
19
|
// This will create 'package.json' implicating a certain version of the CDK
|
|
15
20
|
await updateCdkDependency(context, context.packages.requestedCliVersion(), context.packages.requestedFrameworkVersion());
|
|
16
|
-
|
|
21
|
+
|
|
22
|
+
////////////////////////////////////////////////////////////////////////
|
|
23
|
+
// Run the `npm create` workflow
|
|
24
|
+
//
|
|
25
|
+
|
|
26
|
+
// I tested to confirm that this will use the locally installed `create-amplify`
|
|
27
|
+
await shell.shell(['npm', 'create', '-y', 'amplify']);
|
|
28
|
+
await shell.shell(['npx', 'ampx', 'configure', 'telemetry', 'disable']);
|
|
17
29
|
|
|
18
30
|
await shell.shell(['npx', 'ampx', 'sandbox', '--once'], {
|
|
19
31
|
modEnv: {
|
|
@@ -35,9 +47,52 @@ integTest('amplify integration', withToolContext(async (context) => {
|
|
|
35
47
|
}), TIMEOUT);
|
|
36
48
|
|
|
37
49
|
async function updateCdkDependency(context: TemporaryDirectoryContext, cliVersion: string, libVersion: string) {
|
|
38
|
-
const filename = path.join(context.integTestDir, '
|
|
39
|
-
const pj = JSON.parse(await fs.readFile(filename, { encoding: 'utf-8' }));
|
|
40
|
-
|
|
41
|
-
|
|
50
|
+
const filename = path.join(context.integTestDir, 'node_modules', 'create-amplify', 'lib', 'default_packages.json');
|
|
51
|
+
const pj: unknown = JSON.parse(await fs.readFile(filename, { encoding: 'utf-8' }));
|
|
52
|
+
|
|
53
|
+
// Be extra paranoid about the types here, since we don't fully control them
|
|
54
|
+
assertIsObject(pj);
|
|
55
|
+
assertIsStringArray(pj.defaultDevPackages);
|
|
56
|
+
|
|
57
|
+
replacePackageVersionIn('aws-cdk', cliVersion, pj.defaultDevPackages);
|
|
58
|
+
replacePackageVersionIn('aws-cdk-lib', libVersion, pj.defaultDevPackages);
|
|
59
|
+
|
|
42
60
|
await fs.writeFile(filename, JSON.stringify(pj, undefined, 2), { encoding: 'utf-8' });
|
|
43
61
|
}
|
|
62
|
+
|
|
63
|
+
/**
|
|
64
|
+
* Mutably update the given string array, replacing the version of packages with the given name
|
|
65
|
+
*
|
|
66
|
+
* We assume the list of packages is a string array of the form
|
|
67
|
+
*
|
|
68
|
+
* ```
|
|
69
|
+
* ["package@version", "package@version", ...]
|
|
70
|
+
* ```
|
|
71
|
+
*
|
|
72
|
+
* It's a failure if we don't find an entry to update.
|
|
73
|
+
*/
|
|
74
|
+
function replacePackageVersionIn(packName: string, version: string, xs: string[]) {
|
|
75
|
+
let didUpdate = false;
|
|
76
|
+
for (let i = 0; i < xs.length; i++) {
|
|
77
|
+
if (xs[i].startsWith(`${packName}@`)) {
|
|
78
|
+
xs[i] = `${packName}@${version}`;
|
|
79
|
+
didUpdate = true;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
if (!didUpdate) {
|
|
84
|
+
throw new Error(`Did not find a package version to update for ${packName} in ${JSON.stringify(xs)}`);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
function assertIsObject(xs: unknown): asserts xs is Record<string, unknown> {
|
|
89
|
+
if (typeof xs !== 'object' || xs === null) {
|
|
90
|
+
throw new Error(`Expected object, got ${JSON.stringify(xs)}`);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
function assertIsStringArray(xs: unknown): asserts xs is string[] {
|
|
95
|
+
if (!Array.isArray(xs) || xs.length === 0 || typeof xs[0] !== 'string') {
|
|
96
|
+
throw new Error(`Expected list of strings, got ${JSON.stringify(xs)}`);
|
|
97
|
+
}
|
|
98
|
+
}
|