Merge pull request #49 from cloudgraphdev/feature/CG-1631

fix: Fixed some duplication issues without destroying data first

Author: tyler-dunkel

src/services/billing/mutation.ts

@@ -1,5 +1,5 @@
 export default `mutation($input: [AddawsBillingInput!]!) {
-  addawsBilling(input: $input) {
+  addawsBilling(input: $input, upsert: true) {
     numUids
   }
-}`
+}`

src/services/billing/schema.graphql

@@ -1,6 +1,4 @@
-type awsBilling {
-  id: String! @id @search(by: [hash])
-  accountId: String! @id @search(by: [hash])
+type awsBilling implements awsOptionalService @key(fields: "id") {
   totalCostMonthToDate: awsTotalBillingInfo
   totalCostLast30Days: awsTotalBillingInfo
   monthToDateDailyAverage: [awsServiceBillingInfo]

src/services/flowLogs/mutation.ts

@@ -1,5 +1,5 @@
 export default `mutation($input: [AddawsFlowLogInput!]!) {
-  addawsFlowLog(input: $input) {
+  addawsFlowLog(input: $input, upsert: true) {
     numUids
   }
 }`

src/services/flowLogs/schema.graphql

@@ -1,4 +1,4 @@
-type awsFlowLog implements awsOptionalService @key(fields: "id") {
+type awsFlowLog implements awsBaseService @key(fields: "arn") {
   creationTime: String @search(by: [hash, regexp])
   deliverLogsErrorMessage: String @search(by: [hash, regexp, fulltext])
   deliverLogsPermissionArn: String @search(by: [hash, regexp])

src/types/generated.ts

@@ -552,9 +552,7 @@ export type AwsBaseService = {
   region?: Maybe<Scalars['String']>;
 };
 
-export type AwsBilling = {
-  accountId: Scalars['String'];
-  id: Scalars['String'];
+export type AwsBilling = AwsOptionalService & {
   last30Days?: Maybe<Array<Maybe<AwsServiceBillingInfo>>>;
   last30DaysDailyAverage?: Maybe<Array<Maybe<AwsServiceBillingInfo>>>;
   monthToDate?: Maybe<Array<Maybe<AwsServiceBillingInfo>>>;
@@ -2872,7 +2870,7 @@ export type AwsFederatedAuthentication = {
   selfServiceSamlProviderArn?: Maybe<Scalars['String']>;
 };
 
-export type AwsFlowLog = AwsOptionalService & {
+export type AwsFlowLog = AwsBaseService & {
   creationTime?: Maybe<Scalars['String']>;
   deliverLogsErrorMessage?: Maybe<Scalars['String']>;
   deliverLogsPermissionArn?: Maybe<Scalars['String']>;