Skip to content

Commit

Permalink
Merge branch 'main' into fix/cluster-name-validation
Browse files Browse the repository at this point in the history
  • Loading branch information
mazyu36 authored Jan 8, 2025
2 parents 47e1654 + bbdd42c commit 390cd7e
Show file tree
Hide file tree
Showing 82 changed files with 5,066 additions and 82 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/github-merit-badger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
badges: '[beginning-contributor,repeat-contributor,valued-contributor,admired-contributor,star-contributor,distinguished-contributor]'
thresholds: '[0,3,6,13,25,50]'
badge-type: 'achievement'
ignore-usernames: '[rix0rrr,iliapolo,otaviomacedo,kaizencc,comcalvi,TheRealAmazonKendra,mrgrain,pahud,kellertk,ashishdhingra,HBobertz,sumupitchayan,colifran,khushail,moelasmar,paulhcsun,GavinZZ,aaythapa,xazhao,gracelu0,jfuss,shikha372,kirtishrinkhala,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,michelle-wangg,jiayiwang7,1kaileychen,saiyush,5d,aws-cdk-automation,dependabot[bot],mergify[bot]]'
ignore-usernames: '[rix0rrr,iliapolo,otaviomacedo,kaizencc,comcalvi,TheRealAmazonKendra,mrgrain,pahud,kellertk,ashishdhingra,HBobertz,sumupitchayan,colifran,khushail,moelasmar,paulhcsun,GavinZZ,aaythapa,xazhao,gracelu0,jfuss,shikha372,kirtishrinkhala,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,michelle-wangg,jiayiwang7,1kaileychen,saiyush,5d,iankhou,aws-cdk-automation,dependabot[bot],mergify[bot]]'
2 changes: 1 addition & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ pull_request_rules:
label:
add: [ contribution/core ]
conditions:
- author~=^(rix0rrr|iliapolo|otaviomacedo|kaizencc|comcalvi|TheRealAmazonKendra|mrgrain|pahud|ashishdhingra|kellertk|HBobertz|sumupitchayan|colifran|moelasmar|paulhcsun|GavinZZ|aaythapa|xazhao|gracelu0|jfuss|shikha372|kirtishrinkhala|godwingrs22|bergjaak|samson-keung|IanKonlog|Leo10Gama|scorbiere|michelle-wangg|jiayiwang7|1kaileychen|saiyush|5d)$
- author~=^(rix0rrr|iliapolo|otaviomacedo|kaizencc|comcalvi|TheRealAmazonKendra|mrgrain|pahud|ashishdhingra|kellertk|HBobertz|sumupitchayan|colifran|moelasmar|paulhcsun|GavinZZ|aaythapa|xazhao|gracelu0|jfuss|shikha372|kirtishrinkhala|godwingrs22|bergjaak|samson-keung|IanKonlog|Leo10Gama|scorbiere|michelle-wangg|jiayiwang7|1kaileychen|saiyush|5d|iankhou)$
- -label~="contribution/core"
- name: automatic merge
actions:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.v2.alpha.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [2.174.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.174.0-alpha.0...v2.174.1-alpha.0) (2025-01-07)

## [2.174.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.173.4-alpha.0...v2.174.0-alpha.0) (2025-01-04)


Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.v2.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [2.174.1](https://github.com/aws/aws-cdk/compare/v2.174.0...v2.174.1) (2025-01-07)


### Features

* update L1 CloudFormation resource definitions ([#32755](https://github.com/aws/aws-cdk/issues/32755)) ([0bc32c9](https://github.com/aws/aws-cdk/commit/0bc32c9acca6f8524ca0c8d925534ede79950213))
* update L1 CloudFormation resource definitions ([#32768](https://github.com/aws/aws-cdk/issues/32768)) ([20070a4](https://github.com/aws/aws-cdk/commit/20070a4cc77133e4fbdb556655cb3d0127620397))

## [2.174.0](https://github.com/aws/aws-cdk/compare/v2.173.4...v2.174.0) (2025-01-04)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import * as ecsPatterns from 'aws-cdk-lib/aws-ecs-patterns';
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm': true,
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new cdk.Stack(app, 'aws-ecs-integ-alb-ec2-cmd-entrypoint');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ import * as integ from '@aws-cdk/integ-tests-alpha';
import { ApplicationLoadBalancedEc2Service } from 'aws-cdk-lib/aws-ecs-patterns';
import * as elbv2 from 'aws-cdk-lib/aws-elasticloadbalancingv2';

const app = new App();
const app = new App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new Stack(app, 'aws-ecs-integ-alb');
const vpc = new Vpc(stack, 'Vpc', { maxAzs: 2, restrictDefaultSecurityGroup: false });
const cluster = new Cluster(stack, 'Cluster', { vpc });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ import { IntegTest } from '@aws-cdk/integ-tests-alpha';

import { ApplicationMultipleTargetGroupsEc2Service } from 'aws-cdk-lib/aws-ecs-patterns';

const app = new App();
const app = new App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new Stack(app, 'aws-ecs-integ-multiple-alb-healthchecks');
const vpc = new Vpc(stack, 'Vpc', { maxAzs: 2, restrictDefaultSecurityGroup: false });
const cluster = new Cluster(stack, 'Cluster', { vpc });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ import { App, Stack } from 'aws-cdk-lib';
import { IntegTest } from '@aws-cdk/integ-tests-alpha';
import { NetworkMultipleTargetGroupsEc2Service } from 'aws-cdk-lib/aws-ecs-patterns';

const app = new App();
const app = new App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new Stack(app, 'aws-ecs-integ-nlb-healthchecks');
const vpc = new Vpc(stack, 'Vpc', { maxAzs: 2, restrictDefaultSecurityGroup: false });
const cluster = new Cluster(stack, 'Cluster', { vpc });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ const app = new App({
postCliContext: {
'@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm': false,
'@aws-cdk/aws-ecs:reduceEc2FargateCloudWatchPermissions': false,
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new Stack(app, 'aws-ecs-integ-alb-idle-timeout');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ const app = new App({
postCliContext: {
[AUTOSCALING_GENERATE_LAUNCH_TEMPLATE]: false,
[REDUCE_EC2_FARGATE_CLOUDWATCH_PERMISSIONS]: false,
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new Stack(app, 'aws-ecs-integ-multiple-alb');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ import * as integ from '@aws-cdk/integ-tests-alpha';
import { NetworkLoadBalancedEc2Service } from 'aws-cdk-lib/aws-ecs-patterns';
import { IpAddressType } from 'aws-cdk-lib/aws-elasticloadbalancingv2';

const app = new App();
const app = new App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new Stack(app, 'aws-ecs-integ-nlb');
const vpc = new Vpc(stack, 'Vpc', { maxAzs: 2, restrictDefaultSecurityGroup: false });
const cluster = new Cluster(stack, 'Cluster', { vpc });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ import * as cdk from 'aws-cdk-lib';
import * as integ from '@aws-cdk/integ-tests-alpha';
import { ScheduledEc2Task } from 'aws-cdk-lib/aws-ecs-patterns';

const app = new cdk.App();
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});

class EventStack extends cdk.Stack {
constructor(scope: cdk.App, id: string) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ import { Certificate } from 'aws-cdk-lib/aws-certificatemanager';
const certArn = process.env.CDK_INTEG_CERT_ARN || process.env.CERT_ARN;
if (!certArn) throw new Error('For this test you must provide your own Certificate as an env var "CERT_ARN". See framework-integ/README.md for details.');

const app = new App();
const app = new App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new Stack(app, 'tls-network-load-balanced-ecs-service');
const vpc = new Vpc(stack, 'Vpc', { maxAzs: 2 });
const cluster = new Cluster(stack, 'Cluster', { vpc });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2';
import * as cdk from 'aws-cdk-lib';
import * as ecs from 'aws-cdk-lib/aws-ecs';

const app = new cdk.App();
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new cdk.Stack(app, 'aws-ecs-integ-appmesh-proxy');

// Create a cluster
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import * as integ from '@aws-cdk/integ-tests-alpha';
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm': true,
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new cdk.Stack(app, 'integ-ec2-capacity-provider-managed-draining');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2';
import * as cdk from 'aws-cdk-lib';
import * as ecs from 'aws-cdk-lib/aws-ecs';

const app = new cdk.App();
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new cdk.Stack(app, 'integ-ec2-capacity-provider');

const vpc = new ec2.Vpc(stack, 'Vpc', { maxAzs: 2, restrictDefaultSecurityGroup: false });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ import * as elb from 'aws-cdk-lib/aws-elasticloadbalancing';
import * as cdk from 'aws-cdk-lib';
import * as ecs from 'aws-cdk-lib/aws-ecs';

const app = new cdk.App();
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new cdk.Stack(app, 'aws-ecs-integ');

const vpc = new ec2.Vpc(stack, 'Vpc', { maxAzs: 2, restrictDefaultSecurityGroup: false });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ import * as cloudmap from 'aws-cdk-lib/aws-servicediscovery';
import * as cdk from 'aws-cdk-lib';
import * as ecs from 'aws-cdk-lib/aws-ecs';

const app = new cdk.App();
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new cdk.Stack(app, 'aws-ecs-integ');
const vpc = new ec2.Vpc(stack, 'Vpc', {
restrictDefaultSecurityGroup: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@ import * as cdk from 'aws-cdk-lib';
import * as integ from '@aws-cdk/integ-tests-alpha';
import * as ecs from 'aws-cdk-lib/aws-ecs';

const app = new cdk.App();
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new cdk.Stack(app, 'integ-default-capacity-provider');

const vpc = new ec2.Vpc(stack, 'Vpc', { maxAzs: 2, restrictDefaultSecurityGroup: false });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ import * as cdk from 'aws-cdk-lib';
import * as integ from '@aws-cdk/integ-tests-alpha';
import * as ecs from 'aws-cdk-lib/aws-ecs';

const app = new cdk.App();
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new cdk.Stack(app, 'integ-deployment-alarms');

const vpc = new ec2.Vpc(stack, 'Vpc', { maxAzs: 2 });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import * as ecs from 'aws-cdk-lib/aws-ecs';
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:reduceEc2FargateCloudWatchPermissions': true,
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new cdk.Stack(app, 'aws-ecs-integ-enable-execute-command');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ import * as cdk from 'aws-cdk-lib';
import * as ecs from 'aws-cdk-lib/aws-ecs';
import { IntegTest } from '@aws-cdk/integ-tests-alpha';

const app = new cdk.App();
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new cdk.Stack(app, 'aws-ecs-integ');

// S3 bucket to host envfile without public access
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ import * as s3 from 'aws-cdk-lib/aws-s3';
import * as cdk from 'aws-cdk-lib';
import * as ecs from 'aws-cdk-lib/aws-ecs';

const app = new cdk.App();
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new cdk.Stack(app, 'aws-ecs-integ-exec-command');

const vpc = new ec2.Vpc(stack, 'Vpc', { maxAzs: 2, restrictDefaultSecurityGroup: false });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@ import * as s3_assets from 'aws-cdk-lib/aws-s3-assets';
import * as cdk from 'aws-cdk-lib';
import * as ecs from 'aws-cdk-lib/aws-ecs';

const app = new cdk.App();
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new cdk.Stack(app, 'aws-ecs-integ');
const vpc = new ec2.Vpc(stack, 'Vpc', { maxAzs: 2, restrictDefaultSecurityGroup: false });
const cluster = new ecs.Cluster(stack, 'EcsCluster', { vpc });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2';
import * as cdk from 'aws-cdk-lib';
import * as ecs from 'aws-cdk-lib/aws-ecs';

const app = new cdk.App();
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new cdk.Stack(app, 'aws-ecs-integ');

const vpc = new ec2.Vpc(stack, 'Vpc', { maxAzs: 2, restrictDefaultSecurityGroup: false });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ import * as elbv2 from 'aws-cdk-lib/aws-elasticloadbalancingv2';
import * as cdk from 'aws-cdk-lib';
import * as ecs from 'aws-cdk-lib/aws-ecs';

const app = new cdk.App();
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new cdk.Stack(app, 'aws-ecs-integ');

const vpc = new ec2.Vpc(stack, 'Vpc', { maxAzs: 2, restrictDefaultSecurityGroup: false });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@ import * as elbv2 from 'aws-cdk-lib/aws-elasticloadbalancingv2';
import * as cdk from 'aws-cdk-lib';
import * as ecs from 'aws-cdk-lib/aws-ecs';

const app = new cdk.App();
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new cdk.Stack(app, 'aws-ecs-integ-ecs');

const vpc = new ec2.Vpc(stack, 'Vpc', { maxAzs: 2, restrictDefaultSecurityGroup: false });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@ import { Construct } from 'constructs';
import * as ecs from 'aws-cdk-lib/aws-ecs';
import { IntegTest } from '@aws-cdk/integ-tests-alpha';

const app = new cdk.App();
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});

// WHEN
class EcsStack extends cdk.Stack {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ import * as cdk from 'aws-cdk-lib';
import { Construct } from 'constructs';
import * as ecs from 'aws-cdk-lib/aws-ecs';

const app = new cdk.App();
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});

class EcsStack extends cdk.Stack {
constructor(scope: Construct, id: string, props?: cdk.StackProps) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ import * as cdk from 'aws-cdk-lib';
import * as integ from '@aws-cdk/integ-tests-alpha';
import * as ecs from 'aws-cdk-lib/aws-ecs';

const app = new cdk.App();
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new cdk.Stack(app, 'aws-ecs-integ-pseudo-terminal');

// Create a cluster
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2';
import * as cdk from 'aws-cdk-lib';
import * as ecs from 'aws-cdk-lib/aws-ecs';

const app = new cdk.App();
const app = new cdk.App({
postCliContext: {
'@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature': false,
'@aws-cdk/aws-ecs:disableEcsImdsBlocking': false,
},
});
const stack = new cdk.Stack(app, 'aws-ecs-integ-ecs');

const vpc = new ec2.Vpc(stack, 'Vpc', { maxAzs: 2, restrictDefaultSecurityGroup: false });
Expand Down
Loading

0 comments on commit 390cd7e

Please sign in to comment.