Merge branch 'main' into huijbers/coverage-txt

aws · Aug 25, 2023 · 10328e0 · 10328e0
2 parents 90e414c + 6cffca0
commit 10328e0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/packages/aws-cdk-lib/core/lib/helpers-internal/cfn-parse.ts b/packages/aws-cdk-lib/core/lib/helpers-internal/cfn-parse.ts
@@ -472,6 +472,7 @@ export class CfnParser {
  case 'Delete': return CfnDeletionPolicy.DELETE;
  case 'Retain': return CfnDeletionPolicy.RETAIN;
  case 'Snapshot': return CfnDeletionPolicy.SNAPSHOT;
+ case 'RetainExceptOnCreate': return CfnDeletionPolicy.RETAIN_EXCEPT_ON_CREATE;
  default: throw new Error(`Unrecognized DeletionPolicy '${policy}'`);
  }
  }

diff --git a/packages/aws-cdk/lib/api/hotswap/ecs-services.ts b/packages/aws-cdk/lib/api/hotswap/ecs-services.ts
@@ -132,8 +132,9 @@ export async function isHotswappableEcsServiceChange(
  },
  },
  } as const;
+ const excludeFromTransformLowercased = transformObjectKeys(excludeFromTransform, lowerCaseFirstCharacter);
  // We first uppercase the task definition to properly merge it with the one from CloudFormation template.
- const upperCasedTaskDef = transformObjectKeys(target.taskDefinition, upperCaseFirstCharacter, excludeFromTransform);
+ const upperCasedTaskDef = transformObjectKeys(target.taskDefinition, upperCaseFirstCharacter, excludeFromTransformLowercased);
  // merge evaluatable diff from CloudFormation template.
  const updatedTaskDef = applyPropertyUpdates(changes.updates, upperCasedTaskDef);
  // lowercase the merged task definition to use it in AWS SDK.

diff --git a/packages/aws-cdk/test/api/hotswap/ecs-services-hotswap-deployments.test.ts b/packages/aws-cdk/test/api/hotswap/ecs-services-hotswap-deployments.test.ts
@@ -812,13 +812,22 @@ describe.each([HotswapMode.FALL_BACK, HotswapMode.HOTSWAP_ONLY])('%p mode', (hot
  });
  });
 
- test('should call registerTaskDefinition with certain properties not lowercased', async () => {
+ test('should call registerTaskDefinition with certain properties not lowercased nor uppercased', async () => {
  // GIVEN
  setupCurrentTaskDefinition({
  taskDefinitionProperties: {
  Family: 'my-task-def',
  ContainerDefinitions: [
- { Image: 'image1' },
+ {
+ Image: 'image1',
+ DockerLabels: { Label1: 'label1' },
+ FirelensConfiguration: {
+ Options: { Name: 'cloudwatch' },
+ },
+ LogConfiguration: {
+ Options: { Option1: 'option1', option2: 'option2' },
+ },
+ },
  ],
  Volumes: [
  {
@@ -846,7 +855,7 @@ describe.each([HotswapMode.FALL_BACK, HotswapMode.HOTSWAP_ONLY])('%p mode', (hot
  Options: { Name: 'cloudwatch' },
  },
  LogConfiguration: {
- Options: { Option1: 'option1' },
+ Options: { Option1: 'option1', option2: 'option2' },
  },
  },
  ],
@@ -887,7 +896,7 @@ describe.each([HotswapMode.FALL_BACK, HotswapMode.HOTSWAP_ONLY])('%p mode', (hot
  },
  },
  logConfiguration: {
- options: { Option1: 'option1' },
+ options: { Option1: 'option1', option2: 'option2' },
  },
  },
  ],