feat: Added sageMakerNotebookInstances field to awsAccount schema

Author: Marco Franceschi

src/enums/serviceAliases.ts

@@ -56,6 +56,7 @@ export default {
   [services.route53Record]: 'route53Records',
   [services.routeTable]: 'routeTables',
   [services.sageMakerExperiment]: 'sageMakerExperiments',
+  [services.sageMakerNotebookInstance]: 'sageMakerNotebookInstances',
   [services.sageMakerProject]: 'sageMakerProjects',
   [services.secretsManager]: 'secretsManager',
   [services.sg]: 'securityGroups',

src/services/account/schema.graphql

@@ -1,6 +1,5 @@
 type awsAccount @key(fields: "id") {
   id: String! @id @search(by: [hash])
-  accountId: String! @search(by: [hash])
   regions: [String] @search(by: [hash])
   albs: [awsAlb]
   apiGatewayResources: [awsApiGatewayResource]
@@ -78,6 +77,7 @@ type awsAccount @key(fields: "id") {
   routeTables: [awsRouteTable]
   s3: [awsS3]
   sageMakerExperiments: [awsSageMakerExperiment]
+  sageMakerNotebookInstances: [awsSageMakerNotebookInstance]
   sageMakerProjects: [awsSageMakerProject]
   secretsManager: [awsSecretsManager]
   securityGroups: [awsSecurityGroup]

src/services/index.ts

@@ -698,8 +698,7 @@ export default class Provider extends CloudGraph.Client {
         }
         const { accountId } = await this.getIdentity(account)
         accounts.data[globalRegion].push({
-          id: `account:${accountId}`,
-          accountId,
+          id: accountId,
           regions: configuredRegions.split(','),
         })
         if (!crawledAccounts.find(val => val === accountId)) {

src/types/generated.ts

@@ -129,7 +129,6 @@ export type AwsAccessLogSettings = {
 };
 
 export type AwsAccount = {
-  accountId: Scalars['String'];
   albs?: Maybe<Array<Maybe<AwsAlb>>>;
   apiGatewayResources?: Maybe<Array<Maybe<AwsApiGatewayResource>>>;
   apiGatewayRestApis?: Maybe<Array<Maybe<AwsApiGatewayRestApi>>>;
@@ -208,6 +207,7 @@ export type AwsAccount = {
   routeTables?: Maybe<Array<Maybe<AwsRouteTable>>>;
   s3?: Maybe<Array<Maybe<AwsS3>>>;
   sageMakerExperiments?: Maybe<Array<Maybe<AwsSageMakerExperiment>>>;
+  sageMakerNotebookInstances?: Maybe<Array<Maybe<AwsSageMakerNotebookInstance>>>;
   sageMakerProjects?: Maybe<Array<Maybe<AwsSageMakerProject>>>;
   secretsManager?: Maybe<Array<Maybe<AwsSecretsManager>>>;
   securityGroups?: Maybe<Array<Maybe<AwsSecurityGroup>>>;