From 6857cc9f33c5d5a66161d190bbe24f5e55eb6a78 Mon Sep 17 00:00:00 2001 From: Atanas Pamukchiev Date: Mon, 10 Jun 2024 18:14:21 +0200 Subject: [PATCH 01/13] feat: Add ability to configure hotswap properties for ECS --- .../tests/cli-integ-tests/cli.integtest.ts | 34 ++++++++ packages/aws-cdk/README.md | 7 ++ packages/aws-cdk/lib/api/deploy-stack.ts | 10 ++- packages/aws-cdk/lib/api/deployments.ts | 26 +++++- .../aws-cdk/lib/api/hotswap-deployments.ts | 23 +++-- packages/aws-cdk/lib/api/hotswap/common.ts | 35 ++++++++ .../aws-cdk/lib/api/hotswap/ecs-services.ts | 11 ++- packages/aws-cdk/lib/cdk-toolkit.ts | 21 ++++- packages/aws-cdk/lib/cli.ts | 13 +++ .../aws-cdk/test/api/deploy-stack.test.ts | 4 +- .../ecs-services-hotswap-deployments.test.ts | 84 ++++++++++++++++++- .../test/api/hotswap/hotswap-test-setup.ts | 6 +- 12 files changed, 255 insertions(+), 19 deletions(-) diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts index f323110eecfa4..a487743cf08fc 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts @@ -1823,6 +1823,40 @@ integTest('hotswap deployment for ecs service detects failed deployment and erro expect(deployOutput).not.toContain('hotswapped!'); })); +integTest('hotswap ECS deployment respects properties override', withDefaultFixture(async (fixture) => { + // GIVEN + const stackArn = await fixture.cdkDeploy('ecs-hotswap', { + captureStderr: false, + }); + + // WHEN + await fixture.cdkDeploy('ecs-hotswap', { + options: [ + '--hotswap', + '--hotswap-ecs-minimum-healthy-percent 50', + '--hotswap-ecs-maximum-healthy-percent 100', + ], + modEnv: { + DYNAMIC_ECS_PROPERTY_VALUE: 'new value', + }, + }); + + const describeStacksResponse = await fixture.aws.cloudFormation('describeStacks', { + StackName: stackArn, + }); + const clusterName = describeStacksResponse.Stacks?.[0].Outputs?.find(output => output.OutputKey == 'ClusterName')?.OutputValue!; + const serviceName = describeStacksResponse.Stacks?.[0].Outputs?.find(output => output.OutputKey == 'ServiceName')?.OutputValue!; + + // THEN + + const describeServicesResponse = await fixture.aws.ecs('describeServices', { + cluster: clusterName, + services: [serviceName], + }); + expect(describeServicesResponse.services?.[0].deployments).toHaveLength(2); + +})); + async function listChildren(parent: string, pred: (x: string) => Promise) { const ret = new Array(); for (const child of await fs.readdir(parent, { encoding: 'utf-8' })) { diff --git a/packages/aws-cdk/README.md b/packages/aws-cdk/README.md index 2b06a12c6b2d4..680d75196dff7 100644 --- a/packages/aws-cdk/README.md +++ b/packages/aws-cdk/README.md @@ -443,6 +443,13 @@ Hotswapping is currently supported for the following changes - VTL mapping template changes for AppSync Resolvers and Functions. - Schema changes for AppSync GraphQL Apis. +You can optionally pass additional parameters to configure the behavior of your hotswap deployments. A list of the currently available configuration options can be found below. + +| Service | Parameter | +| ------- | --------- | +| ECS | hotswap-ecs-minimum-healthy-percent | +| ECS | hotswap-ecs-maximum-healthy-percent | + **⚠ Note #1**: This command deliberately introduces drift in CloudFormation stacks in order to speed up deployments. For this reason, only use it for development purposes. **Never use this flag for your production deployments**! diff --git a/packages/aws-cdk/lib/api/deploy-stack.ts b/packages/aws-cdk/lib/api/deploy-stack.ts index 28af2d39616b0..cfe1fe906fd04 100644 --- a/packages/aws-cdk/lib/api/deploy-stack.ts +++ b/packages/aws-cdk/lib/api/deploy-stack.ts @@ -5,7 +5,7 @@ import * as uuid from 'uuid'; import { ISDK, SdkProvider } from './aws-auth'; import { EnvironmentResources } from './environment-resources'; import { CfnEvaluationException } from './evaluate-cloudformation-template'; -import { HotswapMode, ICON } from './hotswap/common'; +import { HotswapMode, HotswapProperties, ICON } from './hotswap/common'; import { tryHotswapDeployment } from './hotswap-deployments'; import { changeSetHasNoChanges, CloudFormationStack, TemplateParameters, waitForChangeSet, @@ -172,6 +172,11 @@ export interface DeployStackOptions { */ readonly hotswap?: HotswapMode; + /** + * Extra properties that configure hotswap behavior + */ + readonly hotswapProperties?: HotswapProperties; + /** * The extra string to append to the User-Agent header when performing AWS SDK calls. * @@ -263,6 +268,7 @@ export async function deployStack(options: DeployStackOptions): Promise Promise; const RESOURCE_DETECTORS: { [key: string]: HotswapDetector } = { @@ -59,7 +59,7 @@ const RESOURCE_DETECTORS: { [key: string]: HotswapDetector } = { export async function tryHotswapDeployment( sdkProvider: SdkProvider, assetParams: { [key: string]: string }, cloudFormationStack: CloudFormationStack, stackArtifact: cxapi.CloudFormationStackArtifact, - hotswapMode: HotswapMode, + hotswapMode: HotswapMode, hotswapProperties: HotswapProperties, ): Promise { // resolve the environment, so we can substitute things like AWS::Region in CFN expressions const resolvedEnv = await sdkProvider.resolveEnvironment(stackArtifact.environment); @@ -83,7 +83,7 @@ export async function tryHotswapDeployment( const stackChanges = cfn_diff.fullDiff(currentTemplate.deployedRootTemplate, stackArtifact.template); const { hotswappableChanges, nonHotswappableChanges } = await classifyResourceChanges( - stackChanges, evaluateCfnTemplate, sdk, currentTemplate.nestedStacks, + stackChanges, evaluateCfnTemplate, sdk, currentTemplate.nestedStacks, hotswapProperties, ); logNonHotswappableChanges(nonHotswappableChanges, hotswapMode); @@ -110,6 +110,7 @@ async function classifyResourceChanges( evaluateCfnTemplate: EvaluateCloudFormationTemplate, sdk: ISDK, nestedStackNames: { [nestedStackName: string]: NestedStackTemplates }, + hotswapProperties: HotswapProperties, ): Promise { const resourceDifferences = getStackResourceDifferences(stackChanges); @@ -128,7 +129,14 @@ async function classifyResourceChanges( // gather the results of the detector functions for (const [logicalId, change] of Object.entries(resourceDifferences)) { if (change.newValue?.Type === 'AWS::CloudFormation::Stack' && change.oldValue?.Type === 'AWS::CloudFormation::Stack') { - const nestedHotswappableResources = await findNestedHotswappableChanges(logicalId, change, nestedStackNames, evaluateCfnTemplate, sdk); + const nestedHotswappableResources = await findNestedHotswappableChanges( + logicalId, + change, + nestedStackNames, + evaluateCfnTemplate, + sdk, + hotswapProperties, + ); hotswappableResources.push(...nestedHotswappableResources.hotswappableChanges); nonHotswappableResources.push(...nestedHotswappableResources.nonHotswappableChanges); @@ -148,7 +156,7 @@ async function classifyResourceChanges( const resourceType: string = hotswappableChangeCandidate.newValue.Type; if (resourceType in RESOURCE_DETECTORS) { // run detector functions lazily to prevent unhandled promise rejections - promises.push(() => RESOURCE_DETECTORS[resourceType](logicalId, hotswappableChangeCandidate, evaluateCfnTemplate)); + promises.push(() => RESOURCE_DETECTORS[resourceType](logicalId, hotswappableChangeCandidate, evaluateCfnTemplate, hotswapProperties)); } else { reportNonHotswappableChange(nonHotswappableResources, hotswappableChangeCandidate, undefined, 'This resource type is not supported for hotswap deployments'); } @@ -228,6 +236,7 @@ async function findNestedHotswappableChanges( nestedStackTemplates: { [nestedStackName: string]: NestedStackTemplates }, evaluateCfnTemplate: EvaluateCloudFormationTemplate, sdk: ISDK, + hotswapProperties: HotswapProperties, ): Promise { const nestedStack = nestedStackTemplates[logicalId]; if (!nestedStack.physicalName) { @@ -251,7 +260,7 @@ async function findNestedHotswappableChanges( nestedStackTemplates[logicalId].deployedTemplate, nestedStackTemplates[logicalId].generatedTemplate, ); - return classifyResourceChanges(nestedDiff, evaluateNestedCfnTemplate, sdk, nestedStackTemplates[logicalId].nestedStackTemplates); + return classifyResourceChanges(nestedDiff, evaluateNestedCfnTemplate, sdk, nestedStackTemplates[logicalId].nestedStackTemplates, hotswapProperties); } /** Returns 'true' if a pair of changes is for the same resource. */ diff --git a/packages/aws-cdk/lib/api/hotswap/common.ts b/packages/aws-cdk/lib/api/hotswap/common.ts index eb4b787d04e92..9da95d2f2db1c 100644 --- a/packages/aws-cdk/lib/api/hotswap/common.ts +++ b/packages/aws-cdk/lib/api/hotswap/common.ts @@ -98,6 +98,41 @@ export class HotswappableChangeCandidate { type Exclude = { [key: string]: Exclude | true } +/** + * Represents configuration properties for hotswap deployments + */ +export class HotswapProperties { + // Each supported resource type will have its own properties. Currently this is ECS + ecsHotswapProperties?: EcsHotswapProperties; + + public constructor (ecsHotswapProperties?: EcsHotswapProperties) { + this.ecsHotswapProperties = ecsHotswapProperties; + } +} + +/** + * Represents configuration properties for ECS hotswap deployments + */ +export class 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; + // 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; + + public constructor (minimumHealthyPercent?: number, maximumHealthyPercent?: number) { + this.minimumHealthyPercent = minimumHealthyPercent; + this.maximumHealthyPercent = maximumHealthyPercent; + } + + /** + * Check if any hotswap properties are defined + * @returns true if all properties are undefined, false otherwise + */ + public isEmpty(): boolean { + return this.minimumHealthyPercent === undefined && this.maximumHealthyPercent === undefined; + } +} + /** * This function transforms all keys (recursively) in the provided `val` object. * diff --git a/packages/aws-cdk/lib/api/hotswap/ecs-services.ts b/packages/aws-cdk/lib/api/hotswap/ecs-services.ts index 266bd9e7e460b..ab933056f362e 100644 --- a/packages/aws-cdk/lib/api/hotswap/ecs-services.ts +++ b/packages/aws-cdk/lib/api/hotswap/ecs-services.ts @@ -1,10 +1,10 @@ import * as AWS from 'aws-sdk'; -import { ChangeHotswapResult, classifyChanges, HotswappableChangeCandidate, lowerCaseFirstCharacter, reportNonHotswappableChange, transformObjectKeys } from './common'; +import { ChangeHotswapResult, classifyChanges, HotswappableChangeCandidate, HotswapProperties, lowerCaseFirstCharacter, reportNonHotswappableChange, transformObjectKeys } from './common'; import { ISDK } from '../aws-auth'; import { EvaluateCloudFormationTemplate } from '../evaluate-cloudformation-template'; export async function isHotswappableEcsServiceChange( - logicalId: string, change: HotswappableChangeCandidate, evaluateCfnTemplate: EvaluateCloudFormationTemplate, + logicalId: string, change: HotswappableChangeCandidate, evaluateCfnTemplate: EvaluateCloudFormationTemplate, hostswapProperties: HotswapProperties, ): Promise { // the only resource change we can evaluate here is an ECS TaskDefinition if (change.newValue.Type !== 'AWS::ECS::TaskDefinition') { @@ -83,6 +83,10 @@ export async function isHotswappableEcsServiceChange( const registerTaskDefResponse = await sdk.ecs().registerTaskDefinition(lowercasedTaskDef).promise(); const taskDefRevArn = registerTaskDefResponse.taskDefinition?.taskDefinitionArn; + let ecsHotswapProperties = hostswapProperties.ecsHotswapProperties; + let minimumHealthyPercent = ecsHotswapProperties?.minimumHealthyPercent; + let maximumHealthyPercent = ecsHotswapProperties?.maximumHealthyPercent; + // Step 2 - update the services using that TaskDefinition to point to the new TaskDefinition Revision const servicePerClusterUpdates: { [cluster: string]: Array<{ promise: Promise; ecsService: EcsService }> } = {}; for (const ecsService of ecsServicesReferencingTaskDef) { @@ -105,7 +109,8 @@ export async function isHotswappableEcsServiceChange( cluster: clusterName, forceNewDeployment: true, deploymentConfiguration: { - minimumHealthyPercent: 0, + minimumHealthyPercent: minimumHealthyPercent !== undefined ? minimumHealthyPercent : 0, + maximumPercent: maximumHealthyPercent !== undefined ? maximumHealthyPercent : undefined, }, }).promise(), ecsService: ecsService, diff --git a/packages/aws-cdk/lib/cdk-toolkit.ts b/packages/aws-cdk/lib/cdk-toolkit.ts index 854b7ec6419c2..3610a2b0b8fec 100644 --- a/packages/aws-cdk/lib/cdk-toolkit.ts +++ b/packages/aws-cdk/lib/cdk-toolkit.ts @@ -12,7 +12,7 @@ import { Bootstrapper, BootstrapEnvironmentOptions } from './api/bootstrap'; import { CloudAssembly, DefaultSelection, ExtendedStackSelection, StackCollection, StackSelector } from './api/cxapp/cloud-assembly'; import { CloudExecutable } from './api/cxapp/cloud-executable'; import { Deployments } from './api/deployments'; -import { HotswapMode } from './api/hotswap/common'; +import { EcsHotswapProperties, HotswapMode, HotswapProperties } from './api/hotswap/common'; import { findCloudWatchLogGroups } from './api/logs/find-cloudwatch-logs'; import { CloudWatchLogEventMonitor } from './api/logs/logs-monitor'; import { createDiffChangeSet, ResourcesToImport } from './api/util/cloudformation'; @@ -245,6 +245,13 @@ export class CdkToolkit { warning('⚠️ They should only be used for development - never use them for your production Stacks!\n'); } + let ecsHotswapProperties = new EcsHotswapProperties(options.hotswapEcsMinimumHealthyPercent, options.hotswapEcsMaximumHealthyPercent); + if (!ecsHotswapProperties.isEmpty() && options.hotswap !== HotswapMode.FULL_DEPLOYMENT) { + warning('⚠️ Hotswap properties defined while not in hotswap mode will be ignored.'); + } + let hotswapProperties = new HotswapProperties(); + hotswapProperties.ecsHotswapProperties = ecsHotswapProperties; + const stacks = stackCollection.stackArtifacts; const stackOutputs: { [key: string]: any } = { }; @@ -347,6 +354,7 @@ export class CdkToolkit { ci: options.ci, rollback: options.rollback, hotswap: options.hotswap, + hotswapProperties: hotswapProperties, extraUserAgent: options.extraUserAgent, assetParallelism: options.assetParallelism, ignoreNoStacks: options.ignoreNoStacks, @@ -1213,6 +1221,17 @@ interface WatchOptions extends Omit { */ readonly hotswap: HotswapMode; + /** + * An override for the minimum healthy percent for an ECS service during hotswap deployments. + * @default 0 + */ + readonly hotswapEcsMinimumHealthyPercent?: number; + + /** + * An override for the maximum healthy percent for an ECS service during hotswap deployments. + */ + readonly hotswapEcsMaximumHealthyPercent?: number; + /** * The extra string to append to the User-Agent header when performing AWS SDK calls. * diff --git a/packages/aws-cdk/lib/cli.ts b/packages/aws-cdk/lib/cli.ts index 2c15bb7b9949f..9fcd6920b2797 100644 --- a/packages/aws-cdk/lib/cli.ts +++ b/packages/aws-cdk/lib/cli.ts @@ -158,6 +158,17 @@ async function parseCommandLineArguments(args: string[]) { 'and falls back to a full deployment if that is not possible. ' + 'Do not use this in production environments', }) + .option('hotswap-ecs-minimum-healthy-percent', { + type: 'number', + default: 0, + desc: 'When using hotswap for ECS, set the minimum healthy percent' + + 'for the updated task definition', + }) + .option('hotswap-ecs-maximum-healthy-percent', { + type: 'number', + desc: 'When using hotswap for ECS, set the minimum healthy percent' + + 'for the updated task definition', + }) .option('watch', { type: 'boolean', desc: 'Continuously observe the project files, ' + @@ -598,6 +609,8 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise { }); // THEN - expect(tryHotswapDeployment).toHaveBeenCalledWith(expect.anything(), { A: 'A-value', B: 'B=value' }, expect.anything(), expect.anything(), HotswapMode.FALL_BACK); + expect(tryHotswapDeployment).toHaveBeenCalledWith(expect.anything(), { A: 'A-value', B: 'B=value' }, expect.anything(), expect.anything(), HotswapMode.FALL_BACK, expect.anything()); }); test('correctly passes SSM parameters when hotswapping', async () => { @@ -178,7 +178,7 @@ test('correctly passes SSM parameters when hotswapping', async () => { }); // THEN - expect(tryHotswapDeployment).toHaveBeenCalledWith(expect.anything(), { SomeParameter: 'SomeValue' }, expect.anything(), expect.anything(), HotswapMode.FALL_BACK); + expect(tryHotswapDeployment).toHaveBeenCalledWith(expect.anything(), { SomeParameter: 'SomeValue' }, expect.anything(), expect.anything(), HotswapMode.FALL_BACK, expect.anything()); }); test('call CreateStack when method=direct and the stack doesnt exist yet', async () => { 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 index e0267635a59d8..4cf697e4327ff 100644 --- 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 @@ -1,7 +1,7 @@ /* eslint-disable import/order */ import * as AWS from 'aws-sdk'; import * as setup from './hotswap-test-setup'; -import { HotswapMode } from '../../../lib/api/hotswap/common'; +import { HotswapMode, HotswapProperties, EcsHotswapProperties } from '../../../lib/api/hotswap/common'; let hotswapMockSdkProvider: setup.HotswapMockSdkProvider; let mockRegisterTaskDef: jest.Mock; @@ -637,3 +637,85 @@ describe.each([HotswapMode.FALL_BACK, HotswapMode.HOTSWAP_ONLY])('%p mode', (hot }); }); }); + +describe.each([ + new HotswapProperties(new EcsHotswapProperties(10)), + new HotswapProperties(new EcsHotswapProperties(undefined, 100)), + new HotswapProperties(new EcsHotswapProperties(10, 100)), +])('hotswap properties', (hotswapProperties) => { + test('should handle all possible hotswap properties', async () => { + // GIVEN + setup.setCurrentCfnStackTemplate({ + Resources: { + TaskDef: { + Type: 'AWS::ECS::TaskDefinition', + Properties: { + Family: 'my-task-def', + ContainerDefinitions: [ + { Image: 'image1' }, + ], + }, + }, + Service: { + Type: 'AWS::ECS::Service', + Properties: { + TaskDefinition: { Ref: 'TaskDef' }, + }, + }, + }, + }); + setup.pushStackResourceSummaries( + setup.stackSummaryOf('Service', 'AWS::ECS::Service', + 'arn:aws:ecs:region:account:service/my-cluster/my-service'), + ); + mockRegisterTaskDef.mockReturnValue({ + taskDefinition: { + taskDefinitionArn: 'arn:aws:ecs:region:account:task-definition/my-task-def:3', + }, + }); + const cdkStackArtifact = setup.cdkStackArtifactOf({ + template: { + Resources: { + TaskDef: { + Type: 'AWS::ECS::TaskDefinition', + Properties: { + Family: 'my-task-def', + ContainerDefinitions: [ + { Image: 'image2' }, + ], + }, + }, + Service: { + Type: 'AWS::ECS::Service', + Properties: { + TaskDefinition: { Ref: 'TaskDef' }, + }, + }, + }, + }, + }); + + // WHEN + const deployStackResult = await hotswapMockSdkProvider.tryHotswapDeployment(HotswapMode.HOTSWAP_ONLY, cdkStackArtifact, {}, hotswapProperties); + + // THEN + expect(deployStackResult).not.toBeUndefined(); + expect(mockRegisterTaskDef).toBeCalledWith({ + family: 'my-task-def', + containerDefinitions: [ + { image: 'image2' }, + ], + }); + expect(mockUpdateService).toBeCalledWith({ + service: 'arn:aws:ecs:region:account:service/my-cluster/my-service', + cluster: 'my-cluster', + taskDefinition: 'arn:aws:ecs:region:account:task-definition/my-task-def:3', + deploymentConfiguration: { + minimumHealthyPercent: hotswapProperties.ecsHotswapProperties?.minimumHealthyPercent == undefined ? + 0 : hotswapProperties.ecsHotswapProperties?.minimumHealthyPercent, + maximumPercent: hotswapProperties.ecsHotswapProperties?.maximumHealthyPercent, + }, + forceNewDeployment: true, + }); + }); +}); diff --git a/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts b/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts index 63bded36370f1..edc0898ca4ada 100644 --- a/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts +++ b/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts @@ -5,7 +5,7 @@ import * as codebuild from 'aws-sdk/clients/codebuild'; import * as lambda from 'aws-sdk/clients/lambda'; import * as stepfunctions from 'aws-sdk/clients/stepfunctions'; import { DeployStackResult } from '../../../lib/api'; -import { HotswapMode } from '../../../lib/api/hotswap/common'; +import { HotswapMode, HotswapProperties } from '../../../lib/api/hotswap/common'; import * as deployments from '../../../lib/api/hotswap-deployments'; import { CloudFormationStack, Template } from '../../../lib/api/util/cloudformation'; import { testStack, TestStackArtifact } from '../../util'; @@ -180,7 +180,9 @@ export class HotswapMockSdkProvider { hotswapMode: HotswapMode, stackArtifact: cxapi.CloudFormationStackArtifact, assetParams: { [key: string]: string } = {}, + hotswapProperties?: HotswapProperties, ): Promise { - return deployments.tryHotswapDeployment(this.mockSdkProvider, assetParams, currentCfnStack, stackArtifact, hotswapMode); + let hotswapProps = hotswapProperties || new HotswapProperties(); + return deployments.tryHotswapDeployment(this.mockSdkProvider, assetParams, currentCfnStack, stackArtifact, hotswapMode, hotswapProps); } } From 4100689fba40a143f6300e0cc63e080a3acb05e7 Mon Sep 17 00:00:00 2001 From: Atanas Pamukchiev Date: Mon, 10 Jun 2024 18:21:16 +0200 Subject: [PATCH 02/13] clean up unused parameters --- packages/aws-cdk/lib/api/deployments.ts | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/packages/aws-cdk/lib/api/deployments.ts b/packages/aws-cdk/lib/api/deployments.ts index efc5cbc487b04..82f06771052b3 100644 --- a/packages/aws-cdk/lib/api/deployments.ts +++ b/packages/aws-cdk/lib/api/deployments.ts @@ -179,24 +179,6 @@ export interface DeployStackOptions { */ readonly hotswapProperties?: HotswapProperties; - // /* - // * The minimum healthy percentage of the hotswapped task. - // * A 'hotswap' deployment will attempt to short-circuit CloudFormation - // * and update the affected resources like Lambda functions directly. - // * - // * @default - 0 - // */ - // readonly hotswapMinimumHealthyPercent?: Number; - - // /* - // *The minimum healthy percentage of the hotswapped task. - // * A 'hotswap' deployment will attempt to short-circuit CloudFormation - // * and update the affected resources like Lambda functions directly. - // * - // * @default - `HotswapMode.FULL_DEPLOYMENT` for regular deployments, `HotswapMode.HOTSWAP_ONLY` for 'watch' deployments - // */ - // readonly hotswapMaximumHealthyPercent?: Number; - /** * The extra string to append to the User-Agent header when performing AWS SDK calls. * From e4c0d7d90cdcc70ce3e5cbf183925755af04eca9 Mon Sep 17 00:00:00 2001 From: Atanas Pamukchiev Date: Wed, 3 Jul 2024 14:51:36 +0200 Subject: [PATCH 03/13] Fix typo in comments Co-authored-by: Andrew Hammond <445764+ahammond@users.noreply.github.com> --- packages/aws-cdk/lib/cli.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws-cdk/lib/cli.ts b/packages/aws-cdk/lib/cli.ts index 9fcd6920b2797..51e8f4d2f4b0b 100644 --- a/packages/aws-cdk/lib/cli.ts +++ b/packages/aws-cdk/lib/cli.ts @@ -166,7 +166,7 @@ async function parseCommandLineArguments(args: string[]) { }) .option('hotswap-ecs-maximum-healthy-percent', { type: 'number', - desc: 'When using hotswap for ECS, set the minimum healthy percent' + + desc: 'When using hotswap for ECS, set the maximum healthy percent' + 'for the updated task definition', }) .option('watch', { From 2f6fc67ae6d55b23ba46c1fa0005c96c1b4d46ed Mon Sep 17 00:00:00 2001 From: Atanas Pamukchiev Date: Mon, 8 Jul 2024 10:12:39 +0200 Subject: [PATCH 04/13] improve parameter validation --- .../cli-integ/tests/cli-integ-tests/cli.integtest.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts index a487743cf08fc..261710f1ffb4e 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts @@ -1833,8 +1833,8 @@ integTest('hotswap ECS deployment respects properties override', withDefaultFixt await fixture.cdkDeploy('ecs-hotswap', { options: [ '--hotswap', - '--hotswap-ecs-minimum-healthy-percent 50', - '--hotswap-ecs-maximum-healthy-percent 100', + '--hotswap-ecs-minimum-healthy-percent', '100', + '--hotswap-ecs-maximum-healthy-percent', '200', ], modEnv: { DYNAMIC_ECS_PROPERTY_VALUE: 'new value', @@ -1853,7 +1853,8 @@ integTest('hotswap ECS deployment respects properties override', withDefaultFixt cluster: clusterName, services: [serviceName], }); - expect(describeServicesResponse.services?.[0].deployments).toHaveLength(2); + expect(describeServicesResponse.services?.[0].deploymentConfiguration?.minimumHealthyPercent).toEqual(100); + expect(describeServicesResponse.services?.[0].deploymentConfiguration?.maximumPercent).toEqual(200); })); From 36ef28329f565afb87fad8eab5f2b1c05ca5c6bd Mon Sep 17 00:00:00 2001 From: Atanas Pamukchiev Date: Tue, 9 Jul 2024 12:59:40 +0200 Subject: [PATCH 05/13] improve parameter validation --- packages/aws-cdk/lib/api/hotswap/common.ts | 14 +++++++++++-- packages/aws-cdk/lib/cdk-toolkit.ts | 23 +++++++++++----------- packages/aws-cdk/lib/cli.ts | 5 ++--- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/packages/aws-cdk/lib/api/hotswap/common.ts b/packages/aws-cdk/lib/api/hotswap/common.ts index 9da95d2f2db1c..0f67256dc4d28 100644 --- a/packages/aws-cdk/lib/api/hotswap/common.ts +++ b/packages/aws-cdk/lib/api/hotswap/common.ts @@ -120,7 +120,17 @@ export class EcsHotswapProperties { readonly maximumHealthyPercent?: number; public constructor (minimumHealthyPercent?: number, maximumHealthyPercent?: number) { - this.minimumHealthyPercent = minimumHealthyPercent; + if (minimumHealthyPercent !== undefined && minimumHealthyPercent < 0 ) { + throw new Error('hotswap-ecs-minimum-healthy-percent can\'t be a negative number'); + } + if (maximumHealthyPercent !== undefined && maximumHealthyPercent < 0 ) { + throw new Error('hotswap-ecs-maximum-healthy-percent can\'t be a negative number'); + } + if (minimumHealthyPercent == undefined) { + this.minimumHealthyPercent = 0; + } else { + this.minimumHealthyPercent = minimumHealthyPercent; + } this.maximumHealthyPercent = maximumHealthyPercent; } @@ -129,7 +139,7 @@ export class EcsHotswapProperties { * @returns true if all properties are undefined, false otherwise */ public isEmpty(): boolean { - return this.minimumHealthyPercent === undefined && this.maximumHealthyPercent === undefined; + return this.minimumHealthyPercent === 0 && this.maximumHealthyPercent === undefined; } } diff --git a/packages/aws-cdk/lib/cdk-toolkit.ts b/packages/aws-cdk/lib/cdk-toolkit.ts index 3610a2b0b8fec..90c1d8b448279 100644 --- a/packages/aws-cdk/lib/cdk-toolkit.ts +++ b/packages/aws-cdk/lib/cdk-toolkit.ts @@ -246,7 +246,7 @@ export class CdkToolkit { } let ecsHotswapProperties = new EcsHotswapProperties(options.hotswapEcsMinimumHealthyPercent, options.hotswapEcsMaximumHealthyPercent); - if (!ecsHotswapProperties.isEmpty() && options.hotswap !== HotswapMode.FULL_DEPLOYMENT) { + if (!ecsHotswapProperties.isEmpty() && options.hotswap == HotswapMode.FULL_DEPLOYMENT) { warning('⚠️ Hotswap properties defined while not in hotswap mode will be ignored.'); } let hotswapProperties = new HotswapProperties(); @@ -1221,17 +1221,6 @@ interface WatchOptions extends Omit { */ readonly hotswap: HotswapMode; - /** - * An override for the minimum healthy percent for an ECS service during hotswap deployments. - * @default 0 - */ - readonly hotswapEcsMinimumHealthyPercent?: number; - - /** - * An override for the maximum healthy percent for an ECS service during hotswap deployments. - */ - readonly hotswapEcsMaximumHealthyPercent?: number; - /** * The extra string to append to the User-Agent header when performing AWS SDK calls. * @@ -1309,6 +1298,16 @@ export interface DeployOptions extends CfnDeployOptions, WatchOptions { */ readonly watch?: boolean; + /** + * An override for the minimum healthy percent for an ECS service during hotswap deployments. + */ + readonly hotswapEcsMinimumHealthyPercent?: number; + + /** + * An override for the maximum healthy percent for an ECS service during hotswap deployments. + */ + readonly hotswapEcsMaximumHealthyPercent?: number; + /** * Whether we should cache the Cloud Assembly after the first time it has been synthesized. * The default is 'true', we only don't want to do it in case the deployment is triggered by diff --git a/packages/aws-cdk/lib/cli.ts b/packages/aws-cdk/lib/cli.ts index 51e8f4d2f4b0b..72fb7c8790106 100644 --- a/packages/aws-cdk/lib/cli.ts +++ b/packages/aws-cdk/lib/cli.ts @@ -160,7 +160,6 @@ async function parseCommandLineArguments(args: string[]) { }) .option('hotswap-ecs-minimum-healthy-percent', { type: 'number', - default: 0, desc: 'When using hotswap for ECS, set the minimum healthy percent' + 'for the updated task definition', }) @@ -609,8 +608,8 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise Date: Thu, 25 Jul 2024 14:33:57 +0200 Subject: [PATCH 06/13] changed to use cdk.json information --- package.json | 4 +-- .../@aws-cdk-testing/cli-integ/package.json | 6 ++-- .../tests/cli-integ-tests/cli.integtest.ts | 4 +-- .../framework-integ/package.json | 14 ++++---- .../package.json | 16 +++++----- .../@aws-cdk/aws-amplify-alpha/package.json | 18 +++++------ .../@aws-cdk/aws-appconfig-alpha/package.json | 16 +++++----- .../@aws-cdk/aws-apprunner-alpha/package.json | 16 +++++----- .../@aws-cdk/aws-cloud9-alpha/package.json | 16 +++++----- .../@aws-cdk/aws-codestar-alpha/package.json | 14 ++++---- .../package.json | 14 ++++---- .../package.json | 8 ++--- .../@aws-cdk/aws-gamelift-alpha/package.json | 16 +++++----- packages/@aws-cdk/aws-glue-alpha/package.json | 16 +++++----- .../aws-iot-actions-alpha/package.json | 32 +++++++++---------- packages/@aws-cdk/aws-iot-alpha/package.json | 16 +++++----- .../aws-iotevents-actions-alpha/package.json | 20 ++++++------ .../@aws-cdk/aws-iotevents-alpha/package.json | 16 +++++----- packages/@aws-cdk/aws-ivs-alpha/package.json | 16 +++++----- .../package.json | 16 +++++----- .../aws-kinesisfirehose-alpha/package.json | 16 +++++----- .../package.json | 18 +++++------ .../@aws-cdk/aws-lambda-go-alpha/package.json | 16 +++++----- .../aws-lambda-python-alpha/package.json | 16 +++++----- .../@aws-cdk/aws-location-alpha/package.json | 16 +++++----- packages/@aws-cdk/aws-msk-alpha/package.json | 16 +++++----- .../@aws-cdk/aws-neptune-alpha/package.json | 16 +++++----- .../@aws-cdk/aws-pipes-alpha/package.json | 16 +++++----- .../aws-pipes-enrichments-alpha/package.json | 23 +++++++------ .../aws-pipes-sources-alpha/package.json | 23 +++++++------ .../aws-pipes-targets-alpha/package.json | 20 ++++++------ .../@aws-cdk/aws-redshift-alpha/package.json | 18 +++++------ .../aws-route53resolver-alpha/package.json | 14 ++++---- .../aws-s3objectlambda-alpha/package.json | 14 ++++---- .../@aws-cdk/aws-sagemaker-alpha/package.json | 16 +++++----- .../@aws-cdk/aws-scheduler-alpha/package.json | 16 +++++----- .../aws-scheduler-targets-alpha/package.json | 20 ++++++------ .../package.json | 16 +++++----- .../@aws-cdk/cdk-cli-wrapper/package.json | 8 ++--- packages/@aws-cdk/cli-lib-alpha/package.json | 12 +++---- .../cloud-assembly-schema/package.json | 10 +++--- .../@aws-cdk/cloudformation-diff/package.json | 6 ++-- .../custom-resource-handlers/package.json | 10 +++--- packages/@aws-cdk/cx-api/package.json | 12 +++---- .../example-construct-library/package.json | 14 ++++---- packages/@aws-cdk/integ-runner/package.json | 22 ++++++------- .../@aws-cdk/integ-tests-alpha/package.json | 16 +++++----- packages/@aws-cdk/region-info/package.json | 10 +++--- packages/aws-cdk-lib/package.json | 16 +++++----- packages/aws-cdk/lib/api/deployments.ts | 8 +---- .../aws-cdk/lib/api/hotswap-deployments.ts | 15 ++++----- packages/aws-cdk/lib/api/hotswap/common.ts | 12 ------- .../aws-cdk/lib/api/hotswap/ecs-services.ts | 9 ++++-- packages/aws-cdk/lib/cdk-toolkit.ts | 7 ++-- packages/aws-cdk/lib/cli.ts | 12 ------- packages/aws-cdk/package.json | 20 ++++++------ .../ecs-services-hotswap-deployments.test.ts | 20 ++++++------ .../test/api/hotswap/hotswap-test-setup.ts | 8 ++--- packages/awslint/package.json | 8 ++--- packages/cdk-assets/package.json | 12 +++---- packages/cdk/package.json | 6 ++-- scripts/@aws-cdk/script-tests/package.json | 4 +-- tools/@aws-cdk/cdk-build-tools/package.json | 14 ++++---- tools/@aws-cdk/cdk-release/package.json | 8 ++--- tools/@aws-cdk/eslint-plugin/package.json | 4 +-- tools/@aws-cdk/lazify/package.json | 6 ++-- tools/@aws-cdk/node-bundle/package.json | 4 +-- tools/@aws-cdk/pkglint/package.json | 8 ++--- tools/@aws-cdk/pkgtools/package.json | 8 ++--- tools/@aws-cdk/prlint/package.json | 4 +-- tools/@aws-cdk/spec2cdk/package.json | 8 ++--- tools/@aws-cdk/yarn-cling/package.json | 6 ++-- 72 files changed, 457 insertions(+), 494 deletions(-) diff --git a/package.json b/package.json index 4b07be0640957..c2b34818b4f4b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aws-cdk", - "version": "0.0.0", + "version": "2.148.0", "private": true, "pkglint": { "include": "dependencies/node-version" @@ -177,4 +177,4 @@ "dependencies": { "string-width": "^4.2.3" } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/cli-integ/package.json b/packages/@aws-cdk-testing/cli-integ/package.json index 162353a78423c..1264579066c6d 100644 --- a/packages/@aws-cdk-testing/cli-integ/package.json +++ b/packages/@aws-cdk-testing/cli-integ/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk-testing/cli-integ", "description": "Integration tests for the AWS CDK CLI", - "version": "0.0.0", + "version": "2.148.0", "bin": { "run-suite": "bin/run-suite", "download-and-run-old-tests": "bin/download-and-run-old-tests", @@ -29,13 +29,13 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", "@types/semver": "^7.5.8", "@types/yargs": "^15.0.19", "@types/fs-extra": "^9.0.13", "@types/glob": "^7.2.0", "@types/npm": "^7.19.3", - "@aws-cdk/pkglint": "0.0.0" + "@aws-cdk/pkglint": "2.148.0-alpha.0" }, "dependencies": { "@octokit/rest": "^18.12.0", diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts index 261710f1ffb4e..7e937db11b9c3 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts @@ -1826,15 +1826,13 @@ integTest('hotswap deployment for ecs service detects failed deployment and erro integTest('hotswap ECS deployment respects properties override', withDefaultFixture(async (fixture) => { // GIVEN const stackArn = await fixture.cdkDeploy('ecs-hotswap', { - captureStderr: false, + captureStderr: true, }); // WHEN await fixture.cdkDeploy('ecs-hotswap', { options: [ '--hotswap', - '--hotswap-ecs-minimum-healthy-percent', '100', - '--hotswap-ecs-maximum-healthy-percent', '200', ], modEnv: { DYNAMIC_ECS_PROPERTY_VALUE: 'new value', diff --git a/packages/@aws-cdk-testing/framework-integ/package.json b/packages/@aws-cdk-testing/framework-integ/package.json index b7d426ec9743b..cefc2cdee7a62 100644 --- a/packages/@aws-cdk-testing/framework-integ/package.json +++ b/packages/@aws-cdk-testing/framework-integ/package.json @@ -2,7 +2,7 @@ "name": "@aws-cdk-testing/framework-integ", "description": "Integration tests for aws-cdk-lib", "private": true, - "version": "0.0.0", + "version": "2.148.0-alpha.0", "scripts": { "build": "cdk-build", "watch": "cdk-watch", @@ -29,20 +29,20 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "^2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@aws-sdk/client-acm": "3.421.0", "@aws-sdk/client-rds": "3.421.0", "@aws-sdk/client-s3": "3.421.0", "delay": "5.0.0" }, "dependencies": { - "@aws-cdk/integ-tests-alpha": "0.0.0", + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0", "@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242", "@aws-cdk/lambda-layer-kubectl-v29": "^2.1.0", "@aws-cdk/lambda-layer-kubectl-v30": "^2.0.0", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "aws-sdk": "^2.1653.0", "aws-sdk-mock": "5.6.0", "cdk8s": "2.68.85", @@ -67,4 +67,4 @@ "publishConfig": { "tag": "latest" } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/app-staging-synthesizer-alpha/package.json b/packages/@aws-cdk/app-staging-synthesizer-alpha/package.json index 213f699b80df1..5f63d0e5bab7b 100644 --- a/packages/@aws-cdk/app-staging-synthesizer-alpha/package.json +++ b/packages/@aws-cdk/app-staging-synthesizer-alpha/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/app-staging-synthesizer-alpha", "private": false, - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "Cdk synthesizer for with app-scoped staging stack", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -84,18 +84,18 @@ } }, "devDependencies": { - "aws-cdk-lib": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0", + "aws-cdk-lib": "2.148.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0", "constructs": "^10.0.0", - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/pkglint": "0.0.0" + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0" }, "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "publishConfig": { "tag": "latest" } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-amplify-alpha/package.json b/packages/@aws-cdk/aws-amplify-alpha/package.json index 73d7741aa90f5..e96b1fe64124b 100644 --- a/packages/@aws-cdk/aws-amplify-alpha/package.json +++ b/packages/@aws-cdk/aws-amplify-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-amplify-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "private": false, "description": "The CDK Construct Library for AWS::Amplify", "main": "lib/index.js", @@ -86,21 +86,21 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", - "@aws-cdk/custom-resource-handlers": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/custom-resource-handlers": "2.148.0-alpha.0", "@aws-sdk/client-amplify": "3.451.0", "@aws-sdk/client-s3": "3.451.0", "@aws-sdk/s3-request-presigner": "3.451.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "0.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0", + "aws-cdk-lib": "2.148.0", + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0", "constructs": "^10.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -120,4 +120,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-appconfig-alpha/package.json b/packages/@aws-cdk/aws-appconfig-alpha/package.json index 8b499a59ba22c..aefba814922ee 100644 --- a/packages/@aws-cdk/aws-appconfig-alpha/package.json +++ b/packages/@aws-cdk/aws-appconfig-alpha/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/aws-appconfig-alpha", "private": false, - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "This module is deprecated. All constructs are now available under aws-cdk-lib/aws-appconfig", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -76,13 +76,13 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "@types/mime-types": "^2.1.4", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", "jest": "^29.7.0" }, @@ -91,7 +91,7 @@ }, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "separate-module": false, @@ -114,4 +114,4 @@ "bundleDependencies": [ "mime-types" ] -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-apprunner-alpha/package.json b/packages/@aws-cdk/aws-apprunner-alpha/package.json index c5feb3d66e0e9..cad5f99cef483 100644 --- a/packages/@aws-cdk/aws-apprunner-alpha/package.json +++ b/packages/@aws-cdk/aws-apprunner-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-apprunner-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "The CDK Construct Library for AWS::AppRunner", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -84,17 +84,17 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "aws-cdk-lib": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "aws-cdk-lib": "2.148.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -115,4 +115,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloud9-alpha/package.json b/packages/@aws-cdk/aws-cloud9-alpha/package.json index ac9d7da9a5a0b..277f8c0e034ae 100644 --- a/packages/@aws-cdk/aws-cloud9-alpha/package.json +++ b/packages/@aws-cdk/aws-cloud9-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-cloud9-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "private": false, "description": "The CDK Construct Library for AWS::Cloud9", "main": "lib/index.js", @@ -81,18 +81,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -112,4 +112,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-codestar-alpha/package.json b/packages/@aws-cdk/aws-codestar-alpha/package.json index 4f97131e3dc6f..ce24ad7bd8b2a 100644 --- a/packages/@aws-cdk/aws-codestar-alpha/package.json +++ b/packages/@aws-cdk/aws-codestar-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-codestar-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "private": false, "description": "The CDK Construct Library for AWS::CodeStar", "main": "lib/index.js", @@ -83,16 +83,16 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -112,4 +112,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cognito-identitypool-alpha/package.json b/packages/@aws-cdk/aws-cognito-identitypool-alpha/package.json index c1279b90a11ab..2c2214e42019b 100644 --- a/packages/@aws-cdk/aws-cognito-identitypool-alpha/package.json +++ b/packages/@aws-cdk/aws-cognito-identitypool-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-cognito-identitypool-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "The CDK Construct Library for AWS::Cognito Identity Pools", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -81,18 +81,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -113,4 +113,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-custom-resource-sdk-adapter/package.json b/packages/@aws-cdk/aws-custom-resource-sdk-adapter/package.json index a8ab7389aab0d..20839587aaa5f 100644 --- a/packages/@aws-cdk/aws-custom-resource-sdk-adapter/package.json +++ b/packages/@aws-cdk/aws-custom-resource-sdk-adapter/package.json @@ -2,7 +2,7 @@ "name": "@aws-cdk/aws-custom-resource-sdk-adapter", "description": "Adapter to convert AWS SDK v2 to AWS CDK v3 calls for AwsCustomResource", "private": true, - "version": "0.0.0", + "version": "2.148.0-alpha.0", "main": "lib/index.js", "types": "lib/index.d.ts", "scripts": { @@ -25,8 +25,8 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@aws-sdk/client-s3": "3.421.0", "@smithy/types": "^2.12.0", "@types/jest": "^29.5.12", @@ -51,4 +51,4 @@ "publishConfig": { "tag": "latest" } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-gamelift-alpha/package.json b/packages/@aws-cdk/aws-gamelift-alpha/package.json index d5bb65bc7830e..bce78409446f5 100644 --- a/packages/@aws-cdk/aws-gamelift-alpha/package.json +++ b/packages/@aws-cdk/aws-gamelift-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-gamelift-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "private": false, "description": "The CDK Construct Library for AWS::GameLift", "main": "lib/index.js", @@ -81,19 +81,19 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -113,4 +113,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-glue-alpha/package.json b/packages/@aws-cdk/aws-glue-alpha/package.json index d46ba9fbe2569..1a2c9078bec3f 100644 --- a/packages/@aws-cdk/aws-glue-alpha/package.json +++ b/packages/@aws-cdk/aws-glue-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-glue-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "private": false, "description": "The CDK Construct Library for AWS::Glue", "main": "lib/index.js", @@ -81,18 +81,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", "jest": "^29.7.0" }, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -112,4 +112,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/package.json b/packages/@aws-cdk/aws-iot-actions-alpha/package.json index 9e60554afc3e6..1e35b37ac7923 100644 --- a/packages/@aws-cdk/aws-iot-actions-alpha/package.json +++ b/packages/@aws-cdk/aws-iot-actions-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-iot-actions-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "Receipt rule actions for AWS IoT", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -81,29 +81,29 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", "constructs": "^10.0.0", - "aws-cdk-lib": "0.0.0", - "@aws-cdk/aws-kinesisfirehose-destinations-alpha": "0.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0", - "@aws-cdk/aws-iot-alpha": "0.0.0", - "@aws-cdk/aws-iotevents-alpha": "0.0.0", - "@aws-cdk/aws-kinesisfirehose-alpha": "0.0.0" + "aws-cdk-lib": "2.148.0", + "@aws-cdk/aws-kinesisfirehose-destinations-alpha": "2.148.0-alpha.0", + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0", + "@aws-cdk/aws-iot-alpha": "2.148.0-alpha.0", + "@aws-cdk/aws-iotevents-alpha": "2.148.0-alpha.0", + "@aws-cdk/aws-kinesisfirehose-alpha": "2.148.0-alpha.0" }, "dependencies": { "case": "1.6.3" }, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "@aws-cdk/aws-iot-alpha": "0.0.0", - "@aws-cdk/aws-iotevents-alpha": "0.0.0", - "@aws-cdk/aws-kinesisfirehose-alpha": "0.0.0", - "@aws-cdk/aws-kinesisfirehose-destinations-alpha": "0.0.0", - "aws-cdk-lib": "^0.0.0", + "@aws-cdk/aws-iot-alpha": "2.148.0-alpha.0", + "@aws-cdk/aws-iotevents-alpha": "2.148.0-alpha.0", + "@aws-cdk/aws-kinesisfirehose-alpha": "2.148.0-alpha.0", + "@aws-cdk/aws-kinesisfirehose-destinations-alpha": "2.148.0-alpha.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "bundledDependencies": [ @@ -127,4 +127,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-iot-alpha/package.json b/packages/@aws-cdk/aws-iot-alpha/package.json index d6fb42e4ba366..32d1cf2e20877 100644 --- a/packages/@aws-cdk/aws-iot-alpha/package.json +++ b/packages/@aws-cdk/aws-iot-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-iot-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "private": false, "description": "The CDK Construct Library for AWS::IoT", "main": "lib/index.js", @@ -81,19 +81,19 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -113,4 +113,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-iotevents-actions-alpha/package.json b/packages/@aws-cdk/aws-iotevents-actions-alpha/package.json index 1c74334bd2db2..5b7a99f1aa4b3 100644 --- a/packages/@aws-cdk/aws-iotevents-actions-alpha/package.json +++ b/packages/@aws-cdk/aws-iotevents-actions-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-iotevents-actions-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "Receipt Detector Model actions for AWS IoT Events", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -74,21 +74,21 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0", - "@aws-cdk/aws-iotevents-alpha": "0.0.0" + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0", + "@aws-cdk/aws-iotevents-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "@aws-cdk/aws-iotevents-alpha": "0.0.0", - "aws-cdk-lib": "^0.0.0", + "@aws-cdk/aws-iotevents-alpha": "2.148.0-alpha.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -109,4 +109,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-iotevents-alpha/package.json b/packages/@aws-cdk/aws-iotevents-alpha/package.json index 2c150c03a39fa..27ff8ac0b1dda 100644 --- a/packages/@aws-cdk/aws-iotevents-alpha/package.json +++ b/packages/@aws-cdk/aws-iotevents-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-iotevents-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "private": false, "description": "The CDK Construct Library for AWS::IoTEvents", "main": "lib/index.js", @@ -83,18 +83,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -114,4 +114,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-ivs-alpha/package.json b/packages/@aws-cdk/aws-ivs-alpha/package.json index a650d78d8385e..64142e0c02226 100644 --- a/packages/@aws-cdk/aws-ivs-alpha/package.json +++ b/packages/@aws-cdk/aws-ivs-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-ivs-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "The CDK Construct Library for AWS::IVS", "main": "lib/index.js", "private": false, @@ -84,17 +84,17 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -114,4 +114,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/package.json b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/package.json index c1aeea79ee8c1..8cc3c824a4c46 100644 --- a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/package.json +++ b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-kinesisanalytics-flink-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "A CDK Construct Library for Kinesis Analytics Flink applications", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -77,19 +77,19 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -115,4 +115,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-kinesisfirehose-alpha/package.json b/packages/@aws-cdk/aws-kinesisfirehose-alpha/package.json index afbae35da3b7f..f61c7e4a1bd2a 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose-alpha/package.json +++ b/packages/@aws-cdk/aws-kinesisfirehose-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-kinesisfirehose-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "private": false, "description": "The CDK Construct Library for AWS::KinesisFirehose", "main": "lib/index.js", @@ -81,18 +81,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -117,4 +117,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/package.json b/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/package.json index 0004dacb07c41..c844b1e066346 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/package.json +++ b/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-kinesisfirehose-destinations-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "CDK Destinations Constructs for AWS Kinesis Firehose", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -75,20 +75,20 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/aws-kinesisfirehose-alpha": "0.0.0" + "@aws-cdk/aws-kinesisfirehose-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "@aws-cdk/aws-kinesisfirehose-alpha": "0.0.0", - "aws-cdk-lib": "^0.0.0", + "@aws-cdk/aws-kinesisfirehose-alpha": "2.148.0-alpha.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -114,4 +114,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-lambda-go-alpha/package.json b/packages/@aws-cdk/aws-lambda-go-alpha/package.json index 837ea1c9efc46..30e07f0d270fa 100644 --- a/packages/@aws-cdk/aws-lambda-go-alpha/package.json +++ b/packages/@aws-cdk/aws-lambda-go-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-lambda-go-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "The CDK Construct Library for AWS Lambda in Golang", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -77,18 +77,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -114,4 +114,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-lambda-python-alpha/package.json b/packages/@aws-cdk/aws-lambda-python-alpha/package.json index ad3d3e094aac2..12ea1a9375518 100644 --- a/packages/@aws-cdk/aws-lambda-python-alpha/package.json +++ b/packages/@aws-cdk/aws-lambda-python-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-lambda-python-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "private": false, "description": "The CDK Construct Library for AWS Lambda in Python", "main": "lib/index.js", @@ -76,18 +76,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -112,4 +112,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-location-alpha/package.json b/packages/@aws-cdk/aws-location-alpha/package.json index 212997a349649..df819571acdd1 100644 --- a/packages/@aws-cdk/aws-location-alpha/package.json +++ b/packages/@aws-cdk/aws-location-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-location-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "The CDK Construct Library for AWS::Location", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -84,17 +84,17 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -115,4 +115,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-msk-alpha/package.json b/packages/@aws-cdk/aws-msk-alpha/package.json index 2d3b15514e30f..29a2910f192cc 100644 --- a/packages/@aws-cdk/aws-msk-alpha/package.json +++ b/packages/@aws-cdk/aws-msk-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-msk-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "private": false, "description": "The CDK Construct Library for AWS::MSK", "main": "lib/index.js", @@ -83,18 +83,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -114,4 +114,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-neptune-alpha/package.json b/packages/@aws-cdk/aws-neptune-alpha/package.json index 8cda4e7a40c2e..09a4daeb00819 100644 --- a/packages/@aws-cdk/aws-neptune-alpha/package.json +++ b/packages/@aws-cdk/aws-neptune-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-neptune-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "private": false, "description": "The CDK Construct Library for AWS::Neptune", "main": "lib/index.js", @@ -82,17 +82,17 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -112,4 +112,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-pipes-alpha/package.json b/packages/@aws-cdk/aws-pipes-alpha/package.json index cce6916209aff..f03b38d9ee68a 100644 --- a/packages/@aws-cdk/aws-pipes-alpha/package.json +++ b/packages/@aws-cdk/aws-pipes-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-pipes-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "The CDK Construct Library for Amazon EventBridge Pipes", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -81,18 +81,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "jest": "^29", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -115,4 +115,4 @@ "jsiiRosetta": { "exampleDependencies": {} } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-pipes-enrichments-alpha/package.json b/packages/@aws-cdk/aws-pipes-enrichments-alpha/package.json index dd3b96aa821e3..eb0664ee976e3 100644 --- a/packages/@aws-cdk/aws-pipes-enrichments-alpha/package.json +++ b/packages/@aws-cdk/aws-pipes-enrichments-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-pipes-enrichments-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "The CDK Construct Library for Amazon EventBridge Pipes Enrichments", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -81,21 +81,20 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "jest": "^29", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/aws-pipes-alpha": "0.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" - }, - "dependencies": { + "@aws-cdk/aws-pipes-alpha": "2.148.0-alpha.0", + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, + "dependencies": {}, "peerDependencies": { - "@aws-cdk/aws-pipes-alpha": "0.0.0", - "aws-cdk-lib": "^0.0.0", + "@aws-cdk/aws-pipes-alpha": "2.148.0-alpha.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -118,4 +117,4 @@ "jsiiRosetta": { "exampleDependencies": {} } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-pipes-sources-alpha/package.json b/packages/@aws-cdk/aws-pipes-sources-alpha/package.json index 209ec9f5d4872..1937077d801ab 100644 --- a/packages/@aws-cdk/aws-pipes-sources-alpha/package.json +++ b/packages/@aws-cdk/aws-pipes-sources-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-pipes-sources-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "The CDK Construct Library for Amazon EventBridge Pipes Sources", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -81,21 +81,20 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "jest": "^29", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/aws-pipes-alpha": "0.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" - }, - "dependencies": { + "@aws-cdk/aws-pipes-alpha": "2.148.0-alpha.0", + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, + "dependencies": {}, "peerDependencies": { - "@aws-cdk/aws-pipes-alpha": "0.0.0", - "aws-cdk-lib": "^0.0.0", + "@aws-cdk/aws-pipes-alpha": "2.148.0-alpha.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -118,4 +117,4 @@ "jsiiRosetta": { "exampleDependencies": {} } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-pipes-targets-alpha/package.json b/packages/@aws-cdk/aws-pipes-targets-alpha/package.json index 34a0ffbcca5c2..bbb6ef62403bb 100644 --- a/packages/@aws-cdk/aws-pipes-targets-alpha/package.json +++ b/packages/@aws-cdk/aws-pipes-targets-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-pipes-targets-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "The CDK Construct Library for Amazon EventBridge Pipes Targets", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -81,20 +81,20 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "jest": "^29", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/aws-pipes-alpha": "0.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" + "@aws-cdk/aws-pipes-alpha": "2.148.0-alpha.0", + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "peerDependencies": { - "@aws-cdk/aws-pipes-alpha": "0.0.0", - "aws-cdk-lib": "^0.0.0", + "@aws-cdk/aws-pipes-alpha": "2.148.0-alpha.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -117,4 +117,4 @@ "jsiiRosetta": { "exampleDependencies": {} } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-redshift-alpha/package.json b/packages/@aws-cdk/aws-redshift-alpha/package.json index 92a68447f7d5d..93e5621618b0f 100644 --- a/packages/@aws-cdk/aws-redshift-alpha/package.json +++ b/packages/@aws-cdk/aws-redshift-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-redshift-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "private": false, "description": "The CDK Construct Library for AWS::Redshift", "main": "lib/index.js", @@ -84,22 +84,22 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", - "@aws-cdk/custom-resource-handlers": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/custom-resource-handlers": "2.148.0-alpha.0", "@aws-sdk/client-redshift": "3.452.0", "@aws-sdk/client-redshift-data": "3.451.0", "@aws-sdk/client-secrets-manager": "3.451.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -119,4 +119,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-route53resolver-alpha/package.json b/packages/@aws-cdk/aws-route53resolver-alpha/package.json index 3f21b5e158731..418c478036e2e 100644 --- a/packages/@aws-cdk/aws-route53resolver-alpha/package.json +++ b/packages/@aws-cdk/aws-route53resolver-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-route53resolver-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "private": false, "description": "The CDK Construct Library for AWS::Route53Resolver", "main": "lib/index.js", @@ -82,16 +82,16 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -111,4 +111,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-s3objectlambda-alpha/package.json b/packages/@aws-cdk/aws-s3objectlambda-alpha/package.json index c297cabaa0299..97fcdb03610b5 100644 --- a/packages/@aws-cdk/aws-s3objectlambda-alpha/package.json +++ b/packages/@aws-cdk/aws-s3objectlambda-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-s3objectlambda-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "The CDK Construct Library for AWS::S3ObjectLambda", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -84,17 +84,17 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -115,4 +115,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-sagemaker-alpha/package.json b/packages/@aws-cdk/aws-sagemaker-alpha/package.json index c9a2b91e52d78..f3b21457db99b 100644 --- a/packages/@aws-cdk/aws-sagemaker-alpha/package.json +++ b/packages/@aws-cdk/aws-sagemaker-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-sagemaker-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "private": false, "description": "The CDK Construct Library for AWS::SageMaker", "main": "lib/index.js", @@ -82,18 +82,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -113,4 +113,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-scheduler-alpha/package.json b/packages/@aws-cdk/aws-scheduler-alpha/package.json index f519b30dfd69a..6e75c37a79050 100644 --- a/packages/@aws-cdk/aws-scheduler-alpha/package.json +++ b/packages/@aws-cdk/aws-scheduler-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-scheduler-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "The CDK Construct Library for Amazon Scheduler", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -81,17 +81,17 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -116,4 +116,4 @@ "@aws-cdk/aws-scheduler-targets-alpha": "*" } } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-scheduler-targets-alpha/package.json b/packages/@aws-cdk/aws-scheduler-targets-alpha/package.json index e30631dbdea55..c3db15225e9a2 100644 --- a/packages/@aws-cdk/aws-scheduler-targets-alpha/package.json +++ b/packages/@aws-cdk/aws-scheduler-targets-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-scheduler-targets-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "The CDK Construct Library for Amazon Scheduler Targets", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -82,19 +82,19 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "0.0.0", - "@aws-cdk/aws-scheduler-alpha": "0.0.0", + "aws-cdk-lib": "2.148.0", + "@aws-cdk/aws-scheduler-alpha": "2.148.0-alpha.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^0.0.0", - "@aws-cdk/aws-scheduler-alpha": "0.0.0", + "aws-cdk-lib": "^2.148.0", + "@aws-cdk/aws-scheduler-alpha": "2.148.0-alpha.0", "constructs": "^10.0.0" }, "engines": { @@ -114,4 +114,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/package.json b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/package.json index ec2c9af425af7..ce4f1ad15b984 100644 --- a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/package.json +++ b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-servicecatalogappregistry-alpha", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "The CDK Construct Library for AWS::ServiceCatalogAppRegistry", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -84,17 +84,17 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "0.0.0" + "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "engines": { @@ -115,4 +115,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/cdk-cli-wrapper/package.json b/packages/@aws-cdk/cdk-cli-wrapper/package.json index 989dbead54d80..83fd5e5c7756c 100644 --- a/packages/@aws-cdk/cdk-cli-wrapper/package.json +++ b/packages/@aws-cdk/cdk-cli-wrapper/package.json @@ -2,7 +2,7 @@ "name": "@aws-cdk/cdk-cli-wrapper", "description": "CDK CLI Wrapper Library", "private": true, - "version": "0.0.0", + "version": "2.148.0-alpha.0", "main": "lib/index.js", "types": "lib/index.d.ts", "scripts": { @@ -28,9 +28,9 @@ "license": "Apache-2.0", "devDependencies": { "@types/jest": "^29.5.12", - "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", "jest": "^29.7.0", - "@aws-cdk/pkglint": "0.0.0" + "@aws-cdk/pkglint": "2.148.0-alpha.0" }, "repository": { "url": "https://github.com/aws/aws-cdk.git", @@ -66,4 +66,4 @@ "ubergen": { "exclude": true } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/cli-lib-alpha/package.json b/packages/@aws-cdk/cli-lib-alpha/package.json index b2cecc23c8d3c..a95d78989a5a9 100644 --- a/packages/@aws-cdk/cli-lib-alpha/package.json +++ b/packages/@aws-cdk/cli-lib-alpha/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/cli-lib-alpha", "description": "AWS CDK Programmatic CLI library", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "private": false, "main": "lib/main.js", "types": "lib/index.d.ts", @@ -83,11 +83,11 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "aws-cdk-lib": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "aws-cdk-lib": "2.148.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", - "aws-cdk": "0.0.0", + "aws-cdk": "2.148.0", "constructs": "^10.0.0", "jest": "^29.7.0", "ts-node": "^10.9.2" @@ -122,4 +122,4 @@ }, "dependencies": {}, "peerDependencies": {} -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/cloud-assembly-schema/package.json b/packages/@aws-cdk/cloud-assembly-schema/package.json index 0a05241153b84..73008430a4d16 100644 --- a/packages/@aws-cdk/cloud-assembly-schema/package.json +++ b/packages/@aws-cdk/cloud-assembly-schema/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/cloud-assembly-schema", - "version": "0.0.0", + "version": "2.148.0", "description": "Cloud Assembly Schema", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -80,12 +80,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "@types/mock-fs": "^4.13.4", "@types/semver": "^7.5.8", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "jest": "^29.7.0", "mock-fs": "^4.14.0", "typescript-json-schema": "^0.64.0" @@ -119,4 +119,4 @@ "publishConfig": { "tag": "latest" } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/cloudformation-diff/package.json b/packages/@aws-cdk/cloudformation-diff/package.json index 80e2b93c70a01..c24cab1e49dfe 100644 --- a/packages/@aws-cdk/cloudformation-diff/package.json +++ b/packages/@aws-cdk/cloudformation-diff/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/cloudformation-diff", - "version": "0.0.0", + "version": "2.148.0", "description": "Utilities to diff CDK stacks against CloudFormation templates", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -32,8 +32,8 @@ "table": "^6.8.2" }, "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@aws-sdk/client-cloudformation": "^3.529.1", "@types/jest": "^29.5.12", "@types/string-width": "^4.0.1", diff --git a/packages/@aws-cdk/custom-resource-handlers/package.json b/packages/@aws-cdk/custom-resource-handlers/package.json index b35f6ca550efe..5683f0f76b77a 100644 --- a/packages/@aws-cdk/custom-resource-handlers/package.json +++ b/packages/@aws-cdk/custom-resource-handlers/package.json @@ -2,7 +2,7 @@ "name": "@aws-cdk/custom-resource-handlers", "description": "CDK Custom Resources", "private": true, - "version": "0.0.0", + "version": "2.148.0-alpha.0", "scripts": { "build": "tsc -b && node scripts/generate.js", "integ": "integ-runner --language javascript", @@ -25,9 +25,9 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", - "@aws-cdk/aws-custom-resource-sdk-adapter": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/aws-custom-resource-sdk-adapter": "2.148.0-alpha.0", "@aws-sdk/client-ecs": "3.451.0", "@aws-sdk/client-ssm": "3.453.0", "@aws-sdk/client-kinesis": "3.451.0", @@ -94,4 +94,4 @@ "publishConfig": { "tag": "latest" } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/cx-api/package.json b/packages/@aws-cdk/cx-api/package.json index 9f6ae2cf09c03..785dc67fca253 100644 --- a/packages/@aws-cdk/cx-api/package.json +++ b/packages/@aws-cdk/cx-api/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/cx-api", - "version": "0.0.0", + "version": "2.148.0", "description": "Cloud executable protocol", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -82,13 +82,13 @@ "semver": "^7.6.2" }, "peerDependencies": { - "@aws-cdk/cloud-assembly-schema": "0.0.0" + "@aws-cdk/cloud-assembly-schema": "2.148.0" }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/cloud-assembly-schema": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/cloud-assembly-schema": "2.148.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "@types/mock-fs": "^4.13.4", "@types/semver": "^7.5.8", @@ -120,4 +120,4 @@ "publishConfig": { "tag": "latest" } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/example-construct-library/package.json b/packages/@aws-cdk/example-construct-library/package.json index af49fd3c976e4..556b0474c9859 100644 --- a/packages/@aws-cdk/example-construct-library/package.json +++ b/packages/@aws-cdk/example-construct-library/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/example-construct-library", "private": true, - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "An example CDK Construct Library that can serve as a template for creating new libraries", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -73,16 +73,16 @@ }, "license": "Apache-2.0", "devDependencies": { - "aws-cdk-lib": "0.0.0", - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "aws-cdk-lib": "2.148.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "jest": "^29.7.0" }, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "separate-module": false, @@ -99,4 +99,4 @@ "AWSLINT_BASE_CONSTRUCT": true } } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/integ-runner/package.json b/packages/@aws-cdk/integ-runner/package.json index 0d190d8f8208f..e29e39e8d383e 100644 --- a/packages/@aws-cdk/integ-runner/package.json +++ b/packages/@aws-cdk/integ-runner/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/integ-runner", "description": "CDK Integration Testing Tool", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "main": "lib/index.js", "types": "lib/index.d.ts", "bin": { @@ -56,9 +56,9 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "aws-cdk-lib": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "aws-cdk-lib": "2.148.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/fs-extra": "^9.0.13", "@types/jest": "^29.5.12", "@types/mock-fs": "^4.13.4", @@ -71,13 +71,13 @@ }, "dependencies": { "chokidar": "^3.6.0", - "@aws-cdk/cloud-assembly-schema": "0.0.0", - "@aws-cdk/cloudformation-diff": "0.0.0", - "@aws-cdk/cx-api": "0.0.0", + "@aws-cdk/cloud-assembly-schema": "2.148.0", + "@aws-cdk/cloudformation-diff": "2.148.0", + "@aws-cdk/cx-api": "2.148.0", "@aws-cdk/aws-service-spec": "^0.1.9", - "cdk-assets": "0.0.0", - "@aws-cdk/cdk-cli-wrapper": "0.0.0", - "aws-cdk": "0.0.0", + "cdk-assets": "2.148.0", + "@aws-cdk/cdk-cli-wrapper": "2.148.0-alpha.0", + "aws-cdk": "2.148.0", "chalk": "^4", "fs-extra": "^9.1.0", "workerpool": "^6.5.1", @@ -108,4 +108,4 @@ "publishConfig": { "tag": "latest" } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/integ-tests-alpha/package.json b/packages/@aws-cdk/integ-tests-alpha/package.json index b037fab0d094f..508bd4a4dcbe5 100644 --- a/packages/@aws-cdk/integ-tests-alpha/package.json +++ b/packages/@aws-cdk/integ-tests-alpha/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/integ-tests-alpha", "description": "CDK Integration Testing Constructs", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "private": false, "main": "lib/index.js", "types": "lib/index.d.ts", @@ -66,10 +66,10 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", - "@aws-cdk/aws-custom-resource-sdk-adapter": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/integ-runner": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/aws-custom-resource-sdk-adapter": "2.148.0-alpha.0", "@aws-sdk/client-ec2": "3.421.0", "@aws-sdk/client-s3": "3.421.0", "@aws-sdk/client-sfn": "3.421.0", @@ -81,14 +81,14 @@ "jest": "^29.7.0", "nock": "^13.5.4", "sinon": "^9.2.4", - "aws-cdk-lib": "0.0.0", + "aws-cdk-lib": "2.148.0", "node-fetch": "^2.7.0", "@types/node-fetch": "^2.6.11", "constructs": "^10.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^0.0.0", + "aws-cdk-lib": "^2.148.0", "constructs": "^10.0.0" }, "repository": { @@ -136,4 +136,4 @@ "assert/assert-dependency" ] } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/region-info/package.json b/packages/@aws-cdk/region-info/package.json index f61301aa16aa4..e8c7e6c9b4bff 100644 --- a/packages/@aws-cdk/region-info/package.json +++ b/packages/@aws-cdk/region-info/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/region-info", - "version": "0.0.0", + "version": "2.148.0", "description": "AWS region information, such as service principal names", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -80,9 +80,9 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", - "aws-cdk-lib": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", + "aws-cdk-lib": "2.148.0", "@types/fs-extra": "^9.0.13", "@types/jest": "^29.5.12", "fs-extra": "^9.1.0" @@ -113,4 +113,4 @@ "publishConfig": { "tag": "latest" } -} +} \ No newline at end of file diff --git a/packages/aws-cdk-lib/package.json b/packages/aws-cdk-lib/package.json index e616bf8e66e17..55c2c3f8409e4 100644 --- a/packages/aws-cdk-lib/package.json +++ b/packages/aws-cdk-lib/package.json @@ -1,6 +1,6 @@ { "name": "aws-cdk-lib", - "version": "0.0.0", + "version": "2.148.0", "description": "Version 2 of the AWS Cloud Development Kit library", "main": "index.js", "types": "index.d.ts", @@ -136,11 +136,11 @@ }, "devDependencies": { "@aws-cdk/aws-service-spec": "^0.1.9", - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/custom-resource-handlers": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", - "@aws-cdk/aws-custom-resource-sdk-adapter": "0.0.0", - "@aws-cdk/spec2cdk": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/custom-resource-handlers": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/aws-custom-resource-sdk-adapter": "2.148.0-alpha.0", + "@aws-cdk/spec2cdk": "2.148.0-alpha.0", "@aws-sdk/client-acm": "3.421.0", "@aws-sdk/client-account": "3.421.0", "@aws-sdk/client-codepipeline": "3.421.0", @@ -165,7 +165,7 @@ "@types/lodash": "^4.17.6", "@types/punycode": "^2.1.4", "@types/mime-types": "^2.1.4", - "@aws-cdk/lazify": "0.0.0", + "@aws-cdk/lazify": "2.148.0-alpha.0", "aws-sdk": "^2.1653.0", "aws-sdk-client-mock": "^3.1.0", "aws-sdk-client-mock-jest": "^3.1.0", @@ -517,4 +517,4 @@ "@aws-cdk/aws-kinesisfirehose-destinations-alpha": "*" } } -} +} \ No newline at end of file diff --git a/packages/aws-cdk/lib/api/deployments.ts b/packages/aws-cdk/lib/api/deployments.ts index 82f06771052b3..ee357e01b525c 100644 --- a/packages/aws-cdk/lib/api/deployments.ts +++ b/packages/aws-cdk/lib/api/deployments.ts @@ -6,7 +6,7 @@ import { ISDK } from './aws-auth/sdk'; import { CredentialsOptions, SdkForEnvironment, SdkProvider } from './aws-auth/sdk-provider'; import { deployStack, DeployStackResult, destroyStack, DeploymentMethod } from './deploy-stack'; import { EnvironmentResources, EnvironmentResourcesRegistry } from './environment-resources'; -import { HotswapMode, HotswapProperties } from './hotswap/common'; +import { HotswapMode } from './hotswap/common'; import { loadCurrentTemplateWithNestedStacks, loadCurrentTemplate, RootTemplateWithNestedStacks } from './nested-stack-helpers'; import { CloudFormationStack, Template, ResourcesToImport, ResourceIdentifierSummaries } from './util/cloudformation'; import { StackActivityProgress } from './util/cloudformation/stack-activity-monitor'; @@ -174,11 +174,6 @@ export interface DeployStackOptions { */ readonly hotswap?: HotswapMode; - /** - * Properties that configure hotswap behavior - */ - readonly hotswapProperties?: HotswapProperties; - /** * The extra string to append to the User-Agent header when performing AWS SDK calls. * @@ -415,7 +410,6 @@ export class Deployments { ci: options.ci, rollback: options.rollback, hotswap: options.hotswap, - hotswapProperties: options.hotswapProperties, extraUserAgent: options.extraUserAgent, resourcesToImport: options.resourcesToImport, overrideTemplate: options.overrideTemplate, diff --git a/packages/aws-cdk/lib/api/hotswap-deployments.ts b/packages/aws-cdk/lib/api/hotswap-deployments.ts index 9942ad4bb2c71..edf6c8cb7a16c 100644 --- a/packages/aws-cdk/lib/api/hotswap-deployments.ts +++ b/packages/aws-cdk/lib/api/hotswap-deployments.ts @@ -6,7 +6,7 @@ import { DeployStackResult } from './deploy-stack'; import { EvaluateCloudFormationTemplate } from './evaluate-cloudformation-template'; import { isHotswappableAppSyncChange } from './hotswap/appsync-mapping-templates'; import { isHotswappableCodeBuildProjectChange } from './hotswap/code-build-projects'; -import { ICON, ChangeHotswapResult, HotswapMode, HotswappableChange, NonHotswappableChange, HotswappableChangeCandidate, HotswapProperties, ClassifiedResourceChanges, reportNonHotswappableChange, reportNonHotswappableResource } from './hotswap/common'; +import { ICON, ChangeHotswapResult, HotswapMode, HotswappableChange, NonHotswappableChange, HotswappableChangeCandidate, ClassifiedResourceChanges, reportNonHotswappableChange, reportNonHotswappableResource } from './hotswap/common'; import { isHotswappableEcsServiceChange } from './hotswap/ecs-services'; import { isHotswappableLambdaFunctionChange } from './hotswap/lambda-functions'; import { skipChangeForS3DeployCustomResourcePolicy, isHotswappableS3BucketDeploymentChange } from './hotswap/s3-bucket-deployments'; @@ -16,7 +16,7 @@ import { CloudFormationStack } from './util/cloudformation'; import { print } from '../logging'; type HotswapDetector = ( - logicalId: string, change: HotswappableChangeCandidate, evaluateCfnTemplate: EvaluateCloudFormationTemplate, hostswapProperties: HotswapProperties, + logicalId: string, change: HotswappableChangeCandidate, evaluateCfnTemplate: EvaluateCloudFormationTemplate ) => Promise; const RESOURCE_DETECTORS: { [key: string]: HotswapDetector } = { @@ -59,7 +59,7 @@ const RESOURCE_DETECTORS: { [key: string]: HotswapDetector } = { export async function tryHotswapDeployment( sdkProvider: SdkProvider, assetParams: { [key: string]: string }, cloudFormationStack: CloudFormationStack, stackArtifact: cxapi.CloudFormationStackArtifact, - hotswapMode: HotswapMode, hotswapProperties: HotswapProperties, + hotswapMode: HotswapMode, ): Promise { // resolve the environment, so we can substitute things like AWS::Region in CFN expressions const resolvedEnv = await sdkProvider.resolveEnvironment(stackArtifact.environment); @@ -83,7 +83,7 @@ export async function tryHotswapDeployment( const stackChanges = cfn_diff.fullDiff(currentTemplate.deployedRootTemplate, stackArtifact.template); const { hotswappableChanges, nonHotswappableChanges } = await classifyResourceChanges( - stackChanges, evaluateCfnTemplate, sdk, currentTemplate.nestedStacks, hotswapProperties, + stackChanges, evaluateCfnTemplate, sdk, currentTemplate.nestedStacks, ); logNonHotswappableChanges(nonHotswappableChanges, hotswapMode); @@ -110,7 +110,6 @@ async function classifyResourceChanges( evaluateCfnTemplate: EvaluateCloudFormationTemplate, sdk: ISDK, nestedStackNames: { [nestedStackName: string]: NestedStackTemplates }, - hotswapProperties: HotswapProperties, ): Promise { const resourceDifferences = getStackResourceDifferences(stackChanges); @@ -135,7 +134,6 @@ async function classifyResourceChanges( nestedStackNames, evaluateCfnTemplate, sdk, - hotswapProperties, ); hotswappableResources.push(...nestedHotswappableResources.hotswappableChanges); nonHotswappableResources.push(...nestedHotswappableResources.nonHotswappableChanges); @@ -156,7 +154,7 @@ async function classifyResourceChanges( const resourceType: string = hotswappableChangeCandidate.newValue.Type; if (resourceType in RESOURCE_DETECTORS) { // run detector functions lazily to prevent unhandled promise rejections - promises.push(() => RESOURCE_DETECTORS[resourceType](logicalId, hotswappableChangeCandidate, evaluateCfnTemplate, hotswapProperties)); + promises.push(() => RESOURCE_DETECTORS[resourceType](logicalId, hotswappableChangeCandidate, evaluateCfnTemplate)); } else { reportNonHotswappableChange(nonHotswappableResources, hotswappableChangeCandidate, undefined, 'This resource type is not supported for hotswap deployments'); } @@ -236,7 +234,6 @@ async function findNestedHotswappableChanges( nestedStackTemplates: { [nestedStackName: string]: NestedStackTemplates }, evaluateCfnTemplate: EvaluateCloudFormationTemplate, sdk: ISDK, - hotswapProperties: HotswapProperties, ): Promise { const nestedStack = nestedStackTemplates[logicalId]; if (!nestedStack.physicalName) { @@ -260,7 +257,7 @@ async function findNestedHotswappableChanges( nestedStackTemplates[logicalId].deployedTemplate, nestedStackTemplates[logicalId].generatedTemplate, ); - return classifyResourceChanges(nestedDiff, evaluateNestedCfnTemplate, sdk, nestedStackTemplates[logicalId].nestedStackTemplates, hotswapProperties); + return classifyResourceChanges(nestedDiff, evaluateNestedCfnTemplate, sdk, nestedStackTemplates[logicalId].nestedStackTemplates); } /** Returns 'true' if a pair of changes is for the same resource. */ diff --git a/packages/aws-cdk/lib/api/hotswap/common.ts b/packages/aws-cdk/lib/api/hotswap/common.ts index 0f67256dc4d28..073f1eec4388d 100644 --- a/packages/aws-cdk/lib/api/hotswap/common.ts +++ b/packages/aws-cdk/lib/api/hotswap/common.ts @@ -98,18 +98,6 @@ export class HotswappableChangeCandidate { type Exclude = { [key: string]: Exclude | true } -/** - * Represents configuration properties for hotswap deployments - */ -export class HotswapProperties { - // Each supported resource type will have its own properties. Currently this is ECS - ecsHotswapProperties?: EcsHotswapProperties; - - public constructor (ecsHotswapProperties?: EcsHotswapProperties) { - this.ecsHotswapProperties = ecsHotswapProperties; - } -} - /** * Represents configuration properties for ECS hotswap deployments */ diff --git a/packages/aws-cdk/lib/api/hotswap/ecs-services.ts b/packages/aws-cdk/lib/api/hotswap/ecs-services.ts index ab933056f362e..b0462e9f29d8f 100644 --- a/packages/aws-cdk/lib/api/hotswap/ecs-services.ts +++ b/packages/aws-cdk/lib/api/hotswap/ecs-services.ts @@ -1,16 +1,18 @@ import * as AWS from 'aws-sdk'; -import { ChangeHotswapResult, classifyChanges, HotswappableChangeCandidate, HotswapProperties, lowerCaseFirstCharacter, reportNonHotswappableChange, transformObjectKeys } from './common'; +import { ChangeHotswapResult, classifyChanges, HotswappableChangeCandidate, lowerCaseFirstCharacter, reportNonHotswappableChange, transformObjectKeys } from './common'; +import { Configuration } from '../../settings'; import { ISDK } from '../aws-auth'; import { EvaluateCloudFormationTemplate } from '../evaluate-cloudformation-template'; export async function isHotswappableEcsServiceChange( - logicalId: string, change: HotswappableChangeCandidate, evaluateCfnTemplate: EvaluateCloudFormationTemplate, hostswapProperties: HotswapProperties, + logicalId: string, change: HotswappableChangeCandidate, evaluateCfnTemplate: EvaluateCloudFormationTemplate, ): Promise { // the only resource change we can evaluate here is an ECS TaskDefinition if (change.newValue.Type !== 'AWS::ECS::TaskDefinition') { return []; } + const config = new Configuration; const ret: ChangeHotswapResult = []; // We only allow a change in the ContainerDefinitions of the TaskDefinition for now - @@ -83,7 +85,8 @@ export async function isHotswappableEcsServiceChange( const registerTaskDefResponse = await sdk.ecs().registerTaskDefinition(lowercasedTaskDef).promise(); const taskDefRevArn = registerTaskDefResponse.taskDefinition?.taskDefinitionArn; - let ecsHotswapProperties = hostswapProperties.ecsHotswapProperties; + let ecsHotswapProperties = config.settings.get(['hotswapProperties']).ecs; + let minimumHealthyPercent = ecsHotswapProperties?.minimumHealthyPercent; let maximumHealthyPercent = ecsHotswapProperties?.maximumHealthyPercent; diff --git a/packages/aws-cdk/lib/cdk-toolkit.ts b/packages/aws-cdk/lib/cdk-toolkit.ts index 90c1d8b448279..31fddff1e9724 100644 --- a/packages/aws-cdk/lib/cdk-toolkit.ts +++ b/packages/aws-cdk/lib/cdk-toolkit.ts @@ -12,7 +12,7 @@ import { Bootstrapper, BootstrapEnvironmentOptions } from './api/bootstrap'; import { CloudAssembly, DefaultSelection, ExtendedStackSelection, StackCollection, StackSelector } from './api/cxapp/cloud-assembly'; import { CloudExecutable } from './api/cxapp/cloud-executable'; import { Deployments } from './api/deployments'; -import { EcsHotswapProperties, HotswapMode, HotswapProperties } from './api/hotswap/common'; +import { HotswapMode } from './api/hotswap/common'; import { findCloudWatchLogGroups } from './api/logs/find-cloudwatch-logs'; import { CloudWatchLogEventMonitor } from './api/logs/logs-monitor'; import { createDiffChangeSet, ResourcesToImport } from './api/util/cloudformation'; @@ -245,12 +245,10 @@ export class CdkToolkit { warning('⚠️ They should only be used for development - never use them for your production Stacks!\n'); } - let ecsHotswapProperties = new EcsHotswapProperties(options.hotswapEcsMinimumHealthyPercent, options.hotswapEcsMaximumHealthyPercent); + let ecsHotswapProperties = this.props.configuration.settings.get(['hotswapProperties']).ecs; if (!ecsHotswapProperties.isEmpty() && options.hotswap == HotswapMode.FULL_DEPLOYMENT) { warning('⚠️ Hotswap properties defined while not in hotswap mode will be ignored.'); } - let hotswapProperties = new HotswapProperties(); - hotswapProperties.ecsHotswapProperties = ecsHotswapProperties; const stacks = stackCollection.stackArtifacts; @@ -354,7 +352,6 @@ export class CdkToolkit { ci: options.ci, rollback: options.rollback, hotswap: options.hotswap, - hotswapProperties: hotswapProperties, extraUserAgent: options.extraUserAgent, assetParallelism: options.assetParallelism, ignoreNoStacks: options.ignoreNoStacks, diff --git a/packages/aws-cdk/lib/cli.ts b/packages/aws-cdk/lib/cli.ts index 72fb7c8790106..2c15bb7b9949f 100644 --- a/packages/aws-cdk/lib/cli.ts +++ b/packages/aws-cdk/lib/cli.ts @@ -158,16 +158,6 @@ async function parseCommandLineArguments(args: string[]) { 'and falls back to a full deployment if that is not possible. ' + 'Do not use this in production environments', }) - .option('hotswap-ecs-minimum-healthy-percent', { - type: 'number', - desc: 'When using hotswap for ECS, set the minimum healthy percent' + - 'for the updated task definition', - }) - .option('hotswap-ecs-maximum-healthy-percent', { - type: 'number', - desc: 'When using hotswap for ECS, set the maximum healthy percent' + - 'for the updated task definition', - }) .option('watch', { type: 'boolean', desc: 'Continuously observe the project files, ' + @@ -608,8 +598,6 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise; @@ -9,7 +10,6 @@ let mockUpdateService: (params: AWS.ECS.UpdateServiceRequest) => AWS.ECS.UpdateS beforeEach(() => { hotswapMockSdkProvider = setup.setupHotswapTests(); - mockRegisterTaskDef = jest.fn(); mockUpdateService = jest.fn(); hotswapMockSdkProvider.stubEcs({ @@ -639,10 +639,10 @@ describe.each([HotswapMode.FALL_BACK, HotswapMode.HOTSWAP_ONLY])('%p mode', (hot }); describe.each([ - new HotswapProperties(new EcsHotswapProperties(10)), - new HotswapProperties(new EcsHotswapProperties(undefined, 100)), - new HotswapProperties(new EcsHotswapProperties(10, 100)), -])('hotswap properties', (hotswapProperties) => { + new Configuration().settings.set(['hotswapProperties'], { minimumHealthyPercent: 10 }), + new Configuration().settings.set(['hotswapProperties'], { minimumHealthyPercent: undefined, maximumHealthyPercent: 100 }), + new Configuration().settings.set(['hotswapProperties'], { minimumHealthyPercent: 10, maximumHealthyPercent: 100 }), +])('hotswap properties', (settings) => { test('should handle all possible hotswap properties', async () => { // GIVEN setup.setCurrentCfnStackTemplate({ @@ -696,7 +696,7 @@ describe.each([ }); // WHEN - const deployStackResult = await hotswapMockSdkProvider.tryHotswapDeployment(HotswapMode.HOTSWAP_ONLY, cdkStackArtifact, {}, hotswapProperties); + const deployStackResult = await hotswapMockSdkProvider.tryHotswapDeployment(HotswapMode.HOTSWAP_ONLY, cdkStackArtifact, settings.get(['hotswapProperties']).ecs); // THEN expect(deployStackResult).not.toBeUndefined(); @@ -711,9 +711,9 @@ describe.each([ cluster: 'my-cluster', taskDefinition: 'arn:aws:ecs:region:account:task-definition/my-task-def:3', deploymentConfiguration: { - minimumHealthyPercent: hotswapProperties.ecsHotswapProperties?.minimumHealthyPercent == undefined ? - 0 : hotswapProperties.ecsHotswapProperties?.minimumHealthyPercent, - maximumPercent: hotswapProperties.ecsHotswapProperties?.maximumHealthyPercent, + minimumHealthyPercent: settings.get(['hotswapProperties']).ecs?.minimumHealthyPercent == undefined ? + 0 : settings.get(['hotswapProperties']).ecs?.minimumHealthyPercent, + maximumPercent: settings.get(['hotswapProperties']).ecs?.maximumHealthyPercent, }, forceNewDeployment: true, }); diff --git a/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts b/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts index edc0898ca4ada..3ad2fc4e6002a 100644 --- a/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts +++ b/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts @@ -5,7 +5,7 @@ import * as codebuild from 'aws-sdk/clients/codebuild'; import * as lambda from 'aws-sdk/clients/lambda'; import * as stepfunctions from 'aws-sdk/clients/stepfunctions'; import { DeployStackResult } from '../../../lib/api'; -import { HotswapMode, HotswapProperties } from '../../../lib/api/hotswap/common'; +import { HotswapMode } from '../../../lib/api/hotswap/common'; import * as deployments from '../../../lib/api/hotswap-deployments'; import { CloudFormationStack, Template } from '../../../lib/api/util/cloudformation'; import { testStack, TestStackArtifact } from '../../util'; @@ -180,9 +180,9 @@ export class HotswapMockSdkProvider { hotswapMode: HotswapMode, stackArtifact: cxapi.CloudFormationStackArtifact, assetParams: { [key: string]: string } = {}, - hotswapProperties?: HotswapProperties, + // ecsHotswapProperties?: EcsHotswapProperties, ): Promise { - let hotswapProps = hotswapProperties || new HotswapProperties(); - return deployments.tryHotswapDeployment(this.mockSdkProvider, assetParams, currentCfnStack, stackArtifact, hotswapMode, hotswapProps); + // let ecsProps = ecsHotswapProperties || new EcsHotswapProperties(); + return deployments.tryHotswapDeployment(this.mockSdkProvider, assetParams, currentCfnStack, stackArtifact, hotswapMode); } } diff --git a/packages/awslint/package.json b/packages/awslint/package.json index f9ba600f5ba97..5dec0bb501e5c 100644 --- a/packages/awslint/package.json +++ b/packages/awslint/package.json @@ -1,6 +1,6 @@ { "name": "awslint", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "Enforces the AWS Construct Library guidelines", "scripts": { "build": "tsc -b && eslint . --ext=.ts && pkglint && chmod +x bin/awslint", @@ -26,8 +26,8 @@ "yargs": "^16.2.0" }, "devDependencies": { - "@aws-cdk/eslint-plugin": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/eslint-plugin": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/fs-extra": "^9.0.13", "@types/jest": "^29.5.12", "@types/yargs": "^15.0.19", @@ -71,4 +71,4 @@ "publishConfig": { "tag": "latest" } -} +} \ No newline at end of file diff --git a/packages/cdk-assets/package.json b/packages/cdk-assets/package.json index e07450f12ec3a..601eb13d41898 100644 --- a/packages/cdk-assets/package.json +++ b/packages/cdk-assets/package.json @@ -1,7 +1,7 @@ { "name": "cdk-assets", "description": "CDK Asset Publishing Tool", - "version": "0.0.0", + "version": "2.148.0", "main": "lib/index.js", "types": "lib/index.d.ts", "bin": { @@ -36,15 +36,15 @@ "@types/mime": "^2.0.3", "@types/mock-fs": "^4.13.4", "@types/yargs": "^15.0.19", - "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", "jest": "^29.7.0", "jszip": "^3.10.1", "mock-fs": "^4.14.0", - "@aws-cdk/pkglint": "0.0.0" + "@aws-cdk/pkglint": "2.148.0-alpha.0" }, "dependencies": { - "@aws-cdk/cloud-assembly-schema": "0.0.0", - "@aws-cdk/cx-api": "0.0.0", + "@aws-cdk/cloud-assembly-schema": "2.148.0", + "@aws-cdk/cx-api": "2.148.0", "archiver": "^5.3.2", "aws-sdk": "^2.1653.0", "glob": "^7.2.3", @@ -79,4 +79,4 @@ "publishConfig": { "tag": "latest" } -} +} \ No newline at end of file diff --git a/packages/cdk/package.json b/packages/cdk/package.json index 93ad07d732cc9..22dbed66546e6 100644 --- a/packages/cdk/package.json +++ b/packages/cdk/package.json @@ -1,12 +1,12 @@ { "name": "cdk", - "version": "0.0.0", + "version": "2.148.0", "description": "AWS CDK Toolkit", "bin": { "cdk": "bin/cdk" }, "dependencies": { - "aws-cdk": "0.0.0" + "aws-cdk": "2.148.0" }, "repository": { "type": "git", @@ -45,4 +45,4 @@ "publishConfig": { "tag": "latest" } -} +} \ No newline at end of file diff --git a/scripts/@aws-cdk/script-tests/package.json b/scripts/@aws-cdk/script-tests/package.json index f70f9c91fa809..eefe3d440d644 100644 --- a/scripts/@aws-cdk/script-tests/package.json +++ b/scripts/@aws-cdk/script-tests/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/script-tests", "private": true, - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "various tests for development and build scripts", "scripts": { "build": "echo ok", @@ -14,4 +14,4 @@ "devDependencies": { "jest": "^29.7.0" } -} +} \ No newline at end of file diff --git a/tools/@aws-cdk/cdk-build-tools/package.json b/tools/@aws-cdk/cdk-build-tools/package.json index 53374615cbef5..ce06042ce19d8 100644 --- a/tools/@aws-cdk/cdk-build-tools/package.json +++ b/tools/@aws-cdk/cdk-build-tools/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/cdk-build-tools", "private": true, - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "Tools package with shared build scripts for CDK packages", "repository": { "type": "git", @@ -35,7 +35,7 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/fs-extra": "^9.0.13", "@types/jest": "^29.5.12", "@types/semver": "^7.5.8", @@ -44,12 +44,12 @@ }, "main": "lib/index.js", "dependencies": { - "@aws-cdk/eslint-plugin": "0.0.0", - "@aws-cdk/yarn-cling": "0.0.0", - "@aws-cdk/node-bundle": "0.0.0", + "@aws-cdk/eslint-plugin": "2.148.0-alpha.0", + "@aws-cdk/yarn-cling": "2.148.0-alpha.0", + "@aws-cdk/node-bundle": "2.148.0-alpha.0", "@typescript-eslint/eslint-plugin": "^6.21.0", "@typescript-eslint/parser": "^6.21.0", - "awslint": "0.0.0", + "awslint": "2.148.0-alpha.0", "chalk": "^4", "eslint": "^7.32.0", "eslint-import-resolver-node": "^0.3.9", @@ -87,4 +87,4 @@ "ubergen": { "exclude": true } -} +} \ No newline at end of file diff --git a/tools/@aws-cdk/cdk-release/package.json b/tools/@aws-cdk/cdk-release/package.json index b0bd7cfb1fc10..2b5a76a57a91f 100644 --- a/tools/@aws-cdk/cdk-release/package.json +++ b/tools/@aws-cdk/cdk-release/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/cdk-release", "private": true, - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "A tool for performing release-related tasks like version bumps, Changelog generation, etc.", "repository": { "type": "git", @@ -28,8 +28,8 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/changelog-parser": "^2.8.4", "@types/fs-extra": "^9.0.13", "@types/jest": "^29.5.12", @@ -66,4 +66,4 @@ "ubergen": { "exclude": true } -} +} \ No newline at end of file diff --git a/tools/@aws-cdk/eslint-plugin/package.json b/tools/@aws-cdk/eslint-plugin/package.json index fd53d24b13694..5dd6f23a239ee 100644 --- a/tools/@aws-cdk/eslint-plugin/package.json +++ b/tools/@aws-cdk/eslint-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/eslint-plugin", "private": true, - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "ESLint plugin for private use within the AWS CDK repo", "main": "lib/index.js", "scripts": { @@ -34,4 +34,4 @@ "keywords": [], "author": "", "license": "Apache-2.0" -} +} \ No newline at end of file diff --git a/tools/@aws-cdk/lazify/package.json b/tools/@aws-cdk/lazify/package.json index ab58062a496fc..d0561c5a0614e 100644 --- a/tools/@aws-cdk/lazify/package.json +++ b/tools/@aws-cdk/lazify/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/lazify", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "private": true, "bin": { "lazify": "bin/lazify" @@ -17,7 +17,7 @@ "devDependencies": { "@types/jest": "^29.5.12", "@types/node": "^16", - "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", "jest": "^29", "ts-jest": "^29", "typescript": "~5.4.5", @@ -30,4 +30,4 @@ }, "main": "lib/index.js", "license": "Apache-2.0" -} +} \ No newline at end of file diff --git a/tools/@aws-cdk/node-bundle/package.json b/tools/@aws-cdk/node-bundle/package.json index 491517f39df5e..c26a65d0e8161 100644 --- a/tools/@aws-cdk/node-bundle/package.json +++ b/tools/@aws-cdk/node-bundle/package.json @@ -40,7 +40,7 @@ }, "main": "lib/index.js", "license": "Apache-2.0", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "jest": { "testMatch": [ "/src/**/__tests__/**/*.ts?(x)", @@ -87,4 +87,4 @@ }, "types": "lib/index.d.ts", "private": true -} +} \ No newline at end of file diff --git a/tools/@aws-cdk/pkglint/package.json b/tools/@aws-cdk/pkglint/package.json index 103bba3225e1b..c644c85b9c2ba 100644 --- a/tools/@aws-cdk/pkglint/package.json +++ b/tools/@aws-cdk/pkglint/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/pkglint", - "version": "0.0.0", + "version": "2.148.0-alpha.0", "private": true, "description": "Validate and fix package.json files", "main": "lib/index.js", @@ -37,7 +37,7 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/eslint-plugin": "0.0.0", + "@aws-cdk/eslint-plugin": "2.148.0-alpha.0", "@types/fs-extra": "^9.0.13", "@types/glob": "^7.2.0", "@types/jest": "^29.5.12", @@ -60,7 +60,7 @@ ] }, "dependencies": { - "@aws-cdk/node-bundle": "0.0.0", + "@aws-cdk/node-bundle": "2.148.0-alpha.0", "case": "^1.6.3", "chalk": "^4", "fs-extra": "^9.1.0", @@ -69,4 +69,4 @@ "semver": "^7.6.2", "yargs": "^16.2.0" } -} +} \ No newline at end of file diff --git a/tools/@aws-cdk/pkgtools/package.json b/tools/@aws-cdk/pkgtools/package.json index 98eed8e7ac33c..70398b4fd8bbe 100644 --- a/tools/@aws-cdk/pkgtools/package.json +++ b/tools/@aws-cdk/pkgtools/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/pkgtools", "private": true, - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "Tools for generating cross-package artifacts", "main": "index.js", "repository": { @@ -31,8 +31,8 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/fs-extra": "^9.0.13", "@types/yargs": "^15.0.19" }, @@ -51,4 +51,4 @@ "ubergen": { "exclude": true } -} +} \ No newline at end of file diff --git a/tools/@aws-cdk/prlint/package.json b/tools/@aws-cdk/prlint/package.json index a3e16a36692ab..ca1c57200fac5 100644 --- a/tools/@aws-cdk/prlint/package.json +++ b/tools/@aws-cdk/prlint/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/prlint", "private": true, - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "", "main": "index.js", "keywords": [], @@ -45,4 +45,4 @@ "build+extract": "npm run build", "lint": "tsc -b && eslint . --ext=.ts" } -} +} \ No newline at end of file diff --git a/tools/@aws-cdk/spec2cdk/package.json b/tools/@aws-cdk/spec2cdk/package.json index 083fbc2e1ab8c..f62bfbd3ff7db 100644 --- a/tools/@aws-cdk/spec2cdk/package.json +++ b/tools/@aws-cdk/spec2cdk/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/spec2cdk", "private": true, - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "Generate L1 resources from @aws-cdk/aws-service-specs", "repository": { "type": "git", @@ -42,8 +42,8 @@ "yargs": "^16.2.0" }, "devDependencies": { - "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "@types/node": "^18", "jest": "^29.7.0" @@ -64,4 +64,4 @@ "dependencies/cdk-point-dependencies" ] } -} +} \ No newline at end of file diff --git a/tools/@aws-cdk/yarn-cling/package.json b/tools/@aws-cdk/yarn-cling/package.json index 075b0ecd856a1..bc5fd73b115cd 100644 --- a/tools/@aws-cdk/yarn-cling/package.json +++ b/tools/@aws-cdk/yarn-cling/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/yarn-cling", "private": true, - "version": "0.0.0", + "version": "2.148.0-alpha.0", "description": "Tool for generating npm-shrinkwrap from yarn.lock", "main": "lib/index.js", "repository": { @@ -37,7 +37,7 @@ ] }, "devDependencies": { - "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/pkglint": "2.148.0-alpha.0", "@types/jest": "^29.5.12", "@types/node": "18.11.19", "@types/semver": "^7.5.8", @@ -65,4 +65,4 @@ "ubergen": { "exclude": true } -} +} \ No newline at end of file From 6ab3b04a5511574e20e09f65b9354500a1280c87 Mon Sep 17 00:00:00 2001 From: Atanas Pamukchiev Date: Mon, 29 Jul 2024 13:25:04 +0300 Subject: [PATCH 07/13] Revert "changed to use cdk.json information" This reverts commit 24c15a035848211dfa65def8e597c2744790e051. --- package.json | 4 +-- .../@aws-cdk-testing/cli-integ/package.json | 6 ++-- .../tests/cli-integ-tests/cli.integtest.ts | 4 ++- .../framework-integ/package.json | 14 ++++---- .../package.json | 16 +++++----- .../@aws-cdk/aws-amplify-alpha/package.json | 18 +++++------ .../@aws-cdk/aws-appconfig-alpha/package.json | 16 +++++----- .../@aws-cdk/aws-apprunner-alpha/package.json | 16 +++++----- .../@aws-cdk/aws-cloud9-alpha/package.json | 16 +++++----- .../@aws-cdk/aws-codestar-alpha/package.json | 14 ++++---- .../package.json | 14 ++++---- .../package.json | 8 ++--- .../@aws-cdk/aws-gamelift-alpha/package.json | 16 +++++----- packages/@aws-cdk/aws-glue-alpha/package.json | 16 +++++----- .../aws-iot-actions-alpha/package.json | 32 +++++++++---------- packages/@aws-cdk/aws-iot-alpha/package.json | 16 +++++----- .../aws-iotevents-actions-alpha/package.json | 20 ++++++------ .../@aws-cdk/aws-iotevents-alpha/package.json | 16 +++++----- packages/@aws-cdk/aws-ivs-alpha/package.json | 16 +++++----- .../package.json | 16 +++++----- .../aws-kinesisfirehose-alpha/package.json | 16 +++++----- .../package.json | 18 +++++------ .../@aws-cdk/aws-lambda-go-alpha/package.json | 16 +++++----- .../aws-lambda-python-alpha/package.json | 16 +++++----- .../@aws-cdk/aws-location-alpha/package.json | 16 +++++----- packages/@aws-cdk/aws-msk-alpha/package.json | 16 +++++----- .../@aws-cdk/aws-neptune-alpha/package.json | 16 +++++----- .../@aws-cdk/aws-pipes-alpha/package.json | 16 +++++----- .../aws-pipes-enrichments-alpha/package.json | 23 ++++++------- .../aws-pipes-sources-alpha/package.json | 23 ++++++------- .../aws-pipes-targets-alpha/package.json | 20 ++++++------ .../@aws-cdk/aws-redshift-alpha/package.json | 18 +++++------ .../aws-route53resolver-alpha/package.json | 14 ++++---- .../aws-s3objectlambda-alpha/package.json | 14 ++++---- .../@aws-cdk/aws-sagemaker-alpha/package.json | 16 +++++----- .../@aws-cdk/aws-scheduler-alpha/package.json | 16 +++++----- .../aws-scheduler-targets-alpha/package.json | 20 ++++++------ .../package.json | 16 +++++----- .../@aws-cdk/cdk-cli-wrapper/package.json | 8 ++--- packages/@aws-cdk/cli-lib-alpha/package.json | 12 +++---- .../cloud-assembly-schema/package.json | 10 +++--- .../@aws-cdk/cloudformation-diff/package.json | 6 ++-- .../custom-resource-handlers/package.json | 10 +++--- packages/@aws-cdk/cx-api/package.json | 12 +++---- .../example-construct-library/package.json | 14 ++++---- packages/@aws-cdk/integ-runner/package.json | 22 ++++++------- .../@aws-cdk/integ-tests-alpha/package.json | 16 +++++----- packages/@aws-cdk/region-info/package.json | 10 +++--- packages/aws-cdk-lib/package.json | 16 +++++----- packages/aws-cdk/lib/api/deployments.ts | 8 ++++- .../aws-cdk/lib/api/hotswap-deployments.ts | 15 +++++---- packages/aws-cdk/lib/api/hotswap/common.ts | 12 +++++++ .../aws-cdk/lib/api/hotswap/ecs-services.ts | 9 ++---- packages/aws-cdk/lib/cdk-toolkit.ts | 7 ++-- packages/aws-cdk/lib/cli.ts | 12 +++++++ packages/aws-cdk/package.json | 20 ++++++------ .../ecs-services-hotswap-deployments.test.ts | 20 ++++++------ .../test/api/hotswap/hotswap-test-setup.ts | 8 ++--- packages/awslint/package.json | 8 ++--- packages/cdk-assets/package.json | 12 +++---- packages/cdk/package.json | 6 ++-- scripts/@aws-cdk/script-tests/package.json | 4 +-- tools/@aws-cdk/cdk-build-tools/package.json | 14 ++++---- tools/@aws-cdk/cdk-release/package.json | 8 ++--- tools/@aws-cdk/eslint-plugin/package.json | 4 +-- tools/@aws-cdk/lazify/package.json | 6 ++-- tools/@aws-cdk/node-bundle/package.json | 4 +-- tools/@aws-cdk/pkglint/package.json | 8 ++--- tools/@aws-cdk/pkgtools/package.json | 8 ++--- tools/@aws-cdk/prlint/package.json | 4 +-- tools/@aws-cdk/spec2cdk/package.json | 8 ++--- tools/@aws-cdk/yarn-cling/package.json | 6 ++-- 72 files changed, 494 insertions(+), 457 deletions(-) diff --git a/package.json b/package.json index c2b34818b4f4b..4b07be0640957 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aws-cdk", - "version": "2.148.0", + "version": "0.0.0", "private": true, "pkglint": { "include": "dependencies/node-version" @@ -177,4 +177,4 @@ "dependencies": { "string-width": "^4.2.3" } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk-testing/cli-integ/package.json b/packages/@aws-cdk-testing/cli-integ/package.json index 1264579066c6d..162353a78423c 100644 --- a/packages/@aws-cdk-testing/cli-integ/package.json +++ b/packages/@aws-cdk-testing/cli-integ/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk-testing/cli-integ", "description": "Integration tests for the AWS CDK CLI", - "version": "2.148.0", + "version": "0.0.0", "bin": { "run-suite": "bin/run-suite", "download-and-run-old-tests": "bin/download-and-run-old-tests", @@ -29,13 +29,13 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", "@types/semver": "^7.5.8", "@types/yargs": "^15.0.19", "@types/fs-extra": "^9.0.13", "@types/glob": "^7.2.0", "@types/npm": "^7.19.3", - "@aws-cdk/pkglint": "2.148.0-alpha.0" + "@aws-cdk/pkglint": "0.0.0" }, "dependencies": { "@octokit/rest": "^18.12.0", diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts index 7e937db11b9c3..261710f1ffb4e 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts @@ -1826,13 +1826,15 @@ integTest('hotswap deployment for ecs service detects failed deployment and erro integTest('hotswap ECS deployment respects properties override', withDefaultFixture(async (fixture) => { // GIVEN const stackArn = await fixture.cdkDeploy('ecs-hotswap', { - captureStderr: true, + captureStderr: false, }); // WHEN await fixture.cdkDeploy('ecs-hotswap', { options: [ '--hotswap', + '--hotswap-ecs-minimum-healthy-percent', '100', + '--hotswap-ecs-maximum-healthy-percent', '200', ], modEnv: { DYNAMIC_ECS_PROPERTY_VALUE: 'new value', diff --git a/packages/@aws-cdk-testing/framework-integ/package.json b/packages/@aws-cdk-testing/framework-integ/package.json index cefc2cdee7a62..b7d426ec9743b 100644 --- a/packages/@aws-cdk-testing/framework-integ/package.json +++ b/packages/@aws-cdk-testing/framework-integ/package.json @@ -2,7 +2,7 @@ "name": "@aws-cdk-testing/framework-integ", "description": "Integration tests for aws-cdk-lib", "private": true, - "version": "2.148.0-alpha.0", + "version": "0.0.0", "scripts": { "build": "cdk-build", "watch": "cdk-watch", @@ -29,20 +29,20 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "^2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "^0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@aws-sdk/client-acm": "3.421.0", "@aws-sdk/client-rds": "3.421.0", "@aws-sdk/client-s3": "3.421.0", "delay": "5.0.0" }, "dependencies": { - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0", + "@aws-cdk/integ-tests-alpha": "0.0.0", "@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242", "@aws-cdk/lambda-layer-kubectl-v29": "^2.1.0", "@aws-cdk/lambda-layer-kubectl-v30": "^2.0.0", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "aws-sdk": "^2.1653.0", "aws-sdk-mock": "5.6.0", "cdk8s": "2.68.85", @@ -67,4 +67,4 @@ "publishConfig": { "tag": "latest" } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/app-staging-synthesizer-alpha/package.json b/packages/@aws-cdk/app-staging-synthesizer-alpha/package.json index 5f63d0e5bab7b..213f699b80df1 100644 --- a/packages/@aws-cdk/app-staging-synthesizer-alpha/package.json +++ b/packages/@aws-cdk/app-staging-synthesizer-alpha/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/app-staging-synthesizer-alpha", "private": false, - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "Cdk synthesizer for with app-scoped staging stack", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -84,18 +84,18 @@ } }, "devDependencies": { - "aws-cdk-lib": "2.148.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0", + "aws-cdk-lib": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/integ-tests-alpha": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0" + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/pkglint": "0.0.0" }, "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "publishConfig": { "tag": "latest" } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-amplify-alpha/package.json b/packages/@aws-cdk/aws-amplify-alpha/package.json index e96b1fe64124b..73d7741aa90f5 100644 --- a/packages/@aws-cdk/aws-amplify-alpha/package.json +++ b/packages/@aws-cdk/aws-amplify-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-amplify-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "private": false, "description": "The CDK Construct Library for AWS::Amplify", "main": "lib/index.js", @@ -86,21 +86,21 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", - "@aws-cdk/custom-resource-handlers": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/custom-resource-handlers": "0.0.0", "@aws-sdk/client-amplify": "3.451.0", "@aws-sdk/client-s3": "3.451.0", "@aws-sdk/s3-request-presigner": "3.451.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "2.148.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0", + "aws-cdk-lib": "0.0.0", + "@aws-cdk/integ-tests-alpha": "0.0.0", "constructs": "^10.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -120,4 +120,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-appconfig-alpha/package.json b/packages/@aws-cdk/aws-appconfig-alpha/package.json index aefba814922ee..8b499a59ba22c 100644 --- a/packages/@aws-cdk/aws-appconfig-alpha/package.json +++ b/packages/@aws-cdk/aws-appconfig-alpha/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/aws-appconfig-alpha", "private": false, - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "This module is deprecated. All constructs are now available under aws-cdk-lib/aws-appconfig", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -76,13 +76,13 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/integ-tests-alpha": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "@types/mime-types": "^2.1.4", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", "jest": "^29.7.0" }, @@ -91,7 +91,7 @@ }, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "separate-module": false, @@ -114,4 +114,4 @@ "bundleDependencies": [ "mime-types" ] -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-apprunner-alpha/package.json b/packages/@aws-cdk/aws-apprunner-alpha/package.json index cad5f99cef483..c5feb3d66e0e9 100644 --- a/packages/@aws-cdk/aws-apprunner-alpha/package.json +++ b/packages/@aws-cdk/aws-apprunner-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-apprunner-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "The CDK Construct Library for AWS::AppRunner", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -84,17 +84,17 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "aws-cdk-lib": "2.148.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "aws-cdk-lib": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/integ-tests-alpha": "0.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -115,4 +115,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-cloud9-alpha/package.json b/packages/@aws-cdk/aws-cloud9-alpha/package.json index 277f8c0e034ae..ac9d7da9a5a0b 100644 --- a/packages/@aws-cdk/aws-cloud9-alpha/package.json +++ b/packages/@aws-cdk/aws-cloud9-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-cloud9-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "private": false, "description": "The CDK Construct Library for AWS::Cloud9", "main": "lib/index.js", @@ -81,18 +81,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/integ-tests-alpha": "0.0.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -112,4 +112,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-codestar-alpha/package.json b/packages/@aws-cdk/aws-codestar-alpha/package.json index ce24ad7bd8b2a..4f97131e3dc6f 100644 --- a/packages/@aws-cdk/aws-codestar-alpha/package.json +++ b/packages/@aws-cdk/aws-codestar-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-codestar-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "private": false, "description": "The CDK Construct Library for AWS::CodeStar", "main": "lib/index.js", @@ -83,16 +83,16 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -112,4 +112,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-cognito-identitypool-alpha/package.json b/packages/@aws-cdk/aws-cognito-identitypool-alpha/package.json index 2c2214e42019b..c1279b90a11ab 100644 --- a/packages/@aws-cdk/aws-cognito-identitypool-alpha/package.json +++ b/packages/@aws-cdk/aws-cognito-identitypool-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-cognito-identitypool-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "The CDK Construct Library for AWS::Cognito Identity Pools", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -81,18 +81,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -113,4 +113,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-custom-resource-sdk-adapter/package.json b/packages/@aws-cdk/aws-custom-resource-sdk-adapter/package.json index 20839587aaa5f..a8ab7389aab0d 100644 --- a/packages/@aws-cdk/aws-custom-resource-sdk-adapter/package.json +++ b/packages/@aws-cdk/aws-custom-resource-sdk-adapter/package.json @@ -2,7 +2,7 @@ "name": "@aws-cdk/aws-custom-resource-sdk-adapter", "description": "Adapter to convert AWS SDK v2 to AWS CDK v3 calls for AwsCustomResource", "private": true, - "version": "2.148.0-alpha.0", + "version": "0.0.0", "main": "lib/index.js", "types": "lib/index.d.ts", "scripts": { @@ -25,8 +25,8 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@aws-sdk/client-s3": "3.421.0", "@smithy/types": "^2.12.0", "@types/jest": "^29.5.12", @@ -51,4 +51,4 @@ "publishConfig": { "tag": "latest" } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-gamelift-alpha/package.json b/packages/@aws-cdk/aws-gamelift-alpha/package.json index bce78409446f5..d5bb65bc7830e 100644 --- a/packages/@aws-cdk/aws-gamelift-alpha/package.json +++ b/packages/@aws-cdk/aws-gamelift-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-gamelift-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "private": false, "description": "The CDK Construct Library for AWS::GameLift", "main": "lib/index.js", @@ -81,19 +81,19 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/integ-tests-alpha": "0.0.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -113,4 +113,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-glue-alpha/package.json b/packages/@aws-cdk/aws-glue-alpha/package.json index 1a2c9078bec3f..d46ba9fbe2569 100644 --- a/packages/@aws-cdk/aws-glue-alpha/package.json +++ b/packages/@aws-cdk/aws-glue-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-glue-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "private": false, "description": "The CDK Construct Library for AWS::Glue", "main": "lib/index.js", @@ -81,18 +81,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/integ-tests-alpha": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", "jest": "^29.7.0" }, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -112,4 +112,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/package.json b/packages/@aws-cdk/aws-iot-actions-alpha/package.json index 1e35b37ac7923..9e60554afc3e6 100644 --- a/packages/@aws-cdk/aws-iot-actions-alpha/package.json +++ b/packages/@aws-cdk/aws-iot-actions-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-iot-actions-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "Receipt rule actions for AWS IoT", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -81,29 +81,29 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", "constructs": "^10.0.0", - "aws-cdk-lib": "2.148.0", - "@aws-cdk/aws-kinesisfirehose-destinations-alpha": "2.148.0-alpha.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0", - "@aws-cdk/aws-iot-alpha": "2.148.0-alpha.0", - "@aws-cdk/aws-iotevents-alpha": "2.148.0-alpha.0", - "@aws-cdk/aws-kinesisfirehose-alpha": "2.148.0-alpha.0" + "aws-cdk-lib": "0.0.0", + "@aws-cdk/aws-kinesisfirehose-destinations-alpha": "0.0.0", + "@aws-cdk/integ-tests-alpha": "0.0.0", + "@aws-cdk/aws-iot-alpha": "0.0.0", + "@aws-cdk/aws-iotevents-alpha": "0.0.0", + "@aws-cdk/aws-kinesisfirehose-alpha": "0.0.0" }, "dependencies": { "case": "1.6.3" }, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "@aws-cdk/aws-iot-alpha": "2.148.0-alpha.0", - "@aws-cdk/aws-iotevents-alpha": "2.148.0-alpha.0", - "@aws-cdk/aws-kinesisfirehose-alpha": "2.148.0-alpha.0", - "@aws-cdk/aws-kinesisfirehose-destinations-alpha": "2.148.0-alpha.0", - "aws-cdk-lib": "^2.148.0", + "@aws-cdk/aws-iot-alpha": "0.0.0", + "@aws-cdk/aws-iotevents-alpha": "0.0.0", + "@aws-cdk/aws-kinesisfirehose-alpha": "0.0.0", + "@aws-cdk/aws-kinesisfirehose-destinations-alpha": "0.0.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "bundledDependencies": [ @@ -127,4 +127,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-iot-alpha/package.json b/packages/@aws-cdk/aws-iot-alpha/package.json index 32d1cf2e20877..d6fb42e4ba366 100644 --- a/packages/@aws-cdk/aws-iot-alpha/package.json +++ b/packages/@aws-cdk/aws-iot-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-iot-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "private": false, "description": "The CDK Construct Library for AWS::IoT", "main": "lib/index.js", @@ -81,19 +81,19 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/integ-tests-alpha": "0.0.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -113,4 +113,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-iotevents-actions-alpha/package.json b/packages/@aws-cdk/aws-iotevents-actions-alpha/package.json index 5b7a99f1aa4b3..1c74334bd2db2 100644 --- a/packages/@aws-cdk/aws-iotevents-actions-alpha/package.json +++ b/packages/@aws-cdk/aws-iotevents-actions-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-iotevents-actions-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "Receipt Detector Model actions for AWS IoT Events", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -74,21 +74,21 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0", - "@aws-cdk/aws-iotevents-alpha": "2.148.0-alpha.0" + "@aws-cdk/integ-tests-alpha": "0.0.0", + "@aws-cdk/aws-iotevents-alpha": "0.0.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "@aws-cdk/aws-iotevents-alpha": "2.148.0-alpha.0", - "aws-cdk-lib": "^2.148.0", + "@aws-cdk/aws-iotevents-alpha": "0.0.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -109,4 +109,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-iotevents-alpha/package.json b/packages/@aws-cdk/aws-iotevents-alpha/package.json index 27ff8ac0b1dda..2c150c03a39fa 100644 --- a/packages/@aws-cdk/aws-iotevents-alpha/package.json +++ b/packages/@aws-cdk/aws-iotevents-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-iotevents-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "private": false, "description": "The CDK Construct Library for AWS::IoTEvents", "main": "lib/index.js", @@ -83,18 +83,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/integ-tests-alpha": "0.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -114,4 +114,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-ivs-alpha/package.json b/packages/@aws-cdk/aws-ivs-alpha/package.json index 64142e0c02226..a650d78d8385e 100644 --- a/packages/@aws-cdk/aws-ivs-alpha/package.json +++ b/packages/@aws-cdk/aws-ivs-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-ivs-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "The CDK Construct Library for AWS::IVS", "main": "lib/index.js", "private": false, @@ -84,17 +84,17 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/integ-tests-alpha": "0.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -114,4 +114,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/package.json b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/package.json index 8cc3c824a4c46..c1aeea79ee8c1 100644 --- a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/package.json +++ b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-kinesisanalytics-flink-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "A CDK Construct Library for Kinesis Analytics Flink applications", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -77,19 +77,19 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/integ-tests-alpha": "0.0.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -115,4 +115,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-kinesisfirehose-alpha/package.json b/packages/@aws-cdk/aws-kinesisfirehose-alpha/package.json index f61c7e4a1bd2a..afbae35da3b7f 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose-alpha/package.json +++ b/packages/@aws-cdk/aws-kinesisfirehose-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-kinesisfirehose-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "private": false, "description": "The CDK Construct Library for AWS::KinesisFirehose", "main": "lib/index.js", @@ -81,18 +81,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/integ-tests-alpha": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -117,4 +117,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/package.json b/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/package.json index c844b1e066346..0004dacb07c41 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/package.json +++ b/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-kinesisfirehose-destinations-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "CDK Destinations Constructs for AWS Kinesis Firehose", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -75,20 +75,20 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/aws-kinesisfirehose-alpha": "2.148.0-alpha.0" + "@aws-cdk/aws-kinesisfirehose-alpha": "0.0.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "@aws-cdk/aws-kinesisfirehose-alpha": "2.148.0-alpha.0", - "aws-cdk-lib": "^2.148.0", + "@aws-cdk/aws-kinesisfirehose-alpha": "0.0.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -114,4 +114,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-lambda-go-alpha/package.json b/packages/@aws-cdk/aws-lambda-go-alpha/package.json index 30e07f0d270fa..837ea1c9efc46 100644 --- a/packages/@aws-cdk/aws-lambda-go-alpha/package.json +++ b/packages/@aws-cdk/aws-lambda-go-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-lambda-go-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "The CDK Construct Library for AWS Lambda in Golang", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -77,18 +77,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/integ-tests-alpha": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -114,4 +114,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-lambda-python-alpha/package.json b/packages/@aws-cdk/aws-lambda-python-alpha/package.json index 12ea1a9375518..ad3d3e094aac2 100644 --- a/packages/@aws-cdk/aws-lambda-python-alpha/package.json +++ b/packages/@aws-cdk/aws-lambda-python-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-lambda-python-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "private": false, "description": "The CDK Construct Library for AWS Lambda in Python", "main": "lib/index.js", @@ -76,18 +76,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/integ-tests-alpha": "0.0.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -112,4 +112,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-location-alpha/package.json b/packages/@aws-cdk/aws-location-alpha/package.json index df819571acdd1..212997a349649 100644 --- a/packages/@aws-cdk/aws-location-alpha/package.json +++ b/packages/@aws-cdk/aws-location-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-location-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "The CDK Construct Library for AWS::Location", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -84,17 +84,17 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/integ-tests-alpha": "0.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -115,4 +115,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-msk-alpha/package.json b/packages/@aws-cdk/aws-msk-alpha/package.json index 29a2910f192cc..2d3b15514e30f 100644 --- a/packages/@aws-cdk/aws-msk-alpha/package.json +++ b/packages/@aws-cdk/aws-msk-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-msk-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "private": false, "description": "The CDK Construct Library for AWS::MSK", "main": "lib/index.js", @@ -83,18 +83,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/integ-tests-alpha": "0.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -114,4 +114,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-neptune-alpha/package.json b/packages/@aws-cdk/aws-neptune-alpha/package.json index 09a4daeb00819..8cda4e7a40c2e 100644 --- a/packages/@aws-cdk/aws-neptune-alpha/package.json +++ b/packages/@aws-cdk/aws-neptune-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-neptune-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "private": false, "description": "The CDK Construct Library for AWS::Neptune", "main": "lib/index.js", @@ -82,17 +82,17 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/integ-tests-alpha": "0.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -112,4 +112,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-pipes-alpha/package.json b/packages/@aws-cdk/aws-pipes-alpha/package.json index f03b38d9ee68a..cce6916209aff 100644 --- a/packages/@aws-cdk/aws-pipes-alpha/package.json +++ b/packages/@aws-cdk/aws-pipes-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-pipes-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "The CDK Construct Library for Amazon EventBridge Pipes", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -81,18 +81,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "jest": "^29", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/integ-tests-alpha": "0.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -115,4 +115,4 @@ "jsiiRosetta": { "exampleDependencies": {} } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-pipes-enrichments-alpha/package.json b/packages/@aws-cdk/aws-pipes-enrichments-alpha/package.json index eb0664ee976e3..dd3b96aa821e3 100644 --- a/packages/@aws-cdk/aws-pipes-enrichments-alpha/package.json +++ b/packages/@aws-cdk/aws-pipes-enrichments-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-pipes-enrichments-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "The CDK Construct Library for Amazon EventBridge Pipes Enrichments", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -81,20 +81,21 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "jest": "^29", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/aws-pipes-alpha": "2.148.0-alpha.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/aws-pipes-alpha": "0.0.0", + "@aws-cdk/integ-tests-alpha": "0.0.0" + }, + "dependencies": { }, - "dependencies": {}, "peerDependencies": { - "@aws-cdk/aws-pipes-alpha": "2.148.0-alpha.0", - "aws-cdk-lib": "^2.148.0", + "@aws-cdk/aws-pipes-alpha": "0.0.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -117,4 +118,4 @@ "jsiiRosetta": { "exampleDependencies": {} } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-pipes-sources-alpha/package.json b/packages/@aws-cdk/aws-pipes-sources-alpha/package.json index 1937077d801ab..209ec9f5d4872 100644 --- a/packages/@aws-cdk/aws-pipes-sources-alpha/package.json +++ b/packages/@aws-cdk/aws-pipes-sources-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-pipes-sources-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "The CDK Construct Library for Amazon EventBridge Pipes Sources", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -81,20 +81,21 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "jest": "^29", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/aws-pipes-alpha": "2.148.0-alpha.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/aws-pipes-alpha": "0.0.0", + "@aws-cdk/integ-tests-alpha": "0.0.0" + }, + "dependencies": { }, - "dependencies": {}, "peerDependencies": { - "@aws-cdk/aws-pipes-alpha": "2.148.0-alpha.0", - "aws-cdk-lib": "^2.148.0", + "@aws-cdk/aws-pipes-alpha": "0.0.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -117,4 +118,4 @@ "jsiiRosetta": { "exampleDependencies": {} } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-pipes-targets-alpha/package.json b/packages/@aws-cdk/aws-pipes-targets-alpha/package.json index bbb6ef62403bb..34a0ffbcca5c2 100644 --- a/packages/@aws-cdk/aws-pipes-targets-alpha/package.json +++ b/packages/@aws-cdk/aws-pipes-targets-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-pipes-targets-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "The CDK Construct Library for Amazon EventBridge Pipes Targets", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -81,20 +81,20 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "jest": "^29", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/aws-pipes-alpha": "2.148.0-alpha.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/aws-pipes-alpha": "0.0.0", + "@aws-cdk/integ-tests-alpha": "0.0.0" }, "dependencies": {}, "peerDependencies": { - "@aws-cdk/aws-pipes-alpha": "2.148.0-alpha.0", - "aws-cdk-lib": "^2.148.0", + "@aws-cdk/aws-pipes-alpha": "0.0.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -117,4 +117,4 @@ "jsiiRosetta": { "exampleDependencies": {} } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-redshift-alpha/package.json b/packages/@aws-cdk/aws-redshift-alpha/package.json index 93e5621618b0f..92a68447f7d5d 100644 --- a/packages/@aws-cdk/aws-redshift-alpha/package.json +++ b/packages/@aws-cdk/aws-redshift-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-redshift-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "private": false, "description": "The CDK Construct Library for AWS::Redshift", "main": "lib/index.js", @@ -84,22 +84,22 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", - "@aws-cdk/custom-resource-handlers": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/custom-resource-handlers": "0.0.0", "@aws-sdk/client-redshift": "3.452.0", "@aws-sdk/client-redshift-data": "3.451.0", "@aws-sdk/client-secrets-manager": "3.451.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/integ-tests-alpha": "0.0.0" }, "dependencies": {}, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -119,4 +119,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-route53resolver-alpha/package.json b/packages/@aws-cdk/aws-route53resolver-alpha/package.json index 418c478036e2e..3f21b5e158731 100644 --- a/packages/@aws-cdk/aws-route53resolver-alpha/package.json +++ b/packages/@aws-cdk/aws-route53resolver-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-route53resolver-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "private": false, "description": "The CDK Construct Library for AWS::Route53Resolver", "main": "lib/index.js", @@ -82,16 +82,16 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -111,4 +111,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-s3objectlambda-alpha/package.json b/packages/@aws-cdk/aws-s3objectlambda-alpha/package.json index 97fcdb03610b5..c297cabaa0299 100644 --- a/packages/@aws-cdk/aws-s3objectlambda-alpha/package.json +++ b/packages/@aws-cdk/aws-s3objectlambda-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-s3objectlambda-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "The CDK Construct Library for AWS::S3ObjectLambda", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -84,17 +84,17 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -115,4 +115,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-sagemaker-alpha/package.json b/packages/@aws-cdk/aws-sagemaker-alpha/package.json index f3b21457db99b..c9a2b91e52d78 100644 --- a/packages/@aws-cdk/aws-sagemaker-alpha/package.json +++ b/packages/@aws-cdk/aws-sagemaker-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-sagemaker-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "private": false, "description": "The CDK Construct Library for AWS::SageMaker", "main": "lib/index.js", @@ -82,18 +82,18 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "jest": "^29.7.0", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/integ-tests-alpha": "0.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -113,4 +113,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-scheduler-alpha/package.json b/packages/@aws-cdk/aws-scheduler-alpha/package.json index 6e75c37a79050..f519b30dfd69a 100644 --- a/packages/@aws-cdk/aws-scheduler-alpha/package.json +++ b/packages/@aws-cdk/aws-scheduler-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-scheduler-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "The CDK Construct Library for Amazon Scheduler", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -81,17 +81,17 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/integ-tests-alpha": "0.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -116,4 +116,4 @@ "@aws-cdk/aws-scheduler-targets-alpha": "*" } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-scheduler-targets-alpha/package.json b/packages/@aws-cdk/aws-scheduler-targets-alpha/package.json index c3db15225e9a2..e30631dbdea55 100644 --- a/packages/@aws-cdk/aws-scheduler-targets-alpha/package.json +++ b/packages/@aws-cdk/aws-scheduler-targets-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-scheduler-targets-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "The CDK Construct Library for Amazon Scheduler Targets", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -82,19 +82,19 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "2.148.0", - "@aws-cdk/aws-scheduler-alpha": "2.148.0-alpha.0", + "aws-cdk-lib": "0.0.0", + "@aws-cdk/aws-scheduler-alpha": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/integ-tests-alpha": "0.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^2.148.0", - "@aws-cdk/aws-scheduler-alpha": "2.148.0-alpha.0", + "aws-cdk-lib": "^0.0.0", + "@aws-cdk/aws-scheduler-alpha": "0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -114,4 +114,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/package.json b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/package.json index ce4f1ad15b984..ec2c9af425af7 100644 --- a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/package.json +++ b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/aws-servicecatalogappregistry-alpha", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "The CDK Construct Library for AWS::ServiceCatalogAppRegistry", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -84,17 +84,17 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "constructs": "^10.0.0", - "@aws-cdk/integ-tests-alpha": "2.148.0-alpha.0" + "@aws-cdk/integ-tests-alpha": "0.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "engines": { @@ -115,4 +115,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/cdk-cli-wrapper/package.json b/packages/@aws-cdk/cdk-cli-wrapper/package.json index 83fd5e5c7756c..989dbead54d80 100644 --- a/packages/@aws-cdk/cdk-cli-wrapper/package.json +++ b/packages/@aws-cdk/cdk-cli-wrapper/package.json @@ -2,7 +2,7 @@ "name": "@aws-cdk/cdk-cli-wrapper", "description": "CDK CLI Wrapper Library", "private": true, - "version": "2.148.0-alpha.0", + "version": "0.0.0", "main": "lib/index.js", "types": "lib/index.d.ts", "scripts": { @@ -28,9 +28,9 @@ "license": "Apache-2.0", "devDependencies": { "@types/jest": "^29.5.12", - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", "jest": "^29.7.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0" + "@aws-cdk/pkglint": "0.0.0" }, "repository": { "url": "https://github.com/aws/aws-cdk.git", @@ -66,4 +66,4 @@ "ubergen": { "exclude": true } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/cli-lib-alpha/package.json b/packages/@aws-cdk/cli-lib-alpha/package.json index a95d78989a5a9..b2cecc23c8d3c 100644 --- a/packages/@aws-cdk/cli-lib-alpha/package.json +++ b/packages/@aws-cdk/cli-lib-alpha/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/cli-lib-alpha", "description": "AWS CDK Programmatic CLI library", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "private": false, "main": "lib/main.js", "types": "lib/index.d.ts", @@ -83,11 +83,11 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "aws-cdk-lib": "2.148.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "aws-cdk-lib": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", - "aws-cdk": "2.148.0", + "aws-cdk": "0.0.0", "constructs": "^10.0.0", "jest": "^29.7.0", "ts-node": "^10.9.2" @@ -122,4 +122,4 @@ }, "dependencies": {}, "peerDependencies": {} -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/cloud-assembly-schema/package.json b/packages/@aws-cdk/cloud-assembly-schema/package.json index 73008430a4d16..0a05241153b84 100644 --- a/packages/@aws-cdk/cloud-assembly-schema/package.json +++ b/packages/@aws-cdk/cloud-assembly-schema/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/cloud-assembly-schema", - "version": "2.148.0", + "version": "0.0.0", "description": "Cloud Assembly Schema", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -80,12 +80,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "@types/mock-fs": "^4.13.4", "@types/semver": "^7.5.8", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "jest": "^29.7.0", "mock-fs": "^4.14.0", "typescript-json-schema": "^0.64.0" @@ -119,4 +119,4 @@ "publishConfig": { "tag": "latest" } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/cloudformation-diff/package.json b/packages/@aws-cdk/cloudformation-diff/package.json index c24cab1e49dfe..80e2b93c70a01 100644 --- a/packages/@aws-cdk/cloudformation-diff/package.json +++ b/packages/@aws-cdk/cloudformation-diff/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/cloudformation-diff", - "version": "2.148.0", + "version": "0.0.0", "description": "Utilities to diff CDK stacks against CloudFormation templates", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -32,8 +32,8 @@ "table": "^6.8.2" }, "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@aws-sdk/client-cloudformation": "^3.529.1", "@types/jest": "^29.5.12", "@types/string-width": "^4.0.1", diff --git a/packages/@aws-cdk/custom-resource-handlers/package.json b/packages/@aws-cdk/custom-resource-handlers/package.json index 5683f0f76b77a..b35f6ca550efe 100644 --- a/packages/@aws-cdk/custom-resource-handlers/package.json +++ b/packages/@aws-cdk/custom-resource-handlers/package.json @@ -2,7 +2,7 @@ "name": "@aws-cdk/custom-resource-handlers", "description": "CDK Custom Resources", "private": true, - "version": "2.148.0-alpha.0", + "version": "0.0.0", "scripts": { "build": "tsc -b && node scripts/generate.js", "integ": "integ-runner --language javascript", @@ -25,9 +25,9 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", - "@aws-cdk/aws-custom-resource-sdk-adapter": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/aws-custom-resource-sdk-adapter": "0.0.0", "@aws-sdk/client-ecs": "3.451.0", "@aws-sdk/client-ssm": "3.453.0", "@aws-sdk/client-kinesis": "3.451.0", @@ -94,4 +94,4 @@ "publishConfig": { "tag": "latest" } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/cx-api/package.json b/packages/@aws-cdk/cx-api/package.json index 785dc67fca253..9f6ae2cf09c03 100644 --- a/packages/@aws-cdk/cx-api/package.json +++ b/packages/@aws-cdk/cx-api/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/cx-api", - "version": "2.148.0", + "version": "0.0.0", "description": "Cloud executable protocol", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -82,13 +82,13 @@ "semver": "^7.6.2" }, "peerDependencies": { - "@aws-cdk/cloud-assembly-schema": "2.148.0" + "@aws-cdk/cloud-assembly-schema": "0.0.0" }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/cloud-assembly-schema": "2.148.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/cloud-assembly-schema": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "@types/mock-fs": "^4.13.4", "@types/semver": "^7.5.8", @@ -120,4 +120,4 @@ "publishConfig": { "tag": "latest" } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/example-construct-library/package.json b/packages/@aws-cdk/example-construct-library/package.json index 556b0474c9859..af49fd3c976e4 100644 --- a/packages/@aws-cdk/example-construct-library/package.json +++ b/packages/@aws-cdk/example-construct-library/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/example-construct-library", "private": true, - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "An example CDK Construct Library that can serve as a template for creating new libraries", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -73,16 +73,16 @@ }, "license": "Apache-2.0", "devDependencies": { - "aws-cdk-lib": "2.148.0", - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "aws-cdk-lib": "0.0.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "jest": "^29.7.0" }, "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "separate-module": false, @@ -99,4 +99,4 @@ "AWSLINT_BASE_CONSTRUCT": true } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/integ-runner/package.json b/packages/@aws-cdk/integ-runner/package.json index e29e39e8d383e..0d190d8f8208f 100644 --- a/packages/@aws-cdk/integ-runner/package.json +++ b/packages/@aws-cdk/integ-runner/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/integ-runner", "description": "CDK Integration Testing Tool", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "main": "lib/index.js", "types": "lib/index.d.ts", "bin": { @@ -56,9 +56,9 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "aws-cdk-lib": "2.148.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "aws-cdk-lib": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/fs-extra": "^9.0.13", "@types/jest": "^29.5.12", "@types/mock-fs": "^4.13.4", @@ -71,13 +71,13 @@ }, "dependencies": { "chokidar": "^3.6.0", - "@aws-cdk/cloud-assembly-schema": "2.148.0", - "@aws-cdk/cloudformation-diff": "2.148.0", - "@aws-cdk/cx-api": "2.148.0", + "@aws-cdk/cloud-assembly-schema": "0.0.0", + "@aws-cdk/cloudformation-diff": "0.0.0", + "@aws-cdk/cx-api": "0.0.0", "@aws-cdk/aws-service-spec": "^0.1.9", - "cdk-assets": "2.148.0", - "@aws-cdk/cdk-cli-wrapper": "2.148.0-alpha.0", - "aws-cdk": "2.148.0", + "cdk-assets": "0.0.0", + "@aws-cdk/cdk-cli-wrapper": "0.0.0", + "aws-cdk": "0.0.0", "chalk": "^4", "fs-extra": "^9.1.0", "workerpool": "^6.5.1", @@ -108,4 +108,4 @@ "publishConfig": { "tag": "latest" } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/integ-tests-alpha/package.json b/packages/@aws-cdk/integ-tests-alpha/package.json index 508bd4a4dcbe5..b037fab0d094f 100644 --- a/packages/@aws-cdk/integ-tests-alpha/package.json +++ b/packages/@aws-cdk/integ-tests-alpha/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/integ-tests-alpha", "description": "CDK Integration Testing Constructs", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "private": false, "main": "lib/index.js", "types": "lib/index.d.ts", @@ -66,10 +66,10 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/integ-runner": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", - "@aws-cdk/aws-custom-resource-sdk-adapter": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/aws-custom-resource-sdk-adapter": "0.0.0", "@aws-sdk/client-ec2": "3.421.0", "@aws-sdk/client-s3": "3.421.0", "@aws-sdk/client-sfn": "3.421.0", @@ -81,14 +81,14 @@ "jest": "^29.7.0", "nock": "^13.5.4", "sinon": "^9.2.4", - "aws-cdk-lib": "2.148.0", + "aws-cdk-lib": "0.0.0", "node-fetch": "^2.7.0", "@types/node-fetch": "^2.6.11", "constructs": "^10.0.0" }, "dependencies": {}, "peerDependencies": { - "aws-cdk-lib": "^2.148.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "repository": { @@ -136,4 +136,4 @@ "assert/assert-dependency" ] } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/region-info/package.json b/packages/@aws-cdk/region-info/package.json index e8c7e6c9b4bff..f61301aa16aa4 100644 --- a/packages/@aws-cdk/region-info/package.json +++ b/packages/@aws-cdk/region-info/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/region-info", - "version": "2.148.0", + "version": "0.0.0", "description": "AWS region information, such as service principal names", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -80,9 +80,9 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", - "aws-cdk-lib": "2.148.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", + "aws-cdk-lib": "0.0.0", "@types/fs-extra": "^9.0.13", "@types/jest": "^29.5.12", "fs-extra": "^9.1.0" @@ -113,4 +113,4 @@ "publishConfig": { "tag": "latest" } -} \ No newline at end of file +} diff --git a/packages/aws-cdk-lib/package.json b/packages/aws-cdk-lib/package.json index 55c2c3f8409e4..e616bf8e66e17 100644 --- a/packages/aws-cdk-lib/package.json +++ b/packages/aws-cdk-lib/package.json @@ -1,6 +1,6 @@ { "name": "aws-cdk-lib", - "version": "2.148.0", + "version": "0.0.0", "description": "Version 2 of the AWS Cloud Development Kit library", "main": "index.js", "types": "index.d.ts", @@ -136,11 +136,11 @@ }, "devDependencies": { "@aws-cdk/aws-service-spec": "^0.1.9", - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/custom-resource-handlers": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", - "@aws-cdk/aws-custom-resource-sdk-adapter": "2.148.0-alpha.0", - "@aws-cdk/spec2cdk": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/custom-resource-handlers": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/aws-custom-resource-sdk-adapter": "0.0.0", + "@aws-cdk/spec2cdk": "0.0.0", "@aws-sdk/client-acm": "3.421.0", "@aws-sdk/client-account": "3.421.0", "@aws-sdk/client-codepipeline": "3.421.0", @@ -165,7 +165,7 @@ "@types/lodash": "^4.17.6", "@types/punycode": "^2.1.4", "@types/mime-types": "^2.1.4", - "@aws-cdk/lazify": "2.148.0-alpha.0", + "@aws-cdk/lazify": "0.0.0", "aws-sdk": "^2.1653.0", "aws-sdk-client-mock": "^3.1.0", "aws-sdk-client-mock-jest": "^3.1.0", @@ -517,4 +517,4 @@ "@aws-cdk/aws-kinesisfirehose-destinations-alpha": "*" } } -} \ No newline at end of file +} diff --git a/packages/aws-cdk/lib/api/deployments.ts b/packages/aws-cdk/lib/api/deployments.ts index ee357e01b525c..82f06771052b3 100644 --- a/packages/aws-cdk/lib/api/deployments.ts +++ b/packages/aws-cdk/lib/api/deployments.ts @@ -6,7 +6,7 @@ import { ISDK } from './aws-auth/sdk'; import { CredentialsOptions, SdkForEnvironment, SdkProvider } from './aws-auth/sdk-provider'; import { deployStack, DeployStackResult, destroyStack, DeploymentMethod } from './deploy-stack'; import { EnvironmentResources, EnvironmentResourcesRegistry } from './environment-resources'; -import { HotswapMode } from './hotswap/common'; +import { HotswapMode, HotswapProperties } from './hotswap/common'; import { loadCurrentTemplateWithNestedStacks, loadCurrentTemplate, RootTemplateWithNestedStacks } from './nested-stack-helpers'; import { CloudFormationStack, Template, ResourcesToImport, ResourceIdentifierSummaries } from './util/cloudformation'; import { StackActivityProgress } from './util/cloudformation/stack-activity-monitor'; @@ -174,6 +174,11 @@ export interface DeployStackOptions { */ readonly hotswap?: HotswapMode; + /** + * Properties that configure hotswap behavior + */ + readonly hotswapProperties?: HotswapProperties; + /** * The extra string to append to the User-Agent header when performing AWS SDK calls. * @@ -410,6 +415,7 @@ export class Deployments { ci: options.ci, rollback: options.rollback, hotswap: options.hotswap, + hotswapProperties: options.hotswapProperties, extraUserAgent: options.extraUserAgent, resourcesToImport: options.resourcesToImport, overrideTemplate: options.overrideTemplate, diff --git a/packages/aws-cdk/lib/api/hotswap-deployments.ts b/packages/aws-cdk/lib/api/hotswap-deployments.ts index edf6c8cb7a16c..9942ad4bb2c71 100644 --- a/packages/aws-cdk/lib/api/hotswap-deployments.ts +++ b/packages/aws-cdk/lib/api/hotswap-deployments.ts @@ -6,7 +6,7 @@ import { DeployStackResult } from './deploy-stack'; import { EvaluateCloudFormationTemplate } from './evaluate-cloudformation-template'; import { isHotswappableAppSyncChange } from './hotswap/appsync-mapping-templates'; import { isHotswappableCodeBuildProjectChange } from './hotswap/code-build-projects'; -import { ICON, ChangeHotswapResult, HotswapMode, HotswappableChange, NonHotswappableChange, HotswappableChangeCandidate, ClassifiedResourceChanges, reportNonHotswappableChange, reportNonHotswappableResource } from './hotswap/common'; +import { ICON, ChangeHotswapResult, HotswapMode, HotswappableChange, NonHotswappableChange, HotswappableChangeCandidate, HotswapProperties, ClassifiedResourceChanges, reportNonHotswappableChange, reportNonHotswappableResource } from './hotswap/common'; import { isHotswappableEcsServiceChange } from './hotswap/ecs-services'; import { isHotswappableLambdaFunctionChange } from './hotswap/lambda-functions'; import { skipChangeForS3DeployCustomResourcePolicy, isHotswappableS3BucketDeploymentChange } from './hotswap/s3-bucket-deployments'; @@ -16,7 +16,7 @@ import { CloudFormationStack } from './util/cloudformation'; import { print } from '../logging'; type HotswapDetector = ( - logicalId: string, change: HotswappableChangeCandidate, evaluateCfnTemplate: EvaluateCloudFormationTemplate + logicalId: string, change: HotswappableChangeCandidate, evaluateCfnTemplate: EvaluateCloudFormationTemplate, hostswapProperties: HotswapProperties, ) => Promise; const RESOURCE_DETECTORS: { [key: string]: HotswapDetector } = { @@ -59,7 +59,7 @@ const RESOURCE_DETECTORS: { [key: string]: HotswapDetector } = { export async function tryHotswapDeployment( sdkProvider: SdkProvider, assetParams: { [key: string]: string }, cloudFormationStack: CloudFormationStack, stackArtifact: cxapi.CloudFormationStackArtifact, - hotswapMode: HotswapMode, + hotswapMode: HotswapMode, hotswapProperties: HotswapProperties, ): Promise { // resolve the environment, so we can substitute things like AWS::Region in CFN expressions const resolvedEnv = await sdkProvider.resolveEnvironment(stackArtifact.environment); @@ -83,7 +83,7 @@ export async function tryHotswapDeployment( const stackChanges = cfn_diff.fullDiff(currentTemplate.deployedRootTemplate, stackArtifact.template); const { hotswappableChanges, nonHotswappableChanges } = await classifyResourceChanges( - stackChanges, evaluateCfnTemplate, sdk, currentTemplate.nestedStacks, + stackChanges, evaluateCfnTemplate, sdk, currentTemplate.nestedStacks, hotswapProperties, ); logNonHotswappableChanges(nonHotswappableChanges, hotswapMode); @@ -110,6 +110,7 @@ async function classifyResourceChanges( evaluateCfnTemplate: EvaluateCloudFormationTemplate, sdk: ISDK, nestedStackNames: { [nestedStackName: string]: NestedStackTemplates }, + hotswapProperties: HotswapProperties, ): Promise { const resourceDifferences = getStackResourceDifferences(stackChanges); @@ -134,6 +135,7 @@ async function classifyResourceChanges( nestedStackNames, evaluateCfnTemplate, sdk, + hotswapProperties, ); hotswappableResources.push(...nestedHotswappableResources.hotswappableChanges); nonHotswappableResources.push(...nestedHotswappableResources.nonHotswappableChanges); @@ -154,7 +156,7 @@ async function classifyResourceChanges( const resourceType: string = hotswappableChangeCandidate.newValue.Type; if (resourceType in RESOURCE_DETECTORS) { // run detector functions lazily to prevent unhandled promise rejections - promises.push(() => RESOURCE_DETECTORS[resourceType](logicalId, hotswappableChangeCandidate, evaluateCfnTemplate)); + promises.push(() => RESOURCE_DETECTORS[resourceType](logicalId, hotswappableChangeCandidate, evaluateCfnTemplate, hotswapProperties)); } else { reportNonHotswappableChange(nonHotswappableResources, hotswappableChangeCandidate, undefined, 'This resource type is not supported for hotswap deployments'); } @@ -234,6 +236,7 @@ async function findNestedHotswappableChanges( nestedStackTemplates: { [nestedStackName: string]: NestedStackTemplates }, evaluateCfnTemplate: EvaluateCloudFormationTemplate, sdk: ISDK, + hotswapProperties: HotswapProperties, ): Promise { const nestedStack = nestedStackTemplates[logicalId]; if (!nestedStack.physicalName) { @@ -257,7 +260,7 @@ async function findNestedHotswappableChanges( nestedStackTemplates[logicalId].deployedTemplate, nestedStackTemplates[logicalId].generatedTemplate, ); - return classifyResourceChanges(nestedDiff, evaluateNestedCfnTemplate, sdk, nestedStackTemplates[logicalId].nestedStackTemplates); + return classifyResourceChanges(nestedDiff, evaluateNestedCfnTemplate, sdk, nestedStackTemplates[logicalId].nestedStackTemplates, hotswapProperties); } /** Returns 'true' if a pair of changes is for the same resource. */ diff --git a/packages/aws-cdk/lib/api/hotswap/common.ts b/packages/aws-cdk/lib/api/hotswap/common.ts index 073f1eec4388d..0f67256dc4d28 100644 --- a/packages/aws-cdk/lib/api/hotswap/common.ts +++ b/packages/aws-cdk/lib/api/hotswap/common.ts @@ -98,6 +98,18 @@ export class HotswappableChangeCandidate { type Exclude = { [key: string]: Exclude | true } +/** + * Represents configuration properties for hotswap deployments + */ +export class HotswapProperties { + // Each supported resource type will have its own properties. Currently this is ECS + ecsHotswapProperties?: EcsHotswapProperties; + + public constructor (ecsHotswapProperties?: EcsHotswapProperties) { + this.ecsHotswapProperties = ecsHotswapProperties; + } +} + /** * Represents configuration properties for ECS hotswap deployments */ diff --git a/packages/aws-cdk/lib/api/hotswap/ecs-services.ts b/packages/aws-cdk/lib/api/hotswap/ecs-services.ts index b0462e9f29d8f..ab933056f362e 100644 --- a/packages/aws-cdk/lib/api/hotswap/ecs-services.ts +++ b/packages/aws-cdk/lib/api/hotswap/ecs-services.ts @@ -1,18 +1,16 @@ import * as AWS from 'aws-sdk'; -import { ChangeHotswapResult, classifyChanges, HotswappableChangeCandidate, lowerCaseFirstCharacter, reportNonHotswappableChange, transformObjectKeys } from './common'; -import { Configuration } from '../../settings'; +import { ChangeHotswapResult, classifyChanges, HotswappableChangeCandidate, HotswapProperties, lowerCaseFirstCharacter, reportNonHotswappableChange, transformObjectKeys } from './common'; import { ISDK } from '../aws-auth'; import { EvaluateCloudFormationTemplate } from '../evaluate-cloudformation-template'; export async function isHotswappableEcsServiceChange( - logicalId: string, change: HotswappableChangeCandidate, evaluateCfnTemplate: EvaluateCloudFormationTemplate, + logicalId: string, change: HotswappableChangeCandidate, evaluateCfnTemplate: EvaluateCloudFormationTemplate, hostswapProperties: HotswapProperties, ): Promise { // the only resource change we can evaluate here is an ECS TaskDefinition if (change.newValue.Type !== 'AWS::ECS::TaskDefinition') { return []; } - const config = new Configuration; const ret: ChangeHotswapResult = []; // We only allow a change in the ContainerDefinitions of the TaskDefinition for now - @@ -85,8 +83,7 @@ export async function isHotswappableEcsServiceChange( const registerTaskDefResponse = await sdk.ecs().registerTaskDefinition(lowercasedTaskDef).promise(); const taskDefRevArn = registerTaskDefResponse.taskDefinition?.taskDefinitionArn; - let ecsHotswapProperties = config.settings.get(['hotswapProperties']).ecs; - + let ecsHotswapProperties = hostswapProperties.ecsHotswapProperties; let minimumHealthyPercent = ecsHotswapProperties?.minimumHealthyPercent; let maximumHealthyPercent = ecsHotswapProperties?.maximumHealthyPercent; diff --git a/packages/aws-cdk/lib/cdk-toolkit.ts b/packages/aws-cdk/lib/cdk-toolkit.ts index 31fddff1e9724..90c1d8b448279 100644 --- a/packages/aws-cdk/lib/cdk-toolkit.ts +++ b/packages/aws-cdk/lib/cdk-toolkit.ts @@ -12,7 +12,7 @@ import { Bootstrapper, BootstrapEnvironmentOptions } from './api/bootstrap'; import { CloudAssembly, DefaultSelection, ExtendedStackSelection, StackCollection, StackSelector } from './api/cxapp/cloud-assembly'; import { CloudExecutable } from './api/cxapp/cloud-executable'; import { Deployments } from './api/deployments'; -import { HotswapMode } from './api/hotswap/common'; +import { EcsHotswapProperties, HotswapMode, HotswapProperties } from './api/hotswap/common'; import { findCloudWatchLogGroups } from './api/logs/find-cloudwatch-logs'; import { CloudWatchLogEventMonitor } from './api/logs/logs-monitor'; import { createDiffChangeSet, ResourcesToImport } from './api/util/cloudformation'; @@ -245,10 +245,12 @@ export class CdkToolkit { warning('⚠️ They should only be used for development - never use them for your production Stacks!\n'); } - let ecsHotswapProperties = this.props.configuration.settings.get(['hotswapProperties']).ecs; + let ecsHotswapProperties = new EcsHotswapProperties(options.hotswapEcsMinimumHealthyPercent, options.hotswapEcsMaximumHealthyPercent); if (!ecsHotswapProperties.isEmpty() && options.hotswap == HotswapMode.FULL_DEPLOYMENT) { warning('⚠️ Hotswap properties defined while not in hotswap mode will be ignored.'); } + let hotswapProperties = new HotswapProperties(); + hotswapProperties.ecsHotswapProperties = ecsHotswapProperties; const stacks = stackCollection.stackArtifacts; @@ -352,6 +354,7 @@ export class CdkToolkit { ci: options.ci, rollback: options.rollback, hotswap: options.hotswap, + hotswapProperties: hotswapProperties, extraUserAgent: options.extraUserAgent, assetParallelism: options.assetParallelism, ignoreNoStacks: options.ignoreNoStacks, diff --git a/packages/aws-cdk/lib/cli.ts b/packages/aws-cdk/lib/cli.ts index 2c15bb7b9949f..72fb7c8790106 100644 --- a/packages/aws-cdk/lib/cli.ts +++ b/packages/aws-cdk/lib/cli.ts @@ -158,6 +158,16 @@ async function parseCommandLineArguments(args: string[]) { 'and falls back to a full deployment if that is not possible. ' + 'Do not use this in production environments', }) + .option('hotswap-ecs-minimum-healthy-percent', { + type: 'number', + desc: 'When using hotswap for ECS, set the minimum healthy percent' + + 'for the updated task definition', + }) + .option('hotswap-ecs-maximum-healthy-percent', { + type: 'number', + desc: 'When using hotswap for ECS, set the maximum healthy percent' + + 'for the updated task definition', + }) .option('watch', { type: 'boolean', desc: 'Continuously observe the project files, ' + @@ -598,6 +608,8 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise; @@ -10,6 +9,7 @@ let mockUpdateService: (params: AWS.ECS.UpdateServiceRequest) => AWS.ECS.UpdateS beforeEach(() => { hotswapMockSdkProvider = setup.setupHotswapTests(); + mockRegisterTaskDef = jest.fn(); mockUpdateService = jest.fn(); hotswapMockSdkProvider.stubEcs({ @@ -639,10 +639,10 @@ describe.each([HotswapMode.FALL_BACK, HotswapMode.HOTSWAP_ONLY])('%p mode', (hot }); describe.each([ - new Configuration().settings.set(['hotswapProperties'], { minimumHealthyPercent: 10 }), - new Configuration().settings.set(['hotswapProperties'], { minimumHealthyPercent: undefined, maximumHealthyPercent: 100 }), - new Configuration().settings.set(['hotswapProperties'], { minimumHealthyPercent: 10, maximumHealthyPercent: 100 }), -])('hotswap properties', (settings) => { + new HotswapProperties(new EcsHotswapProperties(10)), + new HotswapProperties(new EcsHotswapProperties(undefined, 100)), + new HotswapProperties(new EcsHotswapProperties(10, 100)), +])('hotswap properties', (hotswapProperties) => { test('should handle all possible hotswap properties', async () => { // GIVEN setup.setCurrentCfnStackTemplate({ @@ -696,7 +696,7 @@ describe.each([ }); // WHEN - const deployStackResult = await hotswapMockSdkProvider.tryHotswapDeployment(HotswapMode.HOTSWAP_ONLY, cdkStackArtifact, settings.get(['hotswapProperties']).ecs); + const deployStackResult = await hotswapMockSdkProvider.tryHotswapDeployment(HotswapMode.HOTSWAP_ONLY, cdkStackArtifact, {}, hotswapProperties); // THEN expect(deployStackResult).not.toBeUndefined(); @@ -711,9 +711,9 @@ describe.each([ cluster: 'my-cluster', taskDefinition: 'arn:aws:ecs:region:account:task-definition/my-task-def:3', deploymentConfiguration: { - minimumHealthyPercent: settings.get(['hotswapProperties']).ecs?.minimumHealthyPercent == undefined ? - 0 : settings.get(['hotswapProperties']).ecs?.minimumHealthyPercent, - maximumPercent: settings.get(['hotswapProperties']).ecs?.maximumHealthyPercent, + minimumHealthyPercent: hotswapProperties.ecsHotswapProperties?.minimumHealthyPercent == undefined ? + 0 : hotswapProperties.ecsHotswapProperties?.minimumHealthyPercent, + maximumPercent: hotswapProperties.ecsHotswapProperties?.maximumHealthyPercent, }, forceNewDeployment: true, }); diff --git a/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts b/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts index 3ad2fc4e6002a..edc0898ca4ada 100644 --- a/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts +++ b/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts @@ -5,7 +5,7 @@ import * as codebuild from 'aws-sdk/clients/codebuild'; import * as lambda from 'aws-sdk/clients/lambda'; import * as stepfunctions from 'aws-sdk/clients/stepfunctions'; import { DeployStackResult } from '../../../lib/api'; -import { HotswapMode } from '../../../lib/api/hotswap/common'; +import { HotswapMode, HotswapProperties } from '../../../lib/api/hotswap/common'; import * as deployments from '../../../lib/api/hotswap-deployments'; import { CloudFormationStack, Template } from '../../../lib/api/util/cloudformation'; import { testStack, TestStackArtifact } from '../../util'; @@ -180,9 +180,9 @@ export class HotswapMockSdkProvider { hotswapMode: HotswapMode, stackArtifact: cxapi.CloudFormationStackArtifact, assetParams: { [key: string]: string } = {}, - // ecsHotswapProperties?: EcsHotswapProperties, + hotswapProperties?: HotswapProperties, ): Promise { - // let ecsProps = ecsHotswapProperties || new EcsHotswapProperties(); - return deployments.tryHotswapDeployment(this.mockSdkProvider, assetParams, currentCfnStack, stackArtifact, hotswapMode); + let hotswapProps = hotswapProperties || new HotswapProperties(); + return deployments.tryHotswapDeployment(this.mockSdkProvider, assetParams, currentCfnStack, stackArtifact, hotswapMode, hotswapProps); } } diff --git a/packages/awslint/package.json b/packages/awslint/package.json index 5dec0bb501e5c..f9ba600f5ba97 100644 --- a/packages/awslint/package.json +++ b/packages/awslint/package.json @@ -1,6 +1,6 @@ { "name": "awslint", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "Enforces the AWS Construct Library guidelines", "scripts": { "build": "tsc -b && eslint . --ext=.ts && pkglint && chmod +x bin/awslint", @@ -26,8 +26,8 @@ "yargs": "^16.2.0" }, "devDependencies": { - "@aws-cdk/eslint-plugin": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/eslint-plugin": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/fs-extra": "^9.0.13", "@types/jest": "^29.5.12", "@types/yargs": "^15.0.19", @@ -71,4 +71,4 @@ "publishConfig": { "tag": "latest" } -} \ No newline at end of file +} diff --git a/packages/cdk-assets/package.json b/packages/cdk-assets/package.json index 601eb13d41898..e07450f12ec3a 100644 --- a/packages/cdk-assets/package.json +++ b/packages/cdk-assets/package.json @@ -1,7 +1,7 @@ { "name": "cdk-assets", "description": "CDK Asset Publishing Tool", - "version": "2.148.0", + "version": "0.0.0", "main": "lib/index.js", "types": "lib/index.d.ts", "bin": { @@ -36,15 +36,15 @@ "@types/mime": "^2.0.3", "@types/mock-fs": "^4.13.4", "@types/yargs": "^15.0.19", - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", "jest": "^29.7.0", "jszip": "^3.10.1", "mock-fs": "^4.14.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0" + "@aws-cdk/pkglint": "0.0.0" }, "dependencies": { - "@aws-cdk/cloud-assembly-schema": "2.148.0", - "@aws-cdk/cx-api": "2.148.0", + "@aws-cdk/cloud-assembly-schema": "0.0.0", + "@aws-cdk/cx-api": "0.0.0", "archiver": "^5.3.2", "aws-sdk": "^2.1653.0", "glob": "^7.2.3", @@ -79,4 +79,4 @@ "publishConfig": { "tag": "latest" } -} \ No newline at end of file +} diff --git a/packages/cdk/package.json b/packages/cdk/package.json index 22dbed66546e6..93ad07d732cc9 100644 --- a/packages/cdk/package.json +++ b/packages/cdk/package.json @@ -1,12 +1,12 @@ { "name": "cdk", - "version": "2.148.0", + "version": "0.0.0", "description": "AWS CDK Toolkit", "bin": { "cdk": "bin/cdk" }, "dependencies": { - "aws-cdk": "2.148.0" + "aws-cdk": "0.0.0" }, "repository": { "type": "git", @@ -45,4 +45,4 @@ "publishConfig": { "tag": "latest" } -} \ No newline at end of file +} diff --git a/scripts/@aws-cdk/script-tests/package.json b/scripts/@aws-cdk/script-tests/package.json index eefe3d440d644..f70f9c91fa809 100644 --- a/scripts/@aws-cdk/script-tests/package.json +++ b/scripts/@aws-cdk/script-tests/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/script-tests", "private": true, - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "various tests for development and build scripts", "scripts": { "build": "echo ok", @@ -14,4 +14,4 @@ "devDependencies": { "jest": "^29.7.0" } -} \ No newline at end of file +} diff --git a/tools/@aws-cdk/cdk-build-tools/package.json b/tools/@aws-cdk/cdk-build-tools/package.json index ce06042ce19d8..53374615cbef5 100644 --- a/tools/@aws-cdk/cdk-build-tools/package.json +++ b/tools/@aws-cdk/cdk-build-tools/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/cdk-build-tools", "private": true, - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "Tools package with shared build scripts for CDK packages", "repository": { "type": "git", @@ -35,7 +35,7 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "0.0.0", "@types/fs-extra": "^9.0.13", "@types/jest": "^29.5.12", "@types/semver": "^7.5.8", @@ -44,12 +44,12 @@ }, "main": "lib/index.js", "dependencies": { - "@aws-cdk/eslint-plugin": "2.148.0-alpha.0", - "@aws-cdk/yarn-cling": "2.148.0-alpha.0", - "@aws-cdk/node-bundle": "2.148.0-alpha.0", + "@aws-cdk/eslint-plugin": "0.0.0", + "@aws-cdk/yarn-cling": "0.0.0", + "@aws-cdk/node-bundle": "0.0.0", "@typescript-eslint/eslint-plugin": "^6.21.0", "@typescript-eslint/parser": "^6.21.0", - "awslint": "2.148.0-alpha.0", + "awslint": "0.0.0", "chalk": "^4", "eslint": "^7.32.0", "eslint-import-resolver-node": "^0.3.9", @@ -87,4 +87,4 @@ "ubergen": { "exclude": true } -} \ No newline at end of file +} diff --git a/tools/@aws-cdk/cdk-release/package.json b/tools/@aws-cdk/cdk-release/package.json index 2b5a76a57a91f..b0bd7cfb1fc10 100644 --- a/tools/@aws-cdk/cdk-release/package.json +++ b/tools/@aws-cdk/cdk-release/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/cdk-release", "private": true, - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "A tool for performing release-related tasks like version bumps, Changelog generation, etc.", "repository": { "type": "git", @@ -28,8 +28,8 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/changelog-parser": "^2.8.4", "@types/fs-extra": "^9.0.13", "@types/jest": "^29.5.12", @@ -66,4 +66,4 @@ "ubergen": { "exclude": true } -} \ No newline at end of file +} diff --git a/tools/@aws-cdk/eslint-plugin/package.json b/tools/@aws-cdk/eslint-plugin/package.json index 5dd6f23a239ee..fd53d24b13694 100644 --- a/tools/@aws-cdk/eslint-plugin/package.json +++ b/tools/@aws-cdk/eslint-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/eslint-plugin", "private": true, - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "ESLint plugin for private use within the AWS CDK repo", "main": "lib/index.js", "scripts": { @@ -34,4 +34,4 @@ "keywords": [], "author": "", "license": "Apache-2.0" -} \ No newline at end of file +} diff --git a/tools/@aws-cdk/lazify/package.json b/tools/@aws-cdk/lazify/package.json index d0561c5a0614e..ab58062a496fc 100644 --- a/tools/@aws-cdk/lazify/package.json +++ b/tools/@aws-cdk/lazify/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/lazify", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "private": true, "bin": { "lazify": "bin/lazify" @@ -17,7 +17,7 @@ "devDependencies": { "@types/jest": "^29.5.12", "@types/node": "^16", - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", "jest": "^29", "ts-jest": "^29", "typescript": "~5.4.5", @@ -30,4 +30,4 @@ }, "main": "lib/index.js", "license": "Apache-2.0" -} \ No newline at end of file +} diff --git a/tools/@aws-cdk/node-bundle/package.json b/tools/@aws-cdk/node-bundle/package.json index c26a65d0e8161..491517f39df5e 100644 --- a/tools/@aws-cdk/node-bundle/package.json +++ b/tools/@aws-cdk/node-bundle/package.json @@ -40,7 +40,7 @@ }, "main": "lib/index.js", "license": "Apache-2.0", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "jest": { "testMatch": [ "/src/**/__tests__/**/*.ts?(x)", @@ -87,4 +87,4 @@ }, "types": "lib/index.d.ts", "private": true -} \ No newline at end of file +} diff --git a/tools/@aws-cdk/pkglint/package.json b/tools/@aws-cdk/pkglint/package.json index c644c85b9c2ba..103bba3225e1b 100644 --- a/tools/@aws-cdk/pkglint/package.json +++ b/tools/@aws-cdk/pkglint/package.json @@ -1,6 +1,6 @@ { "name": "@aws-cdk/pkglint", - "version": "2.148.0-alpha.0", + "version": "0.0.0", "private": true, "description": "Validate and fix package.json files", "main": "lib/index.js", @@ -37,7 +37,7 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/eslint-plugin": "2.148.0-alpha.0", + "@aws-cdk/eslint-plugin": "0.0.0", "@types/fs-extra": "^9.0.13", "@types/glob": "^7.2.0", "@types/jest": "^29.5.12", @@ -60,7 +60,7 @@ ] }, "dependencies": { - "@aws-cdk/node-bundle": "2.148.0-alpha.0", + "@aws-cdk/node-bundle": "0.0.0", "case": "^1.6.3", "chalk": "^4", "fs-extra": "^9.1.0", @@ -69,4 +69,4 @@ "semver": "^7.6.2", "yargs": "^16.2.0" } -} \ No newline at end of file +} diff --git a/tools/@aws-cdk/pkgtools/package.json b/tools/@aws-cdk/pkgtools/package.json index 70398b4fd8bbe..98eed8e7ac33c 100644 --- a/tools/@aws-cdk/pkgtools/package.json +++ b/tools/@aws-cdk/pkgtools/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/pkgtools", "private": true, - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "Tools for generating cross-package artifacts", "main": "index.js", "repository": { @@ -31,8 +31,8 @@ }, "license": "Apache-2.0", "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/fs-extra": "^9.0.13", "@types/yargs": "^15.0.19" }, @@ -51,4 +51,4 @@ "ubergen": { "exclude": true } -} \ No newline at end of file +} diff --git a/tools/@aws-cdk/prlint/package.json b/tools/@aws-cdk/prlint/package.json index ca1c57200fac5..a3e16a36692ab 100644 --- a/tools/@aws-cdk/prlint/package.json +++ b/tools/@aws-cdk/prlint/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/prlint", "private": true, - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "", "main": "index.js", "keywords": [], @@ -45,4 +45,4 @@ "build+extract": "npm run build", "lint": "tsc -b && eslint . --ext=.ts" } -} \ No newline at end of file +} diff --git a/tools/@aws-cdk/spec2cdk/package.json b/tools/@aws-cdk/spec2cdk/package.json index f62bfbd3ff7db..083fbc2e1ab8c 100644 --- a/tools/@aws-cdk/spec2cdk/package.json +++ b/tools/@aws-cdk/spec2cdk/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/spec2cdk", "private": true, - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "Generate L1 resources from @aws-cdk/aws-service-specs", "repository": { "type": "git", @@ -42,8 +42,8 @@ "yargs": "^16.2.0" }, "devDependencies": { - "@aws-cdk/cdk-build-tools": "2.148.0-alpha.0", - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "@types/node": "^18", "jest": "^29.7.0" @@ -64,4 +64,4 @@ "dependencies/cdk-point-dependencies" ] } -} \ No newline at end of file +} diff --git a/tools/@aws-cdk/yarn-cling/package.json b/tools/@aws-cdk/yarn-cling/package.json index bc5fd73b115cd..075b0ecd856a1 100644 --- a/tools/@aws-cdk/yarn-cling/package.json +++ b/tools/@aws-cdk/yarn-cling/package.json @@ -1,7 +1,7 @@ { "name": "@aws-cdk/yarn-cling", "private": true, - "version": "2.148.0-alpha.0", + "version": "0.0.0", "description": "Tool for generating npm-shrinkwrap from yarn.lock", "main": "lib/index.js", "repository": { @@ -37,7 +37,7 @@ ] }, "devDependencies": { - "@aws-cdk/pkglint": "2.148.0-alpha.0", + "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "@types/node": "18.11.19", "@types/semver": "^7.5.8", @@ -65,4 +65,4 @@ "ubergen": { "exclude": true } -} \ No newline at end of file +} From eb4536dc172e50e4e827b96fe99969b84047ac00 Mon Sep 17 00:00:00 2001 From: Atanas Pamukchiev Date: Thu, 15 Aug 2024 14:47:20 +0200 Subject: [PATCH 08/13] attempt to read hotswap properties from cdk.json --- .../tests/cli-integ-tests/cli.integtest.ts | 2 -- .../aws-cdk/lib/api/hotswap-deployments.ts | 2 +- .../aws-cdk/lib/api/hotswap/ecs-services.ts | 6 +++--- packages/aws-cdk/lib/cdk-toolkit.ts | 14 +++++++++---- packages/aws-cdk/lib/settings.ts | 6 ++++++ .../ecs-services-hotswap-deployments.test.ts | 20 +++++++++---------- 6 files changed, 30 insertions(+), 20 deletions(-) diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts index 261710f1ffb4e..ee1fbdd97acfe 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts @@ -1833,8 +1833,6 @@ integTest('hotswap ECS deployment respects properties override', withDefaultFixt await fixture.cdkDeploy('ecs-hotswap', { options: [ '--hotswap', - '--hotswap-ecs-minimum-healthy-percent', '100', - '--hotswap-ecs-maximum-healthy-percent', '200', ], modEnv: { DYNAMIC_ECS_PROPERTY_VALUE: 'new value', diff --git a/packages/aws-cdk/lib/api/hotswap-deployments.ts b/packages/aws-cdk/lib/api/hotswap-deployments.ts index 9942ad4bb2c71..99367a6918484 100644 --- a/packages/aws-cdk/lib/api/hotswap-deployments.ts +++ b/packages/aws-cdk/lib/api/hotswap-deployments.ts @@ -16,7 +16,7 @@ import { CloudFormationStack } from './util/cloudformation'; import { print } from '../logging'; type HotswapDetector = ( - logicalId: string, change: HotswappableChangeCandidate, evaluateCfnTemplate: EvaluateCloudFormationTemplate, hostswapProperties: HotswapProperties, + logicalId: string, change: HotswappableChangeCandidate, evaluateCfnTemplate: EvaluateCloudFormationTemplate, hotswapProperties: HotswapProperties, ) => Promise; const RESOURCE_DETECTORS: { [key: string]: HotswapDetector } = { diff --git a/packages/aws-cdk/lib/api/hotswap/ecs-services.ts b/packages/aws-cdk/lib/api/hotswap/ecs-services.ts index ab933056f362e..c6e621b72059e 100644 --- a/packages/aws-cdk/lib/api/hotswap/ecs-services.ts +++ b/packages/aws-cdk/lib/api/hotswap/ecs-services.ts @@ -4,7 +4,7 @@ import { ISDK } from '../aws-auth'; import { EvaluateCloudFormationTemplate } from '../evaluate-cloudformation-template'; export async function isHotswappableEcsServiceChange( - logicalId: string, change: HotswappableChangeCandidate, evaluateCfnTemplate: EvaluateCloudFormationTemplate, hostswapProperties: HotswapProperties, + logicalId: string, change: HotswappableChangeCandidate, evaluateCfnTemplate: EvaluateCloudFormationTemplate, hotswapProperties: HotswapProperties, ): Promise { // the only resource change we can evaluate here is an ECS TaskDefinition if (change.newValue.Type !== 'AWS::ECS::TaskDefinition') { @@ -34,7 +34,7 @@ export async function isHotswappableEcsServiceChange( // hotswap is not possible in FALL_BACK mode reportNonHotswappableChange(ret, change, undefined, 'No ECS services reference the changed task definition', false); } if (resourcesReferencingTaskDef.length > ecsServicesReferencingTaskDef.length) { - // if something besides an ECS Service is referencing the TaskDefinition, + // if something besides an ECS Service is rxeferencing the TaskDefinition, // hotswap is not possible in FALL_BACK mode const nonEcsServiceTaskDefRefs = resourcesReferencingTaskDef.filter(r => r.Type !== 'AWS::ECS::Service'); for (const taskRef of nonEcsServiceTaskDefRefs) { @@ -83,7 +83,7 @@ export async function isHotswappableEcsServiceChange( const registerTaskDefResponse = await sdk.ecs().registerTaskDefinition(lowercasedTaskDef).promise(); const taskDefRevArn = registerTaskDefResponse.taskDefinition?.taskDefinitionArn; - let ecsHotswapProperties = hostswapProperties.ecsHotswapProperties; + let ecsHotswapProperties = hotswapProperties.ecsHotswapProperties; let minimumHealthyPercent = ecsHotswapProperties?.minimumHealthyPercent; let maximumHealthyPercent = ecsHotswapProperties?.maximumHealthyPercent; diff --git a/packages/aws-cdk/lib/cdk-toolkit.ts b/packages/aws-cdk/lib/cdk-toolkit.ts index 90c1d8b448279..16c8bb65e703c 100644 --- a/packages/aws-cdk/lib/cdk-toolkit.ts +++ b/packages/aws-cdk/lib/cdk-toolkit.ts @@ -12,7 +12,7 @@ import { Bootstrapper, BootstrapEnvironmentOptions } from './api/bootstrap'; import { CloudAssembly, DefaultSelection, ExtendedStackSelection, StackCollection, StackSelector } from './api/cxapp/cloud-assembly'; import { CloudExecutable } from './api/cxapp/cloud-executable'; import { Deployments } from './api/deployments'; -import { EcsHotswapProperties, HotswapMode, HotswapProperties } from './api/hotswap/common'; +import { HotswapMode, HotswapProperties, EcsHotswapProperties } from './api/hotswap/common'; import { findCloudWatchLogGroups } from './api/logs/find-cloudwatch-logs'; import { CloudWatchLogEventMonitor } from './api/logs/logs-monitor'; import { createDiffChangeSet, ResourcesToImport } from './api/util/cloudformation'; @@ -245,12 +245,18 @@ export class CdkToolkit { warning('⚠️ They should only be used for development - never use them for your production Stacks!\n'); } - let ecsHotswapProperties = new EcsHotswapProperties(options.hotswapEcsMinimumHealthyPercent, options.hotswapEcsMaximumHealthyPercent); + let ecsHotswapPropertiesFromSettings = this.props.configuration.settings.get(['hotswap']).ecs; + let ecsHotswapProperties = new EcsHotswapProperties( + ecsHotswapPropertiesFromSettings.minimumHealthyPercent, + ecsHotswapPropertiesFromSettings.maximumHealthyPercent, + ); + + let hotswapProperties = new HotswapProperties(); + hotswapProperties.ecsHotswapProperties = ecsHotswapProperties; + if (!ecsHotswapProperties.isEmpty() && options.hotswap == HotswapMode.FULL_DEPLOYMENT) { warning('⚠️ Hotswap properties defined while not in hotswap mode will be ignored.'); } - let hotswapProperties = new HotswapProperties(); - hotswapProperties.ecsHotswapProperties = ecsHotswapProperties; const stacks = stackCollection.stackArtifacts; diff --git a/packages/aws-cdk/lib/settings.ts b/packages/aws-cdk/lib/settings.ts index 20ecd57c642ef..1a41f0dda6b8b 100644 --- a/packages/aws-cdk/lib/settings.ts +++ b/packages/aws-cdk/lib/settings.ts @@ -293,6 +293,12 @@ export class Settings { assetParallelism: argv['asset-parallelism'], assetPrebuild: argv['asset-prebuild'], ignoreNoStacks: argv['ignore-no-stacks'], + hotswap: { + ecs: { + minimumEcsHealthyPercent: argv.minimumEcsHealthyPercent, + maximumEcsHealthyPercent: argv.maximumEcsHealthyPercent, + }, + }, }); } 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 index 4cf697e4327ff..72da2f90c58a2 100644 --- 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 @@ -1,7 +1,8 @@ /* eslint-disable import/order */ import * as AWS from 'aws-sdk'; +import { Configuration } from '../../../lib/settings'; import * as setup from './hotswap-test-setup'; -import { HotswapMode, HotswapProperties, EcsHotswapProperties } from '../../../lib/api/hotswap/common'; +import { HotswapMode } from '../../../lib/api/hotswap/common'; let hotswapMockSdkProvider: setup.HotswapMockSdkProvider; let mockRegisterTaskDef: jest.Mock; @@ -9,7 +10,6 @@ let mockUpdateService: (params: AWS.ECS.UpdateServiceRequest) => AWS.ECS.UpdateS beforeEach(() => { hotswapMockSdkProvider = setup.setupHotswapTests(); - mockRegisterTaskDef = jest.fn(); mockUpdateService = jest.fn(); hotswapMockSdkProvider.stubEcs({ @@ -639,10 +639,10 @@ describe.each([HotswapMode.FALL_BACK, HotswapMode.HOTSWAP_ONLY])('%p mode', (hot }); describe.each([ - new HotswapProperties(new EcsHotswapProperties(10)), - new HotswapProperties(new EcsHotswapProperties(undefined, 100)), - new HotswapProperties(new EcsHotswapProperties(10, 100)), -])('hotswap properties', (hotswapProperties) => { + new Configuration().settings.set(['hotswap'], { ecs: { minimumHealthyPercent: 10 } }), + new Configuration().settings.set(['hotswap'], { ecs: { minimumHealthyPercent: undefined, maximumHealthyPercent: 100 } }), + new Configuration().settings.set(['hotswap'], { ecs: { minimumHealthyPercent: 10, maximumHealthyPercent: 100 } }), +])('hotswap properties', (settings) => { test('should handle all possible hotswap properties', async () => { // GIVEN setup.setCurrentCfnStackTemplate({ @@ -696,7 +696,7 @@ describe.each([ }); // WHEN - const deployStackResult = await hotswapMockSdkProvider.tryHotswapDeployment(HotswapMode.HOTSWAP_ONLY, cdkStackArtifact, {}, hotswapProperties); + const deployStackResult = await hotswapMockSdkProvider.tryHotswapDeployment(HotswapMode.HOTSWAP_ONLY, cdkStackArtifact, settings.get(['hotswapProperties']).ecs); // THEN expect(deployStackResult).not.toBeUndefined(); @@ -711,9 +711,9 @@ describe.each([ cluster: 'my-cluster', taskDefinition: 'arn:aws:ecs:region:account:task-definition/my-task-def:3', deploymentConfiguration: { - minimumHealthyPercent: hotswapProperties.ecsHotswapProperties?.minimumHealthyPercent == undefined ? - 0 : hotswapProperties.ecsHotswapProperties?.minimumHealthyPercent, - maximumPercent: hotswapProperties.ecsHotswapProperties?.maximumHealthyPercent, + minimumHealthyPercent: settings.get(['hotswapProperties']).ecs?.minimumHealthyPercent == undefined ? + 0 : settings.get(['hotswapProperties']).ecs?.minimumHealthyPercent, + maximumPercent: settings.get(['hotswapProperties']).ecs?.maximumHealthyPercent, }, forceNewDeployment: true, }); From 5a18a330f21f880fd7aec3dabffb03baec6a0c32 Mon Sep 17 00:00:00 2001 From: rexrafa Date: Thu, 15 Aug 2024 17:59:54 -0300 Subject: [PATCH 09/13] adding cdk.json override --- .../tests/cli-integ-tests/cli.integtest.ts | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts index ee1fbdd97acfe..bb65b0a837d72 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts @@ -1824,6 +1824,22 @@ integTest('hotswap deployment for ecs service detects failed deployment and erro })); integTest('hotswap ECS deployment respects properties override', withDefaultFixture(async (fixture) => { + // Update the CDK context with the new ECS properties + let ecsMinimumHealthyPercent = 100; + let ecsMaximumHealthyPercent = 200; + let cdkJson = JSON.parse(await fs.readFile(path.join(fixture.integTestDir, 'cdk.json'), 'utf8')); + cdkJson = { + ...cdkJson, + hotswap: { + ecs: { + minimumHealthyPercent: ecsMinimumHealthyPercent, + maximumHealthyPercent: ecsMaximumHealthyPercent, + }, + }, + }; + + await fs.writeFile(path.join(fixture.integTestDir, 'cdk.json'), JSON.stringify(cdkJson)); + // GIVEN const stackArn = await fixture.cdkDeploy('ecs-hotswap', { captureStderr: false, @@ -1851,8 +1867,8 @@ integTest('hotswap ECS deployment respects properties override', withDefaultFixt cluster: clusterName, services: [serviceName], }); - expect(describeServicesResponse.services?.[0].deploymentConfiguration?.minimumHealthyPercent).toEqual(100); - expect(describeServicesResponse.services?.[0].deploymentConfiguration?.maximumPercent).toEqual(200); + expect(describeServicesResponse.services?.[0].deploymentConfiguration?.minimumHealthyPercent).toEqual(ecsMinimumHealthyPercent); + expect(describeServicesResponse.services?.[0].deploymentConfiguration?.maximumPercent).toEqual(ecsMaximumHealthyPercent); })); From 6cde23719b294cf7bcfc09c79f640f5f08f59553 Mon Sep 17 00:00:00 2001 From: Atanas Pamukchiev Date: Fri, 16 Aug 2024 16:32:43 +0200 Subject: [PATCH 10/13] cleanup references to cli options --- packages/aws-cdk/README.md | 17 ++++++++++---- packages/aws-cdk/lib/cdk-toolkit.ts | 23 +++++-------------- packages/aws-cdk/lib/cli.ts | 12 ---------- .../ecs-services-hotswap-deployments.test.ts | 18 ++++++++++----- 4 files changed, 30 insertions(+), 40 deletions(-) diff --git a/packages/aws-cdk/README.md b/packages/aws-cdk/README.md index 680d75196dff7..e3c5c06e3947b 100644 --- a/packages/aws-cdk/README.md +++ b/packages/aws-cdk/README.md @@ -443,12 +443,19 @@ Hotswapping is currently supported for the following changes - VTL mapping template changes for AppSync Resolvers and Functions. - Schema changes for AppSync GraphQL Apis. -You can optionally pass additional parameters to configure the behavior of your hotswap deployments. A list of the currently available configuration options can be found below. +You can optionally configure the behavior of your hotswap deployments in `cdk.json`. Currently you can only configure ECS hotswap behavior: + +```json +{ +"hotswap": { + "ecs": { + "minimumHealthyPercent": 100, + "maximumHealthyPercent": 250 + } + } +} +``` -| Service | Parameter | -| ------- | --------- | -| ECS | hotswap-ecs-minimum-healthy-percent | -| ECS | hotswap-ecs-maximum-healthy-percent | **⚠ Note #1**: This command deliberately introduces drift in CloudFormation stacks in order to speed up deployments. For this reason, only use it for development purposes. diff --git a/packages/aws-cdk/lib/cdk-toolkit.ts b/packages/aws-cdk/lib/cdk-toolkit.ts index 16c8bb65e703c..5a9b19ca33032 100644 --- a/packages/aws-cdk/lib/cdk-toolkit.ts +++ b/packages/aws-cdk/lib/cdk-toolkit.ts @@ -245,16 +245,15 @@ export class CdkToolkit { warning('⚠️ They should only be used for development - never use them for your production Stacks!\n'); } - let ecsHotswapPropertiesFromSettings = this.props.configuration.settings.get(['hotswap']).ecs; - let ecsHotswapProperties = new EcsHotswapProperties( - ecsHotswapPropertiesFromSettings.minimumHealthyPercent, - ecsHotswapPropertiesFromSettings.maximumHealthyPercent, - ); + let hotswapPropertiesFromSettings = this.props.configuration.settings.get(['hotswap']) || {}; let hotswapProperties = new HotswapProperties(); - hotswapProperties.ecsHotswapProperties = ecsHotswapProperties; + hotswapProperties.ecsHotswapProperties = new EcsHotswapProperties( + hotswapPropertiesFromSettings.ecs?.minimumHealthyPercent, + hotswapPropertiesFromSettings.ecs?.maximumHealthyPercent, + ); - if (!ecsHotswapProperties.isEmpty() && options.hotswap == HotswapMode.FULL_DEPLOYMENT) { + if (!hotswapProperties.ecsHotswapProperties.isEmpty() && options.hotswap == HotswapMode.FULL_DEPLOYMENT) { warning('⚠️ Hotswap properties defined while not in hotswap mode will be ignored.'); } @@ -1304,16 +1303,6 @@ export interface DeployOptions extends CfnDeployOptions, WatchOptions { */ readonly watch?: boolean; - /** - * An override for the minimum healthy percent for an ECS service during hotswap deployments. - */ - readonly hotswapEcsMinimumHealthyPercent?: number; - - /** - * An override for the maximum healthy percent for an ECS service during hotswap deployments. - */ - readonly hotswapEcsMaximumHealthyPercent?: number; - /** * Whether we should cache the Cloud Assembly after the first time it has been synthesized. * The default is 'true', we only don't want to do it in case the deployment is triggered by diff --git a/packages/aws-cdk/lib/cli.ts b/packages/aws-cdk/lib/cli.ts index 72fb7c8790106..2c15bb7b9949f 100644 --- a/packages/aws-cdk/lib/cli.ts +++ b/packages/aws-cdk/lib/cli.ts @@ -158,16 +158,6 @@ async function parseCommandLineArguments(args: string[]) { 'and falls back to a full deployment if that is not possible. ' + 'Do not use this in production environments', }) - .option('hotswap-ecs-minimum-healthy-percent', { - type: 'number', - desc: 'When using hotswap for ECS, set the minimum healthy percent' + - 'for the updated task definition', - }) - .option('hotswap-ecs-maximum-healthy-percent', { - type: 'number', - desc: 'When using hotswap for ECS, set the maximum healthy percent' + - 'for the updated task definition', - }) .option('watch', { type: 'boolean', desc: 'Continuously observe the project files, ' + @@ -608,8 +598,6 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise; @@ -640,7 +640,7 @@ describe.each([HotswapMode.FALL_BACK, HotswapMode.HOTSWAP_ONLY])('%p mode', (hot describe.each([ new Configuration().settings.set(['hotswap'], { ecs: { minimumHealthyPercent: 10 } }), - new Configuration().settings.set(['hotswap'], { ecs: { minimumHealthyPercent: undefined, maximumHealthyPercent: 100 } }), + new Configuration().settings.set(['hotswap'], { ecs: { minimumHealthyPercent: 10, maximumHealthyPercent: 100 } }), new Configuration().settings.set(['hotswap'], { ecs: { minimumHealthyPercent: 10, maximumHealthyPercent: 100 } }), ])('hotswap properties', (settings) => { test('should handle all possible hotswap properties', async () => { @@ -696,7 +696,13 @@ describe.each([ }); // WHEN - const deployStackResult = await hotswapMockSdkProvider.tryHotswapDeployment(HotswapMode.HOTSWAP_ONLY, cdkStackArtifact, settings.get(['hotswapProperties']).ecs); + let ecsHotswapProperties = new EcsHotswapProperties(settings.get(['hotswap']).ecs.minimumHealthyPercent, settings.get(['hotswap']).ecs.maximumHealthyPercent); + const deployStackResult = await hotswapMockSdkProvider.tryHotswapDeployment( + HotswapMode.HOTSWAP_ONLY, + cdkStackArtifact, + {}, + new HotswapProperties(ecsHotswapProperties), + ); // THEN expect(deployStackResult).not.toBeUndefined(); @@ -711,9 +717,9 @@ describe.each([ cluster: 'my-cluster', taskDefinition: 'arn:aws:ecs:region:account:task-definition/my-task-def:3', deploymentConfiguration: { - minimumHealthyPercent: settings.get(['hotswapProperties']).ecs?.minimumHealthyPercent == undefined ? - 0 : settings.get(['hotswapProperties']).ecs?.minimumHealthyPercent, - maximumPercent: settings.get(['hotswapProperties']).ecs?.maximumHealthyPercent, + minimumHealthyPercent: settings.get(['hotswap']).ecs?.minimumHealthyPercent == undefined ? + 0 : settings.get(['hotswap']).ecs?.minimumHealthyPercent, + maximumPercent: settings.get(['hotswap']).ecs?.maximumHealthyPercent, }, forceNewDeployment: true, }); From 305b920705204e826b6356086c3832aea796688a Mon Sep 17 00:00:00 2001 From: Atanas Pamukchiev Date: Tue, 3 Sep 2024 12:32:17 +0200 Subject: [PATCH 11/13] updated inline comments --- packages/aws-cdk/README.md | 1 - packages/aws-cdk/lib/api/hotswap/common.ts | 1 + packages/aws-cdk/lib/api/hotswap/ecs-services.ts | 2 +- .../test/api/hotswap/ecs-services-hotswap-deployments.test.ts | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/aws-cdk/README.md b/packages/aws-cdk/README.md index e3c5c06e3947b..bfd959d0d0920 100644 --- a/packages/aws-cdk/README.md +++ b/packages/aws-cdk/README.md @@ -456,7 +456,6 @@ You can optionally configure the behavior of your hotswap deployments in `cdk.js } ``` - **⚠ Note #1**: This command deliberately introduces drift in CloudFormation stacks in order to speed up deployments. For this reason, only use it for development purposes. **Never use this flag for your production deployments**! diff --git a/packages/aws-cdk/lib/api/hotswap/common.ts b/packages/aws-cdk/lib/api/hotswap/common.ts index 0f67256dc4d28..9000e3464e6c7 100644 --- a/packages/aws-cdk/lib/api/hotswap/common.ts +++ b/packages/aws-cdk/lib/api/hotswap/common.ts @@ -126,6 +126,7 @@ export class EcsHotswapProperties { if (maximumHealthyPercent !== undefined && maximumHealthyPercent < 0 ) { throw new Error('hotswap-ecs-maximum-healthy-percent can\'t be a negative number'); } + // In order to preserve the current behaviour, when minimumHealthyPercent is not defined, it will be set to the currently default value of 0 if (minimumHealthyPercent == undefined) { this.minimumHealthyPercent = 0; } else { diff --git a/packages/aws-cdk/lib/api/hotswap/ecs-services.ts b/packages/aws-cdk/lib/api/hotswap/ecs-services.ts index c6e621b72059e..e38cd3b9b4748 100644 --- a/packages/aws-cdk/lib/api/hotswap/ecs-services.ts +++ b/packages/aws-cdk/lib/api/hotswap/ecs-services.ts @@ -34,7 +34,7 @@ export async function isHotswappableEcsServiceChange( // hotswap is not possible in FALL_BACK mode reportNonHotswappableChange(ret, change, undefined, 'No ECS services reference the changed task definition', false); } if (resourcesReferencingTaskDef.length > ecsServicesReferencingTaskDef.length) { - // if something besides an ECS Service is rxeferencing the TaskDefinition, + // if something besides an ECS Service is referencing the TaskDefinition, // hotswap is not possible in FALL_BACK mode const nonEcsServiceTaskDefRefs = resourcesReferencingTaskDef.filter(r => r.Type !== 'AWS::ECS::Service'); for (const taskRef of nonEcsServiceTaskDefRefs) { 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 index 8a48cc57f4a7b..176515e222e11 100644 --- 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 @@ -641,7 +641,6 @@ describe.each([HotswapMode.FALL_BACK, HotswapMode.HOTSWAP_ONLY])('%p mode', (hot describe.each([ new Configuration().settings.set(['hotswap'], { ecs: { minimumHealthyPercent: 10 } }), new Configuration().settings.set(['hotswap'], { ecs: { minimumHealthyPercent: 10, maximumHealthyPercent: 100 } }), - new Configuration().settings.set(['hotswap'], { ecs: { minimumHealthyPercent: 10, maximumHealthyPercent: 100 } }), ])('hotswap properties', (settings) => { test('should handle all possible hotswap properties', async () => { // GIVEN From 13a435d7b8a52da774f50edb74de66a53228b46f Mon Sep 17 00:00:00 2001 From: Atanas Pamukchiev Date: Fri, 20 Sep 2024 15:45:27 +0200 Subject: [PATCH 12/13] Fix tests to conform to changes from #31226 --- .../tests/cli-integ-tests/cli.integtest.ts | 21 +++++++++++-------- .../ecs-services-hotswap-deployments.test.ts | 3 +-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts index d36291080b24c..5caf645053bcd 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts @@ -2239,21 +2239,24 @@ integTest('hotswap ECS deployment respects properties override', withDefaultFixt }, }); - const describeStacksResponse = await fixture.aws.cloudFormation('describeStacks', { - StackName: stackArn, - }); + const describeStacksResponse = await fixture.aws.cloudFormation.send( + new DescribeStacksCommand({ + StackName: stackArn, + }), + ); + const clusterName = describeStacksResponse.Stacks?.[0].Outputs?.find(output => output.OutputKey == 'ClusterName')?.OutputValue!; const serviceName = describeStacksResponse.Stacks?.[0].Outputs?.find(output => output.OutputKey == 'ServiceName')?.OutputValue!; // THEN - - const describeServicesResponse = await fixture.aws.ecs('describeServices', { - cluster: clusterName, - services: [serviceName], - }); + const describeServicesResponse = await fixture.aws.ecs.send( + new DescribeServicesCommand({ + cluster: clusterName, + services: [serviceName], + }), + ); expect(describeServicesResponse.services?.[0].deploymentConfiguration?.minimumHealthyPercent).toEqual(ecsMinimumHealthyPercent); expect(describeServicesResponse.services?.[0].deploymentConfiguration?.maximumPercent).toEqual(ecsMaximumHealthyPercent); - })); async function listChildren(parent: string, pred: (x: string) => Promise) { 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 index fc195930c798e..99d4b2ee33ffa 100644 --- 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 @@ -1,10 +1,9 @@ import * as AWS from 'aws-sdk'; -import { Configuration } from '../../../lib/settings'; import * as setup from './hotswap-test-setup'; import { EcsHotswapProperties, HotswapMode, HotswapProperties } from '../../../lib/api/hotswap/common'; +import { Configuration } from '../../../lib/settings'; import { silentTest } from '../../util/silent'; - let hotswapMockSdkProvider: setup.HotswapMockSdkProvider; let mockRegisterTaskDef: jest.Mock; let mockUpdateService: (params: AWS.ECS.UpdateServiceRequest) => AWS.ECS.UpdateServiceResponse; From 1d5a523c087173b15d1048e4f4a6619837cc38b3 Mon Sep 17 00:00:00 2001 From: Atanas Pamukchiev Date: Fri, 27 Sep 2024 11:21:03 +0200 Subject: [PATCH 13/13] address PR feedback --- packages/aws-cdk/lib/api/deploy-stack.ts | 8 +++--- packages/aws-cdk/lib/api/deployments.ts | 6 ++--- .../aws-cdk/lib/api/hotswap-deployments.ts | 26 ++++++++++++------- packages/aws-cdk/lib/api/hotswap/common.ts | 4 +-- .../aws-cdk/lib/api/hotswap/ecs-services.ts | 9 ++++--- packages/aws-cdk/lib/cdk-toolkit.ts | 12 +++------ .../ecs-services-hotswap-deployments.test.ts | 4 +-- .../test/api/hotswap/hotswap-test-setup.ts | 6 ++--- 8 files changed, 41 insertions(+), 34 deletions(-) diff --git a/packages/aws-cdk/lib/api/deploy-stack.ts b/packages/aws-cdk/lib/api/deploy-stack.ts index 385f0790fa78d..ec244f1c52d72 100644 --- a/packages/aws-cdk/lib/api/deploy-stack.ts +++ b/packages/aws-cdk/lib/api/deploy-stack.ts @@ -5,7 +5,7 @@ import * as uuid from 'uuid'; import { ISDK, SdkProvider } from './aws-auth'; import { EnvironmentResources } from './environment-resources'; import { CfnEvaluationException } from './evaluate-cloudformation-template'; -import { HotswapMode, HotswapProperties, ICON } from './hotswap/common'; +import { HotswapMode, HotswapPropertyOverrides, ICON } from './hotswap/common'; import { tryHotswapDeployment } from './hotswap-deployments'; import { addMetadataAssetsToManifest } from '../assets'; import { Tag } from '../cdk-toolkit'; @@ -175,7 +175,7 @@ export interface DeployStackOptions { /** * Extra properties that configure hotswap behavior */ - readonly hotswapProperties?: HotswapProperties; + readonly hotswapPropertyOverrides?: HotswapPropertyOverrides; /** * The extra string to append to the User-Agent header when performing AWS SDK calls. @@ -268,7 +268,7 @@ export async function deployStack(options: DeployStackOptions): Promise Promise; const RESOURCE_DETECTORS: { [key: string]: HotswapDetector } = { @@ -59,7 +62,7 @@ const RESOURCE_DETECTORS: { [key: string]: HotswapDetector } = { export async function tryHotswapDeployment( sdkProvider: SdkProvider, assetParams: { [key: string]: string }, cloudFormationStack: CloudFormationStack, stackArtifact: cxapi.CloudFormationStackArtifact, - hotswapMode: HotswapMode, hotswapProperties: HotswapProperties, + hotswapMode: HotswapMode, hotswapPropertyOverrides: HotswapPropertyOverrides, ): Promise { // resolve the environment, so we can substitute things like AWS::Region in CFN expressions const resolvedEnv = await sdkProvider.resolveEnvironment(stackArtifact.environment); @@ -83,7 +86,7 @@ export async function tryHotswapDeployment( const stackChanges = cfn_diff.fullDiff(currentTemplate.deployedRootTemplate, stackArtifact.template); const { hotswappableChanges, nonHotswappableChanges } = await classifyResourceChanges( - stackChanges, evaluateCfnTemplate, sdk, currentTemplate.nestedStacks, hotswapProperties, + stackChanges, evaluateCfnTemplate, sdk, currentTemplate.nestedStacks, hotswapPropertyOverrides, ); logNonHotswappableChanges(nonHotswappableChanges, hotswapMode); @@ -110,7 +113,7 @@ async function classifyResourceChanges( evaluateCfnTemplate: EvaluateCloudFormationTemplate, sdk: ISDK, nestedStackNames: { [nestedStackName: string]: NestedStackTemplates }, - hotswapProperties: HotswapProperties, + hotswapPropertyOverrides: HotswapPropertyOverrides, ): Promise { const resourceDifferences = getStackResourceDifferences(stackChanges); @@ -135,7 +138,7 @@ async function classifyResourceChanges( nestedStackNames, evaluateCfnTemplate, sdk, - hotswapProperties, + hotswapPropertyOverrides, ); hotswappableResources.push(...nestedHotswappableResources.hotswappableChanges); nonHotswappableResources.push(...nestedHotswappableResources.nonHotswappableChanges); @@ -156,7 +159,7 @@ async function classifyResourceChanges( const resourceType: string = hotswappableChangeCandidate.newValue.Type; if (resourceType in RESOURCE_DETECTORS) { // run detector functions lazily to prevent unhandled promise rejections - promises.push(() => RESOURCE_DETECTORS[resourceType](logicalId, hotswappableChangeCandidate, evaluateCfnTemplate, hotswapProperties)); + promises.push(() => RESOURCE_DETECTORS[resourceType](logicalId, hotswappableChangeCandidate, evaluateCfnTemplate, hotswapPropertyOverrides)); } else { reportNonHotswappableChange(nonHotswappableResources, hotswappableChangeCandidate, undefined, 'This resource type is not supported for hotswap deployments'); } @@ -236,7 +239,7 @@ async function findNestedHotswappableChanges( nestedStackTemplates: { [nestedStackName: string]: NestedStackTemplates }, evaluateCfnTemplate: EvaluateCloudFormationTemplate, sdk: ISDK, - hotswapProperties: HotswapProperties, + hotswapPropertyOverrides: HotswapPropertyOverrides, ): Promise { const nestedStack = nestedStackTemplates[logicalId]; if (!nestedStack.physicalName) { @@ -260,7 +263,12 @@ async function findNestedHotswappableChanges( nestedStackTemplates[logicalId].deployedTemplate, nestedStackTemplates[logicalId].generatedTemplate, ); - return classifyResourceChanges(nestedDiff, evaluateNestedCfnTemplate, sdk, nestedStackTemplates[logicalId].nestedStackTemplates, hotswapProperties); + return classifyResourceChanges( + nestedDiff, + evaluateNestedCfnTemplate, + sdk, + nestedStackTemplates[logicalId].nestedStackTemplates, + hotswapPropertyOverrides); } /** Returns 'true' if a pair of changes is for the same resource. */ diff --git a/packages/aws-cdk/lib/api/hotswap/common.ts b/packages/aws-cdk/lib/api/hotswap/common.ts index 9000e3464e6c7..a066e7b0e4d5d 100644 --- a/packages/aws-cdk/lib/api/hotswap/common.ts +++ b/packages/aws-cdk/lib/api/hotswap/common.ts @@ -99,9 +99,9 @@ export class HotswappableChangeCandidate { type Exclude = { [key: string]: Exclude | true } /** - * Represents configuration properties for hotswap deployments + * Represents configuration property overrides for hotswap deployments */ -export class HotswapProperties { +export class HotswapPropertyOverrides { // Each supported resource type will have its own properties. Currently this is ECS ecsHotswapProperties?: EcsHotswapProperties; diff --git a/packages/aws-cdk/lib/api/hotswap/ecs-services.ts b/packages/aws-cdk/lib/api/hotswap/ecs-services.ts index e38cd3b9b4748..209e1d42c84ca 100644 --- a/packages/aws-cdk/lib/api/hotswap/ecs-services.ts +++ b/packages/aws-cdk/lib/api/hotswap/ecs-services.ts @@ -1,10 +1,13 @@ import * as AWS from 'aws-sdk'; -import { ChangeHotswapResult, classifyChanges, HotswappableChangeCandidate, HotswapProperties, lowerCaseFirstCharacter, reportNonHotswappableChange, transformObjectKeys } from './common'; +import { ChangeHotswapResult, classifyChanges, HotswappableChangeCandidate, HotswapPropertyOverrides, lowerCaseFirstCharacter, reportNonHotswappableChange, transformObjectKeys } from './common'; import { ISDK } from '../aws-auth'; import { EvaluateCloudFormationTemplate } from '../evaluate-cloudformation-template'; export async function isHotswappableEcsServiceChange( - logicalId: string, change: HotswappableChangeCandidate, evaluateCfnTemplate: EvaluateCloudFormationTemplate, hotswapProperties: HotswapProperties, + logicalId: string, + change: HotswappableChangeCandidate, + evaluateCfnTemplate: EvaluateCloudFormationTemplate, + hotswapPropertyOverrides: HotswapPropertyOverrides, ): Promise { // the only resource change we can evaluate here is an ECS TaskDefinition if (change.newValue.Type !== 'AWS::ECS::TaskDefinition') { @@ -83,7 +86,7 @@ export async function isHotswappableEcsServiceChange( const registerTaskDefResponse = await sdk.ecs().registerTaskDefinition(lowercasedTaskDef).promise(); const taskDefRevArn = registerTaskDefResponse.taskDefinition?.taskDefinitionArn; - let ecsHotswapProperties = hotswapProperties.ecsHotswapProperties; + let ecsHotswapProperties = hotswapPropertyOverrides.ecsHotswapProperties; let minimumHealthyPercent = ecsHotswapProperties?.minimumHealthyPercent; let maximumHealthyPercent = ecsHotswapProperties?.maximumHealthyPercent; diff --git a/packages/aws-cdk/lib/cdk-toolkit.ts b/packages/aws-cdk/lib/cdk-toolkit.ts index 501c1966666ee..30198e39eead9 100644 --- a/packages/aws-cdk/lib/cdk-toolkit.ts +++ b/packages/aws-cdk/lib/cdk-toolkit.ts @@ -12,7 +12,7 @@ import { Bootstrapper, BootstrapEnvironmentOptions } from './api/bootstrap'; import { CloudAssembly, DefaultSelection, ExtendedStackSelection, StackCollection, StackSelector } from './api/cxapp/cloud-assembly'; import { CloudExecutable } from './api/cxapp/cloud-executable'; import { Deployments } from './api/deployments'; -import { HotswapMode, HotswapProperties, EcsHotswapProperties } from './api/hotswap/common'; +import { HotswapMode, HotswapPropertyOverrides, EcsHotswapProperties } from './api/hotswap/common'; import { findCloudWatchLogGroups } from './api/logs/find-cloudwatch-logs'; import { CloudWatchLogEventMonitor } from './api/logs/logs-monitor'; import { createDiffChangeSet, ResourcesToImport } from './api/util/cloudformation'; @@ -247,16 +247,12 @@ export class CdkToolkit { let hotswapPropertiesFromSettings = this.props.configuration.settings.get(['hotswap']) || {}; - let hotswapProperties = new HotswapProperties(); - hotswapProperties.ecsHotswapProperties = new EcsHotswapProperties( + let hotswapPropertyOverrides = new HotswapPropertyOverrides(); + hotswapPropertyOverrides.ecsHotswapProperties = new EcsHotswapProperties( hotswapPropertiesFromSettings.ecs?.minimumHealthyPercent, hotswapPropertiesFromSettings.ecs?.maximumHealthyPercent, ); - if (!hotswapProperties.ecsHotswapProperties.isEmpty() && options.hotswap == HotswapMode.FULL_DEPLOYMENT) { - warning('⚠️ Hotswap properties defined while not in hotswap mode will be ignored.'); - } - const stacks = stackCollection.stackArtifacts; const stackOutputs: { [key: string]: any } = { }; @@ -359,7 +355,7 @@ export class CdkToolkit { ci: options.ci, rollback: options.rollback, hotswap: options.hotswap, - hotswapProperties: hotswapProperties, + hotswapPropertyOverrides: hotswapPropertyOverrides, extraUserAgent: options.extraUserAgent, assetParallelism: options.assetParallelism, ignoreNoStacks: options.ignoreNoStacks, 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 index 99d4b2ee33ffa..182749aaa89d0 100644 --- 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 @@ -1,6 +1,6 @@ import * as AWS from 'aws-sdk'; import * as setup from './hotswap-test-setup'; -import { EcsHotswapProperties, HotswapMode, HotswapProperties } from '../../../lib/api/hotswap/common'; +import { EcsHotswapProperties, HotswapMode, HotswapPropertyOverrides } from '../../../lib/api/hotswap/common'; import { Configuration } from '../../../lib/settings'; import { silentTest } from '../../util/silent'; @@ -700,7 +700,7 @@ describe.each([ HotswapMode.HOTSWAP_ONLY, cdkStackArtifact, {}, - new HotswapProperties(ecsHotswapProperties), + new HotswapPropertyOverrides(ecsHotswapProperties), ); // THEN diff --git a/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts b/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts index 60ea011306636..1288c827f2300 100644 --- a/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts +++ b/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts @@ -4,7 +4,7 @@ import * as codebuild from 'aws-sdk/clients/codebuild'; import * as lambda from 'aws-sdk/clients/lambda'; import * as stepfunctions from 'aws-sdk/clients/stepfunctions'; import { DeployStackResult } from '../../../lib/api'; -import { HotswapMode, HotswapProperties } from '../../../lib/api/hotswap/common'; +import { HotswapMode, HotswapPropertyOverrides } from '../../../lib/api/hotswap/common'; import * as deployments from '../../../lib/api/hotswap-deployments'; import { CloudFormationStack, Template } from '../../../lib/api/util/cloudformation'; import { testStack, TestStackArtifact } from '../../util'; @@ -179,9 +179,9 @@ export class HotswapMockSdkProvider { hotswapMode: HotswapMode, stackArtifact: cxapi.CloudFormationStackArtifact, assetParams: { [key: string]: string } = {}, - hotswapProperties?: HotswapProperties, + hotswapPropertyOverrides?: HotswapPropertyOverrides, ): Promise { - let hotswapProps = hotswapProperties || new HotswapProperties(); + let hotswapProps = hotswapPropertyOverrides || new HotswapPropertyOverrides(); return deployments.tryHotswapDeployment(this.mockSdkProvider, assetParams, currentCfnStack, stackArtifact, hotswapMode, hotswapProps); } }