diff --git a/packages/@aws-cdk/cx-api/lib/features.ts b/packages/@aws-cdk/cx-api/lib/features.ts index 645ca1d9fb291..70dfce119e15f 100644 --- a/packages/@aws-cdk/cx-api/lib/features.ts +++ b/packages/@aws-cdk/cx-api/lib/features.ts @@ -213,17 +213,17 @@ export const FUTURE_FLAGS_EXPIRED: string[] = [ */ const FUTURE_FLAGS_DEFAULTS: { [key: string]: boolean } = { [APIGATEWAY_USAGEPLANKEY_ORDERINSENSITIVE_ID]: true, - [ENABLE_STACK_NAME_DUPLICATES_CONTEXT]: false, - [ENABLE_DIFF_NO_FAIL_CONTEXT]: false, + [ENABLE_STACK_NAME_DUPLICATES_CONTEXT]: true, + [ENABLE_DIFF_NO_FAIL_CONTEXT]: true, [STACK_RELATIVE_EXPORTS_CONTEXT]: true, [NEW_STYLE_STACK_SYNTHESIS_CONTEXT]: true, - [DOCKER_IGNORE_SUPPORT]: false, - [SECRETS_MANAGER_PARSE_OWNED_SECRET_NAME]: false, - [KMS_DEFAULT_KEY_POLICIES]: false, - [S3_GRANT_WRITE_WITHOUT_ACL]: false, - [ECS_REMOVE_DEFAULT_DESIRED_COUNT]: false, + [DOCKER_IGNORE_SUPPORT]: true, + [SECRETS_MANAGER_PARSE_OWNED_SECRET_NAME]: true, + [KMS_DEFAULT_KEY_POLICIES]: true, + [S3_GRANT_WRITE_WITHOUT_ACL]: true, + [ECS_REMOVE_DEFAULT_DESIRED_COUNT]: true, [RDS_LOWERCASE_DB_IDENTIFIER]: true, - [EFS_DEFAULT_ENCRYPTION_AT_REST]: false, + [EFS_DEFAULT_ENCRYPTION_AT_REST]: true, [LAMBDA_RECOGNIZE_VERSION_PROPS]: false, [CLOUDFRONT_DEFAULT_SECURITY_POLICY_TLS_V1_2_2021]: true, }; diff --git a/packages/aws-cdk/bin/cdk.ts b/packages/aws-cdk/bin/cdk.ts index 3f90dfc8ff3e2..b119907ba94e2 100644 --- a/packages/aws-cdk/bin/cdk.ts +++ b/packages/aws-cdk/bin/cdk.ts @@ -479,7 +479,10 @@ function determineV2BootstrapSource(args: { template?: string }): BootstrapSourc } function isFeatureEnabled(configuration: Configuration, featureFlag: string) { - return configuration.context.get(featureFlag) ?? cxapi.futureFlagDefault(featureFlag); + const context = configuration.context.get(featureFlag); + return cxapi.FUTURE_FLAGS_EXPIRED.includes(featureFlag) + ? true + : context ?? cxapi.futureFlagDefault(featureFlag); } /**