cdk-common 2.0.218 → 2.0.221
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 +10 -4
- package/API.md +5 -0
- package/lib/main.js +1 -1
- package/lib/managed-policies.d.ts +1 -0
- package/lib/managed-policies.js +2 -1
- package/node_modules/@aws-cdk/assert/package.json +8 -8
- package/node_modules/@aws-cdk/cfnspec/CHANGELOG.md +59 -0
- package/node_modules/@aws-cdk/cfnspec/build-tools/patch-set.js +5 -2
- package/node_modules/@aws-cdk/cfnspec/build-tools/report-issues.d.ts +5 -0
- package/node_modules/@aws-cdk/cfnspec/build-tools/report-issues.js +30 -2
- package/node_modules/@aws-cdk/cfnspec/build-tools/split-spec-by-service.js +26 -2
- package/node_modules/@aws-cdk/cfnspec/cfn.version +1 -1
- package/node_modules/@aws-cdk/cfnspec/package.json +4 -3
- package/node_modules/@aws-cdk/cfnspec/spec/specification.json +182 -8
- package/node_modules/@aws-cdk/cfnspec/tsconfig.tsbuildinfo +75 -17
- package/node_modules/@aws-cdk/cloudformation-diff/package.json +4 -4
- package/node_modules/@types/concat-stream/node_modules/@types/node/README.md +1 -1
- package/node_modules/@types/concat-stream/node_modules/@types/node/package.json +2 -2
- package/node_modules/@types/concat-stream/node_modules/@types/node/path.d.ts +30 -19
- package/node_modules/@types/form-data/node_modules/@types/node/README.md +1 -1
- package/node_modules/@types/form-data/node_modules/@types/node/package.json +2 -2
- package/node_modules/@types/form-data/node_modules/@types/node/path.d.ts +30 -19
- package/package.json +6 -6
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-cdk/assert",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.34.2",
|
|
4
4
|
"description": "An assertion library for use with CDK Apps",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -34,21 +34,21 @@
|
|
|
34
34
|
},
|
|
35
35
|
"license": "Apache-2.0",
|
|
36
36
|
"devDependencies": {
|
|
37
|
-
"@aws-cdk/assert-internal": "2.
|
|
38
|
-
"@aws-cdk/cdk-build-tools": "2.
|
|
39
|
-
"@aws-cdk/pkglint": "2.
|
|
37
|
+
"@aws-cdk/assert-internal": "2.34.2",
|
|
38
|
+
"@aws-cdk/cdk-build-tools": "2.34.2",
|
|
39
|
+
"@aws-cdk/pkglint": "2.34.2",
|
|
40
40
|
"@types/jest": "^27.5.2",
|
|
41
|
-
"aws-cdk-lib": "2.
|
|
42
|
-
"aws-cdk-migration": "2.
|
|
41
|
+
"aws-cdk-lib": "2.34.2",
|
|
42
|
+
"aws-cdk-migration": "2.34.2",
|
|
43
43
|
"constructs": "^10.0.0",
|
|
44
44
|
"jest": "^27.3.1",
|
|
45
45
|
"ts-jest": "^27.1.5"
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@aws-cdk/cloudformation-diff": "2.
|
|
48
|
+
"@aws-cdk/cloudformation-diff": "2.34.2"
|
|
49
49
|
},
|
|
50
50
|
"peerDependencies": {
|
|
51
|
-
"aws-cdk-lib": "^2.
|
|
51
|
+
"aws-cdk-lib": "^2.34.2",
|
|
52
52
|
"constructs": "^10.0.0",
|
|
53
53
|
"jest": ">=26.6.3"
|
|
54
54
|
},
|
|
@@ -1,3 +1,62 @@
|
|
|
1
|
+
# CloudFormation Resource Specification v81.1.0
|
|
2
|
+
|
|
3
|
+
## New Resource Types
|
|
4
|
+
|
|
5
|
+
* AWS::Evidently::Segment
|
|
6
|
+
|
|
7
|
+
## Attribute Changes
|
|
8
|
+
|
|
9
|
+
* AWS::ApiGateway::DocumentationPart DocumentationPartId (__added__)
|
|
10
|
+
* AWS::IoT::Policy Id (__added__)
|
|
11
|
+
|
|
12
|
+
## Property Changes
|
|
13
|
+
|
|
14
|
+
* AWS::CloudWatch::CompositeAlarm ActionsSuppressor (__added__)
|
|
15
|
+
* AWS::CloudWatch::CompositeAlarm ActionsSuppressorExtensionPeriod (__added__)
|
|
16
|
+
* AWS::CloudWatch::CompositeAlarm ActionsSuppressorWaitPeriod (__added__)
|
|
17
|
+
* AWS::EC2::Host InstanceFamily (__added__)
|
|
18
|
+
* AWS::EC2::Host OutpostArn (__added__)
|
|
19
|
+
* AWS::EC2::Host InstanceType.Required (__changed__)
|
|
20
|
+
* Old: true
|
|
21
|
+
* New: false
|
|
22
|
+
* AWS::EC2::VPCEndpointService ContributorInsightsEnabled (__added__)
|
|
23
|
+
* AWS::GuardDuty::Detector Tags (__added__)
|
|
24
|
+
* AWS::GuardDuty::Filter Tags (__added__)
|
|
25
|
+
* AWS::GuardDuty::IPSet Tags (__added__)
|
|
26
|
+
* AWS::GuardDuty::ThreatIntelSet Tags (__added__)
|
|
27
|
+
* AWS::IoT::Policy PolicyDocument.UpdateType (__changed__)
|
|
28
|
+
* Old: Immutable
|
|
29
|
+
* New: Mutable
|
|
30
|
+
* AWS::Location::GeofenceCollection KmsKeyId.UpdateType (__changed__)
|
|
31
|
+
* Old: Mutable
|
|
32
|
+
* New: Immutable
|
|
33
|
+
* AWS::Location::GeofenceCollection PricingPlanDataSource.UpdateType (__changed__)
|
|
34
|
+
* Old: Immutable
|
|
35
|
+
* New: Mutable
|
|
36
|
+
* AWS::Location::Tracker PricingPlanDataSource.UpdateType (__changed__)
|
|
37
|
+
* Old: Immutable
|
|
38
|
+
* New: Mutable
|
|
39
|
+
* AWS::SSO::PermissionSet CustomerManagedPolicyReferences (__added__)
|
|
40
|
+
* AWS::SSO::PermissionSet PermissionsBoundary (__added__)
|
|
41
|
+
|
|
42
|
+
## Property Type Changes
|
|
43
|
+
|
|
44
|
+
* AWS::SSO::PermissionSet.CustomerManagedPolicyReference (__added__)
|
|
45
|
+
* AWS::SSO::PermissionSet.PermissionsBoundary (__added__)
|
|
46
|
+
* AWS::Transfer::Server.As2Transport (__added__)
|
|
47
|
+
* AWS::AppFlow::Flow.ScheduledTriggerProperties FirstExecutionFrom (__added__)
|
|
48
|
+
* AWS::CloudFront::Distribution.DistributionConfig DefaultCacheBehavior.Required (__changed__)
|
|
49
|
+
* Old: false
|
|
50
|
+
* New: true
|
|
51
|
+
* AWS::Transfer::Server.ProtocolDetails As2Transports (__added__)
|
|
52
|
+
|
|
53
|
+
## Unapplied changes
|
|
54
|
+
|
|
55
|
+
* AWS::ConnectCampaigns is at 0.0.0
|
|
56
|
+
* AWS::Rekognition is at 68.0.0
|
|
57
|
+
* AWS::RolesAnywhere is at 0.0.0
|
|
58
|
+
* AWS::SageMaker is at 72.0.0
|
|
59
|
+
|
|
1
60
|
# CloudFormation Resource Specification v81.0.0
|
|
2
61
|
|
|
3
62
|
## New Resource Types
|
|
@@ -17,7 +17,10 @@ async function loadPatchSet(sourceDirectory, relativeTo = process.cwd()) {
|
|
|
17
17
|
for (const file of files) {
|
|
18
18
|
const fullFile = path.join(sourceDirectory, file);
|
|
19
19
|
const relName = path.relative(relativeTo, fullFile);
|
|
20
|
-
if (
|
|
20
|
+
if (file.startsWith('.')) {
|
|
21
|
+
// Nothing, ignore
|
|
22
|
+
}
|
|
23
|
+
else if ((await fs.stat(fullFile)).isDirectory()) {
|
|
21
24
|
ret[relName] = {
|
|
22
25
|
type: 'set',
|
|
23
26
|
sources: await loadPatchSet(fullFile, sourceDirectory),
|
|
@@ -236,4 +239,4 @@ if (require.main === module) {
|
|
|
236
239
|
console.error(e.message);
|
|
237
240
|
});
|
|
238
241
|
}
|
|
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.slice(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"]}
|
|
242
|
+
//# 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 (file.startsWith('.')) {\n      // Nothing, ignore\n    } else 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.slice(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"]}
|
|
@@ -2,10 +2,16 @@
|
|
|
2
2
|
/* eslint-disable no-console */
|
|
3
3
|
/**
|
|
4
4
|
* Report on spec fragment files that are being held back.
|
|
5
|
+
*
|
|
6
|
+
* Report formats:
|
|
7
|
+
*
|
|
8
|
+
* - 'outdated'/'changelog': print for changelog format
|
|
9
|
+
* - 'rejected': print validation errors, exit with error code 1 if there are any
|
|
5
10
|
*/
|
|
6
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
12
|
const path = require("path");
|
|
8
13
|
const fs = require("fs-extra");
|
|
14
|
+
const validate_cfn_1 = require("./validate-cfn");
|
|
9
15
|
async function main(args) {
|
|
10
16
|
if (args.length < 2) {
|
|
11
17
|
throw new Error('Usage: report-issues <DIR> <FORMAT>');
|
|
@@ -19,18 +25,40 @@ async function main(args) {
|
|
|
19
25
|
}
|
|
20
26
|
const json = await fs.readJson(path.join(dir, file));
|
|
21
27
|
const fragmentVersion = json.$version;
|
|
28
|
+
const serviceName = file.replace(/^000_/, '').replace(/\.json$/, '').replace('_', '::');
|
|
22
29
|
switch (format) {
|
|
23
30
|
case 'outdated':
|
|
31
|
+
case 'changelog':
|
|
24
32
|
if (fragmentVersion !== officialVersion) {
|
|
25
33
|
if (!headerPrinted) {
|
|
26
34
|
console.log('## Unapplied changes');
|
|
27
35
|
console.log('');
|
|
28
36
|
headerPrinted = true;
|
|
29
37
|
}
|
|
30
|
-
const serviceName = file.replace(/^000_/, '').replace(/\.json$/, '').replace('_', '::');
|
|
31
38
|
console.log(`* ${serviceName} is at ${fragmentVersion}`);
|
|
32
39
|
}
|
|
33
40
|
break;
|
|
41
|
+
case 'rejected':
|
|
42
|
+
if (fragmentVersion !== officialVersion) {
|
|
43
|
+
// Read the 'rejected' file, parse it (which we expect to fail)
|
|
44
|
+
// and print the failures.
|
|
45
|
+
const rejectedFileName = `.${file.replace(/.json$/, '.rejected.json')}`;
|
|
46
|
+
const rejectedPath = path.join(dir, rejectedFileName);
|
|
47
|
+
if (!await fs.pathExists(rejectedPath)) {
|
|
48
|
+
// If for whatever reason the file doesn't exist, ignore
|
|
49
|
+
continue;
|
|
50
|
+
}
|
|
51
|
+
const rejectedSpec = await fs.readJson(rejectedPath);
|
|
52
|
+
const errors = validate_cfn_1.CfnSpecValidator.validate(rejectedSpec);
|
|
53
|
+
console.warn('='.repeat(70));
|
|
54
|
+
console.warn(' '.repeat(Math.floor(35 - serviceName.length / 2)) + serviceName);
|
|
55
|
+
console.warn('='.repeat(70));
|
|
56
|
+
for (const error of errors) {
|
|
57
|
+
console.warn(validate_cfn_1.formatErrorInContext(error));
|
|
58
|
+
process.exitCode = 1;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
break;
|
|
34
62
|
default:
|
|
35
63
|
throw new Error(`Unknown format type requested: ${format}`);
|
|
36
64
|
}
|
|
@@ -41,4 +69,4 @@ main(process.argv.slice(2)).catch(e => {
|
|
|
41
69
|
console.error(e);
|
|
42
70
|
process.exitCode = 1;
|
|
43
71
|
});
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0LWlzc3Vlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInJlcG9ydC1pc3N1ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLCtCQUErQjtBQUMvQjs7Ozs7OztHQU9HOztBQUVILDZCQUE2QjtBQUM3QiwrQkFBK0I7QUFDL0IsaURBQXdFO0FBRXhFLEtBQUssVUFBVSxJQUFJLENBQUMsSUFBYztJQUNoQyxJQUFJLElBQUksQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1FBQ25CLE1BQU0sSUFBSSxLQUFLLENBQUMscUNBQXFDLENBQUMsQ0FBQztLQUN4RDtJQUVELE1BQU0sQ0FBQyxHQUFHLEVBQUUsTUFBTSxDQUFDLEdBQUcsSUFBSSxDQUFDO0lBRTNCLE1BQU0sZUFBZSxHQUFHLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLGtCQUFrQixDQUFDLENBQUMsQ0FBQyxDQUFDLDRCQUE0QixDQUFDO0lBQzdHLElBQUksYUFBYSxHQUFHLEtBQUssQ0FBQztJQUUxQixLQUFLLE1BQU0sSUFBSSxJQUFJLE1BQU0sRUFBRSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRTtRQUN4QyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsRUFBRTtZQUM1QixTQUFTO1NBQ1Y7UUFFRCxNQUFNLElBQUksR0FBRyxNQUFNLEVBQUUsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUNyRCxNQUFNLGVBQWUsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDO1FBQ3RDLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUV4RixRQUFRLE1BQU0sRUFBRTtZQUNkLEtBQUssVUFBVSxDQUFDO1lBQ2hCLEtBQUssV0FBVztnQkFDZCxJQUFJLGVBQWUsS0FBSyxlQUFlLEVBQUU7b0JBQ3ZDLElBQUksQ0FBQyxhQUFhLEVBQUU7d0JBQ2xCLE9BQU8sQ0FBQyxHQUFHLENBQUMsc0JBQXNCLENBQUMsQ0FBQzt3QkFDcEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQzt3QkFDaEIsYUFBYSxHQUFHLElBQUksQ0FBQztxQkFDdEI7b0JBQ0QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLFdBQVcsVUFBVSxlQUFlLEVBQUUsQ0FBQyxDQUFDO2lCQUMxRDtnQkFDRCxNQUFNO1lBRVIsS0FBSyxVQUFVO2dCQUNiLElBQUksZUFBZSxLQUFLLGVBQWUsRUFBRTtvQkFDdkMsK0RBQStEO29CQUMvRCwwQkFBMEI7b0JBQzFCLE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxJQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLENBQUM7b0JBQ3hFLE1BQU0sWUFBWSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLGdCQUFnQixDQUFDLENBQUM7b0JBQ3RELElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxVQUFVLENBQUMsWUFBWSxDQUFDLEVBQUU7d0JBQ3RDLHdEQUF3RDt3QkFDeEQsU0FBUztxQkFDVjtvQkFDRCxNQUFNLFlBQVksR0FBRyxNQUFNLEVBQUUsQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLENBQUM7b0JBRXJELE1BQU0sTUFBTSxHQUFHLCtCQUFnQixDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsQ0FBQztvQkFFdkQsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7b0JBQzdCLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUUsR0FBRyxXQUFXLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLEdBQUcsV0FBVyxDQUFDLENBQUM7b0JBQ2hGLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO29CQUM3QixLQUFLLE1BQU0sS0FBSyxJQUFJLE1BQU0sRUFBRTt3QkFDMUIsT0FBTyxDQUFDLElBQUksQ0FBQyxtQ0FBb0IsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO3dCQUMxQyxPQUFPLENBQUMsUUFBUSxHQUFHLENBQUMsQ0FBQztxQkFDdEI7aUJBQ0Y7Z0JBQ0QsTUFBTTtZQUVSO2dCQUNFLE1BQU0sSUFBSSxLQUFLLENBQUMsa0NBQWtDLE1BQU0sRUFBRSxDQUFDLENBQUM7U0FDL0Q7S0FDRjtBQUNILENBQUM7QUFFRCxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUU7SUFDcEMsc0NBQXNDO0lBQ3RDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDakIsT0FBTyxDQUFDLFFBQVEsR0FBRyxDQUFDLENBQUM7QUFDdkIsQ0FBQyxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKiBlc2xpbnQtZGlzYWJsZSBuby1jb25zb2xlICovXG4vKipcbiAqIFJlcG9ydCBvbiBzcGVjIGZyYWdtZW50IGZpbGVzIHRoYXQgYXJlIGJlaW5nIGhlbGQgYmFjay5cbiAqXG4gKiBSZXBvcnQgZm9ybWF0czpcbiAqXG4gKiAtICdvdXRkYXRlZCcvJ2NoYW5nZWxvZyc6IHByaW50IGZvciBjaGFuZ2Vsb2cgZm9ybWF0XG4gKiAtICdyZWplY3RlZCc6IHByaW50IHZhbGlkYXRpb24gZXJyb3JzLCBleGl0IHdpdGggZXJyb3IgY29kZSAxIGlmIHRoZXJlIGFyZSBhbnlcbiAqL1xuXG5pbXBvcnQgKiBhcyBwYXRoIGZyb20gJ3BhdGgnO1xuaW1wb3J0ICogYXMgZnMgZnJvbSAnZnMtZXh0cmEnO1xuaW1wb3J0IHsgQ2ZuU3BlY1ZhbGlkYXRvciwgZm9ybWF0RXJyb3JJbkNvbnRleHQgfSBmcm9tICcuL3ZhbGlkYXRlLWNmbic7XG5cbmFzeW5jIGZ1bmN0aW9uIG1haW4oYXJnczogc3RyaW5nW10pIHtcbiAgaWYgKGFyZ3MubGVuZ3RoIDwgMikge1xuICAgIHRocm93IG5ldyBFcnJvcignVXNhZ2U6IHJlcG9ydC1pc3N1ZXMgPERJUj4gPEZPUk1BVD4nKTtcbiAgfVxuXG4gIGNvbnN0IFtkaXIsIGZvcm1hdF0gPSBhcmdzO1xuXG4gIGNvbnN0IG9mZmljaWFsVmVyc2lvbiA9IChhd2FpdCBmcy5yZWFkSnNvbihwYXRoLmpvaW4oZGlyLCAnMDAxX1ZlcnNpb24uanNvbicpKSkuUmVzb3VyY2VTcGVjaWZpY2F0aW9uVmVyc2lvbjtcbiAgbGV0IGhlYWRlclByaW50ZWQgPSBmYWxzZTtcblxuICBmb3IgKGNvbnN0IGZpbGUgb2YgYXdhaXQgZnMucmVhZGRpcihkaXIpKSB7XG4gICAgaWYgKCFmaWxlLnN0YXJ0c1dpdGgoJzAwMF8nKSkge1xuICAgICAgY29udGludWU7XG4gICAgfVxuXG4gICAgY29uc3QganNvbiA9IGF3YWl0IGZzLnJlYWRKc29uKHBhdGguam9pbihkaXIsIGZpbGUpKTtcbiAgICBjb25zdCBmcmFnbWVudFZlcnNpb24gPSBqc29uLiR2ZXJzaW9uO1xuICAgIGNvbnN0IHNlcnZpY2VOYW1lID0gZmlsZS5yZXBsYWNlKC9eMDAwXy8sICcnKS5yZXBsYWNlKC9cXC5qc29uJC8sICcnKS5yZXBsYWNlKCdfJywgJzo6Jyk7XG5cbiAgICBzd2l0Y2ggKGZvcm1hdCkge1xuICAgICAgY2FzZSAnb3V0ZGF0ZWQnOlxuICAgICAgY2FzZSAnY2hhbmdlbG9nJzpcbiAgICAgICAgaWYgKGZyYWdtZW50VmVyc2lvbiAhPT0gb2ZmaWNpYWxWZXJzaW9uKSB7XG4gICAgICAgICAgaWYgKCFoZWFkZXJQcmludGVkKSB7XG4gICAgICAgICAgICBjb25zb2xlLmxvZygnIyMgVW5hcHBsaWVkIGNoYW5nZXMnKTtcbiAgICAgICAgICAgIGNvbnNvbGUubG9nKCcnKTtcbiAgICAgICAgICAgIGhlYWRlclByaW50ZWQgPSB0cnVlO1xuICAgICAgICAgIH1cbiAgICAgICAgICBjb25zb2xlLmxvZyhgKiAke3NlcnZpY2VOYW1lfSBpcyBhdCAke2ZyYWdtZW50VmVyc2lvbn1gKTtcbiAgICAgICAgfVxuICAgICAgICBicmVhaztcblxuICAgICAgY2FzZSAncmVqZWN0ZWQnOlxuICAgICAgICBpZiAoZnJhZ21lbnRWZXJzaW9uICE9PSBvZmZpY2lhbFZlcnNpb24pIHtcbiAgICAgICAgICAvLyBSZWFkIHRoZSAncmVqZWN0ZWQnIGZpbGUsIHBhcnNlIGl0ICh3aGljaCB3ZSBleHBlY3QgdG8gZmFpbClcbiAgICAgICAgICAvLyBhbmQgcHJpbnQgdGhlIGZhaWx1cmVzLlxuICAgICAgICAgIGNvbnN0IHJlamVjdGVkRmlsZU5hbWUgPSBgLiR7ZmlsZS5yZXBsYWNlKC8uanNvbiQvLCAnLnJlamVjdGVkLmpzb24nKX1gO1xuICAgICAgICAgIGNvbnN0IHJlamVjdGVkUGF0aCA9IHBhdGguam9pbihkaXIsIHJlamVjdGVkRmlsZU5hbWUpO1xuICAgICAgICAgIGlmICghYXdhaXQgZnMucGF0aEV4aXN0cyhyZWplY3RlZFBhdGgpKSB7XG4gICAgICAgICAgICAvLyBJZiBmb3Igd2hhdGV2ZXIgcmVhc29uIHRoZSBmaWxlIGRvZXNuJ3QgZXhpc3QsIGlnbm9yZVxuICAgICAgICAgICAgY29udGludWU7XG4gICAgICAgICAgfVxuICAgICAgICAgIGNvbnN0IHJlamVjdGVkU3BlYyA9IGF3YWl0IGZzLnJlYWRKc29uKHJlamVjdGVkUGF0aCk7XG5cbiAgICAgICAgICBjb25zdCBlcnJvcnMgPSBDZm5TcGVjVmFsaWRhdG9yLnZhbGlkYXRlKHJlamVjdGVkU3BlYyk7XG5cbiAgICAgICAgICBjb25zb2xlLndhcm4oJz0nLnJlcGVhdCg3MCkpO1xuICAgICAgICAgIGNvbnNvbGUud2FybignICcucmVwZWF0KE1hdGguZmxvb3IoMzUgLSBzZXJ2aWNlTmFtZS5sZW5ndGggLyAyKSkgKyBzZXJ2aWNlTmFtZSk7XG4gICAgICAgICAgY29uc29sZS53YXJuKCc9Jy5yZXBlYXQoNzApKTtcbiAgICAgICAgICBmb3IgKGNvbnN0IGVycm9yIG9mIGVycm9ycykge1xuICAgICAgICAgICAgY29uc29sZS53YXJuKGZvcm1hdEVycm9ySW5Db250ZXh0KGVycm9yKSk7XG4gICAgICAgICAgICBwcm9jZXNzLmV4aXRDb2RlID0gMTtcbiAgICAgICAgICB9XG4gICAgICAgIH1cbiAgICAgICAgYnJlYWs7XG5cbiAgICAgIGRlZmF1bHQ6XG4gICAgICAgIHRocm93IG5ldyBFcnJvcihgVW5rbm93biBmb3JtYXQgdHlwZSByZXF1ZXN0ZWQ6ICR7Zm9ybWF0fWApO1xuICAgIH1cbiAgfVxufVxuXG5tYWluKHByb2Nlc3MuYXJndi5zbGljZSgyKSkuY2F0Y2goZSA9PiB7XG4gIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBuby1jb25zb2xlXG4gIGNvbnNvbGUuZXJyb3IoZSk7XG4gIHByb2Nlc3MuZXhpdENvZGUgPSAxO1xufSk7Il19
|
|
@@ -38,6 +38,8 @@ async function main(args) {
|
|
|
38
38
|
// Write out
|
|
39
39
|
log('Writing');
|
|
40
40
|
for (const [svcName, svcSpec] of Object.entries(byService)) {
|
|
41
|
+
const successTarget = path.join(outDir, `000_${svcName}.json`);
|
|
42
|
+
const rejectedTarget = path.join(outDir, `.000_${svcName}.rejected.json`);
|
|
41
43
|
const errors = !process.env.NO_VALIDATE ? validate_cfn_1.CfnSpecValidator.validate(svcSpec) : [];
|
|
42
44
|
if (errors.length === 0) {
|
|
43
45
|
// Change 'ResourceSpecificationVersion' to '$version', otherwise they will all conflict
|
|
@@ -46,7 +48,8 @@ async function main(args) {
|
|
|
46
48
|
ResourceTypes: svcSpec.ResourceTypes,
|
|
47
49
|
$version: svcSpec.ResourceSpecificationVersion,
|
|
48
50
|
};
|
|
49
|
-
await patch_set_1.writeSorted(
|
|
51
|
+
await patch_set_1.writeSorted(successTarget, toWrite);
|
|
52
|
+
await ensureGone(rejectedTarget);
|
|
50
53
|
}
|
|
51
54
|
else {
|
|
52
55
|
console.warn('='.repeat(70));
|
|
@@ -55,6 +58,16 @@ async function main(args) {
|
|
|
55
58
|
for (const error of errors) {
|
|
56
59
|
console.warn(validate_cfn_1.formatErrorInContext(error));
|
|
57
60
|
}
|
|
61
|
+
await patch_set_1.writeSorted(rejectedTarget, svcSpec);
|
|
62
|
+
// Make sure that the success file exists. If not, the initial import of a
|
|
63
|
+
// new service failed.
|
|
64
|
+
if (!await fs.pathExists(successTarget)) {
|
|
65
|
+
await patch_set_1.writeSorted(successTarget, {
|
|
66
|
+
PropertyTypes: {},
|
|
67
|
+
ResourceTypes: {},
|
|
68
|
+
$version: '0.0.0',
|
|
69
|
+
});
|
|
70
|
+
}
|
|
58
71
|
}
|
|
59
72
|
}
|
|
60
73
|
await fs.writeJson(path.join(outDir, '001_Version.json'), {
|
|
@@ -71,6 +84,17 @@ async function main(args) {
|
|
|
71
84
|
return byService[svcName];
|
|
72
85
|
}
|
|
73
86
|
}
|
|
87
|
+
async function ensureGone(fileName) {
|
|
88
|
+
try {
|
|
89
|
+
await fs.unlink(fileName);
|
|
90
|
+
}
|
|
91
|
+
catch (e) {
|
|
92
|
+
if (e.code === 'ENOENT') {
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
95
|
+
throw e;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
74
98
|
function serviceName(x) {
|
|
75
99
|
return x.split('::').slice(0, 2).join('_');
|
|
76
100
|
}
|
|
@@ -83,4 +107,4 @@ main(process.argv.slice(2)).catch(e => {
|
|
|
83
107
|
console.error(e);
|
|
84
108
|
process.exitCode = 1;
|
|
85
109
|
});
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
110
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"split-spec-by-service.js","sourceRoot":"","sources":["split-spec-by-service.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable no-console */\n/**\n * Split the given CloudFormation resource specification up into a patch set, by service\n *\n * After splitting, only write out those fragments that are valid.(*)\n *\n * The reason for this is that some service updates sometimes contain mistakes,\n * and we want to be able to take partial upgrades. By splitting the spec, we can\n * take updates to some services while leaving updates to other services behind.\n *\n * (*) If `NO_VALIDATE` is set, all pieces are written out. In normal operation this\n *     should not be used.\n */\nimport * as path from 'path';\nimport * as fs from 'fs-extra';\n\nimport { writeSorted } from './patch-set';\nimport { CfnSpec, CfnSpecValidator, formatErrorInContext } from './validate-cfn';\n\nasync function main(args: string[]) {\n  if (args.length < 2) {\n    throw new Error('Usage: split-spec-by-service <SPECFILE> <DIRECTORY>');\n  }\n\n  const [specFile, outDir] = args;\n  log(`Loading specification: ${specFile}`);\n  const spec: CfnSpec = await fs.readJson(specFile);\n\n  // Split\n  log('Splitting');\n  const byService: Record<string, CfnSpec> = {};\n  for (const [propTypeName, propType] of Object.entries(spec.PropertyTypes)) {\n    const svcName = serviceName(propTypeName);\n    serviceSpec(svcName).PropertyTypes[propTypeName] = propType;\n  }\n  for (const [resTypeName, resType] of Object.entries(spec.ResourceTypes)) {\n    const svcName = serviceName(resTypeName);\n    serviceSpec(svcName).ResourceTypes[resTypeName] = resType;\n  }\n\n  // Write out\n  log('Writing');\n  for (const [svcName, svcSpec] of Object.entries(byService)) {\n    const successTarget = path.join(outDir, `000_${svcName}.json`);\n    const rejectedTarget = path.join(outDir, `.000_${svcName}.rejected.json`);\n\n    const errors = !process.env.NO_VALIDATE ? CfnSpecValidator.validate(svcSpec) : [];\n    if (errors.length === 0) {\n      // Change 'ResourceSpecificationVersion' to '$version', otherwise they will all conflict\n      const toWrite = {\n        PropertyTypes: svcSpec.PropertyTypes,\n        ResourceTypes: svcSpec.ResourceTypes,\n        $version: svcSpec.ResourceSpecificationVersion,\n      };\n\n      await writeSorted(successTarget, toWrite);\n      await ensureGone(rejectedTarget);\n    } else {\n      console.warn('='.repeat(70));\n      console.warn(' '.repeat(Math.floor(35 - svcName.length / 2)) + svcName);\n      console.warn('='.repeat(70));\n      for (const error of errors) {\n        console.warn(formatErrorInContext(error));\n      }\n\n      await writeSorted(rejectedTarget, svcSpec);\n\n      // Make sure that the success file exists. If not, the initial import of a\n      // new service failed.\n      if (!await fs.pathExists(successTarget)) {\n        await writeSorted(successTarget, {\n          PropertyTypes: {},\n          ResourceTypes: {},\n          $version: '0.0.0',\n        });\n      }\n    }\n  }\n  await fs.writeJson(path.join(outDir, '001_Version.json'), {\n    ResourceSpecificationVersion: spec.ResourceSpecificationVersion,\n  }, { spaces: 2 });\n\n  function serviceSpec(svcName: string) {\n    if (!(svcName in byService)) {\n      byService[svcName] = {\n        PropertyTypes: {},\n        ResourceTypes: {},\n        ResourceSpecificationVersion: spec.ResourceSpecificationVersion,\n      };\n    }\n    return byService[svcName];\n  }\n}\n\nasync function ensureGone(fileName: string) {\n  try {\n    await fs.unlink(fileName);\n  } catch (e) {\n    if (e.code === 'ENOENT') { return; }\n    throw e;\n  }\n}\n\nfunction serviceName(x: string) {\n  return x.split('::').slice(0, 2).join('_');\n}\n\nfunction log(x: string) {\n  // eslint-disable-next-line no-console\n  console.log(x);\n}\n\nmain(process.argv.slice(2)).catch(e => {\n  // eslint-disable-next-line no-console\n  console.error(e);\n  process.exitCode = 1;\n});\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
81.
|
|
1
|
+
81.1.0
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-cdk/cfnspec",
|
|
3
3
|
"description": "The CloudFormation resource specification used by @aws-cdk packages",
|
|
4
|
-
"version": "2.
|
|
4
|
+
"version": "2.34.2",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"update": "cdk-build && /bin/bash build-tools/update.sh && /bin/bash build-tools/update-cfnlint.sh",
|
|
7
7
|
"update-metrics": "/bin/bash build-tools/update-metrics.sh",
|
|
8
|
+
"rejected": "node build-tools/report-issues.js spec-source/specification/000_cfn/000_official/ rejected",
|
|
8
9
|
"build": "cdk-build && node build-tools/build",
|
|
9
10
|
"watch": "cdk-watch",
|
|
10
11
|
"lint": "cdk-lint",
|
|
@@ -29,8 +30,8 @@
|
|
|
29
30
|
"main": "lib/index.js",
|
|
30
31
|
"types": "lib/index.d.ts",
|
|
31
32
|
"devDependencies": {
|
|
32
|
-
"@aws-cdk/cdk-build-tools": "2.
|
|
33
|
-
"@aws-cdk/pkglint": "2.
|
|
33
|
+
"@aws-cdk/cdk-build-tools": "2.34.2",
|
|
34
|
+
"@aws-cdk/pkglint": "2.34.2",
|
|
34
35
|
"@types/fs-extra": "^8.1.2",
|
|
35
36
|
"@types/jest": "^27.5.2",
|
|
36
37
|
"@types/md5": "^2.3.2",
|