Skip to content

Commit 539d036

Browse files
authored
2 parents c96c17d + 2cd4582 commit 539d036

10 files changed

+23
-40
lines changed

CHANGELOG.v2.alpha.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
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.
44

5+
## [2.66.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.66.0-alpha.0...v2.66.1-alpha.0) (2023-02-23)
6+
57
## [2.66.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.65.0-alpha.0...v2.66.0-alpha.0) (2023-02-21)
68

79

CHANGELOG.v2.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
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.
44

5+
## [2.66.1](https://github.com/aws/aws-cdk/compare/v2.66.0...v2.66.1) (2023-02-23)
6+
7+
8+
### Bug Fixes
9+
10+
* Correct SamlConsolePrincipal for non-China ([#24277](https://github.com/aws/aws-cdk/issues/24277)) ([d562871](https://github.com/aws/aws-cdk/commit/d562871824350483e80bf6a28868280381e9e83e)), closes [#24243](https://github.com/aws/aws-cdk/issues/24243)
11+
512
## [2.66.0](https://github.com/aws/aws-cdk/compare/v2.65.0...v2.66.0) (2023-02-21)
613

714

packages/@aws-cdk/aws-iam/lib/principals.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ export class SamlConsolePrincipal extends SamlPrincipal {
737737
super(samlProvider, {
738738
...conditions,
739739
StringEquals: {
740-
'SAML:aud': cdk.Aws.PARTITION==='aws-cn'? 'https://signin.amazonaws.cn/saml': `https://signin.${cdk.Aws.URL_SUFFIX}/saml`,
740+
'SAML:aud': cdk.Aws.PARTITION==='aws-cn'? 'https://signin.amazonaws.cn/saml': 'https://signin.aws.amazon.com/saml',
741741
},
742742
});
743743
}

packages/@aws-cdk/aws-iam/test/integ.saml-provider.js.snapshot/cdk-saml-provider.assets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"version": "30.0.0",
33
"files": {
4-
"adc0eedec883653ef9cbd8c66ae68791bf952df8f678cf586e78e02997e2674c": {
4+
"3b60cda5eb73f658ff1ab1a242bd0e399cc5307d4d6493cea0171e543c6f1cc8": {
55
"source": {
66
"path": "cdk-saml-provider.template.json",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "adc0eedec883653ef9cbd8c66ae68791bf952df8f678cf586e78e02997e2674c.json",
12+
"objectKey": "3b60cda5eb73f658ff1ab1a242bd0e399cc5307d4d6493cea0171e543c6f1cc8.json",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}

packages/@aws-cdk/aws-iam/test/integ.saml-provider.js.snapshot/cdk-saml-provider.template.json

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,7 @@
1515
"Action": "sts:AssumeRoleWithSAML",
1616
"Condition": {
1717
"StringEquals": {
18-
"SAML:aud": {
19-
"Fn::Join": [
20-
"",
21-
[
22-
"https://signin.",
23-
{
24-
"Ref": "AWS::URLSuffix"
25-
},
26-
"/saml"
27-
]
28-
]
29-
}
18+
"SAML:aud": "https://signin.aws.amazon.com/saml"
3019
}
3120
},
3221
"Effect": "Allow",
@@ -38,8 +27,7 @@
3827
}
3928
],
4029
"Version": "2012-10-17"
41-
},
42-
"Description": "fix the partition issue"
30+
}
4331
}
4432
}
4533
},

packages/@aws-cdk/aws-iam/test/integ.saml-provider.js.snapshot/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"validateOnSynth": false,
1818
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
1919
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
20-
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/adc0eedec883653ef9cbd8c66ae68791bf952df8f678cf586e78e02997e2674c.json",
20+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/3b60cda5eb73f658ff1ab1a242bd0e399cc5307d4d6493cea0171e543c6f1cc8.json",
2121
"requiresBootstrapStackVersion": 6,
2222
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
2323
"additionalDependencies": [

packages/@aws-cdk/aws-iam/test/integ.saml-provider.js.snapshot/tree.json

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,7 @@
5656
"Action": "sts:AssumeRoleWithSAML",
5757
"Condition": {
5858
"StringEquals": {
59-
"SAML:aud": {
60-
"Fn::Join": [
61-
"",
62-
[
63-
"https://signin.",
64-
{
65-
"Ref": "AWS::URLSuffix"
66-
},
67-
"/saml"
68-
]
69-
]
70-
}
59+
"SAML:aud": "https://signin.aws.amazon.com/saml"
7160
}
7261
},
7362
"Effect": "Allow",
@@ -79,8 +68,7 @@
7968
}
8069
],
8170
"Version": "2012-10-17"
82-
},
83-
"description": "fix the partition issue"
71+
}
8472
}
8573
},
8674
"constructInfo": {
@@ -129,7 +117,7 @@
129117
"path": "saml-provider-test/DefaultTest/Default",
130118
"constructInfo": {
131119
"fqn": "constructs.Construct",
132-
"version": "10.1.249"
120+
"version": "10.1.252"
133121
}
134122
},
135123
"DeployAssert": {
@@ -175,7 +163,7 @@
175163
"path": "Tree",
176164
"constructInfo": {
177165
"fqn": "constructs.Construct",
178-
"version": "10.1.249"
166+
"version": "10.1.252"
179167
}
180168
}
181169
},

packages/@aws-cdk/aws-iam/test/integ.saml-provider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/// !cdk-integ saml*
12
import * as path from 'path';
23
import { App, Stack, StackProps } from '@aws-cdk/core';
34
import { IntegTest } from '@aws-cdk/integ-tests';
@@ -14,7 +15,6 @@ class TestStack extends Stack {
1415

1516
new iam.Role(this, 'Role', {
1617
assumedBy: new iam.SamlConsolePrincipal(provider),
17-
description: 'fix the partition issue',
1818
});
1919
}
2020
}

packages/@aws-cdk/aws-iam/test/principals.test.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,7 @@ test('SAML principal', () => {
166166
Action: 'sts:AssumeRoleWithSAML',
167167
Condition: {
168168
StringEquals: {
169-
'SAML:aud': {
170-
'Fn::Join': ['', ['https://signin.', { Ref: 'AWS::URLSuffix' }, '/saml']],
171-
},
169+
'SAML:aud': 'https://signin.aws.amazon.com/saml',
172170
},
173171
},
174172
Effect: 'Allow',

version.v2.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"version": "2.66.0",
3-
"alphaVersion": "2.66.0-alpha.0"
2+
"version": "2.66.1",
3+
"alphaVersion": "2.66.1-alpha.0"
44
}

0 commit comments

Comments
 (0)