Merge branch 'alpha' into feature/CG-1063

Author: m-pizarro

CHANGELOG.md

@@ -1,3 +1,19 @@
+# [0.79.0-alpha.7](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.79.0-alpha.6...0.79.0-alpha.7) (2022-04-11)
+
+
+### Bug Fixes
+
+* Added iamRole to lambda service ([ae6177d](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/ae6177de995975ab5194c5d2fcc8aaf98ec8d06d))
+
+# [0.79.0-alpha.6](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.79.0-alpha.5...0.79.0-alpha.6) (2022-04-11)
+
+
+### Features
+
+* Handle TODOs for ecs cluster ([554dff7](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/554dff7785dc2c69403a41416c7739625fd02263))
+* Update kms connection ([1e3e66d](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/1e3e66d41e886bbb39ad9f000167fa93c7313b26))
+* Updated README connections ([f536b73](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/f536b73f97c1f0ddbea687588e5d10f089fd2500))
+
 # [0.79.0-alpha.5](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.79.0-alpha.4...0.79.0-alpha.5) (2022-04-08)
 
 

README.md

@@ -1,6 +1,6 @@
 {
   "name": "@cloudgraph/cg-provider-aws",
-  "version": "0.79.0-alpha.5",
+  "version": "0.79.0-alpha.7",
   "description": "cloud-graph provider plugin for AWS used to fetch AWS cloud data.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

package.json

@@ -13,6 +13,7 @@ type awsCloudwatchLog @key(fields: "arn") {
   kms: [awsKms] @hasInverse(field: cloudwatchLog)
   cloudwatch: [awsCloudwatch] @hasInverse(field: cloudwatchLog)
   cloudtrail: [awsCloudtrail] @hasInverse(field: cloudwatchLog)
+  ecsCluster: [awsEcsCluster] @hasInverse(field: cloudwatchLog)
 }
 
 type awsMetricFilter

src/services/cloudwatchLogs/schema.graphql

@@ -103,7 +103,7 @@ export default ({
 
   if (kmsKeyID && kms?.data?.[region]) {
     const kmsInRegion: AwsKms = kms.data[region].find(
-      ({ KeyId }: AwsKms) => kmsKeyID === KeyId
+      ({ KeyArn }: AwsKms) => kmsKeyID === KeyArn
     )
 
     if (kmsInRegion) {

src/services/cognitoUserPool/connections.ts

@@ -0,0 +1,97 @@
+import { ServiceConnection } from '@cloudgraph/sdk'
+
+import { isEmpty } from 'lodash'
+import services from '../../enums/services'
+import { RawAwsEcsCluster } from '../ecsCluster/data'
+import { RawAwsS3 } from '../s3/data'
+import { RawAwsLogGroup } from '../cloudwatchLogs/data'
+import { AwsKms } from '../kms/data'
+import { gets3BucketId } from '../../utils/ids'
+
+export default ({
+  service: ecsCluster,
+  data,
+  region,
+}: {
+  service: RawAwsEcsCluster
+  data: Array<{ name: string; data: { [property: string]: any[] } }>
+  region: string
+}): {
+  [property: string]: ServiceConnection[]
+} => {
+  const {
+    clusterArn: arn,
+    configuration: {
+      executeCommandConfiguration: { logConfiguration, kmsKeyId } = {},
+    } = {},
+  } = ecsCluster
+  const connections: ServiceConnection[] = []
+
+  /**
+   * Find S3
+   * related to this ecs cluster
+   */
+  const buckets = data.find(({ name }) => name === services.s3)
+  if (buckets?.data?.[region]) {
+    const dataAtRegion: RawAwsS3[] = buckets.data[region].filter(
+      ({ Name: name }: RawAwsS3) => name === logConfiguration?.s3BucketName
+    )
+    for (const bucket of dataAtRegion) {
+      connections.push({
+        id: gets3BucketId(bucket.Name),
+        resourceType: services.s3,
+        relation: 'child',
+        field: 's3',
+      })
+    }
+  }
+
+  /**
+   * Find Cloudwatch Log Group
+   * related to this ecs cluster
+   */
+  const logGroups = data.find(({ name }) => name === services.cloudwatchLog)
+  let logGroupsInRegion: RawAwsLogGroup[] = []
+  if (logGroups?.data?.[region]) {
+    logGroupsInRegion = logGroups.data[region].filter(
+      ({ logGroupName }: RawAwsLogGroup) =>
+        logGroupName === logConfiguration?.cloudWatchLogGroupName
+    )
+  }
+
+  if (!isEmpty(logGroupsInRegion)) {
+    for (const logGroup of logGroupsInRegion) {
+      connections.push({
+        id: logGroup.logGroupName,
+        resourceType: services.cloudwatchLog,
+        relation: 'child',
+        field: 'cloudwatchLog',
+      })
+    }
+  }
+
+  /**
+   * Find MKS
+   * related to this ecs cluster
+   */
+  const kms = data.find(({ name }) => name === services.kms)
+  if (kms?.data?.[region]) {
+    const kmsInRegion: AwsKms = kms.data[region].find(
+      ({ KeyArn }: AwsKms) => KeyArn === kmsKeyId
+    )
+
+    if (kmsInRegion) {
+      connections.push({
+        id: kmsInRegion.KeyId,
+        resourceType: services.kms,
+        relation: 'child',
+        field: 'kms',
+      })
+    }
+  }
+
+  const natResult = {
+    [arn]: connections,
+  }
+  return natResult
+}

src/services/ecsCluster/connections.ts

@@ -2,12 +2,15 @@ import {Service} from '@cloudgraph/sdk'
 import BaseService from '../base'
 import format from './format'
 import getData from './data'
+import getConnections from './connections'
 import mutation from './mutation'
 
 export default class EcsCluster extends BaseService implements Service {
   format = format.bind(this)
 
   getData = getData.bind(this)
 
+  getConnections = getConnections.bind(this)
+  
   mutation = mutation
 }

src/services/ecsCluster/index.ts

@@ -16,10 +16,11 @@ type awsEcsCluster implements awsBaseService @key(fields: "arn") {
   ecsService: [awsEcsService] @hasInverse(field: ecsCluster)
   ecsTask: [awsEcsTask] @hasInverse(field: ecsCluster)
   ecsTaskSet: [awsEcsTaskSet] @hasInverse(field: ecsCluster)
+  s3: [awsS3] @hasInverse(field: ecsCluster)
+  cloudwatchLog: [awsCloudwatchLog] @hasInverse(field: ecsCluster)
+  kms: [awsKms] @hasInverse(field: ecsCluster)
 }
 
-#TODO: add connections to cloudwatchLog, s3,
-
 type AwsEcsExecuteCommandLogConfiguration
   @generate(
     query: { get: false, query: true, aggregate: false }

src/services/ecsCluster/schema.graphql

@@ -28,4 +28,5 @@ type awsIamRole implements awsBaseService @key(fields: "id") {
   ec2Instances: [awsEc2] @hasInverse(field: iamRole)
   cognitoUserPools: [awsCognitoUserPool] @hasInverse(field: iamRole)
   appSync: [awsAppSync] @hasInverse(field: iamRoles)
+  lambda: [awsLambda] @hasInverse(field: iamRole)
 }

src/services/iamRole/schema.graphql

@@ -28,6 +28,7 @@ type awsKms implements awsBaseService @key(fields: "id") {
   sageMakerNotebookInstances: [awsSageMakerNotebookInstance]
     @hasInverse(field: kms)
   rdsClusterSnapshots: [awsRdsClusterSnapshot] @hasInverse(field: kms)
+  ecsCluster: [awsEcsCluster] @hasInverse(field: kms)
   dynamodb: [awsDynamoDbTable] @hasInverse(field: kms)
   cognitoUserPools: [awsCognitoUserPool] @hasInverse(field: kms)
 }