feat: Better error handling for exceptions during enhancer data processing

Author: Marco Franceschi

src/enums/serviceAliases.ts

@@ -14,6 +14,7 @@ export default {
   [services.cloudwatchLog]: 'cloudwatchLogs',
   [services.codebuild]: 'codebuilds',
   [services.configurationRecorder]: 'configurationRecorders',
+  [services.dmsReplicationInstance]: 'dmsReplicationInstances',
   [services.ec2Instance]: 'ec2Instances',
   [services.ecsCluster]: 'ecsClusters',
   [services.ecsContainer]: 'ecsContainers',

src/services/account/schema.graphql

@@ -23,6 +23,7 @@ type awsAccount @key(fields: "id") {
   cognitoUserPool: [awsCognitoUserPool]
   configurationRecorders: [awsConfigurationRecorder]
   customerGateway: [awsCustomerGateway]
+  dmsReplicationInstances: [awsDmsReplicationInstance]
   dynamodb: [awsDynamoDbTable]
   ebs: [awsEbs]
   ec2Instances: [awsEc2]

src/services/base/enhancers.ts

@@ -153,6 +153,6 @@ export const enrichInstanceWithBillingData = ({
 }
 
 export default [
-  { name: 'account', enhancer: connectAWSServicesToAccount },
   { name: 'billing', enhancer: enrichInstanceWithBillingData },
+  { name: 'account', enhancer: connectAWSServicesToAccount },
 ]

src/services/index.ts

@@ -614,7 +614,7 @@ export default class Provider extends CloudGraph.Client {
           `There was an error enriching AWS data with ${name} data`
         )
         this.logger.debug(error)
-        return data
+        return enhanceData
       }
     }
 

src/types/generated.ts

@@ -151,6 +151,7 @@ export type AwsAccount = {
   cognitoUserPool?: Maybe<Array<Maybe<AwsCognitoUserPool>>>;
   configurationRecorders?: Maybe<Array<Maybe<AwsConfigurationRecorder>>>;
   customerGateway?: Maybe<Array<Maybe<AwsCustomerGateway>>>;
+  dmsReplicationInstances?: Maybe<Array<Maybe<AwsDmsReplicationInstance>>>;
   dynamodb?: Maybe<Array<Maybe<AwsDynamoDbTable>>>;
   ebs?: Maybe<Array<Maybe<AwsEbs>>>;
   ec2Instances?: Maybe<Array<Maybe<AwsEc2>>>;