From 55e646870e222c90a6218e2701d53ffe864a5c99 Mon Sep 17 00:00:00 2001 From: "mariano.pizarro" Date: Thu, 29 Sep 2022 14:30:02 -0300 Subject: [PATCH 1/3] feat(cli): convert ASTNode to string since now providers return raw schemas instead of strings --- src/commands/scan.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/commands/scan.ts b/src/commands/scan.ts index 2812b4c..08a79f4 100644 --- a/src/commands/scan.ts +++ b/src/commands/scan.ts @@ -3,6 +3,7 @@ import fs from 'fs' import path from 'path' import { Opts, pluginMap, PluginType, ProviderData, StorageEngine } from '@cloudgraph/sdk' import { range } from 'lodash' +import { print } from 'graphql' import Command from './base' import { fileUtils } from '../utils' @@ -217,7 +218,7 @@ export default class Scan extends Command { provider )}` ) - const providerSchema: string = providerClient.getSchema() + const providerSchema: string = print(providerClient.getSchema()) if (!providerSchema) { this.logger.warn(`No schema found for ${provider}, moving on`) continue // eslint-disable-line no-continue From 074b03ef1d1d7e23ccb01c234050741311aee9d6 Mon Sep 17 00:00:00 2001 From: "mariano.pizarro" Date: Tue, 4 Oct 2022 15:30:22 -0300 Subject: [PATCH 2/3] feat(cli): handle provider schema type --- src/commands/scan.ts | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/commands/scan.ts b/src/commands/scan.ts index 08a79f4..bc73701 100644 --- a/src/commands/scan.ts +++ b/src/commands/scan.ts @@ -1,7 +1,13 @@ import chalk from 'chalk' import fs from 'fs' import path from 'path' -import { Opts, pluginMap, PluginType, ProviderData, StorageEngine } from '@cloudgraph/sdk' +import { + Opts, + pluginMap, + PluginType, + ProviderData, + StorageEngine, +} from '@cloudgraph/sdk' import { range } from 'lodash' import { print } from 'graphql' @@ -218,7 +224,11 @@ export default class Scan extends Command { provider )}` ) - const providerSchema: string = print(providerClient.getSchema()) + + const rawSchema = providerClient.getSchema() + const providerSchema: string = + typeof rawSchema === 'object' ? print(rawSchema) : rawSchema + if (!providerSchema) { this.logger.warn(`No schema found for ${provider}, moving on`) continue // eslint-disable-line no-continue @@ -306,7 +316,7 @@ export default class Scan extends Command { isRunning: storageRunning, engine: storageEngine, }, - providerData: allProviderData + providerData: allProviderData, }) } From 1f02b6c743bca6cbbdba982c5980b174ca2624be Mon Sep 17 00:00:00 2001 From: "mariano.pizarro" Date: Tue, 4 Oct 2022 15:53:11 -0300 Subject: [PATCH 3/3] feat(cli): Updated sdk version --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3ec55b3..c8b47a1 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ }, "bugs": "https://github.com/cloudgraphdev/cli/issues", "dependencies": { - "@cloudgraph/sdk": "^0.21.1", + "@cloudgraph/sdk": "^0.22.0", "@graphql-tools/load-files": "^6.3.2", "@graphql-tools/merge": "^8.2.0", "@oclif/core": "1.6.1", diff --git a/yarn.lock b/yarn.lock index 4a5d3a2..eda6de3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -379,10 +379,10 @@ resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cloudgraph/sdk@^0.21.1": - version "0.21.1" - resolved "https://registry.yarnpkg.com/@cloudgraph/sdk/-/sdk-0.21.1.tgz#bb4c0243d73bbc98c4bd0c7d04379e0fac309b2d" - integrity sha512-CHNIwkcfuNXify4nAp3wFYTW7sRGhzTu1haolQmihx+19mEc7WJuGV9wtZBlCIL+bctm8FoIVWDPShKuLHseWA== +"@cloudgraph/sdk@^0.22.0": + version "0.22.0" + resolved "https://registry.yarnpkg.com/@cloudgraph/sdk/-/sdk-0.22.0.tgz#c2a4e817a70ae9b123e0fcd401d55f79e24386ab" + integrity sha512-EJ7vLgrMRh52tOH14TKHgOI62BYy9ZH4WuEhcVr8S8RDnLxBO1XsXOKKjIsE+SmawMBzck8qxiEKttppalhJ8g== dependencies: "@graphql-tools/load-files" "^6.5.3" "@graphql-tools/merge" "^8.2.1"