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

feat(ecs): enable alarm-based rollbacks #25840

Merged
merged 46 commits into from
Jul 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
90d1ac0
fix: Correct SamlConsolePrincipal for non-China (#24277)
Naumel Feb 22, 2023
5734dc2
Merge remote-tracking branch 'upstream/main'
homakk Mar 28, 2023
d0af953
Merge remote-tracking branch 'upstream/main'
homakk Mar 30, 2023
8c0a1c5
Merge remote-tracking branch 'upstream/main'
homakk Mar 31, 2023
fd57a57
entire alarm based rollback task into single commit
homakk Mar 28, 2023
21a3b7d
Merge remote-tracking branch 'upstream/main'
homakk Apr 3, 2023
b0bdeb9
Merge remote-tracking branch 'upstream/main'
homakk Apr 4, 2023
649c1cd
Merged from main
homakk Apr 4, 2023
78f63ee
resolving merge conflicts
homakk Apr 5, 2023
edfa290
Merge remote-tracking branch 'upstream/main'
homakk Apr 5, 2023
2f8915b
Merge branch 'main' into alarambasedrollback
homakk Apr 5, 2023
9d531df
integ files modules updated to resolve merge conflicts
homakk Apr 5, 2023
94b6ba8
Merge branch 'main' into alarambasedrollback
homakk Apr 5, 2023
6d24118
Merge remote-tracking branch 'upstream/main'
homakk Apr 6, 2023
5630657
Merge branch 'main' into alarambasedrollback
homakk Apr 6, 2023
113a350
Merge remote-tracking branch 'upstream/main'
homakk Apr 7, 2023
00cdab0
Merge branch 'main' into alarambasedrollback
homakk Apr 7, 2023
0c80cbd
regarding merge conflicts issue
homakk Apr 7, 2023
cc0dd6c
integ files import changes for merge conflicts
homakk Apr 7, 2023
92cda6b
Merge remote-tracking branch 'upstream/main'
homakk Apr 10, 2023
cc35804
Merge remote-tracking branch 'upstream/main'
homakk Apr 11, 2023
62a4c52
Merge remote-tracking branch 'upstream/main'
homakk Apr 13, 2023
6cf3a22
Merge branch 'main' into alarambasedrollback
homakk Apr 13, 2023
57bfbe6
Merge remote-tracking branch 'upstream/main'
homakk Apr 14, 2023
d7d29b3
Merge branch 'main' into alarambasedrollback
homakk Apr 14, 2023
6a237bb
adding this change for PR not to abondended
homakk Apr 20, 2023
58163f0
Merge remote-tracking branch 'upstream/main'
homakk Apr 20, 2023
e3e7772
Merge branch 'main' into alarambasedrollback
homakk Apr 20, 2023
3acfb15
chore: refactor createAlarm & remove unnecessary unit tests
bvtujo May 10, 2023
fd94df4
chore: fix api but failing unit tests
bvtujo May 17, 2023
dfcd539
chore: fix validation
bvtujo May 17, 2023
4ed03fa
chore: readme changes
bvtujo May 18, 2023
22bdcda
chore: fix integ test, remove unnecessary ec2 test
bvtujo May 19, 2023
a21b5b0
chore: refactor enableAlarms for clarity
bvtujo May 19, 2023
cad3fd2
test: fix integ test, finally
bvtujo May 19, 2023
bae8694
docs: update docstrings for new props and methods
bvtujo May 19, 2023
8017b6f
PR feedback
madeline-k Jun 12, 2023
03fd5e7
update integration tests
madeline-k Jun 26, 2023
30d4c28
test: update patterns integ tests to include deployment alarms
bvtujo Jul 3, 2023
3f56b6f
chore: add aws-cn to list of unsupported partitions
bvtujo Jul 3, 2023
58c1545
Merge branch 'main' into alarm-based-rollback
bvtujo Jul 3, 2023
a9ab90a
test: regenerate snapshots for bad asset shas
bvtujo Jul 3, 2023
fd83ae7
chore: fix govcloud test:
bvtujo Jul 3, 2023
03919ff
Merge branch 'main' into alarm-based-rollback
madeline-k Jul 5, 2023
2cdaadf
Apply suggestions from code review
madeline-k Jul 5, 2023
644c468
chore: update snapshots of failing integ tests to use deployment alarms
bvtujo Jul 5, 2023
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
  •  
  •  
  •  
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "21.0.0",
"version": "32.0.0",
"files": {
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
"source": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "21.0.0",
"version": "32.0.0",
"files": {
"8058932a68b7558432685502c7b88e62d0ce087e3a6648b189ef5cda358e4f75": {
"146a3a0178544a80f025b470e820a77ec783a43b2a5ae0a2590037423ed16a6b": {
"source": {
"path": "aws-cdk-codedeploy-ecs-dg.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "8058932a68b7558432685502c7b88e62d0ce087e3a6648b189ef5cda358e4f75.json",
"objectKey": "146a3a0178544a80f025b470e820a77ec783a43b2a5ae0a2590037423ed16a6b.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,11 @@
"Ref": "EcsCluster97242B84"
},
"DeploymentConfiguration": {
"Alarms": {
"AlarmNames": [],
"Enable": false,
"Rollback": false
},
"MaximumPercent": 200,
"MinimumHealthyPercent": 50
},
Expand Down Expand Up @@ -1091,15 +1096,6 @@
}
}
},
"BlueGreenDGApplication3649479D": {
"Type": "AWS::CodeDeploy::Application",
"Properties": {
"ComputePlatform": "ECS"
},
"DependsOn": [
"CanaryConfig039778DD"
]
},
"BlueGreenDGServiceRole33E3BCAC": {
"Type": "AWS::IAM::Role",
"Properties": {
Expand Down Expand Up @@ -1134,6 +1130,15 @@
"CanaryConfig039778DD"
]
},
"BlueGreenDGApplication3649479D": {
"Type": "AWS::CodeDeploy::Application",
"Properties": {
"ComputePlatform": "ECS"
},
"DependsOn": [
"CanaryConfig039778DD"
]
},
"BlueGreenDG373AB9B0": {
"Type": "AWS::CodeDeploy::DeploymentGroup",
"Properties": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"21.0.0"}
{"version":"32.0.0"}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "21.0.0",
"version": "32.0.0",
"testCases": {
"EcsDeploymentGroupTest/DefaultTest": {
"stacks": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "21.0.0",
"version": "32.0.0",
"artifacts": {
"aws-cdk-codedeploy-ecs-dg.assets": {
"type": "cdk:asset-manifest",
Expand All @@ -17,7 +17,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/8058932a68b7558432685502c7b88e62d0ce087e3a6648b189ef5cda358e4f75.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/146a3a0178544a80f025b470e820a77ec783a43b2a5ae0a2590037423ed16a6b.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down Expand Up @@ -291,16 +291,16 @@
"data": "CanaryConfig039778DD"
}
],
"/aws-cdk-codedeploy-ecs-dg/BlueGreenDG/Application/Resource": [
"/aws-cdk-codedeploy-ecs-dg/BlueGreenDG/ServiceRole/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "BlueGreenDGApplication3649479D"
"data": "BlueGreenDGServiceRole33E3BCAC"
}
],
"/aws-cdk-codedeploy-ecs-dg/BlueGreenDG/ServiceRole/Resource": [
"/aws-cdk-codedeploy-ecs-dg/BlueGreenDG/Application/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "BlueGreenDGServiceRole33E3BCAC"
"data": "BlueGreenDGApplication3649479D"
}
],
"/aws-cdk-codedeploy-ecs-dg/BlueGreenDG/Resource": [
Expand Down
Loading
Loading