Merge pull request #31 from cloudgraphdev/feature/CG-1073

tyler-dunkel · web-flow · commit e5b48c1450f9 · 2022-04-19T10:05:33.000-05:00
feat (vpc): add elb and nacl connections and pluralize connection fields where appropriate
diff --git a/src/services/alb/schema.graphql b/src/services/alb/schema.graphql
@@ -17,7 +17,7 @@ type awsAlb implements awsBaseService @key(fields: "arn") {
   tags: [awsRawTag]
   securityGroups: [awsSecurityGroup] @hasInverse(field: alb)
   ec2Instance: [awsEc2] @hasInverse(field: alb) #change to plural
-  vpc: [awsVpc] @hasInverse(field: alb)
+  vpc: [awsVpc] @hasInverse(field: albs)
   route53Record: [awsRoute53Record] @hasInverse(field: alb) #change to plural
   listeners: [awsAlbListener]
   subnet: [awsSubnet] @hasInverse(field: alb) #change to plural
diff --git a/src/services/ecsService/schema.graphql b/src/services/ecsService/schema.graphql
@@ -32,7 +32,7 @@ type awsEcsService implements awsBaseService @key(fields: "arn") {
   iamRoles: [awsIamRole] @hasInverse(field: ecsServices)
   securityGroups: [awsSecurityGroup] @hasInverse(field: ecsService)
   subnet: [awsSubnet] @hasInverse(field: ecsService) #change to plural
-  vpc: [awsVpc] @hasInverse(field: ecsService)
+  vpc: [awsVpc] @hasInverse(field: ecsServices)
 }
 
 type awsEcsDeployment
diff --git a/src/services/efsMountTarget/schema.graphql b/src/services/efsMountTarget/schema.graphql
@@ -8,7 +8,7 @@ type awsEfsMountTarget implements awsOptionalService @key(fields: "id") {
   efs: [awsEfs] @hasInverse(field: efsMountTarget)
   networkInterface: [awsNetworkInterface] @hasInverse(field: efsMountTarget) #change to plural
   subnet: [awsSubnet] @hasInverse(field: efsMountTarget) #change to plural
-  vpc: [awsVpc] @hasInverse(field: efsMountTarget)
+  vpc: [awsVpc] @hasInverse(field: efsMountTargets)
 }
 
 # TODO: add an arn if possible
diff --git a/src/services/eip/format.ts b/src/services/eip/format.ts
@@ -41,7 +41,7 @@ export default ({
     accountId: account,
     arn: eipAllocationArn({region, account, id}),
     region,
-    vpc: domain === 'vpc' ? t.yes : t.no,
+    isVpc: domain === 'vpc' ? t.yes : t.no,
     customerOwnedIp,
     customerOwnedIpv4Pool,
     domain,
diff --git a/src/services/eip/schema.graphql b/src/services/eip/schema.graphql
@@ -1,6 +1,6 @@
 type awsEip implements awsBaseService @key(fields: "arn") {
   tags: [awsRawTag]
-  vpc: String @search(by: [hash])
+  isVpc: String @search(by: [hash])
   domain: String @search(by: [hash, regexp])
   publicIp: String @search(by: [hash, regexp])
   privateIp: String @search(by: [hash, regexp])
@@ -12,7 +12,7 @@ type awsEip implements awsBaseService @key(fields: "arn") {
   networkBorderGroup: String @search(by: [hash, regexp])
   customerOwnedIp: String @search(by: [hash])
   customerOwnedIpv4Pool: String @search(by: [hash, regexp])
-  vpcs: [awsVpc] @hasInverse(field: eip) #change to singular
+  vpc: [awsVpc] @hasInverse(field: eips)
   ec2Instance: [awsEc2] @hasInverse(field: eip)
   networkInterface: [awsNetworkInterface] @hasInverse(field: eip)
 }
diff --git a/src/services/eksCluster/schema.graphql b/src/services/eksCluster/schema.graphql
@@ -17,7 +17,7 @@ type awsEksCluster implements awsBaseService @key(fields: "arn") {
   kms: [awsKms] @hasInverse(field: eksCluster)
   securityGroups: [awsSecurityGroup] @hasInverse(field: eksCluster)
   subnets: [awsSubnet] @hasInverse(field: eksCluster)
-  vpc: [awsVpc] @hasInverse(field: eksCluster)
+  vpc: [awsVpc] @hasInverse(field: eksClusters)
   ec2Instances: [awsEc2] @hasInverse(field: eksCluster)
 }
 
diff --git a/src/services/elb/connections.ts b/src/services/elb/connections.ts
@@ -10,6 +10,7 @@ import { SecurityGroup } from 'aws-sdk/clients/ec2'
 
 import services from '../../enums/services'
 import { RawAwsSubnet } from '../subnet/data'
+import { RawAwsVpc } from '../vpc/data'
 import { elbArn } from '../../utils/generateArns'
 
 /**
@@ -77,7 +78,7 @@ export default ({
 
   if (vpcs?.data?.[region]) {
     const vpc = vpcs.data[region].find(
-      ({ VpcId }: SecurityGroup) => VpcId === vpcId
+      ({ VpcId }: RawAwsVpc) => VpcId === vpcId
     )
 
     if (vpc) {
diff --git a/src/services/elb/schema.graphql b/src/services/elb/schema.graphql
@@ -19,7 +19,7 @@ type awsElb implements awsBaseService @key(fields: "arn") {
   tags: [awsRawTag]
   cloudfrontDistribution: [awsCloudfront] @hasInverse(field: elb)
   securityGroups: [awsSecurityGroup] @hasInverse(field: elb)
-  vpc: [awsVpc] @hasInverse(field: elb)
+  vpc: [awsVpc] @hasInverse(field: elbs)
   route53Record: [awsRoute53Record] @hasInverse(field: elb) #change to plural
   subnet: [awsSubnet] @hasInverse(field: elb) #change to plural
   ecsService: [awsEcsService] @hasInverse(field: elb)
diff --git a/src/services/flowLogs/schema.graphql b/src/services/flowLogs/schema.graphql
@@ -12,7 +12,7 @@ type awsFlowLog implements awsOptionalService @key(fields: "id") {
   format: String @search(by: [hash, regexp, fulltext])
   maxAggregationInterval: Int @search
   tags: [awsRawTag]
-  vpc: [awsVpc] @hasInverse(field: flowLogs)
+  vpc: [awsVpc] @hasInverse(field: flowLog)
   iamRole: [awsIamRole] @hasInverse(field: flowLogs)
   networkInterface: [awsNetworkInterface] @hasInverse(field: flowLogs) #change to plural
   subnet: [awsSubnet] @hasInverse(field: flowLogs) #change to plural
diff --git a/src/services/igw/schema.graphql b/src/services/igw/schema.graphql
@@ -2,7 +2,7 @@ type awsIgw implements awsBaseService @key(fields: "arn") {
   owner: String @search(by: [hash, regexp])
   attachments: [awsIgwAttachment]
   tags: [awsRawTag]
-  vpc: [awsVpc] @hasInverse(field: igw)
+  vpc: [awsVpc] @hasInverse(field: igws)
 }
 
 type awsIgwAttachment {
diff --git a/src/services/lambda/schema.graphql b/src/services/lambda/schema.graphql
@@ -18,7 +18,7 @@ type awsLambda implements awsBaseService @key(fields: "arn") {
   kms: [awsKms] @hasInverse(field: lambda)
   securityGroups: [awsSecurityGroup] @hasInverse(field: lambda)
   subnet: [awsSubnet] @hasInverse(field: lambda) #change to plural
-  vpc: [awsVpc] @hasInverse(field: lambda)
+  vpc: [awsVpc] @hasInverse(field: lambdas)
   cognitoUserPools: [awsCognitoUserPool] @hasInverse(field: lambdas)
   appSync: [awsAppSync] @hasInverse(field: lambda)
   s3: [awsS3] @hasInverse(field: lambdas)
diff --git a/src/services/nacl/schema.graphql b/src/services/nacl/schema.graphql
@@ -4,7 +4,7 @@ type awsNetworkAcl implements awsBaseService @key(fields: "id") {
   outboundRules: [awsNetworkAclRule]
   associatedSubnets: [awsNetworkAclAssociatedSubnet]
   tags: [awsRawTag]
-  vpc: [awsVpc] @hasInverse(field: nacl)
+  vpc: [awsVpc] @hasInverse(field: nacls)
   subnets: [awsSubnet] @hasInverse(field: nacls)
   vpcId: String @search(by: [hash, regexp])
 }
diff --git a/src/services/natGateway/schema.graphql b/src/services/natGateway/schema.graphql
@@ -5,5 +5,5 @@ type awsNatGateway implements awsBaseService @key(fields: "id") {
   tags: [awsRawTag]
   networkInterface: [awsNetworkInterface] @hasInverse(field: natGateway) #change to plural
   subnet: [awsSubnet] @hasInverse(field: natGateway) #change to plural
-  vpc: [awsVpc] @hasInverse(field: natGateway)
+  vpc: [awsVpc] @hasInverse(field: natGateways)
 }
diff --git a/src/services/networkInterface/schema.graphql b/src/services/networkInterface/schema.graphql
@@ -15,7 +15,7 @@ type awsNetworkInterface implements awsBaseService @key(fields: "arn") {
   eip: [awsEip] @hasInverse(field: networkInterface)
   natGateway: [awsNatGateway] @hasInverse(field: networkInterface)
   subnet: [awsSubnet] @hasInverse(field: networkInterface)
-  vpc: [awsVpc] @hasInverse(field: networkInterface)
+  vpc: [awsVpc] @hasInverse(field: networkInterfaces)
   efsMountTarget: [awsEfsMountTarget] @hasInverse(field: networkInterface)
   flowLogs: [awsFlowLog] @hasInverse(field: networkInterface) #change to singular
   sageMakerNotebookInstances: [awsSageMakerNotebookInstance]
diff --git a/src/services/rdsDbInstance/schema.graphql b/src/services/rdsDbInstance/schema.graphql
@@ -34,7 +34,7 @@ type awsRdsDbInstance implements awsBaseService @key(fields: "arn") {
   kms: [awsKms] @hasInverse(field: rdsDbInstance)
   securityGroups: [awsSecurityGroup] @hasInverse(field: rdsDbInstance)
   subnet: [awsSubnet] @hasInverse(field: rdsDbInstance)
-  vpc: [awsVpc] @hasInverse(field: rdsDbInstance)
+  vpc: [awsVpc] @hasInverse(field: rdsDbInstances)
   cloudwatchLogs: [awsCloudwatchLog] @hasInverse(field: rdsDbInstance)
   route53HostedZone: [awsRoute53HostedZone] @hasInverse(field: rdsDbInstance)
   iamRoles: [awsIamRole] @hasInverse(field: rdsDbInstance)
diff --git a/src/services/redshift/schema.graphql b/src/services/redshift/schema.graphql
@@ -20,5 +20,5 @@ type awsRedshiftCluster implements awsBaseService @key(fields: "arn") {
   publiclyAccessible: Boolean @search
   tags: [awsRawTag]
   kms: [awsKms] @hasInverse(field: redshiftCluster)
-  vpc: [awsVpc] @hasInverse(field: redshiftCluster)
+  vpc: [awsVpc] @hasInverse(field: redshiftClusters)
 }
diff --git a/src/services/route53HostedZone/schema.graphql b/src/services/route53HostedZone/schema.graphql
@@ -5,6 +5,6 @@ type awsRoute53HostedZone implements awsBaseService @key(fields: "arn") {
   nameServers: [String] @search(by: [hash, regexp])
   rdsCluster: [awsRdsCluster] @hasInverse(field: route53HostedZone)
   route53Record: [awsRoute53Record] @hasInverse(field: route53HostedZone) #change to plural
-  vpc: [awsVpc] @hasInverse(field: route53HostedZone)
+  vpc: [awsVpc] @hasInverse(field: route53HostedZones)
   rdsDbInstance: [awsRdsDbInstance] @hasInverse(field: route53HostedZone)
 }
diff --git a/src/services/routeTable/schema.graphql b/src/services/routeTable/schema.graphql
@@ -6,7 +6,7 @@ type awsRouteTable implements awsBaseService @key(fields: "arn") {
   subnetAssociations: [String]
   tags: [awsRawTag]
   subnet: [awsSubnet] @hasInverse(field: routeTable) #change to plural
-  vpc: [awsVpc] @hasInverse(field: routeTable)
+  vpc: [awsVpc] @hasInverse(field: routeTables)
   transitGateway: [awsTransitGateway] @hasInverse(field: routeTable)
   transitGatewayAttachment: [awsTransitGatewayAttachment]
     @hasInverse(field: routeTable)
diff --git a/src/services/subnet/schema.graphql b/src/services/subnet/schema.graphql
@@ -17,7 +17,7 @@ type awsSubnet implements awsBaseService @key(fields: "id") {
   natGateway: [awsNatGateway] @hasInverse(field: subnet) #change to plural
   networkInterface: [awsNetworkInterface] @hasInverse(field: subnet) #change to plural
   routeTable: [awsRouteTable] @hasInverse(field: subnet)
-  vpc: [awsVpc] @hasInverse(field: subnet)
+  vpc: [awsVpc] @hasInverse(field: subnets)
   rdsDbInstance: [awsRdsDbInstance] @hasInverse(field: subnet) #change to plural
   eksCluster: [awsEksCluster] @hasInverse(field: subnets)
   ecsService: [awsEcsService] @hasInverse(field: subnet) #change to plural
diff --git a/src/services/transitGatewayAttachment/schema.graphql b/src/services/transitGatewayAttachment/schema.graphql
@@ -11,6 +11,6 @@ type awsTransitGatewayAttachment implements awsBaseService @key(fields: "arn") {
   transitGateway: [awsTransitGateway]
     @hasInverse(field: transitGatewayAttachment)
   routeTable: [awsRouteTable] @hasInverse(field: transitGatewayAttachment)
-  vpc: [awsVpc] @hasInverse(field: transitGatewayAttachment)
+  vpc: [awsVpc] @hasInverse(field: transitGatewayAttachments)
   vpnConnection: [awsVpnConnection] @hasInverse(field: transitGatewayAttachment)
 }
diff --git a/src/services/vpc/connections.ts b/src/services/vpc/connections.ts
diff --git a/src/services/vpc/schema.graphql b/src/services/vpc/schema.graphql
diff --git a/src/services/vpnGateway/schema.graphql b/src/services/vpnGateway/schema.graphql
diff --git a/src/types/generated.ts b/src/types/generated.ts

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ type awsEcsService implements awsBaseService @key(fields: "arn") {`
`32`	`32`	`iamRoles: [awsIamRole] @hasInverse(field: ecsServices)`
`33`	`33`	`securityGroups: [awsSecurityGroup] @hasInverse(field: ecsService)`
`34`	`34`	`subnet: [awsSubnet] @hasInverse(field: ecsService) #change to plural`
`35`		`- vpc: [awsVpc] @hasInverse(field: ecsService)`
	`35`	`+ vpc: [awsVpc] @hasInverse(field: ecsServices)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`type awsEcsDeployment`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ type awsEfsMountTarget implements awsOptionalService @key(fields: "id") {`
`8`	`8`	`efs: [awsEfs] @hasInverse(field: efsMountTarget)`
`9`	`9`	`networkInterface: [awsNetworkInterface] @hasInverse(field: efsMountTarget) #change to plural`
`10`	`10`	`subnet: [awsSubnet] @hasInverse(field: efsMountTarget) #change to plural`
`11`		`- vpc: [awsVpc] @hasInverse(field: efsMountTarget)`
	`11`	`+ vpc: [awsVpc] @hasInverse(field: efsMountTargets)`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`# TODO: add an arn if possible`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ type awsEksCluster implements awsBaseService @key(fields: "arn") {`
`17`	`17`	`kms: [awsKms] @hasInverse(field: eksCluster)`
`18`	`18`	`securityGroups: [awsSecurityGroup] @hasInverse(field: eksCluster)`
`19`	`19`	`subnets: [awsSubnet] @hasInverse(field: eksCluster)`
`20`		`- vpc: [awsVpc] @hasInverse(field: eksCluster)`
	`20`	`+ vpc: [awsVpc] @hasInverse(field: eksClusters)`
`21`	`21`	`ec2Instances: [awsEc2] @hasInverse(field: eksCluster)`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ type awsIgw implements awsBaseService @key(fields: "arn") {`
`2`	`2`	`owner: String @search(by: [hash, regexp])`
`3`	`3`	`attachments: [awsIgwAttachment]`
`4`	`4`	`tags: [awsRawTag]`
`5`		`- vpc: [awsVpc] @hasInverse(field: igw)`
	`5`	`+ vpc: [awsVpc] @hasInverse(field: igws)`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`type awsIgwAttachment {`