diff --git a/.changeset/green-mangos-pretend.md b/.changeset/green-mangos-pretend.md new file mode 100644 index 00000000..034f6571 --- /dev/null +++ b/.changeset/green-mangos-pretend.md @@ -0,0 +1,5 @@ +--- +"@smartthings/cli": minor +--- + +add support for listing Schema apps by organization diff --git a/package-lock.json b/package-lock.json index faa1d410..c4337f75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4984,12 +4984,13 @@ "link": true }, "node_modules/@smartthings/core-sdk": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/@smartthings/core-sdk/-/core-sdk-8.1.2.tgz", - "integrity": "sha512-itj2uTj0CAM/s7YGBNdXnZ/9DqM1byYBBRCue9RFwmAqhNz+msEYPqve8MwGiopmCnsXjE5+E4bT+efBhpNIew==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@smartthings/core-sdk/-/core-sdk-8.2.0.tgz", + "integrity": "sha512-qKhSQOIKfSj8eUWu6eAXdgjy5S4/ih8lMx8kLbH4YJy483OaIDwsnxVm2LQkIQh3XcuwGkuEdjPfod7vvctxaQ==", + "license": "Apache-2.0", "dependencies": { "async-mutex": "^0.4.0", - "axios": "^0.27.2", + "axios": "^0.28.1", "http-signature": "^1.3.6", "lodash.isdate": "^4.0.1", "lodash.isstring": "^4.0.1", @@ -5000,15 +5001,6 @@ "node": ">=14" } }, - "node_modules/@smartthings/core-sdk/node_modules/axios": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", - "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", - "dependencies": { - "follow-redirects": "^1.14.9", - "form-data": "^4.0.0" - } - }, "node_modules/@smartthings/core-sdk/node_modules/qs": { "version": "6.11.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", @@ -6163,9 +6155,10 @@ "dev": true }, "node_modules/axios": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.28.0.tgz", - "integrity": "sha512-Tu7NYoGY4Yoc7I+Npf9HhUMtEEpV7ZiLH9yndTCoNhcpBH0kwcvFbzYN9/u5QKI5A6uefjsNNWaz5olJVYS62Q==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.28.1.tgz", + "integrity": "sha512-iUcGA5a7p0mVb4Gm/sy+FSECNkPFT4y7wt6OM/CDpO/OnNCvSs3PoMG8ibrC9jRoGYU0gUK5pXVC4NPXq6lHRQ==", + "license": "MIT", "dependencies": { "follow-redirects": "^1.15.0", "form-data": "^4.0.0", @@ -20041,7 +20034,7 @@ "@oclif/plugin-not-found": "^2.3.1", "@oclif/plugin-plugins": "^2.1.0", "@smartthings/cli-lib": "^2.2.4", - "@smartthings/core-sdk": "^8.1.2", + "@smartthings/core-sdk": "^8.2.0", "@smartthings/plugin-cli-edge": "^3.3.3", "inquirer": "^8.2.4", "js-yaml": "^4.1.0", @@ -20096,7 +20089,7 @@ "@log4js-node/log4js-api": "^1.0.2", "@oclif/core": "^1.16.3", "@smartthings/cli-lib": "^2.2.4", - "@smartthings/core-sdk": "^8.1.2", + "@smartthings/core-sdk": "^8.2.0", "axios": "^0.28.0", "inquirer": "^8.2.4", "js-yaml": "^4.1.0", @@ -20142,7 +20135,7 @@ "dependencies": { "@log4js-node/log4js-api": "^1.0.2", "@oclif/core": "^1.16.3", - "@smartthings/core-sdk": "^8.1.2", + "@smartthings/core-sdk": "^8.2.0", "@types/eventsource": "^1.1.9", "axios": "^0.28.0", "chalk": "^4.1.2", @@ -20208,7 +20201,7 @@ "license": "Apache-2.0", "dependencies": { "@smartthings/cli-lib": "^2.2.4", - "@smartthings/core-sdk": "^8.1.2" + "@smartthings/core-sdk": "^8.2.0" }, "devDependencies": { "@types/jest": "^28.1.5", @@ -24319,7 +24312,7 @@ "@oclif/plugin-plugins": "^2.1.0", "@smartthings/cli-lib": "^2.2.4", "@smartthings/cli-testlib": "^2.0.6", - "@smartthings/core-sdk": "^8.1.2", + "@smartthings/core-sdk": "^8.2.0", "@smartthings/plugin-cli-edge": "^3.3.3", "@types/inquirer": "^8.2.1", "@types/jest": "^28.1.5", @@ -24360,7 +24353,7 @@ "requires": { "@log4js-node/log4js-api": "^1.0.2", "@oclif/core": "^1.16.3", - "@smartthings/core-sdk": "^8.1.2", + "@smartthings/core-sdk": "^8.2.0", "@types/eventsource": "^1.1.9", "@types/express": "^4.17.13", "@types/inquirer": "^8.2.1", @@ -24414,7 +24407,7 @@ "version": "file:packages/testlib", "requires": { "@smartthings/cli-lib": "^2.2.4", - "@smartthings/core-sdk": "^8.1.2", + "@smartthings/core-sdk": "^8.2.0", "@types/jest": "^28.1.5", "@types/js-yaml": "^4.0.5", "@types/node": "^18.15.11", @@ -24434,12 +24427,12 @@ } }, "@smartthings/core-sdk": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/@smartthings/core-sdk/-/core-sdk-8.1.2.tgz", - "integrity": "sha512-itj2uTj0CAM/s7YGBNdXnZ/9DqM1byYBBRCue9RFwmAqhNz+msEYPqve8MwGiopmCnsXjE5+E4bT+efBhpNIew==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@smartthings/core-sdk/-/core-sdk-8.2.0.tgz", + "integrity": "sha512-qKhSQOIKfSj8eUWu6eAXdgjy5S4/ih8lMx8kLbH4YJy483OaIDwsnxVm2LQkIQh3XcuwGkuEdjPfod7vvctxaQ==", "requires": { "async-mutex": "^0.4.0", - "axios": "^0.27.2", + "axios": "^0.28.1", "http-signature": "^1.3.6", "lodash.isdate": "^4.0.1", "lodash.isstring": "^4.0.1", @@ -24447,15 +24440,6 @@ "sshpk": "^1.17.0" }, "dependencies": { - "axios": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", - "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", - "requires": { - "follow-redirects": "^1.14.9", - "form-data": "^4.0.0" - } - }, "qs": { "version": "6.11.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", @@ -24473,7 +24457,7 @@ "@oclif/core": "^1.16.3", "@smartthings/cli-lib": "^2.2.4", "@smartthings/cli-testlib": "^2.0.6", - "@smartthings/core-sdk": "^8.1.2", + "@smartthings/core-sdk": "^8.2.0", "@types/cli-table": "^0.3.0", "@types/eventsource": "^1.1.8", "@types/inquirer": "^8.2.1", @@ -25436,9 +25420,9 @@ } }, "axios": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.28.0.tgz", - "integrity": "sha512-Tu7NYoGY4Yoc7I+Npf9HhUMtEEpV7ZiLH9yndTCoNhcpBH0kwcvFbzYN9/u5QKI5A6uefjsNNWaz5olJVYS62Q==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.28.1.tgz", + "integrity": "sha512-iUcGA5a7p0mVb4Gm/sy+FSECNkPFT4y7wt6OM/CDpO/OnNCvSs3PoMG8ibrC9jRoGYU0gUK5pXVC4NPXq6lHRQ==", "requires": { "follow-redirects": "^1.15.0", "form-data": "^4.0.0", diff --git a/packages/cli/package.json b/packages/cli/package.json index 827fba55..0512abc4 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -77,7 +77,7 @@ "@oclif/plugin-not-found": "^2.3.1", "@oclif/plugin-plugins": "^2.1.0", "@smartthings/cli-lib": "^2.2.4", - "@smartthings/core-sdk": "^8.1.2", + "@smartthings/core-sdk": "^8.2.0", "@smartthings/plugin-cli-edge": "^3.3.3", "inquirer": "^8.2.4", "js-yaml": "^4.1.0", diff --git a/packages/cli/src/__tests__/commands/schema.test.ts b/packages/cli/src/__tests__/commands/schema.test.ts index 80b724e8..e2c4878a 100644 --- a/packages/cli/src/__tests__/commands/schema.test.ts +++ b/packages/cli/src/__tests__/commands/schema.test.ts @@ -93,6 +93,7 @@ describe('SchemaCommand', () => { await expect(listFunction()).resolves.toStrictEqual([schemaApp]) expect(listSpy).toHaveBeenCalledTimes(1) - expect(listSpy).toHaveBeenCalledWith() + // TODO: when converting to yargs add case for testing with this flag set to true + expect(listSpy).toHaveBeenCalledWith({ includeAllOrganizations: undefined }) }) }) diff --git a/packages/cli/src/commands/schema.ts b/packages/cli/src/commands/schema.ts index 57c96657..d37a92be 100644 --- a/packages/cli/src/commands/schema.ts +++ b/packages/cli/src/commands/schema.ts @@ -55,7 +55,7 @@ export default class SchemaCommand extends APIOrganizationCommand this.client.schema.list(), + () => this.client.schema.list({ includeAllOrganizations: this.flags['all-organizations'] }), id => this.client.schema.get(id), ) } diff --git a/packages/edge/package.json b/packages/edge/package.json index 988c862b..73e2ec26 100644 --- a/packages/edge/package.json +++ b/packages/edge/package.json @@ -48,7 +48,7 @@ "@log4js-node/log4js-api": "^1.0.2", "@oclif/core": "^1.16.3", "@smartthings/cli-lib": "^2.2.4", - "@smartthings/core-sdk": "^8.1.2", + "@smartthings/core-sdk": "^8.2.0", "axios": "^0.28.0", "inquirer": "^8.2.4", "js-yaml": "^4.1.0", diff --git a/packages/lib/package.json b/packages/lib/package.json index 1cddd5a8..c57e863f 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -30,7 +30,7 @@ "dependencies": { "@log4js-node/log4js-api": "^1.0.2", "@oclif/core": "^1.16.3", - "@smartthings/core-sdk": "^8.1.2", + "@smartthings/core-sdk": "^8.2.0", "@types/eventsource": "^1.1.9", "axios": "^0.28.0", "chalk": "^4.1.2", diff --git a/packages/testlib/package.json b/packages/testlib/package.json index 74329712..c770610d 100644 --- a/packages/testlib/package.json +++ b/packages/testlib/package.json @@ -29,7 +29,7 @@ }, "dependencies": { "@smartthings/cli-lib": "^2.2.4", - "@smartthings/core-sdk": "^8.1.2" + "@smartthings/core-sdk": "^8.2.0" }, "devDependencies": { "@types/jest": "^28.1.5",