Merge pull request #137 from cloudgraphdev/feature/EP-3169-update-cloudfront-and-eksCluster

feat(aws): Update cloudfront and eksCluster

Author: tyler-dunkel

src/services/cloudfront/format.ts

@@ -134,6 +134,7 @@ export default ({
       SmoothStreaming: smoothStreaming,
       TargetOriginId: targetOriginId,
       ViewerProtocolPolicy: viewerProtocolPolicy,
+      CachePolicyId: cachePolicyId,
     } = cache
 
     const forwardedValues = {
@@ -156,6 +157,7 @@ export default ({
       smoothStreaming: smoothStreaming ? t.yes : t.no,
       targetOriginId,
       viewerProtocolPolicy,
+      cachePolicyId
     }
   }
 

src/services/cloudfront/schema.graphql

@@ -79,6 +79,7 @@ type awsCloudfrontCacheBehavior {
   smoothStreaming: String @search(by: [hash])
   targetOriginId: String @search(by: [hash])
   viewerProtocolPolicy: String @search(by: [hash])
+  cachePolicyId: String @search(by: [hash])
 }
 
 type awsCloudfrontCustomErrorResponse {

src/services/eksCluster/data.ts

@@ -7,6 +7,8 @@ import EKS, {
   DescribeClusterRequest,
   DescribeClusterResponse,
   ListTagsForResourceResponse,
+  ListNodegroupsRequest,
+  ListNodegroupsResponse,
 } from 'aws-sdk/clients/eks'
 import CloudGraph from '@cloudgraph/sdk'
 import groupBy from 'lodash/groupBy'
@@ -23,8 +25,8 @@ const errorLog = new AwsErrorLog(serviceName)
 const endpoint = initTestEndpoint(serviceName)
 const MAX_ITEMS = 100
 
-const listClustersForRegion = async ({ 
-  eks, 
+const listClustersForRegion = async ({
+  eks,
   resolveRegion,
 }: {
   eks: EKS
@@ -123,9 +125,61 @@ const getResourceTags = async (eks: EKS, arn: string): Promise<TagMap> =>
     }
   })
 
+const listNodegroups = async ({
+  eks,
+  clusterName,
+}: {
+  eks: EKS
+  clusterName: string
+}): Promise<string[]> =>
+  new Promise<string[]>(resolve => {
+    const nodeGroupsList: string[] = []
+    let args: ListNodegroupsRequest = { clusterName }
+    const listAllNodeGroups = (token?: string): void => {
+      if (token) {
+        args = { ...args, nextToken: token }
+      }
+
+      try {
+        eks.listNodegroups(
+          args,
+          (err: AWSError, data: ListNodegroupsResponse) => {
+            if (err) {
+              errorLog.generateAwsErrorLog({
+                functionName: 'eks:listNodegroups',
+                err,
+              })
+            }
+
+            /**
+             * No node groups for this region
+             */
+            if (isEmpty(data)) {
+              return resolve(nodeGroupsList)
+            }
+
+            const { nextToken, nodegroups } = data || {}
+
+            nodeGroupsList.push(...nodegroups)
+
+            if (nextToken) {
+              listAllNodeGroups(nextToken)
+            }
+
+            resolve(nodeGroupsList)
+          }
+        )
+      } catch (error) {
+        resolve([])
+      }
+    }
+    listAllNodeGroups()
+  })
+
 export interface RawAwsEksCluster extends Omit<Cluster, 'Tags'> {
   region: string
   Tags?: TagMap
+  NodeGroups?: string[]
 }
 
 export default async ({
@@ -140,6 +194,7 @@ export default async ({
     const regionPromises = []
     const clusterPromises = []
     const tagsPromises = []
+    const nodeGroupsPromises = []
 
     // get all clusters for all regions
     regions.split(',').map(region => {
@@ -192,6 +247,22 @@ export default async ({
     })
 
     await Promise.all(tagsPromises)
+
+    // get all node groups for each cluster
+    eksData.map(({ name, region }, idx) => {
+      const eks = new EKS({ ...config, region, endpoint })
+      const nodeGroupsPromise = new Promise<void>(async resolveNodeGroups => {
+        const nodeGroups: string[] = await listNodegroups({
+          eks,
+          clusterName: name,
+        })
+        eksData[idx].NodeGroups = nodeGroups
+        resolveNodeGroups()
+      })
+      nodeGroupsPromises.push(nodeGroupsPromise)
+    })
+
+    await Promise.all(nodeGroupsPromises)
     errorLog.reset()
 
     resolve(groupBy(eksData, 'region'))

src/services/eksCluster/format.ts

@@ -29,6 +29,7 @@ export default ({
     platformVersion,
     encryptionConfig,
     Tags = {},
+    NodeGroups: nodeGroups = []
   } = service
 
   const formattedKubernetesNetworkConfig = {
@@ -70,5 +71,6 @@ export default ({
       ...config,
     })),
     tags: formatTagsFromMap(Tags),
+    nodeGroups
   }
 }

src/services/eksCluster/schema.graphql

@@ -13,6 +13,7 @@ type awsEksCluster implements awsBaseService @key(fields: "arn") {
   platformVersion: String @search(by: [hash, regexp])
   encryptionConfig: [awsEksEncryptionConfig]
   tags: [awsRawTag]
+  nodeGroups: [String] @search(by: [hash])
   iamRoles: [awsIamRole] @hasInverse(field: eksClusters)
   kms: [awsKms] @hasInverse(field: eksCluster)
   securityGroups: [awsSecurityGroup] @hasInverse(field: eksCluster)

src/types/generated.ts

@@ -849,6 +849,7 @@ export type AwsCloudfront = AwsBaseService & {
 
 export type AwsCloudfrontCacheBehavior = {
   allowedMethods?: Maybe<Array<Maybe<Scalars['String']>>>;
+  cachePolicyId?: Maybe<Scalars['String']>;
   cachedMethods?: Maybe<Array<Maybe<Scalars['String']>>>;
   compress?: Maybe<Scalars['String']>;
   defaultTtl?: Maybe<Scalars['String']>;
@@ -2376,6 +2377,7 @@ export type AwsEksCluster = AwsBaseService & {
   kubernetesNetworkConfig?: Maybe<AwsEksKubernetesNetworkConfigResponse>;
   logging?: Maybe<AwsEksLogging>;
   name?: Maybe<Scalars['String']>;
+  nodeGroups?: Maybe<Array<Maybe<Scalars['String']>>>;
   platformVersion?: Maybe<Scalars['String']>;
   resourcesVpcConfig?: Maybe<AwsEksVpcConfigResponse>;
   securityGroups?: Maybe<Array<Maybe<AwsSecurityGroup>>>;