cdk-common 2.0.30 → 2.0.34
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/.jsii +4 -4
- package/lib/main.js +1 -1
- package/node_modules/@aws-cdk/assert/LICENSE +1 -1
- package/node_modules/@aws-cdk/assert/NOTICE +1 -1
- package/node_modules/@aws-cdk/assert/package.json +9 -9
- package/node_modules/@aws-cdk/cfnspec/CHANGELOG.md +16 -0
- package/node_modules/@aws-cdk/cfnspec/build-tools/build.js +7 -53
- package/node_modules/@aws-cdk/cfnspec/build-tools/massage-spec.d.ts +0 -4
- package/node_modules/@aws-cdk/cfnspec/build-tools/massage-spec.js +2 -61
- package/node_modules/@aws-cdk/cfnspec/build-tools/patch-set.d.ts +25 -0
- package/node_modules/@aws-cdk/cfnspec/build-tools/patch-set.js +239 -0
- package/node_modules/@aws-cdk/cfnspec/build-tools/report-issues.d.ts +4 -0
- package/node_modules/@aws-cdk/cfnspec/build-tools/report-issues.js +44 -0
- package/node_modules/@aws-cdk/cfnspec/build-tools/split-spec-by-service.d.ts +1 -0
- package/node_modules/@aws-cdk/cfnspec/build-tools/split-spec-by-service.js +86 -0
- package/node_modules/@aws-cdk/cfnspec/build-tools/template/LICENSE +1 -1
- package/node_modules/@aws-cdk/cfnspec/build-tools/template/NOTICE +1 -1
- package/node_modules/@aws-cdk/cfnspec/build-tools/update-metrics.sh +2 -0
- package/node_modules/@aws-cdk/cfnspec/build-tools/update.sh +34 -18
- package/node_modules/@aws-cdk/cfnspec/build-tools/validate-cfn.d.ts +67 -0
- package/node_modules/@aws-cdk/cfnspec/build-tools/validate-cfn.js +285 -0
- package/node_modules/@aws-cdk/cfnspec/coverage/build-tools/index.html +49 -20
- package/node_modules/@aws-cdk/cfnspec/coverage/build-tools/massage-spec.ts.html +12 -166
- package/node_modules/@aws-cdk/cfnspec/coverage/build-tools/patch-set.ts.html +907 -0
- package/node_modules/@aws-cdk/cfnspec/coverage/build-tools/scrutiny.ts.html +1 -2
- package/node_modules/@aws-cdk/cfnspec/coverage/build-tools/validate-cfn.ts.html +1093 -0
- package/node_modules/@aws-cdk/cfnspec/coverage/index.html +34 -35
- package/node_modules/@aws-cdk/cfnspec/coverage/junit.xml +6217 -6177
- package/node_modules/@aws-cdk/cfnspec/coverage/lcov-report/build-tools/index.html +49 -20
- package/node_modules/@aws-cdk/cfnspec/coverage/lcov-report/build-tools/massage-spec.ts.html +12 -166
- package/node_modules/@aws-cdk/cfnspec/coverage/lcov-report/build-tools/patch-set.ts.html +907 -0
- package/node_modules/@aws-cdk/cfnspec/coverage/lcov-report/build-tools/scrutiny.ts.html +1 -2
- package/node_modules/@aws-cdk/cfnspec/coverage/lcov-report/build-tools/validate-cfn.ts.html +1093 -0
- package/node_modules/@aws-cdk/cfnspec/coverage/lcov-report/index.html +34 -35
- package/node_modules/@aws-cdk/cfnspec/coverage/lcov-report/lib/canned-metrics/canned-metrics-schema.ts.html +2 -3
- package/node_modules/@aws-cdk/cfnspec/coverage/lcov-report/lib/canned-metrics/index.html +1 -2
- package/node_modules/@aws-cdk/cfnspec/coverage/lcov-report/lib/canned-metrics.ts.html +22 -23
- package/node_modules/@aws-cdk/cfnspec/coverage/lcov-report/lib/index.html +19 -20
- package/node_modules/@aws-cdk/cfnspec/coverage/lcov-report/lib/index.ts.html +96 -25
- package/node_modules/@aws-cdk/cfnspec/coverage/lcov-report/lib/schema/augmentation.ts.html +5 -6
- package/node_modules/@aws-cdk/cfnspec/coverage/lcov-report/lib/schema/base-types.ts.html +12 -13
- package/node_modules/@aws-cdk/cfnspec/coverage/lcov-report/lib/schema/index.html +7 -8
- package/node_modules/@aws-cdk/cfnspec/coverage/lcov-report/lib/schema/index.ts.html +11 -12
- package/node_modules/@aws-cdk/cfnspec/coverage/lcov-report/lib/schema/property.ts.html +39 -40
- package/node_modules/@aws-cdk/cfnspec/coverage/lcov-report/lib/schema/resource-type.ts.html +20 -21
- package/node_modules/@aws-cdk/cfnspec/coverage/lcov-report/lib/schema/specification.ts.html +2 -3
- package/node_modules/@aws-cdk/cfnspec/coverage/lcov.info +744 -346
- package/node_modules/@aws-cdk/cfnspec/coverage/lib/canned-metrics/canned-metrics-schema.ts.html +2 -3
- package/node_modules/@aws-cdk/cfnspec/coverage/lib/canned-metrics/index.html +1 -2
- package/node_modules/@aws-cdk/cfnspec/coverage/lib/canned-metrics.ts.html +22 -23
- package/node_modules/@aws-cdk/cfnspec/coverage/lib/index.html +19 -20
- package/node_modules/@aws-cdk/cfnspec/coverage/lib/index.ts.html +96 -25
- package/node_modules/@aws-cdk/cfnspec/coverage/lib/schema/augmentation.ts.html +5 -6
- package/node_modules/@aws-cdk/cfnspec/coverage/lib/schema/base-types.ts.html +12 -13
- package/node_modules/@aws-cdk/cfnspec/coverage/lib/schema/index.html +7 -8
- package/node_modules/@aws-cdk/cfnspec/coverage/lib/schema/index.ts.html +11 -12
- package/node_modules/@aws-cdk/cfnspec/coverage/lib/schema/property.ts.html +39 -40
- package/node_modules/@aws-cdk/cfnspec/coverage/lib/schema/resource-type.ts.html +20 -21
- package/node_modules/@aws-cdk/cfnspec/coverage/lib/schema/specification.ts.html +2 -3
- package/node_modules/@aws-cdk/cfnspec/lib/canned-metrics/README.md +6 -1
- package/node_modules/@aws-cdk/cfnspec/lib/canned-metrics/services.json +19997 -10215
- package/node_modules/@aws-cdk/cfnspec/lib/index.d.ts +8 -0
- package/node_modules/@aws-cdk/cfnspec/lib/index.js +25 -2
- package/node_modules/@aws-cdk/cfnspec/lib/schema/docs.d.ts +20 -0
- package/node_modules/@aws-cdk/cfnspec/lib/schema/docs.js +3 -0
- package/node_modules/@aws-cdk/cfnspec/lib/schema/index.d.ts +1 -0
- package/node_modules/@aws-cdk/cfnspec/lib/schema/index.js +2 -1
- package/node_modules/@aws-cdk/cfnspec/package.json +5 -5
- package/node_modules/@aws-cdk/cfnspec/spec/cfn-docs.json +38910 -0
- package/node_modules/@aws-cdk/cfnspec/spec/cfn-lint.json +3 -3
- package/node_modules/@aws-cdk/cfnspec/spec/specification.json +319 -311
- package/node_modules/@aws-cdk/cfnspec/tsconfig.tsbuildinfo +285 -179
- package/node_modules/@aws-cdk/cloudformation-diff/LICENSE +1 -1
- package/node_modules/@aws-cdk/cloudformation-diff/NOTICE +1 -1
- package/node_modules/@aws-cdk/cloudformation-diff/package.json +7 -7
- package/package.json +5 -5
|
@@ -0,0 +1,239 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.writeSorted = exports.applyAndWrite = exports.applyPatchSet = exports.evaluatePatchSet = exports.loadPatchSet = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Apply a JSON patch set into the given target file
|
|
6
|
+
*
|
|
7
|
+
* The sources can be taken from one or more directories.
|
|
8
|
+
*/
|
|
9
|
+
const path = require("path");
|
|
10
|
+
const fastJsonPatch = require("fast-json-patch");
|
|
11
|
+
const fs = require("fs-extra");
|
|
12
|
+
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
|
13
|
+
const sortJson = require('sort-json');
|
|
14
|
+
async function loadPatchSet(sourceDirectory, relativeTo = process.cwd()) {
|
|
15
|
+
const ret = {};
|
|
16
|
+
const files = await fs.readdir(sourceDirectory);
|
|
17
|
+
for (const file of files) {
|
|
18
|
+
const fullFile = path.join(sourceDirectory, file);
|
|
19
|
+
const relName = path.relative(relativeTo, fullFile);
|
|
20
|
+
if ((await fs.stat(fullFile)).isDirectory()) {
|
|
21
|
+
ret[relName] = {
|
|
22
|
+
type: 'set',
|
|
23
|
+
sources: await loadPatchSet(fullFile, sourceDirectory),
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
else if (file.endsWith('.json')) {
|
|
27
|
+
ret[relName] = {
|
|
28
|
+
type: file.indexOf('patch') === -1 ? 'fragment' : 'patch',
|
|
29
|
+
data: await fs.readJson(fullFile),
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
return ret;
|
|
34
|
+
}
|
|
35
|
+
exports.loadPatchSet = loadPatchSet;
|
|
36
|
+
function evaluatePatchSet(sources, options = {}) {
|
|
37
|
+
const targetObject = {};
|
|
38
|
+
for (const key of Object.keys(sources).sort()) {
|
|
39
|
+
const value = sources[key];
|
|
40
|
+
switch (value.type) {
|
|
41
|
+
case 'fragment':
|
|
42
|
+
log(key);
|
|
43
|
+
merge(targetObject, value.data, []);
|
|
44
|
+
break;
|
|
45
|
+
case 'patch':
|
|
46
|
+
patch(targetObject, value.data, (m) => log(`${key}: ${m}`));
|
|
47
|
+
break;
|
|
48
|
+
case 'set':
|
|
49
|
+
const evaluated = evaluatePatchSet(value.sources, options);
|
|
50
|
+
log(key);
|
|
51
|
+
merge(targetObject, evaluated, []);
|
|
52
|
+
break;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
return targetObject;
|
|
56
|
+
function log(x) {
|
|
57
|
+
if (!options.quiet) {
|
|
58
|
+
// eslint-disable-next-line no-console
|
|
59
|
+
console.log(x);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
exports.evaluatePatchSet = evaluatePatchSet;
|
|
64
|
+
/**
|
|
65
|
+
* Load a patch set from a directory
|
|
66
|
+
*/
|
|
67
|
+
async function applyPatchSet(sourceDirectory, options = {}) {
|
|
68
|
+
const patches = await loadPatchSet(sourceDirectory);
|
|
69
|
+
return evaluatePatchSet(patches, options);
|
|
70
|
+
}
|
|
71
|
+
exports.applyPatchSet = applyPatchSet;
|
|
72
|
+
/**
|
|
73
|
+
* Load a patch set and write it out to a file
|
|
74
|
+
*/
|
|
75
|
+
async function applyAndWrite(targetFile, sourceDirectory, options = {}) {
|
|
76
|
+
const model = await applyPatchSet(sourceDirectory, options);
|
|
77
|
+
await writeSorted(targetFile, model);
|
|
78
|
+
}
|
|
79
|
+
exports.applyAndWrite = applyAndWrite;
|
|
80
|
+
async function writeSorted(targetFile, data) {
|
|
81
|
+
await fs.mkdirp(path.dirname(targetFile));
|
|
82
|
+
await fs.writeJson(targetFile, sortJson(data), { spaces: 2 });
|
|
83
|
+
}
|
|
84
|
+
exports.writeSorted = writeSorted;
|
|
85
|
+
function printSorted(data) {
|
|
86
|
+
process.stdout.write(JSON.stringify(sortJson(data), undefined, 2));
|
|
87
|
+
}
|
|
88
|
+
function merge(target, fragment, jsonPath) {
|
|
89
|
+
if (!fragment) {
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
if (!target || typeof target !== 'object' || Array.isArray(target)) {
|
|
93
|
+
throw new Error(`Expected object, found: '${target}' at '$.${jsonPath.join('.')}'`);
|
|
94
|
+
}
|
|
95
|
+
for (const key of Object.keys(fragment)) {
|
|
96
|
+
if (key.startsWith('$')) {
|
|
97
|
+
continue;
|
|
98
|
+
}
|
|
99
|
+
if (key in target) {
|
|
100
|
+
const specVal = target[key];
|
|
101
|
+
const fragVal = fragment[key];
|
|
102
|
+
if (typeof specVal !== typeof fragVal) {
|
|
103
|
+
// eslint-disable-next-line max-len
|
|
104
|
+
throw new Error(`Attempted to merge ${JSON.stringify(fragVal)} into incompatible ${JSON.stringify(specVal)} at path ${jsonPath.join('/')}/${key}`);
|
|
105
|
+
}
|
|
106
|
+
if (specVal == fragVal) {
|
|
107
|
+
continue;
|
|
108
|
+
}
|
|
109
|
+
if (typeof specVal !== 'object') {
|
|
110
|
+
// eslint-disable-next-line max-len
|
|
111
|
+
throw new Error(`Conflict when attempting to merge ${JSON.stringify(fragVal)} into ${JSON.stringify(specVal)} at path ${jsonPath.join('/')}/${key}`);
|
|
112
|
+
}
|
|
113
|
+
merge(specVal, fragVal, [...jsonPath, key]);
|
|
114
|
+
}
|
|
115
|
+
else {
|
|
116
|
+
target[key] = fragment[key];
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
function patch(target, fragment, log) {
|
|
121
|
+
var _a;
|
|
122
|
+
if (!fragment) {
|
|
123
|
+
return;
|
|
124
|
+
}
|
|
125
|
+
const patches = findPatches(target, fragment);
|
|
126
|
+
for (const p of patches) {
|
|
127
|
+
log((_a = p.description) !== null && _a !== void 0 ? _a : '');
|
|
128
|
+
try {
|
|
129
|
+
fastJsonPatch.applyPatch(target, p.operations);
|
|
130
|
+
}
|
|
131
|
+
catch (e) {
|
|
132
|
+
throw new Error(`error applying patch: ${JSON.stringify(p, undefined, 2)}: ${e.message}`);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
/**
|
|
137
|
+
* Find the sets of patches to apply in a document
|
|
138
|
+
*
|
|
139
|
+
* Adjusts paths to be root-relative, which makes it possible to have paths
|
|
140
|
+
* point outside the patch scope.
|
|
141
|
+
*/
|
|
142
|
+
function findPatches(data, patchSource) {
|
|
143
|
+
const ret = [];
|
|
144
|
+
recurse(data, patchSource, []);
|
|
145
|
+
return ret;
|
|
146
|
+
function recurse(actualData, fragment, jsonPath) {
|
|
147
|
+
if (!fragment) {
|
|
148
|
+
return;
|
|
149
|
+
}
|
|
150
|
+
if ('patch' in fragment) {
|
|
151
|
+
const p = fragment.patch;
|
|
152
|
+
if (!p.operations) {
|
|
153
|
+
throw new Error(`Patch needs 'operations' key, got: ${JSON.stringify(p)}`);
|
|
154
|
+
}
|
|
155
|
+
ret.push({
|
|
156
|
+
description: p.description,
|
|
157
|
+
operations: p.operations.map((op) => adjustPaths(op, jsonPath)),
|
|
158
|
+
});
|
|
159
|
+
}
|
|
160
|
+
else if ('patch:each' in fragment) {
|
|
161
|
+
const p = fragment['patch:each'];
|
|
162
|
+
if (typeof actualData !== 'object') {
|
|
163
|
+
throw new Error(`Patch ${p.description}: expecting object in data, found '${actualData}'`);
|
|
164
|
+
}
|
|
165
|
+
if (!p.operations) {
|
|
166
|
+
throw new Error(`Patch needs 'operations' key, got: ${JSON.stringify(p)}`);
|
|
167
|
+
}
|
|
168
|
+
for (const key in actualData) {
|
|
169
|
+
ret.push({
|
|
170
|
+
description: `${key}: ${p.description}`,
|
|
171
|
+
operations: p.operations.map((op) => adjustPaths(op, [...jsonPath, key])),
|
|
172
|
+
});
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
else {
|
|
176
|
+
for (const key of Object.keys(fragment)) {
|
|
177
|
+
if (!(key in actualData)) {
|
|
178
|
+
actualData[key] = {};
|
|
179
|
+
}
|
|
180
|
+
recurse(actualData[key], fragment[key], [...jsonPath, key]);
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
function adjustPaths(op, jsonPath) {
|
|
185
|
+
return {
|
|
186
|
+
...op,
|
|
187
|
+
...op.path ? { path: adjustPath(op.path, jsonPath) } : undefined,
|
|
188
|
+
...op.from ? { from: adjustPath(op.from, jsonPath) } : undefined,
|
|
189
|
+
};
|
|
190
|
+
}
|
|
191
|
+
/**
|
|
192
|
+
* Adjust path
|
|
193
|
+
*
|
|
194
|
+
* '$/' means from the root, otherwise interpret as relative path.
|
|
195
|
+
*/
|
|
196
|
+
function adjustPath(originalPath, jsonPath) {
|
|
197
|
+
if (typeof originalPath !== 'string') {
|
|
198
|
+
throw new Error(`adjustPath: expected string, got ${JSON.stringify(originalPath)}`);
|
|
199
|
+
}
|
|
200
|
+
if (originalPath.startsWith('$/')) {
|
|
201
|
+
return originalPath.substr(1);
|
|
202
|
+
}
|
|
203
|
+
return jsonPath.map(p => `/${p}`).join('') + originalPath;
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
/**
|
|
207
|
+
* Run this file as a CLI tool, to apply a patch set from the command line
|
|
208
|
+
*/
|
|
209
|
+
async function main(args) {
|
|
210
|
+
const quiet = eatArg('-q', args) || eatArg('--quiet', args);
|
|
211
|
+
if (args.length < 1) {
|
|
212
|
+
throw new Error('Usage: patch-set <DIR> [<FILE>]');
|
|
213
|
+
}
|
|
214
|
+
const [dir, targetFile] = args;
|
|
215
|
+
const model = await applyPatchSet(dir, { quiet });
|
|
216
|
+
if (targetFile) {
|
|
217
|
+
await writeSorted(targetFile, model);
|
|
218
|
+
}
|
|
219
|
+
else {
|
|
220
|
+
printSorted(model);
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
function eatArg(arg, args) {
|
|
224
|
+
for (let i = 0; i < args.length; i++) {
|
|
225
|
+
if (args[i] === arg) {
|
|
226
|
+
args.splice(i, 1);
|
|
227
|
+
return true;
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
return false;
|
|
231
|
+
}
|
|
232
|
+
if (require.main === module) {
|
|
233
|
+
main(process.argv.slice(2)).catch(e => {
|
|
234
|
+
process.exitCode = 1;
|
|
235
|
+
// eslint-disable-next-line no-console
|
|
236
|
+
console.error(e.message);
|
|
237
|
+
});
|
|
238
|
+
}
|
|
239
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"patch-set.js","sourceRoot":"","sources":["patch-set.ts"],"names":[],"mappings":"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","sourcesContent":["\n/**\n * Apply a JSON patch set into the given target file\n *\n * The sources can be taken from one or more directories.\n */\nimport * as path from 'path';\nimport * as fastJsonPatch from 'fast-json-patch';\nimport * as fs from 'fs-extra';\n\n// eslint-disable-next-line @typescript-eslint/no-require-imports\nconst sortJson = require('sort-json');\n\nexport interface PatchOptions {\n  readonly quiet?: boolean;\n}\n\nexport type PatchSet = Record<string, PatchSetElement>;\n\nexport type PatchSetElement =\n  | { readonly type: 'fragment'; readonly data: any }\n  | { readonly type: 'patch'; readonly data: any }\n  | { readonly type: 'set'; readonly sources: PatchSet }\n  ;\n\nexport async function loadPatchSet(sourceDirectory: string, relativeTo = process.cwd()): Promise<PatchSet> {\n  const ret: PatchSet = {};\n\n  const files = await fs.readdir(sourceDirectory);\n  for (const file of files) {\n    const fullFile = path.join(sourceDirectory, file);\n    const relName = path.relative(relativeTo, fullFile);\n\n    if ((await fs.stat(fullFile)).isDirectory()) {\n      ret[relName] = {\n        type: 'set',\n        sources: await loadPatchSet(fullFile, sourceDirectory),\n      };\n    } else if (file.endsWith('.json')) {\n      ret[relName] = {\n        type: file.indexOf('patch') === -1 ? 'fragment' : 'patch',\n        data: await fs.readJson(fullFile),\n      };\n    }\n  }\n\n  return ret;\n}\n\nexport function evaluatePatchSet(sources: PatchSet, options: PatchOptions = {}) {\n  const targetObject: any = {};\n\n  for (const key of Object.keys(sources).sort()) {\n    const value = sources[key];\n\n    switch (value.type) {\n      case 'fragment':\n        log(key);\n        merge(targetObject, value.data, []);\n        break;\n      case 'patch':\n        patch(targetObject, value.data, (m) => log(`${key}: ${m}`));\n        break;\n      case 'set':\n        const evaluated = evaluatePatchSet(value.sources, options);\n        log(key);\n        merge(targetObject, evaluated, []);\n        break;\n    }\n  }\n\n  return targetObject;\n\n  function log(x: string) {\n    if (!options.quiet) {\n      // eslint-disable-next-line no-console\n      console.log(x);\n    }\n  }\n}\n\n/**\n * Load a patch set from a directory\n */\nexport async function applyPatchSet(sourceDirectory: string, options: PatchOptions = {}) {\n  const patches = await loadPatchSet(sourceDirectory);\n  return evaluatePatchSet(patches, options);\n}\n\n/**\n * Load a patch set and write it out to a file\n */\nexport async function applyAndWrite(targetFile: string, sourceDirectory: string, options: PatchOptions = {}) {\n  const model = await applyPatchSet(sourceDirectory, options);\n  await writeSorted(targetFile, model);\n}\n\nexport async function writeSorted(targetFile: string, data: any) {\n  await fs.mkdirp(path.dirname(targetFile));\n  await fs.writeJson(targetFile, sortJson(data), { spaces: 2 });\n}\n\nfunction printSorted(data: any) {\n  process.stdout.write(JSON.stringify(sortJson(data), undefined, 2));\n}\n\nfunction merge(target: any, fragment: any, jsonPath: string[]) {\n  if (!fragment) { return; }\n  if (!target || typeof target !== 'object' || Array.isArray(target)) {\n    throw new Error(`Expected object, found: '${target}' at '$.${jsonPath.join('.')}'`);\n  }\n\n  for (const key of Object.keys(fragment)) {\n    if (key.startsWith('$')) { continue; }\n\n    if (key in target) {\n      const specVal = target[key];\n      const fragVal = fragment[key];\n      if (typeof specVal !== typeof fragVal) {\n        // eslint-disable-next-line max-len\n        throw new Error(`Attempted to merge ${JSON.stringify(fragVal)} into incompatible ${JSON.stringify(specVal)} at path ${jsonPath.join('/')}/${key}`);\n      }\n      if (specVal == fragVal) {\n        continue;\n      }\n      if (typeof specVal !== 'object') {\n        // eslint-disable-next-line max-len\n        throw new Error(`Conflict when attempting to merge ${JSON.stringify(fragVal)} into ${JSON.stringify(specVal)} at path ${jsonPath.join('/')}/${key}`);\n      }\n      merge(specVal, fragVal, [...jsonPath, key]);\n    } else {\n      target[key] = fragment[key];\n    }\n  }\n}\n\nfunction patch(target: any, fragment: any, log: (x: string) => void) {\n  if (!fragment) { return; }\n\n  const patches = findPatches(target, fragment);\n  for (const p of patches) {\n    log(p.description ?? '');\n\n    try {\n      fastJsonPatch.applyPatch(target, p.operations);\n    } catch (e) {\n      throw new Error(`error applying patch: ${JSON.stringify(p, undefined, 2)}: ${e.message}`);\n    }\n  }\n}\n\ninterface Patch {\n  readonly description?: string;\n  readonly operations: Operation[];\n}\n\ntype Operation =\n  | { readonly op: 'add'; readonly path: string; readonly value: any }\n  | { readonly op: 'remove'; readonly path: string }\n  | { readonly op: 'replace'; readonly path: string; readonly value: any }\n  | { readonly op: 'copy'; readonly path: string; readonly from: string }\n  | { readonly op: 'move'; readonly path: string; readonly from: string }\n  | { readonly op: 'test'; readonly path: string; readonly value: any }\n  ;\n\n/**\n * Find the sets of patches to apply in a document\n *\n * Adjusts paths to be root-relative, which makes it possible to have paths\n * point outside the patch scope.\n */\nfunction findPatches(data: any, patchSource: any): Patch[] {\n  const ret: Patch[] = [];\n  recurse(data, patchSource, []);\n  return ret;\n\n  function recurse(actualData: any, fragment: any, jsonPath: string[]) {\n    if (!fragment) { return; }\n\n    if ('patch' in fragment) {\n      const p = fragment.patch;\n      if (!p.operations) {\n        throw new Error(`Patch needs 'operations' key, got: ${JSON.stringify(p)}`);\n      }\n      ret.push({\n        description: p.description,\n        operations: p.operations.map((op: any) => adjustPaths(op, jsonPath)),\n      });\n    } else if ('patch:each' in fragment) {\n      const p = fragment['patch:each'];\n      if (typeof actualData !== 'object') {\n        throw new Error(`Patch ${p.description}: expecting object in data, found '${actualData}'`);\n      }\n      if (!p.operations) {\n        throw new Error(`Patch needs 'operations' key, got: ${JSON.stringify(p)}`);\n      }\n      for (const key in actualData) {\n        ret.push({\n          description: `${key}: ${p.description}`,\n          operations: p.operations.map((op: any) => adjustPaths(op, [...jsonPath, key])),\n        });\n      }\n    } else {\n      for (const key of Object.keys(fragment)) {\n        if (!(key in actualData)) {\n          actualData[key] = {};\n        }\n        recurse(actualData[key], fragment[key], [...jsonPath, key]);\n      }\n    }\n  }\n\n  function adjustPaths(op: any, jsonPath: string[]): Operation {\n    return {\n      ...op,\n      ...op.path ? { path: adjustPath(op.path, jsonPath) } : undefined,\n      ...op.from ? { from: adjustPath(op.from, jsonPath) } : undefined,\n    };\n  }\n\n  /**\n   * Adjust path\n   *\n   * '$/' means from the root, otherwise interpret as relative path.\n   */\n  function adjustPath(originalPath: string, jsonPath: string[]): string {\n    if (typeof originalPath !== 'string') {\n      throw new Error(`adjustPath: expected string, got ${JSON.stringify(originalPath)}`);\n    }\n    if (originalPath.startsWith('$/')) {\n      return originalPath.substr(1);\n    }\n    return jsonPath.map(p => `/${p}`).join('') + originalPath;\n  }\n}\n\n\n/**\n * Run this file as a CLI tool, to apply a patch set from the command line\n */\nasync function main(args: string[]) {\n  const quiet = eatArg('-q', args) || eatArg('--quiet', args);\n\n  if (args.length < 1) {\n    throw new Error('Usage: patch-set <DIR> [<FILE>]');\n  }\n\n  const [dir, targetFile] = args;\n\n  const model = await applyPatchSet(dir, { quiet });\n  if (targetFile) {\n    await writeSorted(targetFile, model);\n  } else {\n    printSorted(model);\n  }\n}\n\nfunction eatArg(arg: string, args: string[]) {\n  for (let i = 0; i < args.length; i++) {\n    if (args[i] === arg) {\n      args.splice(i, 1);\n      return true;\n    }\n  }\n  return false;\n}\n\nif (require.main === module) {\n  main(process.argv.slice(2)).catch(e => {\n    process.exitCode = 1;\n    // eslint-disable-next-line no-console\n    console.error(e.message);\n  });\n}\n"]}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/* eslint-disable no-console */
|
|
3
|
+
/**
|
|
4
|
+
* Report on spec fragment files that are being held back.
|
|
5
|
+
*/
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
const path = require("path");
|
|
8
|
+
const fs = require("fs-extra");
|
|
9
|
+
async function main(args) {
|
|
10
|
+
if (args.length < 2) {
|
|
11
|
+
throw new Error('Usage: report-issues <DIR> <FORMAT>');
|
|
12
|
+
}
|
|
13
|
+
const [dir, format] = args;
|
|
14
|
+
const officialVersion = (await fs.readJson(path.join(dir, '001_Version.json'))).ResourceSpecificationVersion;
|
|
15
|
+
let headerPrinted = false;
|
|
16
|
+
for (const file of await fs.readdir(dir)) {
|
|
17
|
+
if (!file.startsWith('000_')) {
|
|
18
|
+
continue;
|
|
19
|
+
}
|
|
20
|
+
const json = await fs.readJson(path.join(dir, file));
|
|
21
|
+
const fragmentVersion = json.$version;
|
|
22
|
+
switch (format) {
|
|
23
|
+
case 'outdated':
|
|
24
|
+
if (fragmentVersion !== officialVersion) {
|
|
25
|
+
if (!headerPrinted) {
|
|
26
|
+
console.log('## Unapplied changes');
|
|
27
|
+
console.log('');
|
|
28
|
+
headerPrinted = true;
|
|
29
|
+
}
|
|
30
|
+
const serviceName = file.replace(/^000_/, '').replace(/\.json$/, '').replace('_', '::');
|
|
31
|
+
console.log(`* ${serviceName} is at ${fragmentVersion}`);
|
|
32
|
+
}
|
|
33
|
+
break;
|
|
34
|
+
default:
|
|
35
|
+
throw new Error(`Unknown format type requested: ${format}`);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
main(process.argv.slice(2)).catch(e => {
|
|
40
|
+
// eslint-disable-next-line no-console
|
|
41
|
+
console.error(e);
|
|
42
|
+
process.exitCode = 1;
|
|
43
|
+
});
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0LWlzc3Vlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInJlcG9ydC1pc3N1ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLCtCQUErQjtBQUMvQjs7R0FFRzs7QUFFSCw2QkFBNkI7QUFDN0IsK0JBQStCO0FBRS9CLEtBQUssVUFBVSxJQUFJLENBQUMsSUFBYztJQUNoQyxJQUFJLElBQUksQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1FBQ25CLE1BQU0sSUFBSSxLQUFLLENBQUMscUNBQXFDLENBQUMsQ0FBQztLQUN4RDtJQUVELE1BQU0sQ0FBQyxHQUFHLEVBQUUsTUFBTSxDQUFDLEdBQUcsSUFBSSxDQUFDO0lBRTNCLE1BQU0sZUFBZSxHQUFHLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLGtCQUFrQixDQUFDLENBQUMsQ0FBQyxDQUFDLDRCQUE0QixDQUFDO0lBQzdHLElBQUksYUFBYSxHQUFHLEtBQUssQ0FBQztJQUUxQixLQUFLLE1BQU0sSUFBSSxJQUFJLE1BQU0sRUFBRSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRTtRQUN4QyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsRUFBRTtZQUM1QixTQUFTO1NBQ1Y7UUFFRCxNQUFNLElBQUksR0FBRyxNQUFNLEVBQUUsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUNyRCxNQUFNLGVBQWUsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDO1FBRXRDLFFBQVEsTUFBTSxFQUFFO1lBQ2QsS0FBSyxVQUFVO2dCQUNiLElBQUksZUFBZSxLQUFLLGVBQWUsRUFBRTtvQkFDdkMsSUFBSSxDQUFDLGFBQWEsRUFBRTt3QkFDbEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDO3dCQUNwQyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDO3dCQUNoQixhQUFhLEdBQUcsSUFBSSxDQUFDO3FCQUN0QjtvQkFDRCxNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUM7b0JBQ3hGLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxXQUFXLFVBQVUsZUFBZSxFQUFFLENBQUMsQ0FBQztpQkFDMUQ7Z0JBQ0QsTUFBTTtZQUVSO2dCQUNFLE1BQU0sSUFBSSxLQUFLLENBQUMsa0NBQWtDLE1BQU0sRUFBRSxDQUFDLENBQUM7U0FDL0Q7S0FDRjtBQUNILENBQUM7QUFFRCxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUU7SUFDcEMsc0NBQXNDO0lBQ3RDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDakIsT0FBTyxDQUFDLFFBQVEsR0FBRyxDQUFDLENBQUM7QUFDdkIsQ0FBQyxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKiBlc2xpbnQtZGlzYWJsZSBuby1jb25zb2xlICovXG4vKipcbiAqIFJlcG9ydCBvbiBzcGVjIGZyYWdtZW50IGZpbGVzIHRoYXQgYXJlIGJlaW5nIGhlbGQgYmFjay5cbiAqL1xuXG5pbXBvcnQgKiBhcyBwYXRoIGZyb20gJ3BhdGgnO1xuaW1wb3J0ICogYXMgZnMgZnJvbSAnZnMtZXh0cmEnO1xuXG5hc3luYyBmdW5jdGlvbiBtYWluKGFyZ3M6IHN0cmluZ1tdKSB7XG4gIGlmIChhcmdzLmxlbmd0aCA8IDIpIHtcbiAgICB0aHJvdyBuZXcgRXJyb3IoJ1VzYWdlOiByZXBvcnQtaXNzdWVzIDxESVI+IDxGT1JNQVQ+Jyk7XG4gIH1cblxuICBjb25zdCBbZGlyLCBmb3JtYXRdID0gYXJncztcblxuICBjb25zdCBvZmZpY2lhbFZlcnNpb24gPSAoYXdhaXQgZnMucmVhZEpzb24ocGF0aC5qb2luKGRpciwgJzAwMV9WZXJzaW9uLmpzb24nKSkpLlJlc291cmNlU3BlY2lmaWNhdGlvblZlcnNpb247XG4gIGxldCBoZWFkZXJQcmludGVkID0gZmFsc2U7XG5cbiAgZm9yIChjb25zdCBmaWxlIG9mIGF3YWl0IGZzLnJlYWRkaXIoZGlyKSkge1xuICAgIGlmICghZmlsZS5zdGFydHNXaXRoKCcwMDBfJykpIHtcbiAgICAgIGNvbnRpbnVlO1xuICAgIH1cblxuICAgIGNvbnN0IGpzb24gPSBhd2FpdCBmcy5yZWFkSnNvbihwYXRoLmpvaW4oZGlyLCBmaWxlKSk7XG4gICAgY29uc3QgZnJhZ21lbnRWZXJzaW9uID0ganNvbi4kdmVyc2lvbjtcblxuICAgIHN3aXRjaCAoZm9ybWF0KSB7XG4gICAgICBjYXNlICdvdXRkYXRlZCc6XG4gICAgICAgIGlmIChmcmFnbWVudFZlcnNpb24gIT09IG9mZmljaWFsVmVyc2lvbikge1xuICAgICAgICAgIGlmICghaGVhZGVyUHJpbnRlZCkge1xuICAgICAgICAgICAgY29uc29sZS5sb2coJyMjIFVuYXBwbGllZCBjaGFuZ2VzJyk7XG4gICAgICAgICAgICBjb25zb2xlLmxvZygnJyk7XG4gICAgICAgICAgICBoZWFkZXJQcmludGVkID0gdHJ1ZTtcbiAgICAgICAgICB9XG4gICAgICAgICAgY29uc3Qgc2VydmljZU5hbWUgPSBmaWxlLnJlcGxhY2UoL14wMDBfLywgJycpLnJlcGxhY2UoL1xcLmpzb24kLywgJycpLnJlcGxhY2UoJ18nLCAnOjonKTtcbiAgICAgICAgICBjb25zb2xlLmxvZyhgKiAke3NlcnZpY2VOYW1lfSBpcyBhdCAke2ZyYWdtZW50VmVyc2lvbn1gKTtcbiAgICAgICAgfVxuICAgICAgICBicmVhaztcblxuICAgICAgZGVmYXVsdDpcbiAgICAgICAgdGhyb3cgbmV3IEVycm9yKGBVbmtub3duIGZvcm1hdCB0eXBlIHJlcXVlc3RlZDogJHtmb3JtYXR9YCk7XG4gICAgfVxuICB9XG59XG5cbm1haW4ocHJvY2Vzcy5hcmd2LnNsaWNlKDIpKS5jYXRjaChlID0+IHtcbiAgLy8gZXNsaW50LWRpc2FibGUtbmV4dC1saW5lIG5vLWNvbnNvbGVcbiAgY29uc29sZS5lcnJvcihlKTtcbiAgcHJvY2Vzcy5leGl0Q29kZSA9IDE7XG59KTsiXX0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
/* eslint-disable no-console */
|
|
4
|
+
/**
|
|
5
|
+
* Split the given CloudFormation resource specification up into a patch set, by service
|
|
6
|
+
*
|
|
7
|
+
* After splitting, only write out those fragments that are valid.(*)
|
|
8
|
+
*
|
|
9
|
+
* The reason for this is that some service updates sometimes contain mistakes,
|
|
10
|
+
* and we want to be able to take partial upgrades. By splitting the spec, we can
|
|
11
|
+
* take updates to some services while leaving updates to other services behind.
|
|
12
|
+
*
|
|
13
|
+
* (*) If `NO_VALIDATE` is set, all pieces are written out. In normal operation this
|
|
14
|
+
* should not be used.
|
|
15
|
+
*/
|
|
16
|
+
const path = require("path");
|
|
17
|
+
const fs = require("fs-extra");
|
|
18
|
+
const patch_set_1 = require("./patch-set");
|
|
19
|
+
const validate_cfn_1 = require("./validate-cfn");
|
|
20
|
+
async function main(args) {
|
|
21
|
+
if (args.length < 2) {
|
|
22
|
+
throw new Error('Usage: split-spec-by-service <SPECFILE> <DIRECTORY>');
|
|
23
|
+
}
|
|
24
|
+
const [specFile, outDir] = args;
|
|
25
|
+
log(`Loading specification: ${specFile}`);
|
|
26
|
+
const spec = await fs.readJson(specFile);
|
|
27
|
+
// Split
|
|
28
|
+
log('Splitting');
|
|
29
|
+
const byService = {};
|
|
30
|
+
for (const [propTypeName, propType] of Object.entries(spec.PropertyTypes)) {
|
|
31
|
+
const svcName = serviceName(propTypeName);
|
|
32
|
+
serviceSpec(svcName).PropertyTypes[propTypeName] = propType;
|
|
33
|
+
}
|
|
34
|
+
for (const [resTypeName, resType] of Object.entries(spec.ResourceTypes)) {
|
|
35
|
+
const svcName = serviceName(resTypeName);
|
|
36
|
+
serviceSpec(svcName).ResourceTypes[resTypeName] = resType;
|
|
37
|
+
}
|
|
38
|
+
// Write out
|
|
39
|
+
log('Writing');
|
|
40
|
+
for (const [svcName, svcSpec] of Object.entries(byService)) {
|
|
41
|
+
const errors = !process.env.NO_VALIDATE ? validate_cfn_1.CfnSpecValidator.validate(svcSpec) : [];
|
|
42
|
+
if (errors.length === 0) {
|
|
43
|
+
// Change 'ResourceSpecificationVersion' to '$version', otherwise they will all conflict
|
|
44
|
+
const toWrite = {
|
|
45
|
+
PropertyTypes: svcSpec.PropertyTypes,
|
|
46
|
+
ResourceTypes: svcSpec.ResourceTypes,
|
|
47
|
+
$version: svcSpec.ResourceSpecificationVersion,
|
|
48
|
+
};
|
|
49
|
+
await patch_set_1.writeSorted(path.join(outDir, `000_${svcName}.json`), toWrite);
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
console.warn('='.repeat(70));
|
|
53
|
+
console.warn(' '.repeat(Math.floor(35 - svcName.length / 2)) + svcName);
|
|
54
|
+
console.warn('='.repeat(70));
|
|
55
|
+
for (const error of errors) {
|
|
56
|
+
console.warn(validate_cfn_1.formatErrorInContext(error));
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
await fs.writeJson(path.join(outDir, '001_Version.json'), {
|
|
61
|
+
ResourceSpecificationVersion: spec.ResourceSpecificationVersion,
|
|
62
|
+
}, { spaces: 2 });
|
|
63
|
+
function serviceSpec(svcName) {
|
|
64
|
+
if (!(svcName in byService)) {
|
|
65
|
+
byService[svcName] = {
|
|
66
|
+
PropertyTypes: {},
|
|
67
|
+
ResourceTypes: {},
|
|
68
|
+
ResourceSpecificationVersion: spec.ResourceSpecificationVersion,
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
return byService[svcName];
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
function serviceName(x) {
|
|
75
|
+
return x.split('::').slice(0, 2).join('_');
|
|
76
|
+
}
|
|
77
|
+
function log(x) {
|
|
78
|
+
// eslint-disable-next-line no-console
|
|
79
|
+
console.log(x);
|
|
80
|
+
}
|
|
81
|
+
main(process.argv.slice(2)).catch(e => {
|
|
82
|
+
// eslint-disable-next-line no-console
|
|
83
|
+
console.error(e);
|
|
84
|
+
process.exitCode = 1;
|
|
85
|
+
});
|
|
86
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3BsaXQtc3BlYy1ieS1zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsic3BsaXQtc3BlYy1ieS1zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0JBQStCO0FBQy9COzs7Ozs7Ozs7OztHQVdHO0FBQ0gsNkJBQTZCO0FBQzdCLCtCQUErQjtBQUUvQiwyQ0FBMEM7QUFDMUMsaURBQWlGO0FBRWpGLEtBQUssVUFBVSxJQUFJLENBQUMsSUFBYztJQUNoQyxJQUFJLElBQUksQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1FBQ25CLE1BQU0sSUFBSSxLQUFLLENBQUMscURBQXFELENBQUMsQ0FBQztLQUN4RTtJQUVELE1BQU0sQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLEdBQUcsSUFBSSxDQUFDO0lBQ2hDLEdBQUcsQ0FBQywwQkFBMEIsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUMxQyxNQUFNLElBQUksR0FBWSxNQUFNLEVBQUUsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUM7SUFFbEQsUUFBUTtJQUNSLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUNqQixNQUFNLFNBQVMsR0FBNEIsRUFBRSxDQUFDO0lBQzlDLEtBQUssTUFBTSxDQUFDLFlBQVksRUFBRSxRQUFRLENBQUMsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsRUFBRTtRQUN6RSxNQUFNLE9BQU8sR0FBRyxXQUFXLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDMUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxDQUFDLGFBQWEsQ0FBQyxZQUFZLENBQUMsR0FBRyxRQUFRLENBQUM7S0FDN0Q7SUFDRCxLQUFLLE1BQU0sQ0FBQyxXQUFXLEVBQUUsT0FBTyxDQUFDLElBQUksTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEVBQUU7UUFDdkUsTUFBTSxPQUFPLEdBQUcsV0FBVyxDQUFDLFdBQVcsQ0FBQyxD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QztBQUN2QixDQUFDLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qIGVzbGludC1kaXNhYmxlIG5vLWNvbnNvbGUgKi9cbi8qKlxuICogU3BsaXQgdGhlIGdpdmVuIENsb3VkRm9ybWF0aW9uIHJlc291cmNlIHNwZWNpZmljYXRpb24gdXAgaW50byBhIHBhdGNoIHNldCwgYnkgc2VydmljZVxuICpcbiAqIEFmdGVyIHNwbGl0dGluZywgb25seSB3cml0ZSBvdXQgdGhvc2UgZnJhZ21lbnRzIHRoYXQgYXJlIHZhbGlkLigqKVxuICpcbiAqIFRoZSByZWFzb24gZm9yIHRoaXMgaXMgdGhhdCBzb21lIHNlcnZpY2UgdXBkYXRlcyBzb21ldGltZXMgY29udGFpbiBtaXN0YWtlcyxcbiAqIGFuZCB3ZSB3YW50IHRvIGJlIGFibGUgdG8gdGFrZSBwYXJ0aWFsIHVwZ3JhZGVzLiBCeSBzcGxpdHRpbmcgdGhlIHNwZWMsIHdlIGNhblxuICogdGFrZSB1cGRhdGVzIHRvIHNvbWUgc2VydmljZXMgd2hpbGUgbGVhdmluZyB1cGRhdGVzIHRvIG90aGVyIHNlcnZpY2VzIGJlaGluZC5cbiAqXG4gKiAoKikgSWYgYE5PX1ZBTElEQVRFYCBpcyBzZXQsIGFsbCBwaWVjZXMgYXJlIHdyaXR0ZW4gb3V0LiBJbiBub3JtYWwgb3BlcmF0aW9uIHRoaXNcbiAqICAgICBzaG91bGQgbm90IGJlIHVzZWQuXG4gKi9cbmltcG9ydCAqIGFzIHBhdGggZnJvbSAncGF0aCc7XG5pbXBvcnQgKiBhcyBmcyBmcm9tICdmcy1leHRyYSc7XG5cbmltcG9ydCB7IHdyaXRlU29ydGVkIH0gZnJvbSAnLi9wYXRjaC1zZXQnO1xuaW1wb3J0IHsgQ2ZuU3BlYywgQ2ZuU3BlY1ZhbGlkYXRvciwgZm9ybWF0RXJyb3JJbkNvbnRleHQgfSBmcm9tICcuL3ZhbGlkYXRlLWNmbic7XG5cbmFzeW5jIGZ1bmN0aW9uIG1haW4oYXJnczogc3RyaW5nW10pIHtcbiAgaWYgKGFyZ3MubGVuZ3RoIDwgMikge1xuICAgIHRocm93IG5ldyBFcnJvcignVXNhZ2U6IHNwbGl0LXNwZWMtYnktc2VydmljZSA8U1BFQ0ZJTEU+IDxESVJFQ1RPUlk+Jyk7XG4gIH1cblxuICBjb25zdCBbc3BlY0ZpbGUsIG91dERpcl0gPSBhcmdzO1xuICBsb2coYExvYWRpbmcgc3BlY2lmaWNhdGlvbjogJHtzcGVjRmlsZX1gKTtcbiAgY29uc3Qgc3BlYzogQ2ZuU3BlYyA9IGF3YWl0IGZzLnJlYWRKc29uKHNwZWNGaWxlKTtcblxuICAvLyBTcGxpdFxuICBsb2coJ1NwbGl0dGluZycpO1xuICBjb25zdCBieVNlcnZpY2U6IFJlY29yZDxzdHJpbmcsIENmblNwZWM+ID0ge307XG4gIGZvciAoY29uc3QgW3Byb3BUeXBlTmFtZSwgcHJvcFR5cGVdIG9mIE9iamVjdC5lbnRyaWVzKHNwZWMuUHJvcGVydHlUeXBlcykpIHtcbiAgICBjb25zdCBzdmNOYW1lID0gc2VydmljZU5hbWUocHJvcFR5cGVOYW1lKTtcbiAgICBzZXJ2aWNlU3BlYyhzdmNOYW1lKS5Qcm9wZXJ0eVR5cGVzW3Byb3BUeXBlTmFtZV0gPSBwcm9wVHlwZTtcbiAgfVxuICBmb3IgKGNvbnN0IFtyZXNUeXBlTmFtZSwgcmVzVHlwZV0gb2YgT2JqZWN0LmVudHJpZXMoc3BlYy5SZXNvdXJjZVR5cGVzKSkge1xuICAgIGNvbnN0IHN2Y05hbWUgPSBzZXJ2aWNlTmFtZShyZXNUeXBlTmFtZSk7XG4gICAgc2VydmljZVNwZWMoc3ZjTmFtZSkuUmVzb3VyY2VUeXBlc1tyZXNUeXBlTmFtZV0gPSByZXNUeXBlO1xuICB9XG5cbiAgLy8gV3JpdGUgb3V0XG4gIGxvZygnV3JpdGluZycpO1xuICBmb3IgKGNvbnN0IFtzdmNOYW1lLCBzdmNTcGVjXSBvZiBPYmplY3QuZW50cmllcyhieVNlcnZpY2UpKSB7XG4gICAgY29uc3QgZXJyb3JzID0gIXByb2Nlc3MuZW52Lk5PX1ZBTElEQVRFID8gQ2ZuU3BlY1ZhbGlkYXRvci52YWxpZGF0ZShzdmNTcGVjKSA6IFtdO1xuICAgIGlmIChlcnJvcnMubGVuZ3RoID09PSAwKSB7XG4gICAgICAvLyBDaGFuZ2UgJ1Jlc291cmNlU3BlY2lmaWNhdGlvblZlcnNpb24nIHRvICckdmVyc2lvbicsIG90aGVyd2lzZSB0aGV5IHdpbGwgYWxsIGNvbmZsaWN0XG4gICAgICBjb25zdCB0b1dyaXRlID0ge1xuICAgICAgICBQcm9wZXJ0eVR5cGVzOiBzdmNTcGVjLlByb3BlcnR5VHlwZXMsXG4gICAgICAgIFJlc291cmNlVHlwZXM6IHN2Y1NwZWMuUmVzb3VyY2VUeXBlcyxcbiAgICAgICAgJHZlcnNpb246IHN2Y1NwZWMuUmVzb3VyY2VTcGVjaWZpY2F0aW9uVmVyc2lvbixcbiAgICAgIH07XG5cbiAgICAgIGF3YWl0IHdyaXRlU29ydGVkKHBhdGguam9pbihvdXREaXIsIGAwMDBfJHtzdmNOYW1lfS5qc29uYCksIHRvV3JpdGUpO1xuICAgIH0gZWxzZSB7XG4gICAgICBjb25zb2xlLndhcm4oJz0nLnJlcGVhdCg3MCkpO1xuICAgICAgY29uc29sZS53YXJuKCcgJy5yZXBlYXQoTWF0aC5mbG9vcigzNSAtIHN2Y05hbWUubGVuZ3RoIC8gMikpICsgc3ZjTmFtZSk7XG4gICAgICBjb25zb2xlLndhcm4oJz0nLnJlcGVhdCg3MCkpO1xuICAgICAgZm9yIChjb25zdCBlcnJvciBvZiBlcnJvcnMpIHtcbiAgICAgICAgY29uc29sZS53YXJuKGZvcm1hdEVycm9ySW5Db250ZXh0KGVycm9yKSk7XG4gICAgICB9XG4gICAgfVxuICB9XG4gIGF3YWl0IGZzLndyaXRlSnNvbihwYXRoLmpvaW4ob3V0RGlyLCAnMDAxX1ZlcnNpb24uanNvbicpLCB7XG4gICAgUmVzb3VyY2VTcGVjaWZpY2F0aW9uVmVyc2lvbjogc3BlYy5SZXNvdXJjZVNwZWNpZmljYXRpb25WZXJzaW9uLFxuICB9LCB7IHNwYWNlczogMiB9KTtcblxuICBmdW5jdGlvbiBzZXJ2aWNlU3BlYyhzdmNOYW1lOiBzdHJpbmcpIHtcbiAgICBpZiAoIShzdmNOYW1lIGluIGJ5U2VydmljZSkpIHtcbiAgICAgIGJ5U2VydmljZVtzdmNOYW1lXSA9IHtcbiAgICAgICAgUHJvcGVydHlUeXBlczoge30sXG4gICAgICAgIFJlc291cmNlVHlwZXM6IHt9LFxuICAgICAgICBSZXNvdXJjZVNwZWNpZmljYXRpb25WZXJzaW9uOiBzcGVjLlJlc291cmNlU3BlY2lmaWNhdGlvblZlcnNpb24sXG4gICAgICB9O1xuICAgIH1cbiAgICByZXR1cm4gYnlTZXJ2aWNlW3N2Y05hbWVdO1xuICB9XG59XG5cbmZ1bmN0aW9uIHNlcnZpY2VOYW1lKHg6IHN0cmluZykge1xuICByZXR1cm4geC5zcGxpdCgnOjonKS5zbGljZSgwLCAyKS5qb2luKCdfJyk7XG59XG5cbmZ1bmN0aW9uIGxvZyh4OiBzdHJpbmcpIHtcbiAgLy8gZXNsaW50LWRpc2FibGUtbmV4dC1saW5lIG5vLWNvbnNvbGVcbiAgY29uc29sZS5sb2coeCk7XG59XG5cbm1haW4ocHJvY2Vzcy5hcmd2LnNsaWNlKDIpKS5jYXRjaChlID0+IHtcbiAgLy8gZXNsaW50LWRpc2FibGUtbmV4dC1saW5lIG5vLWNvbnNvbGVcbiAgY29uc29sZS5lcnJvcihlKTtcbiAgcHJvY2Vzcy5leGl0Q29kZSA9IDE7XG59KTtcbiJdfQ==
|
|
@@ -186,7 +186,7 @@
|
|
|
186
186
|
same "printed page" as the copyright notice for easier
|
|
187
187
|
identification within third-party archives.
|
|
188
188
|
|
|
189
|
-
Copyright 2018-
|
|
189
|
+
Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
190
190
|
|
|
191
191
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
192
192
|
you may not use this file except in compliance with the License.
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
AWS Cloud Development Kit (AWS CDK)
|
|
2
|
-
Copyright 2018-
|
|
2
|
+
Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
@@ -13,51 +13,67 @@ rm -f CHANGELOG.md.new
|
|
|
13
13
|
function update-spec() {
|
|
14
14
|
local title=$1
|
|
15
15
|
local url=$2
|
|
16
|
-
local
|
|
16
|
+
local targetdir=$3
|
|
17
17
|
local gunzip=$4
|
|
18
|
+
local split=$5
|
|
18
19
|
|
|
19
|
-
local
|
|
20
|
+
local tmpdir="$(mktemp -d)"
|
|
21
|
+
local newspec="${tmpdir}/new_proposed.json"
|
|
22
|
+
local newcombined="${tmpdir}/new.json"
|
|
23
|
+
local oldcombined="${tmpdir}/old.json"
|
|
20
24
|
|
|
21
25
|
# fail if the spec has changes, otherwise we won't be able to determine the diff
|
|
22
|
-
if [ -n "$(git status --porcelain ${
|
|
23
|
-
echo "The
|
|
26
|
+
if [ -n "$(git status --porcelain ${targetdir})" ]; then
|
|
27
|
+
echo "The directory ${targetdir} has changes, revert them before cfn-update"
|
|
24
28
|
exit 1
|
|
25
29
|
fi
|
|
26
30
|
|
|
27
31
|
echo >&2 "Downloading from ${url}..."
|
|
28
32
|
if ${gunzip}; then
|
|
29
|
-
curl -sL "${url}" | gunzip - > ${
|
|
33
|
+
curl -sL "${url}" | gunzip - > ${newspec}
|
|
30
34
|
else
|
|
31
|
-
curl -sL "${url}" > ${
|
|
35
|
+
curl -sL "${url}" > ${newspec}
|
|
32
36
|
fi
|
|
33
37
|
|
|
34
|
-
|
|
35
|
-
|
|
38
|
+
# Calculate the old and new combined specs, so we can do a diff on the changes
|
|
39
|
+
echo >&2 "Updating source spec..."
|
|
40
|
+
|
|
41
|
+
node build-tools/patch-set.js --quiet "${targetdir}" "${oldcombined}"
|
|
42
|
+
if ${split}; then
|
|
43
|
+
node build-tools/split-spec-by-service.js "${newspec}" "${targetdir}"
|
|
44
|
+
else
|
|
45
|
+
cp "${newspec}" "${targetdir}/spec.json"
|
|
46
|
+
sort-json "${targetdir}/spec.json"
|
|
47
|
+
fi
|
|
48
|
+
node build-tools/patch-set.js --quiet "${targetdir}" "${newcombined}"
|
|
36
49
|
|
|
37
50
|
echo >&2 "Updating CHANGELOG.md..."
|
|
38
|
-
node build-tools/spec-diff.js "${title}" "${
|
|
39
|
-
echo "" >> CHANGELOG.md.new
|
|
51
|
+
node build-tools/spec-diff.js "${title}" "${oldcombined}" "${newcombined}" >> CHANGELOG.md.new
|
|
40
52
|
|
|
41
|
-
echo
|
|
42
|
-
rm -f ${target}
|
|
43
|
-
cp ${intermediate} ${target}
|
|
53
|
+
echo "" >> CHANGELOG.md.new
|
|
44
54
|
}
|
|
45
55
|
|
|
56
|
+
# First run a build to get a complete version of the old spec
|
|
57
|
+
|
|
46
58
|
update-spec \
|
|
47
59
|
"CloudFormation Resource Specification" \
|
|
48
60
|
"https://d1uauaxba7bl26.cloudfront.net/latest/gzip/CloudFormationResourceSpecification.json" \
|
|
49
|
-
spec-source/
|
|
50
|
-
true
|
|
61
|
+
spec-source/specification/000_cfn/000_official \
|
|
62
|
+
true true
|
|
51
63
|
|
|
52
64
|
echo >&2 "Recording new version..."
|
|
53
65
|
rm -f cfn.version
|
|
54
|
-
node -p "require('${scriptdir}/../spec-source/
|
|
66
|
+
node -p "require('${scriptdir}/../spec-source/specification/000_cfn/000_official/001_Version.json').ResourceSpecificationVersion" > cfn.version
|
|
67
|
+
|
|
68
|
+
|
|
69
|
+
echo >&2 "Reporting outdated specs..."
|
|
70
|
+
node build-tools/report-issues spec-source/specification/000_cfn/000_official/ outdated >> CHANGELOG.md.new
|
|
55
71
|
|
|
56
72
|
update-spec \
|
|
57
73
|
"Serverless Application Model (SAM) Resource Specification" \
|
|
58
74
|
"https://raw.githubusercontent.com/awslabs/goformation/master/generate/sam-2016-10-31.json" \
|
|
59
|
-
spec-source/
|
|
60
|
-
false
|
|
75
|
+
spec-source/specification/100_sam/000_official \
|
|
76
|
+
false false
|
|
61
77
|
|
|
62
78
|
npm run build
|
|
63
79
|
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
export interface CfnSpec {
|
|
2
|
+
PropertyTypes: Record<string, any>;
|
|
3
|
+
ResourceTypes: Record<string, any>;
|
|
4
|
+
ResourceSpecificationVersion: string;
|
|
5
|
+
}
|
|
6
|
+
export interface ValidationError {
|
|
7
|
+
readonly value: JsonValue<any>;
|
|
8
|
+
readonly message: string;
|
|
9
|
+
}
|
|
10
|
+
export declare class CfnSpecValidator {
|
|
11
|
+
static validate(spec: CfnSpec): ValidationError[];
|
|
12
|
+
readonly errors: ValidationError[];
|
|
13
|
+
private readonly root;
|
|
14
|
+
constructor(spec: CfnSpec);
|
|
15
|
+
validateSpec(): void;
|
|
16
|
+
/**
|
|
17
|
+
* Property types are extremely weird
|
|
18
|
+
*
|
|
19
|
+
* Nominally, they define "records" that have a `Properties` field with the defined
|
|
20
|
+
* properties.
|
|
21
|
+
*
|
|
22
|
+
* However, they are also commonly used as aliases for other types, meaning they have
|
|
23
|
+
* the same type-indicating fields as individual property *fields* would have.
|
|
24
|
+
*
|
|
25
|
+
* Also also, it seems to be quite common to have them empty--have no fields at all.
|
|
26
|
+
* This seems to be taken as an alias for an unstructured `Json` type. It's probably
|
|
27
|
+
* just a mistake, but unfortunately a mistake that S3 is participating in, so if we
|
|
28
|
+
* fail on that we won't be able to consume updates to S3's schema. Our codegen is
|
|
29
|
+
* ready to deal with this and just renders it to an empty struct.
|
|
30
|
+
*/
|
|
31
|
+
private validatePropertyType;
|
|
32
|
+
private validateResourceType;
|
|
33
|
+
private validateProperties;
|
|
34
|
+
/**
|
|
35
|
+
* Validate the type
|
|
36
|
+
*
|
|
37
|
+
* There must be:
|
|
38
|
+
* - Either Type or PrimitiveType
|
|
39
|
+
* - Only if Type is List or Map, there will be either an ItemType or a PrimitiveItemType
|
|
40
|
+
* - Non-primitive Types must correspond to a property type
|
|
41
|
+
*/
|
|
42
|
+
private validateType;
|
|
43
|
+
private assertValidPropertyTypeReference;
|
|
44
|
+
private assertOptional;
|
|
45
|
+
private assert;
|
|
46
|
+
private validateMap;
|
|
47
|
+
private report;
|
|
48
|
+
}
|
|
49
|
+
interface JsonValue<A> {
|
|
50
|
+
readonly path: string[];
|
|
51
|
+
readonly pathValue: any;
|
|
52
|
+
readonly hasValue: boolean;
|
|
53
|
+
readonly value: A;
|
|
54
|
+
readonly valueOrUndefined: A | undefined;
|
|
55
|
+
get<K extends keyof A>(k: K): JsonValue<A[K]>;
|
|
56
|
+
}
|
|
57
|
+
declare class JsonValue<A> implements JsonValue<A> {
|
|
58
|
+
readonly value: A;
|
|
59
|
+
readonly path: string[];
|
|
60
|
+
static of<B>(x: B): JsonValue<B>;
|
|
61
|
+
readonly hasValue: boolean;
|
|
62
|
+
readonly valueOrUndefined: A | undefined;
|
|
63
|
+
readonly pathValue: any;
|
|
64
|
+
constructor(value: A, path: string[]);
|
|
65
|
+
}
|
|
66
|
+
export declare function formatErrorInContext(error: ValidationError): string;
|
|
67
|
+
export {};
|