Merge pull request #72 from cloudgraphdev/fix/nat-gateway-fix

fix(services): fix nat gateway service data

Author: ckoning

src/services/natGateway/format.ts

@@ -1,3 +1,4 @@
+import cuid from 'cuid'
 import { AwsNatGateway } from '../../types/generated'
 import { formatTagsFromMap } from '../../utils/format'
 import { natGatewayArn } from '../../utils/generateArns'
@@ -20,16 +21,27 @@ export default ({
     NatGatewayId: id,
     State: state,
     CreateTime: createTime,
+    NatGatewayAddresses: natGatewayAddresses,
     Tags
   } = rawData
 
+
+  const mappedAddresses = natGatewayAddresses?.map(({ AllocationId, NetworkInterfaceId, PrivateIp, PublicIp }) => ({
+    id: cuid(),
+    allocationId: AllocationId,
+    networkInterfaceId: NetworkInterfaceId,
+    privateIp: PrivateIp,
+    publicIp: PublicIp
+  })) ?? []
+
   return {
     id,
     tags: formatTagsFromMap(Tags),
     accountId: account,
     arn: natGatewayArn({ region, account, id }),
     region,
     state,
+    natGatewayAddresses: mappedAddresses,
     createTime: createTime.toUTCString(),
   }
 }

src/services/natGateway/schema.graphql

@@ -2,8 +2,17 @@ type awsNatGateway implements awsBaseService @key(fields: "id") {
   state: String @search(by: [hash, regexp])
   createTime: String @search(by: [hash, regexp])
   dailyCost: awsTotalBillingInfo
+  natGatewayAddresses: [awsNatGatewayAddress]
   tags: [awsRawTag]
   networkInterface: [awsNetworkInterface] @hasInverse(field: natGateway) #change to plural
   subnet: [awsSubnet] @hasInverse(field: natGateway) #change to plural
   vpc: [awsVpc] @hasInverse(field: natGateways)
 }
+
+type awsNatGatewayAddress {
+  id: String! @id
+  allocationId: String @search(by: [hash, regexp])
+  networkInterfaceId: String @search(by: [hash, regexp])
+  privateIp: String @search(by: [hash, regexp])
+  publicIp: String @search(by: [hash, regexp])
+}

src/types/generated.ts

@@ -3518,13 +3518,22 @@ export type AwsMixedInstancesPolicy = {
 export type AwsNatGateway = AwsBaseService & {
   createTime?: Maybe<Scalars['String']>;
   dailyCost?: Maybe<AwsTotalBillingInfo>;
+  natGatewayAddresses?: Maybe<Array<Maybe<AwsNatGatewayAddress>>>;
   networkInterface?: Maybe<Array<Maybe<AwsNetworkInterface>>>;
   state?: Maybe<Scalars['String']>;
   subnet?: Maybe<Array<Maybe<AwsSubnet>>>;
   tags?: Maybe<Array<Maybe<AwsRawTag>>>;
   vpc?: Maybe<Array<Maybe<AwsVpc>>>;
 };
 
+export type AwsNatGatewayAddress = {
+  allocationId?: Maybe<Scalars['String']>;
+  id: Scalars['String'];
+  networkInterfaceId?: Maybe<Scalars['String']>;
+  privateIp?: Maybe<Scalars['String']>;
+  publicIp?: Maybe<Scalars['String']>;
+};
+
 export type AwsNetworkAcl = AwsBaseService & {
   associatedSubnets?: Maybe<Array<Maybe<AwsNetworkAclAssociatedSubnet>>>;
   default?: Maybe<Scalars['Boolean']>;