Skip to content

Commit db6e2ac

Browse files
schuettcschuettc
authored
fix: update docker build version (#38)
1 parent 23f2cda commit db6e2ac

File tree

8 files changed

+92
-772
lines changed

8 files changed

+92
-772
lines changed

‎deployment/infrastructure/bedrock-auth-auth0.yaml‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,10 @@ Parameters:
4949
- 'false'
5050
Description: Enable CloudWatch monitoring for Bedrock usage
5151

52-
EnableSessionTags:
53-
Type: String
54-
Default: 'true'
55-
AllowedValues:
56-
- 'true'
57-
- 'false'
58-
Description: Enable session tags for enhanced security and tracking
59-
6052
Conditions:
6153
UseDirectIAM: !Equals [!Ref FederationType, direct]
6254
UseCognitoIdentity: !Equals [!Ref FederationType, cognito]
6355
MonitoringEnabled: !Equals [!Ref EnableMonitoring, 'true']
64-
SessionTagsEnabled: !Equals [!Ref EnableSessionTags, 'true']
6556

6657
Resources:
6758
# ===============================================
@@ -177,10 +168,7 @@ Resources:
177168
Federated: !GetAtt Auth0OIDCProvider.Arn
178169
Action:
179170
- 'sts:AssumeRoleWithWebIdentity'
180-
- !If
181-
- SessionTagsEnabled
182-
- 'sts:TagSession'
183-
- !Ref 'AWS::NoValue'
171+
- 'sts:TagSession'
184172
ManagedPolicyArns:
185173
- !Ref BedrockAccessPolicy
186174
Tags:
@@ -272,6 +260,20 @@ Resources:
272260
authenticated: !GetAtt CognitoAuthenticatedRole.Arn
273261
unauthenticated: !GetAtt CognitoUnauthenticatedRole.Arn
274262

263+
# Principal Tag Mapping for Session Tags
264+
IdentityPoolPrincipalTag:
265+
Type: AWS::Cognito::IdentityPoolPrincipalTag
266+
Condition: UseCognitoIdentity
267+
DeletionPolicy: Delete
268+
Properties:
269+
IdentityPoolId: !Ref CognitoIdentityPool
270+
IdentityProviderName: !Ref Auth0Domain
271+
UseDefaults: false
272+
PrincipalTags:
273+
UserEmail: email
274+
UserId: sub
275+
UserName: name
276+
275277
# ===============================================
276278
# Optional Monitoring Resources
277279
# ===============================================

‎deployment/infrastructure/bedrock-auth-azure.yaml‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,10 @@ Parameters:
4949
- 'false'
5050
Description: Enable CloudWatch monitoring for Bedrock usage
5151

52-
EnableSessionTags:
53-
Type: String
54-
Default: 'true'
55-
AllowedValues:
56-
- 'true'
57-
- 'false'
58-
Description: Enable session tags for enhanced security and tracking
59-
6052
Conditions:
6153
UseDirectIAM: !Equals [!Ref FederationType, direct]
6254
UseCognitoIdentity: !Equals [!Ref FederationType, cognito]
6355
MonitoringEnabled: !Equals [!Ref EnableMonitoring, 'true']
64-
SessionTagsEnabled: !Equals [!Ref EnableSessionTags, 'true']
6556

6657
Resources:
6758
# ===============================================
@@ -177,10 +168,7 @@ Resources:
177168
Federated: !GetAtt AzureOIDCProvider.Arn
178169
Action:
179170
- 'sts:AssumeRoleWithWebIdentity'
180-
- !If
181-
- SessionTagsEnabled
182-
- 'sts:TagSession'
183-
- !Ref 'AWS::NoValue'
171+
- 'sts:TagSession'
184172
ManagedPolicyArns:
185173
- !Ref BedrockAccessPolicy
186174
Tags:
@@ -272,6 +260,20 @@ Resources:
272260
authenticated: !GetAtt CognitoAuthenticatedRole.Arn
273261
unauthenticated: !GetAtt CognitoUnauthenticatedRole.Arn
274262

263+
# Principal Tag Mapping for Session Tags
264+
IdentityPoolPrincipalTag:
265+
Type: AWS::Cognito::IdentityPoolPrincipalTag
266+
Condition: UseCognitoIdentity
267+
DeletionPolicy: Delete
268+
Properties:
269+
IdentityPoolId: !Ref CognitoIdentityPool
270+
IdentityProviderName: !Sub 'login.microsoftonline.com/${AzureTenantId}/v2.0'
271+
UseDefaults: false
272+
PrincipalTags:
273+
UserEmail: email
274+
UserId: sub
275+
UserName: name
276+
275277
# ===============================================
276278
# Optional Monitoring Resources
277279
# ===============================================

‎deployment/infrastructure/bedrock-auth-cognito-pool.yaml‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,10 @@ Parameters:
5555
- 'false'
5656
Description: Enable CloudWatch monitoring for Bedrock usage
5757

58-
EnableSessionTags:
59-
Type: String
60-
Default: 'true'
61-
AllowedValues:
62-
- 'true'
63-
- 'false'
64-
Description: Enable session tags for enhanced security and tracking
65-
6658
Conditions:
6759
UseDirectIAM: !Equals [!Ref FederationType, direct]
6860
UseCognitoIdentity: !Equals [!Ref FederationType, cognito]
6961
MonitoringEnabled: !Equals [!Ref EnableMonitoring, 'true']
70-
SessionTagsEnabled: !Equals [!Ref EnableSessionTags, 'true']
7162

7263
Resources:
7364
# ===============================================
@@ -183,10 +174,7 @@ Resources:
183174
Federated: !GetAtt CognitoUserPoolOIDCProvider.Arn
184175
Action:
185176
- 'sts:AssumeRoleWithWebIdentity'
186-
- !If
187-
- SessionTagsEnabled
188-
- 'sts:TagSession'
189-
- !Ref 'AWS::NoValue'
177+
- 'sts:TagSession'
190178
ManagedPolicyArns:
191179
- !Ref BedrockAccessPolicy
192180
Tags:
@@ -226,6 +214,7 @@ Resources:
226214
Federated: cognito-identity.amazonaws.com
227215
Action:
228216
- 'sts:AssumeRoleWithWebIdentity'
217+
- 'sts:TagSession'
229218
Condition:
230219
StringEquals:
231220
'cognito-identity.amazonaws.com:aud': !Ref CognitoIdentityPool
@@ -280,6 +269,19 @@ Resources:
280269
authenticated: !GetAtt CognitoAuthenticatedRole.Arn
281270
unauthenticated: !GetAtt CognitoUnauthenticatedRole.Arn
282271

272+
# Principal Tag Mapping for Session Tags
273+
IdentityPoolPrincipalTag:
274+
Type: AWS::Cognito::IdentityPoolPrincipalTag
275+
Condition: UseCognitoIdentity
276+
DeletionPolicy: Delete
277+
Properties:
278+
IdentityPoolId: !Ref CognitoIdentityPool
279+
IdentityProviderName: !Sub 'cognito-idp.${AWS::Region}.amazonaws.com/${CognitoUserPoolId}'
280+
UseDefaults: false
281+
PrincipalTags:
282+
UserEmail: email
283+
UserId: sub
284+
283285
# ===============================================
284286
# Optional Monitoring Resources
285287
# ===============================================

‎deployment/infrastructure/bedrock-auth-okta.yaml‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,10 @@ Parameters:
4949
- 'false'
5050
Description: Enable CloudWatch monitoring for Bedrock usage
5151

52-
EnableSessionTags:
53-
Type: String
54-
Default: 'true'
55-
AllowedValues:
56-
- 'true'
57-
- 'false'
58-
Description: Enable session tags for enhanced security and tracking
59-
6052
Conditions:
6153
UseDirectIAM: !Equals [!Ref FederationType, direct]
6254
UseCognitoIdentity: !Equals [!Ref FederationType, cognito]
6355
MonitoringEnabled: !Equals [!Ref EnableMonitoring, 'true']
64-
SessionTagsEnabled: !Equals [!Ref EnableSessionTags, 'true']
6556

6657
Resources:
6758
# ===============================================
@@ -176,10 +167,7 @@ Resources:
176167
Federated: !GetAtt OktaOIDCProvider.Arn
177168
Action:
178169
- 'sts:AssumeRoleWithWebIdentity'
179-
- !If
180-
- SessionTagsEnabled
181-
- 'sts:TagSession'
182-
- !Ref 'AWS::NoValue'
170+
- 'sts:TagSession'
183171
ManagedPolicyArns:
184172
- !Ref BedrockAccessPolicy
185173
Tags:
@@ -271,6 +259,20 @@ Resources:
271259
authenticated: !GetAtt CognitoAuthenticatedRole.Arn
272260
unauthenticated: !GetAtt CognitoUnauthenticatedRole.Arn
273261

262+
# Principal Tag Mapping for Session Tags
263+
IdentityPoolPrincipalTag:
264+
Type: AWS::Cognito::IdentityPoolPrincipalTag
265+
Condition: UseCognitoIdentity
266+
DeletionPolicy: Delete
267+
Properties:
268+
IdentityPoolId: !Ref CognitoIdentityPool
269+
IdentityProviderName: !Ref OktaDomain
270+
UseDefaults: false
271+
PrincipalTags:
272+
UserEmail: email
273+
UserId: sub
274+
UserName: name
275+
274276
# ===============================================
275277
# Optional Monitoring Resources
276278
# ===============================================

0 commit comments

Comments
 (0)