fix(toolkit-lib): deploy options is missing importExistingResources and hotswapProperties.ecs.stabilizationTimeoutSeconds

Author: mrgrain

packages/@aws-cdk/toolkit-lib/lib/actions/deploy/index.ts

@@ -28,6 +28,13 @@ export interface ChangeSetDeploymentMethod {
    * If not provided, a name will be generated automatically.
    */
   readonly changeSetName?: string;
+
+  /**
+   * Indicates if the change set imports resources that already exist.
+   *
+   * @default false
+   */
+  readonly importExistingResources?: boolean;
 }
 
 /**
@@ -154,13 +161,18 @@ export interface EcsHotswapProperties {
    * The lower limit on the number of your service's tasks that must remain
    * in the RUNNING state during a deployment, as a percentage of the desiredCount.
    */
-  readonly minimumHealthyPercent: number;
+  readonly minimumHealthyPercent?: number;
 
   /**
    * The upper limit on the number of your service's tasks that are allowed
    * in the RUNNING or PENDING state during a deployment, as a percentage of the desiredCount.
    */
-  readonly maximumHealthyPercent: number;
+  readonly maximumHealthyPercent?: number;
+
+  /**
+   * The number of seconds to wait for a single service to reach stable state.
+   */
+  readonly stabilizationTimeoutSeconds?: number;
 }
 
 /**
@@ -170,5 +182,5 @@ export interface HotswapProperties {
   /**
    * ECS specific hotswap property overrides
    */
-  readonly ecs: EcsHotswapProperties;
+  readonly ecs?: EcsHotswapProperties;
 }

packages/@aws-cdk/toolkit-lib/lib/actions/deploy/private/helpers.ts

@@ -41,7 +41,7 @@ export async function removePublishedAssetsFromWorkGraph(graph: WorkGraph, deplo
  */
 export function createHotswapPropertyOverrides(hotswapProperties: HotswapProperties): HotswapPropertyOverrides {
   return new HotswapPropertyOverrides(new EcsHotswapProperties(
-    hotswapProperties.ecs.minimumHealthyPercent,
-    hotswapProperties.ecs.maximumHealthyPercent,
+    hotswapProperties.ecs?.minimumHealthyPercent,
+    hotswapProperties.ecs?.maximumHealthyPercent,
   ));
 }

packages/@aws-cdk/toolkit-lib/lib/api/deployments/deploy-stack.ts

@@ -25,8 +25,8 @@ import {
   waitForStackDelete,
 } from './cfn-api';
 import { determineAllowCrossAccountAssetPublishing } from './checks';
-import type { ChangeSetDeploymentMethod, DeploymentMethod } from './deployment-method';
 import type { DeployStackResult, SuccessfulDeployStackResult } from './deployment-result';
+import type { ChangeSetDeploymentMethod, DeploymentMethod } from '../../actions/deploy';
 import { ToolkitError } from '../../toolkit/toolkit-error';
 import { formatErrorMessage } from '../../util';
 import type { SDK, SdkProvider, ICloudFormationClient } from '../aws-auth/private';

packages/@aws-cdk/toolkit-lib/lib/api/deployments/deployment-method.ts

@@ -14,8 +14,8 @@ import {
 import { determineAllowCrossAccountAssetPublishing } from './checks';
 
 import { deployStack, destroyStack } from './deploy-stack';
-import type { DeploymentMethod } from './deployment-method';
 import type { DeployStackResult } from './deployment-result';
+import type { DeploymentMethod } from '../../actions/deploy';
 import { ToolkitError } from '../../toolkit/toolkit-error';
 import { formatErrorMessage } from '../../util';
 import type { SdkProvider } from '../aws-auth/private';

packages/@aws-cdk/toolkit-lib/lib/api/deployments/deployments.ts

@@ -1,6 +1,5 @@
 export * from './deployments';
 export * from './deployment-result';
-export * from './deployment-method';
 
 // testing exports
 export * from './checks';

packages/@aws-cdk/toolkit-lib/lib/api/deployments/index.ts

@@ -1,4 +1,5 @@
 import type { PropertyDifference } from '@aws-cdk/cloudformation-diff';
+import type { HotswapProperties, EcsHotswapProperties as IEcsHotswapProperties } from '../../actions';
 import type { HotswappableChange, NonHotswappableChange, ResourceChange } from '../../payloads/hotswap';
 import { NonHotswappableReason } from '../../payloads/hotswap';
 import { ToolkitError } from '../../toolkit/toolkit-error';
@@ -69,25 +70,26 @@ export enum HotswapMode {
 /**
  * Represents configuration property overrides for hotswap deployments
  */
-export class HotswapPropertyOverrides {
+export class HotswapPropertyOverrides implements HotswapProperties {
   // Each supported resource type will have its own properties. Currently this is ECS
-  ecsHotswapProperties?: EcsHotswapProperties;
+  readonly ecs?: IEcsHotswapProperties;
 
-  public constructor (ecsHotswapProperties?: EcsHotswapProperties) {
-    this.ecsHotswapProperties = ecsHotswapProperties;
+  public constructor (ecs?: IEcsHotswapProperties) {
+    this.ecs = ecs;
   }
 }
 
 /**
  * Represents configuration properties for ECS hotswap deployments
  */
-export class EcsHotswapProperties {
+export class EcsHotswapProperties implements IEcsHotswapProperties {
   // The lower limit on the number of your service's tasks that must remain in the RUNNING state during a deployment, as a percentage of the desiredCount
   readonly minimumHealthyPercent?: number;
   // The upper limit on the number of your service's tasks that are allowed in the RUNNING or PENDING state during a deployment, as a percentage of the desiredCount
   readonly maximumHealthyPercent?: number;
   // The number of seconds to wait for a single service to reach stable state.
   readonly stabilizationTimeoutSeconds?: number;
+  readonly foo?: number;
 
   public constructor (minimumHealthyPercent?: number, maximumHealthyPercent?: number, stabilizationTimeoutSeconds?: number) {
     if (minimumHealthyPercent !== undefined && minimumHealthyPercent < 0 ) {

packages/@aws-cdk/toolkit-lib/lib/api/hotswap/common.ts

@@ -128,7 +128,7 @@ export async function isHotswappableEcsServiceChange(
         const registerTaskDefResponse = await sdk.ecs().registerTaskDefinition(lowercasedTaskDef);
         const taskDefRevArn = registerTaskDefResponse.taskDefinition?.taskDefinitionArn;
 
-        let ecsHotswapProperties = hotswapPropertyOverrides.ecsHotswapProperties;
+        let ecsHotswapProperties = hotswapPropertyOverrides.ecs;
         let minimumHealthyPercent = ecsHotswapProperties?.minimumHealthyPercent;
         let maximumHealthyPercent = ecsHotswapProperties?.maximumHealthyPercent;
         let stabilizationTimeoutSeconds = ecsHotswapProperties?.stabilizationTimeoutSeconds;

packages/@aws-cdk/toolkit-lib/lib/api/hotswap/ecs-services.ts

@@ -6,8 +6,9 @@ import type { ResourceIdentifierSummary, ResourceToImport } from '@aws-sdk/clien
 import * as chalk from 'chalk';
 import * as fs from 'fs-extra';
 import * as promptly from 'promptly';
+import type { DeploymentMethod } from '../../actions/deploy';
 import { ToolkitError } from '../../toolkit/toolkit-error';
-import type { DeploymentMethod, Deployments } from '../deployments';
+import type { Deployments } from '../deployments';
 import { assertIsSuccessfulDeployStackResult } from '../deployments';
 import { IO, type IoHelper } from '../io/private';
 import type { Tag } from '../tags';

packages/@aws-cdk/toolkit-lib/lib/api/resource-import/importer.ts

@@ -166,7 +166,7 @@ IAM Statement Changes
       // passed through correctly to Deployments
       expect(mockDeployStack).toHaveBeenCalledWith(expect.objectContaining({
         hotswapPropertyOverrides: {
-          ecsHotswapProperties: {
+          ecs: {
             maximumHealthyPercent: 100,
             minimumHealthyPercent: 0,
           },