Skip to content

Commit ac3eadc

Browse files
authored
chore(deps): update integ runner and cloud assembly versions to include docker build context (#37350)
### Issue # (if applicable) References #31598 ### Reason for this change Splitting dependency updates out of #36930 ### Description of changes Update the following dependencies: - @aws-cdk/integ-runner: ^2.196.1 -> ^2.197.1 - @aws-cdk/cloud-assembly-api: ^2.1.1 -> ^2.2.0 - @aws-cdk/cloud-assembly-schema: ^52.1.0 -> ^53.0.0 - yarn.lock transitive dependency updates Fix the integration tests due to the update. Details below from our friend Kiro: > The PR that introduced the @aws-cdk/aws-eks:useNativeOidcProvider feature flag is #36589 > This PR added the EKS_USE_NATIVE_OIDC_PROVIDER flag with `recommendedValue: true`. Because it's a recommended flag, it was automatically included in the `@aws-cdk/integ-runner`'s auto-generated `recommended-feature-flags.json` when the integ-runner was built against a version of aws-cdk-lib containing this change. This is why `@aws-cdk/integ-runner@2.197.1` includes the flag but `@aws-cdk/integ-runner@2.196.1` does not — `v2.197.1` was the first integ-runner release built after PR #36589 was merged. ### Describe any new or updated permissions being added None ### Description of how you validated changes #36930 ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 293ce90 commit ac3eadc

File tree

56 files changed

+111
-85
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+111
-85
lines changed

packages/@aws-cdk-testing/framework-integ/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"license": "Apache-2.0",
3131
"devDependencies": {
3232
"@aws-cdk/cdk-build-tools": "0.0.0",
33-
"@aws-cdk/integ-runner": "^2.196.1",
33+
"@aws-cdk/integ-runner": "^2.197.1",
3434
"@aws-cdk/pkglint": "0.0.0",
3535
"@aws-sdk/client-acm": "3.632.0",
3636
"@aws-sdk/client-ec2": "3.632.0",

packages/@aws-cdk-testing/framework-integ/test/aws-eks-v2/test/integ.alb-controller.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as integ from '@aws-cdk/integ-tests-alpha';
33
import { KubectlV33Layer } from '@aws-cdk/lambda-layer-kubectl-v33';
44
import { App, CfnOutput, Duration, Stack } from 'aws-cdk-lib';
55
import * as ec2 from 'aws-cdk-lib/aws-ec2';
6-
import { IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS } from 'aws-cdk-lib/cx-api';
6+
import { EKS_USE_NATIVE_OIDC_PROVIDER, IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS } from 'aws-cdk-lib/cx-api';
77
import * as cdk8s from 'cdk8s';
88
import * as kplus from 'cdk8s-plus-27';
99
import * as eks from 'aws-cdk-lib/aws-eks-v2';
@@ -77,6 +77,7 @@ class EksClusterAlbControllerStack extends Stack {
7777
const app = new App({
7878
postCliContext: {
7979
[IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS]: false,
80+
[EKS_USE_NATIVE_OIDC_PROVIDER]: false,
8081
'@aws-cdk/aws-lambda:createNewPoliciesWithAddToRolePolicy': true,
8182
'@aws-cdk/aws-lambda:useCdkManagedLogGroup': false,
8283
},

packages/@aws-cdk-testing/framework-integ/test/aws-eks-v2/test/integ.eks-cluster-imported.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
aws_ec2 as ec2,
1313
} from 'aws-cdk-lib';
1414
import { Asset } from 'aws-cdk-lib/aws-s3-assets';
15-
import { IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS } from 'aws-cdk-lib/cx-api';
15+
import { EKS_USE_NATIVE_OIDC_PROVIDER, IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS } from 'aws-cdk-lib/cx-api';
1616
import * as cdk8s from 'cdk8s';
1717
import * as kplus from 'cdk8s-plus-27';
1818
import type * as constructs from 'constructs';
@@ -221,6 +221,7 @@ class EksClusterStack extends Stack {
221221
const app = new App({
222222
postCliContext: {
223223
[IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS]: false,
224+
[EKS_USE_NATIVE_OIDC_PROVIDER]: false,
224225
'@aws-cdk/aws-lambda:createNewPoliciesWithAddToRolePolicy': true,
225226
'@aws-cdk/aws-lambda:useCdkManagedLogGroup': false,
226227
},

packages/@aws-cdk-testing/framework-integ/test/aws-eks-v2/test/integ.eks-cluster-removal-policy.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import * as integ from '@aws-cdk/integ-tests-alpha';
33
import { KubectlV32Layer } from '@aws-cdk/lambda-layer-kubectl-v32';
44
import type { StackProps } from 'aws-cdk-lib';
55
import { App, RemovalPolicy, Stack } from 'aws-cdk-lib';
6+
import { EKS_USE_NATIVE_OIDC_PROVIDER } from 'aws-cdk-lib/cx-api';
67
import * as ec2 from 'aws-cdk-lib/aws-ec2';
78
import * as eks from 'aws-cdk-lib/aws-eks-v2';
89

@@ -129,7 +130,11 @@ class EksClusterRemovalPolicyStack extends Stack {
129130
}
130131
}
131132

132-
const app = new App();
133+
const app = new App({
134+
postCliContext: {
135+
[EKS_USE_NATIVE_OIDC_PROVIDER]: false,
136+
},
137+
});
133138

134139
const stack = new EksClusterRemovalPolicyStack(app, 'EksClusterV2RemovalPolicyStack');
135140

packages/@aws-cdk-testing/framework-integ/test/aws-eks-v2/test/integ.eks-cluster.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { App, CfnOutput, Duration, Token, Fn, Stack } from 'aws-cdk-lib';
77
import * as ec2 from 'aws-cdk-lib/aws-ec2';
88
import * as kms from 'aws-cdk-lib/aws-kms';
99
import { Asset } from 'aws-cdk-lib/aws-s3-assets';
10-
import { IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS } from 'aws-cdk-lib/cx-api';
10+
import { EKS_USE_NATIVE_OIDC_PROVIDER, IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS } from 'aws-cdk-lib/cx-api';
1111
import * as cdk8s from 'cdk8s';
1212
import * as kplus from 'cdk8s-plus-27';
1313
import type * as constructs from 'constructs';
@@ -359,6 +359,7 @@ const supportedRegions = [
359359
const app = new App({
360360
postCliContext: {
361361
[IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS]: false,
362+
[EKS_USE_NATIVE_OIDC_PROVIDER]: false,
362363
'@aws-cdk/aws-lambda:createNewPoliciesWithAddToRolePolicy': true,
363364
'@aws-cdk/aws-lambda:useCdkManagedLogGroup': false,
364365
},

packages/@aws-cdk-testing/framework-integ/test/aws-eks-v2/test/integ.eks-helm-asset.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import * as path from 'path';
33
import * as integ from '@aws-cdk/integ-tests-alpha';
44
import { App, Stack } from 'aws-cdk-lib';
5+
import { EKS_USE_NATIVE_OIDC_PROVIDER } from 'aws-cdk-lib/cx-api';
56
import * as ec2 from 'aws-cdk-lib/aws-ec2';
67
import * as iam from 'aws-cdk-lib/aws-iam';
78
import { Asset } from 'aws-cdk-lib/aws-s3-assets';
@@ -130,6 +131,7 @@ class EksClusterStack extends Stack {
130131

131132
const app = new App({
132133
postCliContext: {
134+
[EKS_USE_NATIVE_OIDC_PROVIDER]: false,
133135
'@aws-cdk/aws-lambda:createNewPoliciesWithAddToRolePolicy': true,
134136
'@aws-cdk/aws-lambda:useCdkManagedLogGroup': false,
135137
},

packages/@aws-cdk-testing/framework-integ/test/aws-eks-v2/test/integ.eks-inference-nodegroup.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as integ from '@aws-cdk/integ-tests-alpha';
33
import { KubectlV32Layer } from '@aws-cdk/lambda-layer-kubectl-v32';
44
import { App, Stack } from 'aws-cdk-lib';
55
import * as ec2 from 'aws-cdk-lib/aws-ec2';
6-
import { IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS } from 'aws-cdk-lib/cx-api';
6+
import { EKS_USE_NATIVE_OIDC_PROVIDER, IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS } from 'aws-cdk-lib/cx-api';
77
import * as eks from 'aws-cdk-lib/aws-eks-v2';
88

99
class EksClusterInferenceStack extends Stack {
@@ -38,6 +38,7 @@ class EksClusterInferenceStack extends Stack {
3838
const app = new App({
3939
postCliContext: {
4040
[IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS]: false,
41+
[EKS_USE_NATIVE_OIDC_PROVIDER]: false,
4142
'@aws-cdk/aws-lambda:createNewPoliciesWithAddToRolePolicy': true,
4243
'@aws-cdk/aws-lambda:useCdkManagedLogGroup': false,
4344
},

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller-authapi.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
import * as eks from 'aws-cdk-lib/aws-eks';
88
import { getClusterVersionConfig } from './integ-tests-kubernetes-version';
99
import { IntegTest } from '@aws-cdk/integ-tests-alpha';
10-
import { IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS } from 'aws-cdk-lib/cx-api';
10+
import { EKS_USE_NATIVE_OIDC_PROVIDER, IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS } from 'aws-cdk-lib/cx-api';
1111

1212
class EksClusterStack extends Stack {
1313
constructor(scope: App, id: string, props?: StackProps) {
@@ -34,6 +34,7 @@ const app = new App({
3434
postCliContext: {
3535
'@aws-cdk/aws-lambda:useCdkManagedLogGroup': false,
3636
[IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS]: false,
37+
[EKS_USE_NATIVE_OIDC_PROVIDER]: false,
3738
'@aws-cdk/aws-lambda:createNewPoliciesWithAddToRolePolicy': false,
3839
},
3940
});

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import * as kplus from 'cdk8s-plus-27';
77
import { getClusterVersionConfig } from './integ-tests-kubernetes-version';
88
import { Pinger } from './pinger/pinger';
99
import * as eks from 'aws-cdk-lib/aws-eks';
10-
import { IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS } from 'aws-cdk-lib/cx-api';
10+
import { EKS_USE_NATIVE_OIDC_PROVIDER, IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS } from 'aws-cdk-lib/cx-api';
1111

1212
const LATEST_VERSION: eks.AlbControllerVersion = eks.AlbControllerVersion.V2_8_2;
1313
class EksClusterAlbControllerStack extends Stack {
@@ -75,6 +75,7 @@ const app = new App({
7575
postCliContext: {
7676
'@aws-cdk/aws-lambda:useCdkManagedLogGroup': false,
7777
[IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS]: false,
78+
[EKS_USE_NATIVE_OIDC_PROVIDER]: false,
7879
'@aws-cdk/aws-lambda:createNewPoliciesWithAddToRolePolicy': false,
7980
},
8081
});

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import * as eks from 'aws-cdk-lib/aws-eks';
1717
import * as cdk8s from 'cdk8s';
1818
import * as kplus from 'cdk8s-plus-27';
1919
import type * as constructs from 'constructs';
20-
import { IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS } from 'aws-cdk-lib/cx-api';
20+
import { EKS_USE_NATIVE_OIDC_PROVIDER, IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS } from 'aws-cdk-lib/cx-api';
2121

2222
class EksClusterStack extends Stack {
2323
private cluster: eks.Cluster;
@@ -218,6 +218,7 @@ const app = new App({
218218
postCliContext: {
219219
'@aws-cdk/aws-lambda:useCdkManagedLogGroup': false,
220220
[IAM_OIDC_REJECT_UNAUTHORIZED_CONNECTIONS]: false,
221+
[EKS_USE_NATIVE_OIDC_PROVIDER]: false,
221222
'@aws-cdk/aws-lambda:createNewPoliciesWithAddToRolePolicy': false,
222223
},
223224
});

0 commit comments

Comments
 (0)