fix: Fixed billing schema fields

Author: Marco Franceschi

src/services/account/connections.ts

@@ -7,12 +7,12 @@ export default ({
   service,
   data,
 }: {
-  service: any
+  service: { id: string; accountId: string; regions: string[] }
   data: Entity[]
 }): {
   [property: string]: ServiceConnection[]
 } => {
-  const { id } = service
+  const { id, accountId } = service
   const connections: ServiceConnection[] = []
   const connectTo = Object.values(services)
 
@@ -25,7 +25,9 @@ export default ({
     })
 
     if (instances?.data) {
-      const filtered = flatMap(instances.data).filter(i => i.accountId === id)
+      const filtered = flatMap(instances.data).filter(
+        i => i.accountId === accountId
+      )
 
       for (const instance of filtered) {
         if (instance) {

src/services/account/schema.graphql

@@ -1,5 +1,6 @@
 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]

src/services/base/enhancers.ts

@@ -4,14 +4,15 @@ import isEmpty from 'lodash/isEmpty'
 import { rawDataInterface } from '.'
 import { regionMap } from '../../enums/regions'
 import services from '../../enums/services'
+import { checkAndMergeConnections } from '../../utils'
 import addAccountConnections from '../account/connections'
 
 /**
  * Data Enhancers
  */
 export interface EnhancerConfig {
   rawData: rawDataInterface[]
-  accounts: { id: string; regions: string[] }[]
+  accounts: { id: string; accountId: string; regions: string[] }[]
   configuredRegions: string
   data: ProviderData
 }
@@ -37,13 +38,12 @@ export const connectAWSServicesToAccount = ({
       ...connections,
     }
   }
-
   return {
     entities: data.entities,
-    connections: {
-      ...data.connections,
-      ...accountsConnections,
-    },
+    connections: checkAndMergeConnections(
+      data.connections,
+      accountsConnections
+    ),
   }
 }
 

src/services/billing/format.ts

@@ -3,10 +3,15 @@ import { AwsBilling } from '../../types/generated'
 
 const formatCostData = (costData: {
   [key: string]: costInterface
-}): { name: string; cost?: number, currency?: string, formattedCost?: string }[] =>
+}): {
+  name: string
+  cost?: number
+  currency?: string
+  formattedCost?: string
+}[] =>
   Object.keys(costData).map(name => ({
     name,
-    ...costData[name]
+    ...costData[name],
   }))
 /**
  * CloudWatch
@@ -29,15 +34,17 @@ export default ({
   const formattedMonthToDate = formatCostData(monthToDate)
   const formattedLast30Days = formatCostData(last30Days)
   const formattedLast30DailyAverage = formatCostData(last30DaysDailyAverage)
-  const formattedMonthToDateDailyAverage = formatCostData(monthToDateDailyAverage)
+  const formattedMonthToDateDailyAverage = formatCostData(
+    monthToDateDailyAverage
+  )
   return {
-    id: account,
-    account,
+    id: `billing:${account}`,
+    accountId: account,
     totalCostMonthToDate,
     totalCostLast30Days,
     monthToDate: formattedMonthToDate,
     last30Days: formattedLast30Days,
     monthToDateDailyAverage: formattedMonthToDateDailyAverage,
-    last30DaysDailyAverage: formattedLast30DailyAverage
+    last30DaysDailyAverage: formattedLast30DailyAverage,
   }
 }

src/services/billing/schema.graphql

@@ -1,7 +1,6 @@
-# TODO: change to accountId
 type awsBilling {
   id: String! @id @search(by: [hash])
-  account: String! @id @search(by: [hash])
+  accountId: String! @id @search(by: [hash])
   totalCostMonthToDate: awsTotalBillingInfo
   totalCostLast30Days: awsTotalBillingInfo
   monthToDateDailyAverage: [awsServiceBillingInfo]
@@ -10,25 +9,25 @@ type awsBilling {
   last30Days: [awsServiceBillingInfo]
 }
 
-type awsServiceBillingInfo 
+type awsServiceBillingInfo
   @generate(
     query: { get: false, query: false, aggregate: false }
     mutation: { add: false, delete: false }
     subscription: false
   ) {
-    name: String! @search(by: [hash])
-    cost: Float @search
-    currency: String @search(by: [hash, regexp])
-    formattedCost: String @search(by: [hash, regexp])
-  }
+  name: String! @search(by: [hash])
+  cost: Float @search
+  currency: String @search(by: [hash, regexp])
+  formattedCost: String @search(by: [hash, regexp])
+}
 
 type awsTotalBillingInfo
   @generate(
     query: { get: false, query: false, aggregate: false }
     mutation: { add: false, delete: false }
     subscription: false
   ) {
-    cost: Float @search
-    currency: String @search(by: [hash, regexp])
-    formattedCost: String @search(by: [hash, regexp])
-  }
+  cost: Float @search
+  currency: String @search(by: [hash, regexp])
+  formattedCost: String @search(by: [hash, regexp])
+}

src/services/index.ts

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

src/types/generated.ts

@@ -129,6 +129,7 @@ export type AwsAccessLogSettings = {
 };
 
 export type AwsAccount = {
+  accountId: Scalars['String'];
   albs?: Maybe<Array<Maybe<AwsAlb>>>;
   apiGatewayResources?: Maybe<Array<Maybe<AwsApiGatewayResource>>>;
   apiGatewayRestApis?: Maybe<Array<Maybe<AwsApiGatewayRestApi>>>;
@@ -556,7 +557,7 @@ export type AwsAthenaMetadataColumn = {
 };
 
 export type AwsBilling = {
-  account: Scalars['String'];
+  accountId: Scalars['String'];
   id: Scalars['String'];
   last30Days?: Maybe<Array<Maybe<AwsServiceBillingInfo>>>;
   last30DaysDailyAverage?: Maybe<Array<Maybe<AwsServiceBillingInfo>>>;