Merge pull request #51 from cloudgraphdev/feature/CG-1087

feat: Add Additional data to transit gateway attachment

Author: tyler-dunkel

README.md

@@ -80,9 +80,9 @@ CloudGraph AWS Provider will ask you what regions you would like to crawl and wi
 | cloud9                      |                                                                                                                                                                                                                                                                                                                                                                               |
 | cloudformationStack         | cloudformationStack, iamRole, sns                                                                                                                                                                                                                                                                                                                                             |
 | cloudformationStackSet      | iamRole                                                                                                                                                                                                                                                                                                                                                                       |
-| cloudfront                  | cloudwatch, elb, s3                                                                                                                                                                                                                                                                                                                                                                       |
+| cloudfront                  | elb, s3                                                                                                                                                                                                                                                                                                                                                                       |
 | cloudtrail                  | cloudwatch, cloudwatchLog, kms, s3, sns                                                                                                                                                                                                                                                                                                                                       |
-| cloudwatch                  | cloudfront, cloudtrail, cloudwatchLog, sns                                                                                                                                                                                                                                                                                                                                                |
+| cloudwatch                  | cloudtrail, cloudwatchLog, sns                                                                                                                                                                                                                                                                                                                                                |
 | cloudwatchLog               | cloudtrail, cloudwatch, ecsCluster, elasticSearchDomain, kms, managedAirflow, rdsDbInstance                                                                                                                                                                                                                                                                                   |
 | codebuild                   | iamRole, kms, vpc, securityGroup, subnet                                                                                                                                                                                                                                                                                                                                      |
 | cognitoIdentityPool         | iamRole, iamOpenIdConnectProvider, iamSamlProvider, elasticSearchDomain                                                                                                                                                                                                                                                                                                       |

src/services/cloudfront/schema.graphql

@@ -21,7 +21,6 @@ type awsCloudfront implements awsBaseService @key(fields: "id") {
   s3: [awsS3] @hasInverse(field: cloudfrontDistributions)
   tags: [awsRawTag]
   webAcl: [awsWafV2WebAcl] @hasInverse(field: cloudfront)
-  cloudwatch: [awsCloudwatch] @hasInverse(field: cloudfront)
 }
 
 type awsCloudfrontOriginData {

src/services/cloudwatch/connections.ts

@@ -1,9 +1,7 @@
 import { ServiceConnection } from '@cloudgraph/sdk'
 import { isEmpty } from 'lodash'
 import { RawAwsCloudwatch } from './data'
-import { RawAwsCloudfront } from '../cloudfront/data'
 import services from '../../enums/services'
-import { globalRegionName } from '../../enums/regions'
 
 export default ({
   service: cloudwatch,
@@ -17,11 +15,7 @@ export default ({
 }): {
   [property: string]: ServiceConnection[]
 } => {
-  const {
-    AlarmName: id,
-    AlarmActions: alarmActions,
-    Dimensions: dimensions,
-  } = cloudwatch
+  const { AlarmName: id, AlarmActions: alarmActions } = cloudwatch
   const connections: ServiceConnection[] = []
 
   /**
@@ -46,32 +40,6 @@ export default ({
     }
   }
 
-  /**
-   * Find Cloudfront
-   * related to the cloudwatch
-   */
-  const cloudfronts = data.find(({ name }) => name === services.cloudfront)
-  if (cloudfronts?.data?.[globalRegionName]) {
-    const cloudfrontsInRegion: RawAwsCloudfront[] = cloudfronts.data[globalRegionName].filter(
-      ({ summary: { Id: cloudfrontId } }: RawAwsCloudfront) =>
-        dimensions?.some(d => d.Value === cloudfrontId)
-    )
-
-    if (!isEmpty(cloudfrontsInRegion)) {
-      for (const cf of cloudfrontsInRegion) {
-        const {
-          summary: { Id: cloudfrontId },
-        }: RawAwsCloudfront = cf
-        connections.push({
-          id: cloudfrontId,
-          resourceType: services.cloudfront,
-          relation: 'child',
-          field: 'cloudfront',
-        })
-      }
-    }
-  }
-
   const result = {
     [id]: connections,
   }

src/services/cloudwatch/schema.graphql

@@ -14,7 +14,6 @@ type awsCloudwatch implements awsBaseService @key(fields: "arn") {
   cloudwatchLog: [awsCloudwatchLog] @hasInverse(field: cloudwatch)
   sns: [awsSns] @hasInverse(field: cloudwatch)
   cloudtrail: [awsCloudtrail] @hasInverse(field: cloudwatch)
-  cloudfront: [awsCloudfront] @hasInverse(field: cloudwatch)
 }
 
 type awsCloudwatchDimensions

src/types/generated.ts

@@ -741,7 +741,6 @@ export type AwsCloudFormationStackSetParameter = {
 
 export type AwsCloudfront = AwsBaseService & {
   callerReference?: Maybe<Scalars['String']>;
-  cloudwatch?: Maybe<Array<Maybe<AwsCloudwatch>>>;
   customErrorResponses?: Maybe<Array<Maybe<AwsCloudfrontCustomErrorResponse>>>;
   defaultCacheBehavior?: Maybe<AwsCloudfrontCacheBehavior>;
   defaultRootObject?: Maybe<Scalars['String']>;
@@ -897,7 +896,6 @@ export type AwsCloudtrailStatus = {
 export type AwsCloudwatch = AwsBaseService & {
   actions?: Maybe<Array<Maybe<Scalars['String']>>>;
   actionsEnabled?: Maybe<Scalars['String']>;
-  cloudfront?: Maybe<Array<Maybe<AwsCloudfront>>>;
   cloudtrail?: Maybe<Array<Maybe<AwsCloudtrail>>>;
   cloudwatchLog?: Maybe<Array<Maybe<AwsCloudwatchLog>>>;
   comparisonOperator?: Maybe<Scalars['String']>;