Merge pull request #101 from cloudgraphdev/alpha

Beta release

Author: hjaraujof

CHANGELOG.md

@@ -1,3 +1,37 @@
+## [0.83.1-alpha.1](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.83.0...0.83.1-alpha.1) (2022-11-28)
+
+
+### Bug Fixes
+
+* cve vulnerabilities remediations ([5cbef35](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/5cbef351ca63d318e9c834028c97b02ec17a269d))
+
+# [0.83.0](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.82.0...0.83.0) (2022-08-26)
+
+
+### Bug Fixes
+
+* add missing statement elements needed for the policy definitions ([f09656b](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/f09656bac77b65e76a5896f024be88e5d3105fbf))
+* **apiGatewayDomainName:** use ISO string in conversion ([04866de](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/04866deb8a74827b1f855cea0dab71c7e30ef5bc))
+* **deps:** update sdk dep ([bc8f98a](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/bc8f98a17f32103ed88ecf1e4e0505f30caff87e))
+* **iamRole:** added iamBoundaryPermissionPolicy relation and inline policies json documents ([3a713f6](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/3a713f66327610f0ae2f3b2200b82f62a6754a08))
+* **iamRole:** iamPermissionsBoundary and inlinePolicies bug fixes ([9923ba3](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/9923ba3ab2da93477a05a689b7db34fdb08b71f5))
+* **iamRole:** replace inlinePolicies id gen method from cuid to generateUniqueId ([15de961](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/15de96133012fc9a8a037f46c1b4cda2627195dc))
+* Optional chaining for last used details ([751a86b](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/751a86b9911a67d916aee7b7e36ab6eb4101f5ba))
+* **performance:** improve tags processing time ([def9b1f](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/def9b1ff63257508d644f562ba1f9cb24f009d66))
+* Released memory usage fix ([1674215](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/16742153c68f37c8ea47548ead3e20fec8586ca6))
+* Released memory usage fix ([b6d242b](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/b6d242b20e2ece71e07874466c21277d47ca18fa))
+* **services:** Added encryption rules data to s3 service ([dde6694](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/dde6694fcb5af38f8919c291454e736620d4fe89))
+* **services:** fix for rds db instance ([5052362](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/5052362387b0ea11a6c6eb842c4b02d904b6b2d9))
+
+
+### Features
+
+* **iamRole:** Add lastUsedDate ([9c7bd36](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/9c7bd36bac04f83482f967e4ac7e990ccdd49f40))
+* Replaced cuid library for generateUniqueId util ([aca3e8f](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/aca3e8f33faf445d71c951a6c327ed9095a76255))
+* Replaced cuid with unique ids for policies ([30ad96c](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/30ad96c771b18adf3084a39b0f5eb5ab8954d923))
+* **service:** Added default encryption kms connection ([a999cf7](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/a999cf71b6db5ae579ef72051d58ac8e2c85d7b8))
+* Solved duplication issues ([896e813](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/896e81371780b2b57b630b112dcd2848735fb423))
+
 # [0.83.0-beta.1](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.82.0...0.83.0-beta.1) (2022-08-26)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudgraph/cg-provider-aws",
-  "version": "0.83.0-beta.1",
+  "version": "0.83.1-alpha.1",
   "description": "cloud-graph provider plugin for AWS used to fetch AWS cloud data.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -31,27 +31,27 @@
     "terraform:cleanup": "rimraf ./tests/terraform/{.terraform,.terraform.lock.hcl,tfplan} ./tests/terraform/*.{tfstate,tfplan,backup}"
   },
   "dependencies": {
-    "@cloudgraph/sdk": "0.20.0",
+    "@cloudgraph/sdk": "^0.22.1",
     "@fast-csv/parse": "^4.3.6",
-    "@graphql-tools/load-files": "6.3.2",
-    "@graphql-tools/merge": "8.0.1",
+    "@graphql-tools/load-files": "^6.5.3",
+    "@graphql-tools/merge": "^8.2.1",
     "aws-sdk": "^2.1084.0",
     "chalk": "4.1.2",
     "cuid": "2.1.8",
     "dotenv": "10.0.0",
-    "graphql": "^15.7.2",
+    "graphql": "^16.2.0",
     "lodash": "4.17.21",
     "typescript": "4.3.5"
   },
   "devDependencies": {
     "@autocloud/eslint-config": "^0.1.0",
-    "@graphql-codegen/cli": "^2.4.0",
-    "@graphql-codegen/typescript": "1.23.0",
+    "@graphql-codegen/cli": "^2.5.0",
+    "@graphql-codegen/typescript": "^2.4.3",
     "@semantic-release/changelog": "^6.0.1",
     "@semantic-release/git": "^10.0.1",
     "@semantic-release/github": "^8.0.1",
     "@semantic-release/npm": "^9.0.1",
-    "@types/jest": "^26.0.24",
+    "@types/jest": "^27.0.0",
     "@types/lodash": "^4.14.170",
     "@types/node": "^15.12.4",
     "@types/pino": "^6.3.8",
@@ -62,18 +62,23 @@
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-prettier": "^3.4.0",
-    "husky": "^7.0.0",
+    "husky": "^8.0.2",
     "jest": "^27.0.6",
     "lint-staged": "^11.1.1",
     "prettier": "^2.3.2",
     "semantic-release": "^19.0.2",
-    "shx": "^0.3.3",
-    "ts-jest": "^27.0.4"
+    "shx": "^0.3.4",
+    "ts-jest": "^27.1.5"
   },
   "lint-staged": {
     "*.{ts,graphql,json}": [
       "yarn lint:fix",
       "git add --force"
     ]
+  },
+  "resolutions": {
+    "**/braces": "^2.3.1",
+    "**/glob-parent": "^5.1.2",
+    "**/uri-js": "^3.0.1"
   }
 }

src/services/index.ts

@@ -8,7 +8,7 @@ import { loadFilesSync } from '@graphql-tools/load-files'
 import { mergeTypeDefs } from '@graphql-tools/merge'
 import AWS, { Config } from 'aws-sdk'
 import chalk from 'chalk'
-import { print } from 'graphql'
+import { DocumentNode } from 'graphql'
 import STS from 'aws-sdk/clients/sts'
 import { isEmpty, merge } from 'lodash'
 import path from 'path'
@@ -438,12 +438,12 @@ export default class Provider extends CloudGraph.Client {
    * getSchema is used to get the schema for provider
    * @returns A string of graphql sub schemas
    */
-  getSchema(): string {
+   getSchema(): DocumentNode {
     const typesArray = loadFilesSync(path.join(__dirname), {
       recursive: true,
       extensions: ['graphql'],
     })
-    return print(mergeTypeDefs(typesArray))
+    return mergeTypeDefs(typesArray)
   }
 
   /**

src/types/generated.ts

@@ -1,4 +1,5 @@
 export type Maybe<T> = T | null;
+export type InputMaybe<T> = Maybe<T>;
 export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
 export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
 export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
@@ -125,8 +126,6 @@ export type AwsStringMap = {
   value?: Maybe<Scalars['String']>;
 };
 
-
-
 export type AwsAccessLogSettings = {
   destinationArn?: Maybe<Scalars['String']>;
   format?: Maybe<Scalars['String']>;