Merge remote-tracking branch 'origin/main' into adot-go-update

* origin/main:
  Downgrade EKS version to 1.31 to support adot addon installation
  adding dbinsights advanced for aurora cluster
  Update package dependencies along with aws-cdk version
  Add kubectlLayer version and bump EKS and oTeL addon versions
  Update the aws-cdk and other dependencies to latest versions
  Update PetSite application ecs clusters with enhanced observability
  Update codepipeline-stack.yml file with github user variable
  CDK TaskDefinition change (#300)
  Petfood removal and RDS ServerlessV2 migration (#292)
  Fixed type conversion error on Fargate Task definition
  Petfood removal and RDS ServerlessV2 migration (#292)

Author: bonclay7

PetAdoptions/cdk/pet_stack/lib/applications.ts

@@ -9,6 +9,7 @@ import { readFileSync } from 'fs';
 import { Construct } from 'constructs'
 import { ContainerImageBuilderProps, ContainerImageBuilder } from './common/container-image-builder'
 import { PetAdoptionsHistory } from './applications/pet-adoptions-history-application'
+import { KubectlV31Layer } from '@aws-cdk/lambda-layer-kubectl-v31';
 
 export class Applications extends Stack {
   constructor(scope: Construct, id: string, props?: StackProps) {
@@ -25,6 +26,7 @@ export class Applications extends Stack {
 
     const cluster = eks.Cluster.fromClusterAttributes(this, 'MyCluster', {
       clusterName: 'PetSite',
+      kubectlLayer: new KubectlV31Layer(this, 'kubectl'),
       kubectlRoleArn: roleArn,
     });
     // ClusterID is not available for creating the proper conditions https://github.com/aws/aws-cdk/issues/10347
@@ -142,4 +144,4 @@ export class Applications extends Stack {
         new CfnOutput(this, key, { value: value })
     });
     }
-}
+}

PetAdoptions/cdk/pet_stack/lib/services.ts

@@ -15,10 +15,7 @@ import * as yaml from 'js-yaml';
 import * as path from 'path';
 import * as lambda from 'aws-cdk-lib/aws-lambda';
 import * as elbv2 from 'aws-cdk-lib/aws-elasticloadbalancingv2';
-import * as cloud9 from 'aws-cdk-lib/aws-cloud9';
 import * as cloudwatch from 'aws-cdk-lib/aws-cloudwatch';
-import * as ecr from 'aws-cdk-lib/aws-ecr';
-import * as ecrassets from 'aws-cdk-lib/aws-ecr-assets';
 import * as applicationinsights from 'aws-cdk-lib/aws-applicationinsights';
 import * as resourcegroups from 'aws-cdk-lib/aws-resourcegroups';
 
@@ -34,8 +31,7 @@ import { CfnJson, RemovalPolicy, Fn, Duration, Stack, StackProps, CfnOutput } fr
 import { readFileSync } from 'fs';
 import 'ts-replace-all'
 import { TreatMissingData, ComparisonOperator } from 'aws-cdk-lib/aws-cloudwatch';
-import { KubectlLayer } from 'aws-cdk-lib/lambda-layer-kubectl';
-import { Cloud9Environment } from './modules/core/cloud9';
+import { KubectlV31Layer } from '@aws-cdk/lambda-layer-kubectl-v31';
 
 export class Services extends Stack {
     constructor(scope: Construct, id: string, props?: StackProps) {
@@ -133,19 +129,21 @@ export class Services extends Stack {
             rdsUsername = "petadmin"
         }
 
-        const auroraCluster = new rds.ServerlessCluster(this, 'Database', {
-
-            engine: rds.DatabaseClusterEngine.auroraPostgres({ version: rds.AuroraPostgresEngineVersion.VER_13_9 }),
-
+        const auroraCluster = new rds.DatabaseCluster(this, 'Database', {
+            engine: rds.DatabaseClusterEngine.auroraPostgres({ version: rds.AuroraPostgresEngineVersion.VER_13_15 }),
             parameterGroup: rds.ParameterGroup.fromParameterGroupName(this, 'ParameterGroup', 'default.aurora-postgresql13'),
             vpc: theVPC,
             securityGroups: [rdssecuritygroup],
             defaultDatabaseName: 'adoptions',
-            scaling: {
-                autoPause: Duration.minutes(60),
-                minCapacity: rds.AuroraCapacityUnit.ACU_2,
-                maxCapacity: rds.AuroraCapacityUnit.ACU_8,
-            }
+            databaseInsightsMode: rds.DatabaseInsightsMode.ADVANCED,
+            performanceInsightRetention: rds.PerformanceInsightRetention.MONTHS_15,
+            writer: rds.ClusterInstance.serverlessV2('writer', {
+                autoMinorVersionUpgrade: true
+            }),
+            readers: [
+            ],
+            serverlessV2MaxCapacity: 1,
+            serverlessV2MinCapacity: 0.5,
         });
 
 
@@ -185,7 +183,7 @@ export class Services extends Stack {
 
         const ecsPayForAdoptionCluster = new ecs.Cluster(this, "PayForAdoption", {
             vpc: theVPC,
-            containerInsights: true
+            containerInsightsV2: ecs.ContainerInsights.ENHANCED
         });
         // PayForAdoption service definitions-----------------------------------------------------------------------
         const payForAdoptionService = new PayForAdoptionService(this, 'pay-for-adoption-service', {
@@ -206,7 +204,7 @@ export class Services extends Stack {
 
         const ecsPetListAdoptionCluster = new ecs.Cluster(this, "PetListAdoptions", {
             vpc: theVPC,
-            containerInsights: true
+            containerInsightsV2: ecs.ContainerInsights.ENHANCED
         });
         // PetListAdoptions service definitions-----------------------------------------------------------------------
         const listAdoptionsService = new ListAdoptionsService(this, 'list-adoptions-service', {
@@ -225,7 +223,7 @@ export class Services extends Stack {
 
         const ecsPetSearchCluster = new ecs.Cluster(this, "PetSearch", {
             vpc: theVPC,
-            containerInsights: true
+            containerInsightsV2: ecs.ContainerInsights.ENHANCED
         });
         // PetSearch service definitions-----------------------------------------------------------------------
         const searchService = new SearchService(this, 'search-service', {
@@ -338,8 +336,8 @@ export class Services extends Stack {
             defaultCapacity: 2,
             defaultCapacityInstance: ec2.InstanceType.of(ec2.InstanceClass.T3, ec2.InstanceSize.MEDIUM),
             secretsEncryptionKey: secretsKey,
-            version: KubernetesVersion.of('1.31'),
-            kubectlLayer: new KubectlLayer(this, 'kubectl'),
+            version: eks.KubernetesVersion.V1_31,
+            kubectlLayer: new KubectlV31Layer(this, 'kubectl'),
             authenticationMode: eks.AuthenticationMode.API_AND_CONFIG_MAP,
         });
 
@@ -507,7 +505,7 @@ export class Services extends Stack {
         // NOTE: Amazon CloudWatch Observability Addon for CloudWatch Agent and Fluentbit
         const otelAddon = new eks.CfnAddon(this, 'otelObservabilityAddon', {
             addonName: 'amazon-cloudwatch-observability',
-            addonVersion: 'v2.6.0-eksbuild.1',
+            addonVersion: 'v3.3.0-eksbuild.1',
             clusterName: cluster.clusterName,
             // the properties below are optional
             resolveConflicts: 'OVERWRITE',

PetAdoptions/cdk/pet_stack/lib/services/ecs-service.ts

@@ -51,7 +51,7 @@ export abstract class EcsService extends Construct {
     ]
   });
 
-  public readonly taskDefinition: ecs.TaskDefinition;
+  public readonly taskDefinition: ecs.FargateTaskDefinition;
   public readonly service: ecs_patterns.ApplicationLoadBalancedServiceBase;
   public readonly container: ecs.ContainerDefinition;
 

PetAdoptions/cdk/pet_stack/lib/services/list-adoptions-service.ts

@@ -6,7 +6,7 @@ import { Construct } from 'constructs'
 
 
 export interface ListAdoptionServiceProps extends EcsServiceProps {
-  database: rds.ServerlessCluster
+  database: rds.DatabaseCluster
 }
 
 export class ListAdoptionsService extends EcsService {

PetAdoptions/cdk/pet_stack/lib/services/pay-for-adoption-service.ts

@@ -5,7 +5,7 @@ import { EcsService, EcsServiceProps } from './ecs-service'
 import { Construct } from 'constructs'
 
 export interface PayForAdoptionServiceProps extends EcsServiceProps {
-  database: rds.ServerlessCluster
+  database: rds.DatabaseCluster
 }
 
 export class PayForAdoptionService extends EcsService {

PetAdoptions/cdk/pet_stack/package.json

@@ -12,23 +12,24 @@
     "cdk": "cdk"
   },
   "dependencies": {
-    "@aws-cdk/aws-lambda-python-alpha": "^2.131.0-alpha.0",
+    "@aws-cdk/aws-lambda-python-alpha": "^2.179.0-alpha.0",
+    "@aws-cdk/lambda-layer-kubectl-v31": "^2.0.3",
     "@types/js-yaml": "^4.0.9",
-    "aws-cdk-lib": "^2.146.0",
-    "cdk-ecr-deployment": "^3.0.67",
+    "aws-cdk-lib": "^2.179.0",
+    "cdk-ecr-deployment": "^3.1.9",
     "jest": "^29.7.0",
     "js-yaml": "^4.1.0",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.12",
-    "@types/node": "^20.14.2",
-    "aws-cdk": "^2.146.0",
-    "cdk-nag": "^2.28.144",
-    "constructs": "^10.3.0",
-    "ts-jest": "^29.1.5",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^22.13.4",
+    "aws-cdk": "^2.1000.2",
+    "cdk-nag": "^2.35.24",
+    "constructs": "^10.4.2",
+    "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
     "ts-replace-all": "^1.0.0",
-    "typescript": "^5.4.5"
+    "typescript": "^5.7.3"
   }
-}
+}

PetAdoptions/cdk/pet_stack/resources/load_balancer/iam_policy.json

@@ -18,6 +18,7 @@
                 "elasticloadbalancing:DescribeLoadBalancers",
                 "elasticloadbalancing:DescribeLoadBalancerAttributes",
                 "elasticloadbalancing:DescribeListeners",
+                "elasticloadbalancing:DescribeListenerAttributes",
                 "elasticloadbalancing:DescribeListenerCertificates",
                 "elasticloadbalancing:DescribeSSLPolicies",
                 "elasticloadbalancing:DescribeRules",