Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(lambda): updating addToRolePolicy to avoid circular dependency potential (under feature flag) #33291

Merged
merged 55 commits into from
Feb 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
bbb9d62
fix(lambda): updating addToRolePolicy to avoid circular dependency po…
Feb 1, 2025
80829b1
Merge branch 'aws:main' into circularLambdaCognitoFix
IkeNefcy Feb 1, 2025
2948650
fix:adding dedupe mechanism. Altering integs again
Feb 1, 2025
d06f012
fix: updated certificatemanager integ
Feb 2, 2025
3664a8d
fix: updating a bunch more integs
Feb 3, 2025
c885c2a
fix: updating assets, fixing alpha integ
Feb 3, 2025
1478dbc
fix: more integs
Feb 3, 2025
acc49d8
fix: editing more tests to match
Feb 3, 2025
74ecb57
fix: more integs
Feb 3, 2025
46c6208
Merge branch 'aws:main' into circularLambdaCognitoFix
IkeNefcy Feb 3, 2025
b9cb066
fix: reverting zip name
Feb 3, 2025
717eb4d
fix: wrong one
Feb 3, 2025
a08043a
fix: asset cleanup
Feb 3, 2025
eb9b9e4
fix: reverting name
Feb 3, 2025
00cfec0
fix: rename
Feb 4, 2025
acb15dd
Merge branch 'main' into circularLambdaCognitoFix
IkeNefcy Feb 4, 2025
dd7f677
Merge branch 'main' into circularLambdaCognitoFix
IkeNefcy Feb 4, 2025
0e5e67e
Merge remote-tracking branch 'origin/main' into circularLambdaCognitoFix
Feb 6, 2025
c458e3b
Merge remote-tracking branch 'origin/main' into circularLambdaCognitoFix
Feb 6, 2025
fc0f058
Merge branch 'aws:main' into circularLambdaCognitoFix
IkeNefcy Feb 6, 2025
6625f9e
fix: integ updates
Feb 6, 2025
137e5ca
fix: alpha integ updates
Feb 6, 2025
81c795c
Merge branch 'main' into circularLambdaCognitoFix
IkeNefcy Feb 7, 2025
8aeb2b4
Merge branch 'main' into circularLambdaCognitoFix
IkeNefcy Feb 7, 2025
73a7e98
Merge branch 'main' into circularLambdaCognitoFix
IkeNefcy Feb 11, 2025
883f4c1
feat: updating all tests with feature flag
Feb 11, 2025
197f6c0
fix: updating alpha integs
Feb 11, 2025
a64cb4d
fix: missed comment space
Feb 11, 2025
3eb09e4
fix: did not mean to shift this out of the default tests
Feb 11, 2025
b051e21
fix: rebuilding alpha integs again
Feb 11, 2025
732a0d1
fix: adding stragler file
Feb 11, 2025
5643825
Merge branch 'main' into circularLambdaCognitoFix
IkeNefcy Feb 11, 2025
7472247
fix: more integ adjustments
Feb 12, 2025
9329977
Merge remote-tracking branch 'origin/main' into circularLambdaCognitoFix
Feb 12, 2025
813b03a
fix: integ adjustments
Feb 12, 2025
a4131fd
fix: integs from conflicts
Feb 12, 2025
dd54398
Merge branch 'main' into circularLambdaCognitoFix
IkeNefcy Feb 13, 2025
d8657af
Merge branch 'main' into circularLambdaCognitoFix
IkeNefcy Feb 13, 2025
e2005b8
fix: more integ updates from conflict merge
Feb 13, 2025
234ab3e
fix: integ update
Feb 14, 2025
fe05af1
Merge branch 'main' into circularLambdaCognitoFix
IkeNefcy Feb 14, 2025
5c02859
fix: altering asset format
Feb 14, 2025
5c4769f
fix: ??
Feb 14, 2025
94d4519
fix: removing trailing return line
Feb 14, 2025
fc01df5
fix: this space is literally in the current cdk integ that is live, b…
Feb 14, 2025
00636bb
fix: who knows anymore
Feb 14, 2025
4f869f6
fix: adding tab space
Feb 15, 2025
1a21351
fix: another attempt
Feb 15, 2025
5ef1b10
Merge branch 'main' into circularLambdaCognitoFix
IkeNefcy Feb 15, 2025
fc9032b
Merge branch 'main' into circularLambdaCognitoFix
IkeNefcy Feb 18, 2025
eba9198
Merge branch 'main' into circularLambdaCognitoFix
QuantumNeuralCoder Feb 18, 2025
52eb436
Merge branch 'main' into circularLambdaCognitoFix
QuantumNeuralCoder Feb 18, 2025
4a4f9af
Merge branch 'main' into circularLambdaCognitoFix
QuantumNeuralCoder Feb 18, 2025
224a738
fix: removing left over doc folders from tests
Feb 19, 2025
2bfe918
Merge branch 'main' into circularLambdaCognitoFix
mergify[bot] Feb 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -1030,54 +1030,6 @@
"Vpc1IsolatedSubnet2RouteTableAssociation6394B926"
]
},
"TestFunction0ServiceRoleDefaultPolicy02794024": {
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": "execute-api:Invoke",
"Effect": "Allow",
"Resource": {
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":execute-api:",
{
"Ref": "AWS::Region"
},
":",
{
"Ref": "AWS::AccountId"
},
":",
{
"Ref": "ApiF70053CD"
},
"/*/*/*"
]
]
}
}
],
"Version": "2012-10-17"
},
"PolicyName": "TestFunction0ServiceRoleDefaultPolicy02794024",
"Roles": [
{
"Ref": "TestFunction0ServiceRoleD0765191"
}
]
},
"DependsOn": [
"Vpc1IsolatedSubnet1RouteTableAssociation5CB6A296",
"Vpc1IsolatedSubnet2RouteTableAssociation6394B926"
]
},
"TestFunction0SecurityGroup749DC118": {
"Type": "AWS::EC2::SecurityGroup",
"Properties": {
Expand Down Expand Up @@ -1160,12 +1112,59 @@
}
},
"DependsOn": [
"TestFunction0ServiceRoleDefaultPolicy02794024",
"TestFunction0ServiceRoleD0765191",
"Vpc1IsolatedSubnet1RouteTableAssociation5CB6A296",
"Vpc1IsolatedSubnet2RouteTableAssociation6394B926"
]
},
"TestFunction0inlinePolicyAddedToExecutionRole00B5803B5": {
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": "execute-api:Invoke",
"Effect": "Allow",
"Resource": {
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":execute-api:",
{
"Ref": "AWS::Region"
},
":",
{
"Ref": "AWS::AccountId"
},
":",
{
"Ref": "ApiF70053CD"
},
"/*/*/*"
]
]
}
}
],
"Version": "2012-10-17"
},
"PolicyName": "TestFunction0inlinePolicyAddedToExecutionRole00B5803B5",
"Roles": [
{
"Ref": "TestFunction0ServiceRoleD0765191"
}
]
},
"DependsOn": [
"Vpc1IsolatedSubnet1RouteTableAssociation5CB6A296",
"Vpc1IsolatedSubnet2RouteTableAssociation6394B926"
]
},
"TestFunction1ServiceRoleFF9BD7F5": {
"Type": "AWS::IAM::Role",
"Properties": {
Expand Down Expand Up @@ -1213,54 +1212,6 @@
"Vpc2IsolatedSubnet2RouteTableAssociation0186F707"
]
},
"TestFunction1ServiceRoleDefaultPolicyEA6A8ACA": {
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": "execute-api:Invoke",
"Effect": "Allow",
"Resource": {
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":execute-api:",
{
"Ref": "AWS::Region"
},
":",
{
"Ref": "AWS::AccountId"
},
":",
{
"Ref": "ApiF70053CD"
},
"/*/*/*"
]
]
}
}
],
"Version": "2012-10-17"
},
"PolicyName": "TestFunction1ServiceRoleDefaultPolicyEA6A8ACA",
"Roles": [
{
"Ref": "TestFunction1ServiceRoleFF9BD7F5"
}
]
},
"DependsOn": [
"Vpc2IsolatedSubnet1RouteTableAssociation4E22797D",
"Vpc2IsolatedSubnet2RouteTableAssociation0186F707"
]
},
"TestFunction1SecurityGroup263EDDE5": {
"Type": "AWS::EC2::SecurityGroup",
"Properties": {
Expand Down Expand Up @@ -1343,11 +1294,58 @@
}
},
"DependsOn": [
"TestFunction1ServiceRoleDefaultPolicyEA6A8ACA",
"TestFunction1ServiceRoleFF9BD7F5",
"Vpc2IsolatedSubnet1RouteTableAssociation4E22797D",
"Vpc2IsolatedSubnet2RouteTableAssociation0186F707"
]
},
"TestFunction1inlinePolicyAddedToExecutionRole054C03DAF": {
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": "execute-api:Invoke",
"Effect": "Allow",
"Resource": {
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":execute-api:",
{
"Ref": "AWS::Region"
},
":",
{
"Ref": "AWS::AccountId"
},
":",
{
"Ref": "ApiF70053CD"
},
"/*/*/*"
]
]
}
}
],
"Version": "2012-10-17"
},
"PolicyName": "TestFunction1inlinePolicyAddedToExecutionRole054C03DAF",
"Roles": [
{
"Ref": "TestFunction1ServiceRoleFF9BD7F5"
}
]
},
"DependsOn": [
"Vpc2IsolatedSubnet1RouteTableAssociation4E22797D",
"Vpc2IsolatedSubnet2RouteTableAssociation0186F707"
]
}
},
"Outputs": {
Expand Down
Loading