From cd2ea7e5e14baf6ee40859a2c46c3b8e5d904249 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Mon, 16 Oct 2023 10:43:00 -0400 Subject: [PATCH 1/3] Update jsonschema to newer version Signed-off-by: Andrew W. Harn --- .gitignore | 1 + npm-shrinkwrap.json | 8 ++++---- packages/imperative/package.json | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1f961765b6..c7366a4e4f 100644 --- a/.gitignore +++ b/.gitignore @@ -102,6 +102,7 @@ imperative_debug.log # Licenses in package folders (managed with build scripts) packages/*/LICENSE zowex/ +packages/secrets/ # Browserified bundles and compiled JS for web help packages/imperative/web-help/dist/css/bundle* diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 7b2e7efa92..f525b75d38 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -21430,9 +21430,9 @@ ] }, "node_modules/jsonschema": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.1.1.tgz", - "integrity": "sha512-kHyDK+K6ehb+0LmJYzsQSd3QkRPDEPoG/59uhNzFTLVb92J9jYPaonLkzJe+Z4angkIhDeurMmvhtmjAVrz9eA==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz", + "integrity": "sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==", "engines": { "node": "*" } @@ -31467,7 +31467,7 @@ "glob": "7.1.6", "js-yaml": "3.14.1", "jsonfile": "4.0.0", - "jsonschema": "1.1.1", + "jsonschema": "1.4.1", "lodash-deep": "2.0.0", "log4js": "6.4.0", "markdown-it": "12.3.2", diff --git a/packages/imperative/package.json b/packages/imperative/package.json index ea0b4a6308..fa19a73218 100644 --- a/packages/imperative/package.json +++ b/packages/imperative/package.json @@ -55,7 +55,7 @@ "glob": "7.1.6", "js-yaml": "3.14.1", "jsonfile": "4.0.0", - "jsonschema": "1.1.1", + "jsonschema": "1.4.1", "lodash-deep": "2.0.0", "log4js": "6.4.0", "markdown-it": "12.3.2", From 00ca6e1231ed651632b75c287938cbdf52a79a43 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Mon, 16 Oct 2023 10:57:20 -0400 Subject: [PATCH 2/3] Also update mustache Signed-off-by: Andrew W. Harn --- npm-shrinkwrap.json | 8 ++++---- packages/imperative/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index f525b75d38..b189099536 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -23820,9 +23820,9 @@ } }, "node_modules/mustache": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz", - "integrity": "sha512-IgZ/cCHtDG1ft0vdDV9wrlNz20SvbUu2ECoDF6dhk2ZtedLNy1Kehy4oFlzmHPxcUQmVZuXYS2j+d0NkaEjTXQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/mustache/-/mustache-2.3.2.tgz", + "integrity": "sha512-KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ==", "bin": { "mustache": "bin/mustache" }, @@ -31471,7 +31471,7 @@ "lodash-deep": "2.0.0", "log4js": "6.4.0", "markdown-it": "12.3.2", - "mustache": "2.3.0", + "mustache": "2.3.2", "npm-package-arg": "8.1.1", "opener": "1.5.2", "pacote": "11.1.4", diff --git a/packages/imperative/package.json b/packages/imperative/package.json index fa19a73218..337947dcde 100644 --- a/packages/imperative/package.json +++ b/packages/imperative/package.json @@ -59,7 +59,7 @@ "lodash-deep": "2.0.0", "log4js": "6.4.0", "markdown-it": "12.3.2", - "mustache": "2.3.0", + "mustache": "2.3.2", "npm-package-arg": "8.1.1", "opener": "1.5.2", "pacote": "11.1.4", From e5872059817733a618f97ec3517d6c4927045e9f Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Mon, 16 Oct 2023 11:31:49 -0400 Subject: [PATCH 3/3] Update broken snapshots Signed-off-by: Andrew W. Harn --- .../__snapshots__/BasicProfileManager.save.unit.test.ts.snap | 2 +- .../BasicProfileManager.validate.unit.test.ts.snap | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.save.unit.test.ts.snap b/packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.save.unit.test.ts.snap index bdd9d9b307..950e4aadfa 100644 --- a/packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.save.unit.test.ts.snap +++ b/packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.save.unit.test.ts.snap @@ -61,7 +61,7 @@ exports[`Basic Profile Manager Save should detect that the dependencies are pres exports[`Basic Profile Manager Save should fail a save request if a profile has more properties than defined on the schema 1`] = ` "Errors located in profile \\"tasty_apple\\" of type \\"apple\\": -profile additionalProperty \\"seedless\\" exists in instance when not allowed +profile is not allowed to have the additional property \\"seedless\\" " `; diff --git a/packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.validate.unit.test.ts.snap b/packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.validate.unit.test.ts.snap index 5d2a6372ff..0b4000e40e 100644 --- a/packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.validate.unit.test.ts.snap +++ b/packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.validate.unit.test.ts.snap @@ -35,7 +35,7 @@ exports[`Basic Profile Manager Validate should detect undefined parms 1`] = `"Ex exports[`Basic Profile Manager Validate should fail a save request if a profile has more properties than defined on the schema 1`] = ` "Errors located in profile \\"good_apple\\" of type \\"apple\\": -profile additionalProperty \\"seedless\\" exists in instance when not allowed +profile is not allowed to have the additional property \\"seedless\\" " `;