@gradientedge/cdk-utils 9.13.0 → 9.14.0

package/src/lib/aws/services/identity-access-management/main.ts

@@ -260,44 +260,6 @@ export class IamManager {
     })
   }
 
-  /**
-   * @summary Method to create iam policy to invalidate cloudfront cache
-   * @param resourceArns list of ARNs to allow access to
-   */
-  public policyForCloudfrontInvalidation(resourceArns?: string[]) {
-    return new PolicyDocument({
-      statements: [
-        this.statementForCreateAnyLogStream(),
-        this.statementForPutAnyLogEvent(),
-        this.statementForCloudfrontInvalidation(),
-        new PolicyStatement({
-          actions: [
-            'ecr:GetDownloadUrlForLayer',
-            'ecr:BatchGetImage',
-            'ecr:BatchCheckLayerAvailability',
-            'ecr:GetAuthorizationToken',
-          ],
-          effect: Effect.ALLOW,
-          resources: resourceArns ?? ['*'],
-        }),
-      ],
-    })
-  }
-
-  /**
-   * @summary Method to create iam role to invalidate cloudfront cache
-   * @param id scoped id of the resource
-   * @param scope scope in which this resource is defined
-   */
-  public roleForCloudfrontInvalidation(id: string, scope: CommonConstruct) {
-    return new Role(scope, `${id}-install-deps-project-role`, {
-      assumedBy: new ServicePrincipal('codebuild.amazonaws.com'),
-      inlinePolicies: {
-        codeBuildPolicy: this.policyForCloudfrontInvalidation(),
-      },
-    })
-  }
-
   /**
    * @summary Method to create iam statement to assume iam role
    * @param scope scope in which this resource is defined
@@ -444,6 +406,77 @@ export class IamManager {
     })
   }
 
+  /**
+   * @summary Method to create iam policy to invalidate cloudfront cache
+   * @param resourceArns list of ARNs to allow access to
+   */
+  public createPolicyForCloudfrontInvalidation(resourceArns?: string[]) {
+    return new PolicyDocument({
+      statements: [
+        this.statementForCreateAnyLogStream(),
+        this.statementForPutAnyLogEvent(),
+        this.statementForCloudfrontInvalidation(),
+        new PolicyStatement({
+          actions: [
+            'ecr:GetDownloadUrlForLayer',
+            'ecr:BatchGetImage',
+            'ecr:BatchCheckLayerAvailability',
+            'ecr:GetAuthorizationToken',
+          ],
+          effect: Effect.ALLOW,
+          resources: resourceArns ?? ['*'],
+        }),
+      ],
+    })
+  }
+
+  /**
+   * @summary Method to create iam policy for sqs
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param sqsQueue
+   * @param eventBridgeRule
+   * @param servicePrincipals
+   */
+  public createPolicyForSqsEvent(
+    id: string,
+    scope: CommonConstruct,
+    sqsQueue: Queue,
+    eventBridgeRule: IRule,
+    servicePrincipals?: ServicePrincipal[]
+  ) {
+    return new PolicyDocument({
+      statements: [
+        new PolicyStatement({
+          actions: ['sqs:*'],
+          conditions: {
+            ArnEquals: {
+              'aws:SourceArn': eventBridgeRule,
+            },
+          },
+          effect: Effect.ALLOW,
+          principals: servicePrincipals ?? [new ServicePrincipal('events.amazonaws.com')],
+          resources: [sqsQueue.queueArn],
+        }),
+      ],
+    })
+  }
+
+  /**
+   * @summary Method to create iam role to invalidate cloudfront cache
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   */
+  public createRoleForCloudfrontInvalidation(id: string, scope: CommonConstruct) {
+    return new Role(scope, `${id}-install-deps-project-role`, {
+      assumedBy: new ServicePrincipal('codebuild.amazonaws.com'),
+      inlinePolicies: {
+        codeBuildPolicy: this.createPolicyForCloudfrontInvalidation(),
+      },
+      roleName: scope.resourceNameFormatter.format(`${id}-cf-invalidation`, scope.props.resourceNameOptions?.iam),
+    })
+  }
+
   /**
    * @summary Method to create iam statement for cloud trail
    * @param id scoped id of the resource
@@ -464,7 +497,7 @@ export class IamManager {
           policyName: scope.resourceNameFormatter.format(`${id}-policy`),
         },
       ],
-      roleName: scope.resourceNameFormatter.format(id),
+      roleName: scope.resourceNameFormatter.format(`${id}-trail`, scope.props.resourceNameOptions?.iam),
     })
 
     createCfnOutput(`${id}Arn`, scope, role.attrArn)
@@ -489,7 +522,7 @@ export class IamManager {
       assumedBy: new ServicePrincipal('events.amazonaws.com'),
       description: `Role for ${id} ECS Task execution from EventBridge`,
       inlinePolicies: { policy },
-      roleName: scope.resourceNameFormatter.format(id),
+      roleName: scope.resourceNameFormatter.format(`${id}-ecs-event`, scope.props.resourceNameOptions?.iam),
     })
 
     createCfnOutput(`${id}Arn`, scope, role.roleArn)
@@ -516,7 +549,7 @@ export class IamManager {
           'arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy'
         ),
       ],
-      roleName: scope.resourceNameFormatter.format(id),
+      roleName: scope.resourceNameFormatter.format(`${id}-ecs-exec`, scope.props.resourceNameOptions?.iam),
     })
 
     createCfnOutput(`${id}Arn`, scope, role.roleArn)
@@ -549,7 +582,7 @@ export class IamManager {
           'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'
         ),
       ],
-      roleName: scope.resourceNameFormatter.format(id),
+      roleName: scope.resourceNameFormatter.format(`${id}-lambda`, scope.props.resourceNameOptions?.iam),
     })
 
     createCfnOutput(`${id}Arn`, scope, role.roleArn)
@@ -575,7 +608,7 @@ export class IamManager {
       assumedBy: servicePrincipal ?? new ServicePrincipal('appconfig.amazonaws.com'),
       description: `Role for ${id} AppConfig Secrets`,
       inlinePolicies: { policy },
-      roleName: scope.resourceNameFormatter.format(id),
+      roleName: scope.resourceNameFormatter.format(`${id}-app-secrets`, scope.props.resourceNameOptions?.iam),
     })
 
     createCfnOutput(`${id}Arn`, scope, role.roleArn)
@@ -608,7 +641,7 @@ export class IamManager {
           'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'
         ),
       ],
-      roleName: scope.resourceNameFormatter.format(id),
+      roleName: scope.resourceNameFormatter.format(`${id}-sfn-exec`, scope.props.resourceNameOptions?.iam),
     })
 
     createCfnOutput(`${id}Arn`, scope, role.roleArn)
@@ -628,7 +661,7 @@ export class IamManager {
     const role = new Role(scope, `${id}`, {
       assumedBy: new ServicePrincipal('pipes.amazonaws.com'),
       description: `Role for ${id} Pipe`,
-      roleName: scope.resourceNameFormatter.format(id),
+      roleName: scope.resourceNameFormatter.format(`${id}-pipe`, scope.props.resourceNameOptions?.iam),
     })
 
     role.addToPolicy(this.statementForPollQueue([queueArn]))
@@ -651,7 +684,7 @@ export class IamManager {
     const role = new Role(scope, `${id}`, {
       assumedBy: new ServicePrincipal('pipes.amazonaws.com'),
       description: `Role for ${id} Pipe`,
-      roleName: scope.resourceNameFormatter.format(id),
+      roleName: scope.resourceNameFormatter.format(`${id}-pipe`, scope.props.resourceNameOptions?.iam),
     })
 
     role.addToPolicy(this.statementForPollQueue([queueArn]))
@@ -663,38 +696,6 @@ export class IamManager {
     return role
   }
 
-  /**
-   * @summary Method to create iam policy for sqs
-   * @param id scoped id of the resource
-   * @param scope scope in which this resource is defined
-   * @param sqsQueue
-   * @param eventBridgeRule
-   * @param servicePrincipals
-   */
-  public createPolicyForSqsEvent(
-    id: string,
-    scope: CommonConstruct,
-    sqsQueue: Queue,
-    eventBridgeRule: IRule,
-    servicePrincipals?: ServicePrincipal[]
-  ) {
-    return new PolicyDocument({
-      statements: [
-        new PolicyStatement({
-          actions: ['sqs:*'],
-          conditions: {
-            ArnEquals: {
-              'aws:SourceArn': eventBridgeRule,
-            },
-          },
-          effect: Effect.ALLOW,
-          principals: servicePrincipals ?? [new ServicePrincipal('events.amazonaws.com')],
-          resources: [sqsQueue.queueArn],
-        }),
-      ],
-    })
-  }
-
   /**
    * @summary Method to create iam statement for dynamoDb to lambda function pipe
    * @param id scoped id of the resource
@@ -711,7 +712,7 @@ export class IamManager {
     const role = new Role(scope, `${id}`, {
       assumedBy: new ServicePrincipal('pipes.amazonaws.com'),
       description: `Role for ${id} Pipe`,
-      roleName: scope.resourceNameFormatter.format(id),
+      roleName: scope.resourceNameFormatter.format(`${id}-pipe`, scope.props.resourceNameOptions?.iam),
     })
 
     role.addToPolicy(this.statementFordynamoDbStream([dynamoDbStreamArn]))

package/src/lib/aws/services/key-management-service/main.ts

@@ -32,7 +32,7 @@ export class KmsManager {
 
     const key = new Key(scope, `${id}`, {
       ...props,
-      alias: scope.resourceNameFormatter.format(props.alias, props.resourceNameOptions),
+      alias: scope.resourceNameFormatter.format(props.alias, scope.props.resourceNameOptions?.kms),
     })
 
     createCfnOutput(`${id}-keyId`, scope, key.keyId)

package/src/lib/aws/services/key-management-service/types.ts

@@ -3,6 +3,4 @@ import { ResourceNameFormatterProps } from '../../common'
 
 /**
  */
-export interface KmsKeyProps extends KeyProps {
-  resourceNameOptions?: ResourceNameFormatterProps
-}
+export interface KmsKeyProps extends KeyProps {}

package/src/lib/aws/services/lambda/main.ts

@@ -53,7 +53,7 @@ export class LambdaManager {
       compatibleArchitectures: architectures ?? [Architecture.ARM_64],
       compatibleRuntimes: [scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME],
       description: `${id}`,
-      layerVersionName: `${id}-${scope.props.stage}`,
+      layerVersionName: scope.resourceNameFormatter.format(id, scope.props.resourceNameOptions?.lambdaLayer),
     })
 
     createCfnOutput(`${id}-lambdaLayerArn`, scope, lambdaLayer.layerVersionArn)
@@ -110,7 +110,10 @@ export class LambdaManager {
     if (!props) throw `Lambda props undefined for ${id}`
     if (!props.functionName) throw `Lambda functionName undefined for ${id}`
 
-    const functionName = scope.resourceNameFormatter.format(props.functionName, props.resourceNameOptions)
+    const functionName = scope.resourceNameFormatter.format(
+      props.functionName,
+      scope.props.resourceNameOptions?.lambdaFunction
+    )
 
     let deadLetterQueue
     if (props.deadLetterQueueEnabled) {
@@ -143,8 +146,8 @@ export class LambdaManager {
       functionName,
       handler: handler || 'index.lambda_handler',
       layers,
-      logGroup: new LogGroup(scope, `${id}-log-group`, {
-        logGroupName: `/aws/lambda/${functionName}`,
+      logGroup: scope.logManager.createLogGroup(`${id}-log-group`, scope, {
+        logGroupName: props.functionName,
         removalPolicy: RemovalPolicy.DESTROY,
         retention: scope.props.logRetention ?? logRetention,
       }),
@@ -268,7 +271,10 @@ export class LambdaManager {
     if (!props) throw `Lambda props undefined for ${id}`
     if (!props.functionName) throw `Lambda functionName undefined for ${id}`
 
-    const functionName = scope.resourceNameFormatter.format(props.functionName, props.resourceNameOptions)
+    const functionName = scope.resourceNameFormatter.format(
+      props.functionName,
+      scope.props.resourceNameOptions?.lambdaFunction
+    )
 
     let deadLetterQueue
     if (props.deadLetterQueueEnabled) {
@@ -299,8 +305,8 @@ export class LambdaManager {
       },
       filesystem: accessPoint ? FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg') : undefined,
       functionName,
-      logGroup: new LogGroup(scope, `${id}-log-group`, {
-        logGroupName: `/aws/lambda/${functionName}`,
+      logGroup: scope.logManager.createLogGroup(`${id}-log-group`, scope, {
+        logGroupName: props.functionName,
         removalPolicy: RemovalPolicy.DESTROY,
         retention: scope.props.logRetention ?? logRetention,
       }),

package/src/lib/aws/services/lambda/types.ts

@@ -23,7 +23,6 @@ export interface LambdaProps extends FunctionProps {
   redriveq?: QueueProps
   tags?: TagProps[]
   timeoutInSecs?: number
-  resourceNameOptions?: ResourceNameFormatterProps
 }
 
 /**
@@ -38,7 +37,6 @@ export interface LambdaAliasProps extends AliasProps {
 export interface LambdaEdgeProps extends EdgeFunctionProps {
   tags?: TagProps[]
   timeoutInSecs?: number
-  resourceNameOptions?: ResourceNameFormatterProps
 }
 
 /**

package/src/lib/aws/services/secrets-manager/main.ts

@@ -34,7 +34,7 @@ export class SecretsManager {
 
     const secret = new Secret(scope, `${id}`, {
       ...props,
-      secretName: scope.resourceNameFormatter.format(props.secretName, props.resourceNameOptions),
+      secretName: scope.resourceNameFormatter.format(props.secretName, scope.props.resourceNameOptions?.secret),
     })
 
     createCfnOutput(`${id}-secretName`, scope, secret.secretName)

package/src/lib/aws/services/secrets-manager/types.ts

@@ -1,6 +1,4 @@
 import { SecretProps } from 'aws-cdk-lib/aws-secretsmanager'
 import { ResourceNameFormatterProps } from '../../common'
 
-export interface SecretBaseProps extends SecretProps {
-  resourceNameOptions?: ResourceNameFormatterProps
-}
+export interface SecretBaseProps extends SecretProps {}

package/src/lib/aws/services/simple-notification-service/main.ts

@@ -41,8 +41,8 @@ export class SnsManager {
 
     const topic = new Topic(scope, id, {
       ...props,
-      displayName: scope.resourceNameFormatter.format(props.topicName, props.resourceNameOptions),
-      topicName: scope.resourceNameFormatter.format(props.topicName, props.resourceNameOptions),
+      displayName: scope.resourceNameFormatter.format(props.topicName, scope.props.resourceNameOptions?.sns),
+      topicName: scope.resourceNameFormatter.format(props.topicName, scope.props.resourceNameOptions?.sns),
     })
 
     if (emails && !_.isEmpty(emails)) {
@@ -73,8 +73,8 @@ export class SnsManager {
 
     const topic = new Topic(scope, id, {
       ...props,
-      displayName: scope.resourceNameFormatter.format(props.topicName, props.resourceNameOptions),
-      topicName: scope.resourceNameFormatter.format(props.topicName, props.resourceNameOptions),
+      displayName: scope.resourceNameFormatter.format(props.topicName, scope.props.resourceNameOptions?.sns),
+      topicName: scope.resourceNameFormatter.format(props.topicName, scope.props.resourceNameOptions?.sns),
     })
 
     topic.addSubscription(new LambdaSubscription(lambdaFunction))

package/src/lib/aws/services/simple-notification-service/types.ts

@@ -3,6 +3,4 @@ import { ResourceNameFormatterProps } from '../../common'
 
 /**
  */
-export interface SubscriptionProps extends TopicProps {
-  resourceNameOptions?: ResourceNameFormatterProps
-}
+export interface SubscriptionProps extends TopicProps {}

package/src/lib/aws/services/simple-queue-service/main.ts

@@ -34,7 +34,7 @@ export class SqsManager {
     if (!props) throw `Queue props undefined for ${id}`
     if (!props.queueName) throw `Queue queueName undefined for ${id}`
 
-    let queueName = scope.resourceNameFormatter.format(props.queueName, props.resourceNameOptions)
+    let queueName = scope.resourceNameFormatter.format(props.queueName, scope.props.resourceNameOptions?.sqs)
     if (props.fifo) queueName += '.fifo'
 
     const queue = new Queue(scope, id, {

package/src/lib/aws/services/simple-queue-service/types.ts

@@ -14,5 +14,4 @@ export interface QueueProps extends sqs.QueueProps {
   retryBatchSize?: number
   tags?: TagProps[]
   visibilityTimeoutInSecs?: number
-  resourceNameOptions?: ResourceNameFormatterProps
 }

package/src/lib/aws/services/simple-storage-service/main.ts

@@ -78,7 +78,7 @@ export class S3Manager {
     if (!scope.props.excludeAccountNumberForBuckets) {
       return S3Manager.determineBucketNameByAccountAndRegion(scope, bucketName)
     }
-    return scope.resourceNameFormatter.format(bucketName, props.resourceNameOptions)
+    return scope.resourceNameFormatter.format(bucketName, scope.props.resourceNameOptions?.s3)
   }
 
   /**

package/src/lib/aws/services/simple-storage-service/types.ts

@@ -25,6 +25,5 @@ export interface S3BucketProps extends s3.BucketProps {
   existingBucket?: boolean
   lifecycleRules?: LifecycleRule[]
   logBucketName?: string
-  resourceNameOptions?: ResourceNameFormatterProps
   tags?: TagProps[]
 }

package/src/lib/aws/services/step-function/main.ts

@@ -485,7 +485,10 @@ export class SfnManager {
         level: props.logs?.level ?? LogLevel.ALL,
       },
       role,
-      stateMachineName: scope.resourceNameFormatter.format(props.stateMachineName, props.resourceNameOptions),
+      stateMachineName: scope.resourceNameFormatter.format(
+        props.stateMachineName,
+        scope.props.resourceNameOptions?.stepFunction
+      ),
     })
 
     createCfnOutput(`${id}-stateMachineName`, scope, stateMachine.stateMachineName)

package/src/lib/aws/services/step-function/types.ts

@@ -108,9 +108,7 @@ export interface SfnCallApiGatewayRestApiEndpointProps extends CallApiGatewayRes
 
 /**
  */
-export interface SfnStateMachineProps extends StateMachineProps {
-  resourceNameOptions?: ResourceNameFormatterProps
-}
+export interface SfnStateMachineProps extends StateMachineProps {}
 
 /**
  */

package/src/lib/aws/services/systems-manager/main.ts

@@ -41,7 +41,7 @@ export class SsmManager {
     const parameter = new StringParameter(scope, `${id}`, {
       ...props,
       description: `${props.description} - ${scope.props.stage} stage`,
-      parameterName: scope.resourceNameFormatter.format(props.parameterName, props.resourceNameOptions),
+      parameterName: scope.resourceNameFormatter.format(props.parameterName, scope.props.resourceNameOptions?.ssm),
     })
 
     createCfnOutput(`${id}-parameterArn`, scope, parameter.parameterArn)

package/src/lib/aws/services/systems-manager/types.ts

@@ -8,6 +8,4 @@ export interface SSMParameterReaderProps {
   region: string
 }
 
-export interface SSMStringParameterProps extends StringParameterProps {
-  resourceNameOptions?: ResourceNameFormatterProps
-}
+export interface SSMStringParameterProps extends StringParameterProps {}

package/src/lib/aws/services/virtual-private-cloud/main.ts

@@ -37,7 +37,7 @@ export class VpcManager {
     if (!props) throw `Vpc props undefined for ${id}`
     if (!props.vpcName) throw `Vpc vpcName undefined for ${id}`
 
-    const vpcName = scope.resourceNameFormatter.format(props.vpcName, props.resourceNameOptions)
+    const vpcName = scope.resourceNameFormatter.format(props.vpcName, scope.props.resourceNameOptions?.vpc)
     let vpc
     if (props.isIPV6) {
       vpc = new Ipv6Vpc(scope, `${id}`, {
@@ -85,7 +85,7 @@ export class VpcManager {
     const vpc = this.createVpc(id, scope, props)
     Tags.of(vpc).add(
       'Name',
-      scope.resourceNameFormatter.format(vpcIdentifier ?? CommonVpcIdentifier, props.resourceNameOptions)
+      scope.resourceNameFormatter.format(vpcIdentifier ?? CommonVpcIdentifier, scope.props.resourceNameOptions?.vpc)
     )
 
     return vpc

package/src/lib/aws/services/virtual-private-cloud/types.ts

@@ -3,5 +3,4 @@ import { ResourceNameFormatterProps } from '../../common'
 
 export interface VpcProps extends ec2.VpcProps {
   isIPV6?: boolean
-  resourceNameOptions?: ResourceNameFormatterProps
 }

package/src/lib/aws/services/web-application-firewall/main.ts

@@ -33,7 +33,7 @@ export class WafManager {
     const ipSet = new CfnIPSet(scope, `${id}`, {
       ...props,
       description: `IP Set for ${id} - ${scope.props.stage} stage`,
-      name: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
+      name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.waf),
     })
 
     createCfnOutput(`${id}-ipSetId`, scope, ipSet.attrId)
@@ -55,7 +55,7 @@ export class WafManager {
     const webAcl = new CfnWebACL(scope, `${id}`, {
       ...props,
       description: `Web Acl for ${id} - ${scope.props.stage} stage`,
-      name: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
+      name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.waf),
       tags: [{ key: 'service', value: scope.props.name }],
     })
 

package/src/lib/aws/services/web-application-firewall/types.ts

@@ -3,12 +3,8 @@ import { ResourceNameFormatterProps } from '../../common'
 
 /**
  */
-export interface WafIPSetProps extends CfnIPSetProps {
-  resourceNameOptions?: ResourceNameFormatterProps
-}
+export interface WafIPSetProps extends CfnIPSetProps {}
 
 /**
  */
-export interface WafWebACLProps extends CfnWebACLProps {
-  resourceNameOptions?: ResourceNameFormatterProps
-}
+export interface WafWebACLProps extends CfnWebACLProps {}