Merge branch 'cdklabs:main' into rds-query

cdklabs · Jan 10, 2025 · eeec756 · eeec756
2 parents c0a0aa7 + f6efde5
commit eeec756
Show file tree

Hide file tree

Showing 8 changed files with 184 additions and 114 deletions.
diff --git a/.projen/deps.json b/.projen/deps.json
diff --git a/.projen/tasks.json b/.projen/tasks.json
diff --git a/.projenrc.ts b/.projenrc.ts
@@ -73,7 +73,12 @@ export const project = new cdk.JsiiProject({
     jestVersion: '29',
   },
   srcdir: 'lib',
-  bundledDeps: ['jsonschema', 'semver'],
+  bundledDeps: [
+    // restricting to minor 4 because of https://github.com/tdegrunt/jsonschema/issues/405
+    // which breaks our canaries on node 16.
+    'jsonschema@~1.4.1',
+    'semver',
+  ],
   description: 'Cloud Assembly Schema',
   devDeps: ['@types/semver', 'mock-fs', 'typescript-json-schema', 'tsx'],
   gitignore: ['.DS_Store', '**/*.d.ts', '**/*.js'],

diff --git a/lib/cloud-assembly/metadata-schema.ts b/lib/cloud-assembly/metadata-schema.ts
@@ -260,14 +260,24 @@ export type LogicalIdMetadataEntry = string;
  */
 export type StackTagsMetadataEntry = Tag[];
 
+/**
+ * Any other type of metadata entry
+ *
+ * This could probably be changed to `any`, but it's safer not
+ * to do so right now.
+ * See https://github.com/cdklabs/cloud-assembly-schema/pull/121.
+ */
+export type PrimitiveType = boolean | number | string;
+
 /**
  * Union type for all metadata entries that might exist in the manifest.
  */
 export type MetadataEntryData =
   | AssetMetadataEntry
   | LogMessageMetadataEntry
   | LogicalIdMetadataEntry
-  | StackTagsMetadataEntry;
+  | StackTagsMetadataEntry
+  | PrimitiveType;
 
 /**
  * Type of artifact metadata entry.

diff --git a/package.json b/package.json
diff --git a/schema/cloud-assembly.schema.json b/schema/cloud-assembly.schema.json
@@ -126,7 +126,11 @@
                             }
                         },
                         {
-                            "type": "string"
+                            "type": [
+                                "string",
+                                "number",
+                                "boolean"
+                            ]
                         },
                         {
                             "description": "Free form data."

diff --git a/schema/version.json b/schema/version.json
@@ -1,4 +1,4 @@
 {
-  "schemaHash": "f0ccc3212331af8a1c75830878d218fd667e5957063831be3b5bfd803b25f0cc",
+  "schemaHash": "bf762e5da559c685e06892ef65fdfc33d1c4bd53d4eb07d4a326d476ac58ae25",
   "revision": 39
 }