Merge pull request #46 from cloudgraphdev/beta

RELEASE: 0.79.0

Author: tyler-dunkel

CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@cloudgraph/cg-provider-aws",
-  "version": "0.78.1",
+  "version": "0.79.0-beta.1",
   "description": "cloud-graph provider plugin for AWS used to fetch AWS cloud data.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -76,4 +76,4 @@
       "git add --force"
     ]
   }
-}
+}

README.md

@@ -8,4 +8,5 @@ export default {
   route53HostedZone: ['route53Record'],
   emrCluster: ['emrInstance', 'emrStep'],
   ecsService: ['ecsTaskSet', 'ecsTaskDefinition'],
+  iamInstanceProfile: ['ec2Instance'],
 }

package.json

@@ -47,6 +47,7 @@ export default {
   [services.iamUser]: 'iamUsers',
   [services.kinesisStream]: 'kinesisStreams',
   [services.lambda]: 'lambdaFunctions',
+  [services.managedAirflow]: 'managedAirflows',
   [services.nat]: 'natGateway',
   [services.networkInterface]: 'networkInterfaces',
   [services.organization]: 'organizations',

src/enums/relations.ts

@@ -427,6 +427,7 @@ export default {
   gettingRotationStatus: 'Checking rotation status for each key...',
   gettingPolicies: 'Fetching default Policy for each key...',
   gettingTags: 'Fetching Tags for each key...',
+  gettingAliases: 'Fetching Aliases for each key...',
 
   /**
    * EKS

src/enums/serviceAliases.ts

@@ -1,5 +1,4 @@
-type awsAccount @key(fields: "id") {
-  id: String! @id @search(by: [hash])
+type awsAccount implements awsOptionalService @key(fields: "id") {
   regions: [String] @search(by: [hash])
   albs: [awsAlb]
   apiGatewayResources: [awsApiGatewayResource]

src/properties/logger.ts

@@ -1,9 +1,5 @@
-type awsAlb @key(fields: "arn") {
-  id: String! @id @search(by: [hash, regexp])
+type awsAlb implements awsBaseService @key(fields: "arn") {
   name: String @search(by: [hash, regexp])
-  accountId: String! @search(by: [hash, regexp])
-  arn: String! @id @search(by: [hash, regexp])
-  region: String @search(by: [hash, regexp])
   dnsName: String @search(by: [hash, regexp])
   scheme: String @search(by: [hash, regexp])
   type: String @search(by: [hash, regexp])
@@ -21,10 +17,12 @@ type awsAlb @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
+  elasticBeanstalkEnvs: [awsElasticBeanstalkEnv] @hasInverse(field: albs)
+  webAcl: [awsWafV2WebAcl] @hasInverse(field: albs)
 }
 
 type awsAlbListener

src/services/account/schema.graphql

@@ -6,12 +6,8 @@ type awsApiGatewayMethod @key(fields: "arn") {
   apiKeyRequired: Boolean @search
 }
 
-type awsApiGatewayResource @key(fields: "arn") {
-  id: String! @search(by: [hash])
-  accountId: String! @search(by: [hash])
-  arn: String! @id @search(by: [hash, regexp])
-  region: String @search(by: [hash, regexp])
+type awsApiGatewayResource implements awsBaseService @key(fields: "arn") {
   restApi: [awsApiGatewayRestApi] @hasInverse(field: resources) #change to plural
   path: String @search(by: [hash, regexp])
   methods: [awsApiGatewayMethod]
-}
+}

src/services/alb/schema.graphql

@@ -4,11 +4,7 @@ type awsApiGatewayEndpointConfiguration {
   vpcEndpointIds: [String] @search(by: [hash])
 }
 
-type awsApiGatewayRestApi @key(fields: "arn") {
-  id: String! @id @search(by: [hash])
-  accountId: String! @search(by: [hash])
-  arn: String! @id @search(by: [hash, regexp])
-  region: String @search(by: [hash, regexp])
+type awsApiGatewayRestApi implements awsBaseService @key(fields: "arn") {
   description: String @search(by: [hash, regexp, fulltext])
   policy: awsIamJSONPolicy
   endpointConfiguration: awsApiGatewayEndpointConfiguration
@@ -21,5 +17,3 @@ type awsApiGatewayRestApi @key(fields: "arn") {
   resources: [awsApiGatewayResource] @hasInverse(field: restApi)
   route53Record: [awsRoute53Record] @hasInverse(field: restApi) #change to plural
 }
-
-