Skip to content

Commit a34dd00

Browse files
tyler-dunkeltyler-dunkel
authored
Merge pull request #16 from cloudgraphdev/fix/CG-334
fix(elasticBeanstalkEnv): add connections with alb, elb, ec2 and sqs services
2 parents a59e3a5 + fe21ecd commit a34dd00

File tree

12 files changed

+193
-18
lines changed

12 files changed

+193
-18
lines changed

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ CloudGraph AWS Provider will ask you what regions you would like to crawl and wi
6969

7070
| Service | Relations |
7171
| --------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
72-
| alb | ec2, route53Record, securityGroup, subnet, vpc |
72+
| alb | ec2, elasticBeanstalkEnv, route53Record, securityGroup, subnet, vpc |
7373
| apiGatewayRestApi | apiGatewayResource, apiGatewayStage, route53Record |
7474
| apiGatewayStage | apiGatewayRestApi |
7575
| apiGatewayResource | apiGatewayRestApi |
7676
| appSync | cognitoUserPool, dynamodb, iamRole, lambda, rdsCluster, wafV2WebAcl |
77-
| asg | ebs, ec2, iamRole, securityGroup, subnet |
77+
| asg | ebs, ec2, elasticBeanstalkEnv, iamRole, securityGroup, subnet |
7878
| athenaDataCatalog | |
7979
| clientVpnEndpoint | securityGroup |
8080
| cloud9 | |
@@ -107,9 +107,9 @@ CloudGraph AWS Provider will ask you what regions you would like to crawl and wi
107107
| elastiCacheCluster | securityGroup, subnet, vpc |
108108
| elastiCacheReplicationGroup | kms |
109109
| elasticBeanstalkApp | elasticBeanstalkEnv, iamRole |
110-
| elasticBeanstalkEnv | ec2, elasticBeanstalkApp, iamRole |
110+
| elasticBeanstalkEnv | alb, asg, ec2, elb, elasticBeanstalkApp, iamRole, sqs |
111111
| elasticSearchDomain | kms, securityGroup, subnet, vpc |
112-
| elb | cloudfront, ecsService, securityGroup, subnet, vpc |
112+
| elb | cloudfront, ecsService, elasticBeanstalkEnv, securityGroup, subnet, vpc |
113113
| emrCluster | kms, subnet |
114114
| emrInstance | ebs, ec2 |
115115
| emrStep | |
@@ -152,7 +152,7 @@ CloudGraph AWS Provider will ask you what regions you would like to crawl and wi
152152
| securityGroup | alb, asg, clientVpnEndpoint, codebuild, dmsReplicationInstance, ecsService, lambda, ec2, elasticSearchDomain, elb, rdsCluster, rdsDbInstance, eksCluster, elastiCacheCluster, managedAirflow, sageMakerNotebookInstance, networkInterface |
153153
| ses | |
154154
| sns | kms, cloudtrail, cloudwatch, s3 |
155-
| sqs | s3 |
155+
| sqs | elasticBeanstalkEnv, s3 |
156156
| subnet | alb, asg, codebuild, dmsReplicationInstance, ec2, ecsService, efsMountTarget, elastiCacheCluster, elasticSearchDomain, elb, lambda, managedAirflow, natGateway, networkInterface, rdsCluster, sageMakerNotebookInstance, routeTable, vpc, eksCluster, emrCluster, flowLog |
157157
| systemsManagerInstance | ec2, iamRole |
158158
| systemsManagerDocument | |

‎src/services/alb/schema.graphql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ type awsAlb implements awsBaseService @key(fields: "arn") {
2121
route53Record: [awsRoute53Record] @hasInverse(field: alb) #change to plural
2222
listeners: [awsAlbListener]
2323
subnet: [awsSubnet] @hasInverse(field: alb) #change to plural
24+
elasticBeanstalkEnvs: [awsElasticBeanstalkEnv] @hasInverse(field: albs)
2425
}
2526

2627
type awsAlbListener

‎src/services/asg/schema.graphql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ type awsAsg implements awsBaseService @key(fields: "arn") {
131131
tags: [awsRawTag]
132132
launchConfiguration: awsLaunchConfiguration
133133
ec2Instance: [awsEc2] @hasInverse(field: asg) #change to plural
134+
elasticBeanstalkEnvs: [awsElasticBeanstalkEnv] @hasInverse(field: asgs)
134135
securityGroups: [awsSecurityGroup] @hasInverse(field: asg)
135136
ebs: [awsEbs] @hasInverse(field: asg)
136137
subnet: [awsSubnet] @hasInverse(field: asg) #change to plural

‎src/services/ec2/connections.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ export default ({
310310
id: elasticBeanstalkEnv.EnvironmentId,
311311
resourceType: services.elasticBeanstalkEnv,
312312
relation: 'child',
313-
field: 'elasticBeanstalkEnv',
313+
field: 'elasticBeanstalkEnvs',
314314
})
315315
}
316316
}

‎src/services/ec2/schema.graphql‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,15 @@ type awsEc2 implements awsBaseService @key(fields: "arn") {
108108
alb: [awsAlb] @hasInverse(field: ec2Instance)
109109
asg: [awsAsg] @hasInverse(field: ec2Instance)
110110
ebs: [awsEbs] @hasInverse(field: ec2Instance)
111-
eip: [awsEip] @hasInverse(field: ec2Instance)
112-
networkInterfaces: [awsNetworkInterface] @hasInverse(field: ec2Instance)
113-
securityGroups: [awsSecurityGroup] @hasInverse(field: ec2Instance)
114-
subnets: [awsSubnet] @hasInverse(field: ec2Instances)
115111
ecsContainer: [awsEcsContainer] @hasInverse(field: ec2Instances)
116-
emrInstance: [awsEmrInstance] @hasInverse(field: ec2Instance)
117-
systemsManagerInstance: [awsSystemsManagerInstance] @hasInverse(field: ec2Instance)
112+
eip: [awsEip] @hasInverse(field: ec2Instance)
118113
eksCluster: [awsEksCluster] @hasInverse(field: ec2Instances)
119114
elasticBeanstalkEnv: [awsElasticBeanstalkEnv] @hasInverse(field: ec2Instances)
115+
emrInstance: [awsEmrInstance] @hasInverse(field: ec2Instance)
120116
iamInstanceProfile: [awsIamInstanceProfile] @hasInverse(field: ec2Instances)
121117
iamRole: [awsIamRole] @hasInverse(field: ec2Instances)
118+
networkInterfaces: [awsNetworkInterface] @hasInverse(field: ec2Instance)
119+
securityGroups: [awsSecurityGroup] @hasInverse(field: ec2Instance)
120+
subnets: [awsSubnet] @hasInverse(field: ec2Instances)
121+
systemsManagerInstance: [awsSystemsManagerInstance] @hasInverse(field: ec2Instance)
122122
}

‎src/services/elasticBeanstalkApplication/schema.graphql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ type awsElasticBeanstalkApp implements awsBaseService @key(fields: "arn") {
22
name: String @search(by: [hash, regexp])
33
description: String @search(by: [hash, regexp])
44
iamServiceRole: String @search(by: [hash, regexp])
5-
elasticBeanstalkEnvs: [awsElasticBeanstalkEnv] @hasInverse(field: elasticBeanstalkApps)
5+
elasticBeanstalkEnvs: [awsElasticBeanstalkEnv] @hasInverse(field: elasticBeanstalkApp)
66
tags: [awsRawTag]
77
iamRole: [awsIamRole] @hasInverse(field: elasticBeanstalkApps)
88
}

0 commit comments

Comments
 (0)