Use the constants for Arch

raykrueger · Oct 7, 2024 · 3172354 · 3172354
1 parent 50ecf54
commit 3172354
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/auto_shutdown.ts b/src/auto_shutdown.ts
@@ -3,10 +3,11 @@ import { ComparisonOperator } from 'aws-cdk-lib/aws-cloudwatch';
 import { SnsAction } from 'aws-cdk-lib/aws-cloudwatch-actions';
 import { BaseService } from 'aws-cdk-lib/aws-ecs';
 import { PolicyStatement } from 'aws-cdk-lib/aws-iam';
-import { Architecture, Code, Function, Runtime } from 'aws-cdk-lib/aws-lambda';
+import { Code, Function } from 'aws-cdk-lib/aws-lambda';
 import { Topic } from 'aws-cdk-lib/aws-sns';
 import { LambdaSubscription } from 'aws-cdk-lib/aws-sns-subscriptions';
 import { Construct } from 'constructs';
+import { Constants } from './constants';
 
 export interface AutoShutdownProps {
   readonly cpuUtilizationMin?: number;
@@ -40,10 +41,10 @@ export class AutoShutdown extends Construct {
 
   buildShutdownFunction(code: Code) {
     return new Function(this, 'AutoShutdownFunction', {
-      architecture: Architecture.ARM_64,
+      architecture: Constants.LAMBDA_ARCH,
       code,
       handler: 'autoshutdown.handler',
-      runtime: Runtime.PYTHON_3_9,
+      runtime: Constants.LAMBDA_RUNTIME,
     });
   }
 

diff --git a/src/discord-state-machine.ts b/src/discord-state-machine.ts
@@ -1,7 +1,7 @@
 import * as path from 'path';
 import { BaseService, ICluster } from 'aws-cdk-lib/aws-ecs';
 import { Grant, IGrantable } from 'aws-cdk-lib/aws-iam';
-import { Architecture, Code, Function } from 'aws-cdk-lib/aws-lambda';
+import { Code, Function } from 'aws-cdk-lib/aws-lambda';
 import { ISecret } from 'aws-cdk-lib/aws-secretsmanager';
 import { Choice, Condition, DefinitionBody, Pass, Result, StateMachine, Succeed } from 'aws-cdk-lib/aws-stepfunctions';
 import { CallAwsService, LambdaInvoke } from 'aws-cdk-lib/aws-stepfunctions-tasks';
@@ -30,7 +30,7 @@ export class DiscordStateMachine extends Construct {
 
     const responseFunction = new Function(this, 'DiscordResponse', {
       runtime: Constants.LAMBDA_RUNTIME,
-      architecture: Architecture.ARM_64,
+      architecture: Constants.LAMBDA_ARCH,
       code: Code.fromAsset(path.join(__dirname, '../resources/functions/discord'), {
         bundling: {
           image: Constants.LAMBDA_RUNTIME.bundlingImage,

diff --git a/src/discord.ts b/src/discord.ts
@@ -3,7 +3,7 @@ import { ApiGatewayToLambda } from '@aws-solutions-constructs/aws-apigateway-lam
 import { AuthorizationType } from 'aws-cdk-lib/aws-apigateway';
 import { BaseService } from 'aws-cdk-lib/aws-ecs';
 import { PolicyStatement } from 'aws-cdk-lib/aws-iam';
-import { Architecture, Code, Function } from 'aws-cdk-lib/aws-lambda';
+import { Code, Function } from 'aws-cdk-lib/aws-lambda';
 import { Secret } from 'aws-cdk-lib/aws-secretsmanager';
 import { Construct } from 'constructs';
 import { Constants } from './constants';
@@ -33,7 +33,7 @@ export class DiscordBotConstruct extends Construct {
 
     const f = new Function(this, 'DiscordBotFunction', {
       runtime: Constants.LAMBDA_RUNTIME,
-      architecture: Architecture.ARM_64,
+      architecture: Constants.LAMBDA_ARCH,
       code: Code.fromAsset(path.join(__dirname, '../resources/functions/discord'), {
         bundling: {
           image: Constants.LAMBDA_RUNTIME.bundlingImage,

diff --git a/src/discord_bot_custom_resource.ts b/src/discord_bot_custom_resource.ts
@@ -2,7 +2,7 @@ import * as crypto from 'crypto';
 import * as fs from 'fs';
 import * as path from 'path';
 import { CustomResource, RemovalPolicy } from 'aws-cdk-lib';
-import { Architecture, Code, Function } from 'aws-cdk-lib/aws-lambda';
+import { Code, Function } from 'aws-cdk-lib/aws-lambda';
 import { ISecret } from 'aws-cdk-lib/aws-secretsmanager';
 import { Provider } from 'aws-cdk-lib/custom-resources';
 import { Construct } from 'constructs';
@@ -40,7 +40,7 @@ export class DiscordBotCustomResource extends Construct {
 
     const f = new Function(this, 'DiscordBotCRHandler', {
       runtime: Constants.LAMBDA_RUNTIME,
-      architecture: Architecture.ARM_64,
+      architecture: Constants.LAMBDA_ARCH,
       code,
       handler: 'discord_provider.on_event',
       environment: {