Skip to content

Commit a0712ec

Browse files
authored
Merge pull request #12 from cloudgraphdev/fix/cve-remediations-1
fix: cve vulnerabilities remediations
2 parents e46c023 + ce7dd8f commit a0712ec

File tree

3 files changed

+3288
-4183
lines changed

3 files changed

+3288
-4183
lines changed

package.json

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"terraform:cleanup": "rimraf ./tests/terraform/{.terraform,.terraform.lock.hcl,tfplan} ./tests/terraform/*.{tfstate,tfplan,backup}"
3232
},
3333
"dependencies": {
34-
"@cloudgraph/sdk": "^0.11.0",
34+
"@cloudgraph/sdk": "0.22.1",
3535
"@google-cloud/api-gateway": "^1.2.1",
3636
"@google-cloud/asset": "^3.22.0",
3737
"@google-cloud/bigquery": "^5.10.0",
@@ -52,8 +52,8 @@
5252
"@google-cloud/secret-manager": "^3.10.1",
5353
"@google-cloud/storage": "^5.16.1",
5454
"@google-cloud/vpc-access": "^1.1.2",
55-
"@graphql-tools/load-files": "6.3.2",
56-
"@graphql-tools/merge": "8.0.1",
55+
"@graphql-tools/load-files": "^6.5.3",
56+
"@graphql-tools/merge": "^8.2.3",
5757
"chalk": "4.1.2",
5858
"cuid": "2.1.8",
5959
"dotenv": "10.0.0",
@@ -64,13 +64,13 @@
6464
},
6565
"devDependencies": {
6666
"@autocloud/eslint-config": "^0.1.0",
67-
"@graphql-codegen/cli": "2.4.0",
68-
"@graphql-codegen/typescript": "2.4.2",
67+
"@graphql-codegen/cli": "^2.5.0",
68+
"@graphql-codegen/typescript": "^2.4.3",
6969
"@semantic-release/changelog": "^6.0.1",
7070
"@semantic-release/git": "^10.0.1",
7171
"@semantic-release/github": "^8.0.1",
7272
"@semantic-release/npm": "^9.0.1",
73-
"@types/jest": "^26.0.24",
73+
"@types/jest": "^27.0.0",
7474
"@types/lodash": "^4.14.170",
7575
"@types/node": "^15.12.4",
7676
"@types/node-fetch": "^2.5.5",
@@ -82,18 +82,23 @@
8282
"eslint-config-prettier": "^6.11.0",
8383
"eslint-plugin-import": "^2.22.1",
8484
"eslint-plugin-prettier": "^3.4.0",
85-
"husky": "^7.0.0",
85+
"husky": "^8.0.2",
8686
"jest": "^27.0.6",
8787
"lint-staged": "^11.1.1",
8888
"prettier": "^2.3.2",
8989
"semantic-release": "^19.0.2",
90-
"shx": "^0.3.3",
91-
"ts-jest": "^27.0.4"
90+
"shx": "^0.3.4",
91+
"ts-jest": "^27.1.5"
9292
},
9393
"lint-staged": {
9494
"*.{ts,graphql,json}": [
9595
"yarn lint:fix",
9696
"git add --force"
9797
]
98+
},
99+
"resolutions": {
100+
"**/braces": "^2.3.1",
101+
"**/glob-parent": "^5.1.2",
102+
"**/uri-js": "^3.0.1"
98103
}
99104
}

src/services/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import CloudGraph, {
77
import { loadFilesSync } from '@graphql-tools/load-files'
88
import { mergeTypeDefs } from '@graphql-tools/merge'
99
import chalk from 'chalk'
10-
import { print } from 'graphql'
10+
import { DocumentNode } from 'graphql'
1111
import { isEmpty, merge, unionBy } from 'lodash'
1212
import path from 'path'
1313

@@ -223,12 +223,12 @@ export default class Provider extends CloudGraph.Client {
223223
* getSchema is used to get the schema for provider
224224
* @returns A string of graphql sub schemas
225225
*/
226-
getSchema(): string {
226+
getSchema(): DocumentNode {
227227
const typesArray = loadFilesSync(path.join(__dirname), {
228228
recursive: true,
229229
extensions: ['graphql'],
230230
})
231-
return print(mergeTypeDefs(typesArray))
231+
return mergeTypeDefs(typesArray)
232232
}
233233

234234
/**

0 commit comments

Comments
 (0)