Merge branch 'alpha' into feature/EP-3200-add-codecommit-repository-service

Author: m-pizarro

CHANGELOG.md

@@ -1,3 +1,10 @@
+# [0.89.0-alpha.10](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.89.0-alpha.9...0.89.0-alpha.10) (2023-06-01)
+
+
+### Features
+
+* add config missing services ([ad4f1a1](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/ad4f1a1e2f58caa21838cc1966621e863bc648e8))
+
 # [0.89.0-alpha.9](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.89.0-alpha.8...0.89.0-alpha.9) (2023-06-01)
 
 

README.md

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

package.json

@@ -22,7 +22,9 @@ export default {
   [services.cloudwatchEventRule]: 'cloudwatchEventRules',
   [services.codebuild]: 'codebuilds',
   [services.codeCommitRepository]: 'codeCommitRepositories',
+  [services.configurationDeliveryChannel]: 'configurationDeliveryChannels',
   [services.configurationRecorder]: 'configurationRecorders',
+  [services.configurationRule]: 'configurationRules',
   [services.dmsReplicationInstance]: 'dmsReplicationInstances',
   [services.ebsSnapshot]: 'ebsSnapshots',
   [services.ec2Instance]: 'ec2Instances',

src/enums/serviceAliases.ts

@@ -92,7 +92,9 @@ import ClientVpnEndpoint from '../services/clientVpnEndpoint'
 import VpnConnection from '../services/vpnConnection'
 import Organization from '../services/organization'
 import CloudWatchLog from '../services/cloudwatchLogs'
+import ConfigurationDeliveryChannel from '../services/configurationDeliveryChannel'
 import ConfigurationRecorder from '../services/configurationRecorder'
+import ConfigurationRule from '../services/configurationRule'
 import CodeBuild from '../services/codeBuild'
 import GlueJob from '../services/glueJob'
 import GlueRegistry from '../services/glueRegistry'
@@ -151,7 +153,9 @@ export default {
   [services.codeCommitRepository]: CodeCommitRepository,
   [services.cognitoIdentityPool]: CognitoIdentityPool,
   [services.cognitoUserPool]: CognitoUserPool,
+  [services.configurationDeliveryChannel]: ConfigurationDeliveryChannel,
   [services.configurationRecorder]: ConfigurationRecorder,
+  [services.configurationRule]: ConfigurationRule,
   [services.ebs]: EBS,
   [services.ebsSnapshot]: EBSSnapshot,
   [services.ec2Instance]: EC2,

src/enums/serviceMap.ts

@@ -27,7 +27,9 @@ export default {
   codeCommitRepository: 'codeCommitRepository',
   cognitoIdentityPool: 'cognitoIdentityPool',
   cognitoUserPool: 'cognitoUserPool',
+  configurationDeliveryChannel: 'configurationDeliveryChannel',
   configurationRecorder: 'configurationRecorder',
+  configurationRule: 'configurationRule',
   customerGateway: 'customerGateway',
   dmsReplicationInstance: 'dmsReplicationInstance',
   dynamodb: 'dynamodb',

src/enums/services.ts

@@ -305,13 +305,13 @@ export default {
   lookingforRdsClusters: 'Looking for RDS Clusters...',
   creatingRdsInstance: (num: number): string => `Creating RDS Instance #${num}`,
   fetchedRdsClusters: (num: number): string => `Fetched ${num} RDS Clusters`,
-  fetchedRdsGlobalClusters: (num: number): string => `Fetched ${num} RDS Global Clusters`,
+  fetchedRdsGlobalClusters: (num: number): string =>
+    `Fetched ${num} RDS Global Clusters`,
   fetchedRdsInstances: (num: number): string =>
     `Fetched ${num} RDS DB Instances`,
   fetchedRdsEventSubscriptions: (num: number): string =>
     `Fetched ${num} RDS DB Event Subscriptions`,
-  fetchedRdsDbProxies: (num: number): string =>
-    `Fetched ${num} RDS DB Proxies`,
+  fetchedRdsDbProxies: (num: number): string => `Fetched ${num} RDS DB Proxies`,
   noClusterFound: '❎ DB Instance is not part of a cluster ❎ ',
   foundCluster: 'Found the cluster the instance belongs to',
   addingRdsInstances: (num: number): string =>
@@ -705,6 +705,11 @@ export default {
   gettingCloudwatchLogGroups: 'Fetching CloudWatch Log groups...',
   foundMoreCloudwatchMetricFilters: (num: number): string =>
     `Found another ${num} CloudWatch Metric filters in this region...`,
+  /**
+   * Configuration Delivery Channel
+   */
+  fetchedCOnfigurationDeliveryChannels: (num: number): string =>
+    `Fetched ${num} Configuration Delivery Channels`,
   /**
    * Configuration Recorders
    */
@@ -715,6 +720,11 @@ export default {
    */
   fetchedConfigurationRecorderStatus: (num: number): string =>
     `Fetched ${num} Configuration Recorder Status`,
+  /**
+   * Configuration Rules
+   */
+  fetchedConfigurationRules: (num: number): string =>
+    `Fetched ${num} Configuration Rules`,
   /**
    * Vpc Endpoints
    */

src/properties/logger.ts

@@ -25,7 +25,9 @@ type awsAccount implements awsOptionalService @key(fields: "id") {
   codeCommitRepository: [awsCodeCommitRepository]
   cognitoIdentityPool: [awsCognitoIdentityPool]
   cognitoUserPool: [awsCognitoUserPool]
+  configurationDeliveryChannels: [awsConfigurationDeliveryChannel]
   configurationRecorders: [awsConfigurationRecorder]
+  configurationRules: [awsConfigurationRule]
   customerGateway: [awsCustomerGateway]
   dmsReplicationInstances: [awsDmsReplicationInstance]
   dynamodb: [awsDynamoDbTable]
@@ -79,7 +81,7 @@ type awsAccount implements awsOptionalService @key(fields: "id") {
   networkInterfaces: [awsNetworkInterface]
   organizations: [awsOrganization]
   rdsClusters: [awsRdsCluster]
-  rdsGlobalCluster : [awsRdsGlobalCluster]
+  rdsGlobalCluster: [awsRdsGlobalCluster]
   rdsClusterSnapshots: [awsRdsClusterSnapshot]
   rdsDbInstances: [awsRdsDbInstance]
   rdsEventSubscription: [awsRdsEventSubscription]

src/services/account/schema.graphql

@@ -0,0 +1,106 @@
+import CloudGraph from '@cloudgraph/sdk'
+import groupBy from 'lodash/groupBy'
+import isEmpty from 'lodash/isEmpty'
+
+import EC2, {
+  DeliveryChannel,
+  DeliveryChannelList,
+  DescribeDeliveryChannelsResponse,
+} from 'aws-sdk/clients/configservice'
+
+import { Config } from 'aws-sdk/lib/config'
+import { AWSError } from 'aws-sdk/lib/error'
+
+import { initTestEndpoint } from '../../utils'
+import AwsErrorLog from '../../utils/errorLog'
+import awsLoggerText from '../../properties/logger'
+
+const lt = { ...awsLoggerText }
+const { logger } = CloudGraph
+const serviceName = 'Configuration Delivery Channel'
+const errorLog = new AwsErrorLog(serviceName)
+const endpoint = initTestEndpoint(serviceName)
+
+export interface RawAwsConfigurationDeliveryChannel extends DeliveryChannel {
+  region: string
+}
+
+const listConfigurationDeliveryChannelData = async ({
+  ec2,
+}: {
+  ec2: EC2
+}): Promise<DeliveryChannelList> =>
+  new Promise<DeliveryChannelList>(resolve => {
+    try {
+      ec2.describeDeliveryChannels(
+        {},
+        (err: AWSError, data: DescribeDeliveryChannelsResponse) => {
+          if (err) {
+            errorLog.generateAwsErrorLog({
+              functionName: 'ec2:describeDeliveryChannels',
+              err,
+            })
+          }
+
+          if (isEmpty(data)) {
+            return resolve([])
+          }
+
+          const { DeliveryChannels: channels = [] } = data || {}
+
+          resolve(channels)
+        }
+      )
+    } catch (error) {
+      resolve([])
+    }
+  })
+
+export default async ({
+  regions,
+  config,
+}: {
+  regions: string
+  config: Config
+}): Promise<{
+  [region: string]: RawAwsConfigurationDeliveryChannel[]
+}> =>
+  new Promise(async resolve => {
+    const configurationDeliveryChannelsResult: RawAwsConfigurationDeliveryChannel[] =
+      []
+
+    const regionPromises = regions.split(',').map(region => {
+      const ec2 = new EC2({ ...config, region, endpoint })
+
+      return new Promise<void>(
+        async resolveConfigurationDeliveryChannelData => {
+          // Get Configuration Delivery Channel Data
+          const configurationDeliveryChannels =
+            await listConfigurationDeliveryChannelData({
+              ec2,
+            })
+
+          if (!isEmpty(configurationDeliveryChannels)) {
+            for (const configurationDeliveryChannel of configurationDeliveryChannels) {
+              configurationDeliveryChannelsResult.push({
+                ...configurationDeliveryChannel,
+                region,
+              })
+            }
+          }
+
+          resolveConfigurationDeliveryChannelData()
+        }
+      )
+    })
+
+    await Promise.all(regionPromises)
+    logger.debug(
+      lt.fetchedCOnfigurationDeliveryChannels(
+        configurationDeliveryChannelsResult.length
+      )
+    )
+    errorLog.reset()
+
+    resolve(groupBy(configurationDeliveryChannelsResult, 'region'))
+  })

src/services/configurationDeliveryChannel/data.ts

@@ -0,0 +1,26 @@
+import { AwsConfigurationDeliveryChannel } from '../../types'
+import { RawAwsConfigurationDeliveryChannel } from './data'
+
+/**
+ * Configuration Delivery Channel
+ */
+
+export default ({
+  service: rawData,
+  account,
+  region,
+}: {
+  service: RawAwsConfigurationDeliveryChannel
+  account: string
+  region: string
+}): AwsConfigurationDeliveryChannel => {
+  const { name } = rawData
+
+  return {
+    id: name,
+    accountId: account,
+    arn: name,
+    region,
+    name,
+  }
+}