Skip to content

Fix AMI cleanup workflow to deregister AMI before deleting snapshots #238

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix AMI cleanup workflow to deregister AMI before deleting snapshots #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29ffa63
Fix AMI cleanup workflow to deregister AMI before deleting snapshots
Jun 18, 2025
8b95b27
Update snapshot test for AMI cleanup workflow changes
Jun 18, 2025
09fa879
Merge branch 'aws-samples:main' into fix/ami-cleanup-workflow
fsatsuki Jun 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
167 changes: 78 additions & 89 deletions cdk/lib/constructs/ec2-gc/sfn/asl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,103 +82,92 @@
"ProcessorConfig": {
"Mode": "INLINE"
},
"StartAt": "Parallel",
"StartAt": "Cleanup",
"States": {
"Parallel": {
"Type": "Parallel",
"Branches": [
{
"StartAt": "DeleteImageBuilderImage",
"States": {
"DeleteImageBuilderImage": {
"Type": "Task",
"Resource": "arn:aws:states:::aws-sdk:imagebuilder:deleteImage",
"Arguments": {
"ImageBuildVersionArn": "{% $states.input.Tags[Key = 'Ec2ImageBuilderArn'].Value %}"
},
"Next": "Pass",
"Catch": [
{
"ErrorEquals": [
"States.ALL"
],
"Next": "Pass"
}
]
},
"Pass": {
"Type": "Pass",
"End": true
}
}
"Cleanup": {
"Type": "Map",
"Items": "{% [$states.input] %}",
"ItemProcessor": {
"ProcessorConfig": {
"Mode": "INLINE"
},
{
"StartAt": "DeregisterImage",
"States": {
"DeregisterImage": {
"Type": "Task",
"Resource": "arn:aws:states:::aws-sdk:ec2:deregisterImage",
"Arguments": {
"ImageId": "{% $states.input.ImageId %}"
},
"Next": "Pass (1)",
"Catch": [
{
"ErrorEquals": [
"States.ALL"
],
"Next": "Pass (1)"
}
]
"StartAt": "DeleteImageBuilderImage",
"States": {
"DeleteImageBuilderImage": {
"Type": "Task",
"Resource": "arn:aws:states:::aws-sdk:imagebuilder:deleteImage",
"Arguments": {
"ImageBuildVersionArn": "{% $states.input.Tags[Key = 'Ec2ImageBuilderArn'].Value %}"
},
"Pass (1)": {
"Type": "Pass",
"End": true
}
}
},
{
"StartAt": "ProcessSnapshots",
"States": {
"ProcessSnapshots": {
"Type": "Map",
"Items": "{% [$states.input.BlockDeviceMappings[$exists(Ebs)]] %}",
"ItemProcessor": {
"ProcessorConfig": {
"Mode": "INLINE"
},
"StartAt": "DeleteSnapshotInMap",
"States": {
"DeleteSnapshotInMap": {
"Type": "Task",
"Resource": "arn:aws:states:::aws-sdk:ec2:deleteSnapshot",
"Arguments": {
"SnapshotId": "{% $states.input.Ebs.SnapshotId %}"
},
"Next": "Pass (2)",
"Catch": [
{
"ErrorEquals": [
"States.ALL"
],
"Next": "Pass (2)"
}
]
"Next": "DeregisterImage",
"Catch": [
{
"ErrorEquals": [
"States.ALL"
],
"Next": "DeregisterImage"
}
]
},
"DeregisterImage": {
"Type": "Task",
"Resource": "arn:aws:states:::aws-sdk:ec2:deregisterImage",
"Arguments": {
"ImageId": "{% $states.input.ImageId %}"
},
"Next": "ProcessSnapshots",
"Catch": [
{
"ErrorEquals": [
"States.ALL"
],
"Next": "Pass"
}
]
},
"ProcessSnapshots": {
"Type": "Map",
"Items": "{% [$states.input.BlockDeviceMappings[$exists(Ebs)]] %}",
"ItemProcessor": {
"ProcessorConfig": {
"Mode": "INLINE"
},
"StartAt": "DeleteSnapshotInMap",
"States": {
"DeleteSnapshotInMap": {
"Type": "Task",
"Resource": "arn:aws:states:::aws-sdk:ec2:deleteSnapshot",
"Arguments": {
"SnapshotId": "{% $states.input.Ebs.SnapshotId %}"
},
"Pass (2)": {
"Type": "Pass",
"End": true
}
"Next": "Pass (2)",
"Catch": [
{
"ErrorEquals": [
"States.ALL"
],
"Next": "Pass (2)"
}
]
},
"Pass (2)": {
"Type": "Pass",
"End": true
}
},
"MaxConcurrency": 5,
"End": true
}
}
},
"MaxConcurrency": 5,
"Next": "Pass"
},
"Pass": {
"Type": "Pass",
"End": true
}
}
],
},
"MaxConcurrency": 3,
"End": true
}
}}
}
},
"MaxConcurrency": 3,
Expand Down
167 changes: 78 additions & 89 deletions cdk/test/__snapshots__/cdk.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1457,103 +1457,92 @@ Remote SWE Agents Team",
"ProcessorConfig": {
"Mode": "INLINE"
},
"StartAt": "Parallel",
"StartAt": "Cleanup",
"States": {
"Parallel": {
"Type": "Parallel",
"Branches": [
{
"StartAt": "DeleteImageBuilderImage",
"States": {
"DeleteImageBuilderImage": {
"Type": "Task",
"Resource": "arn:aws:states:::aws-sdk:imagebuilder:deleteImage",
"Arguments": {
"ImageBuildVersionArn": "{% $states.input.Tags[Key = 'Ec2ImageBuilderArn'].Value %}"
},
"Next": "Pass",
"Catch": [
{
"ErrorEquals": [
"States.ALL"
],
"Next": "Pass"
}
]
},
"Pass": {
"Type": "Pass",
"End": true
}
}
"Cleanup": {
"Type": "Map",
"Items": "{% [$states.input] %}",
"ItemProcessor": {
"ProcessorConfig": {
"Mode": "INLINE"
},
{
"StartAt": "DeregisterImage",
"States": {
"DeregisterImage": {
"Type": "Task",
"Resource": "arn:aws:states:::aws-sdk:ec2:deregisterImage",
"Arguments": {
"ImageId": "{% $states.input.ImageId %}"
},
"Next": "Pass (1)",
"Catch": [
{
"ErrorEquals": [
"States.ALL"
],
"Next": "Pass (1)"
}
]
"StartAt": "DeleteImageBuilderImage",
"States": {
"DeleteImageBuilderImage": {
"Type": "Task",
"Resource": "arn:aws:states:::aws-sdk:imagebuilder:deleteImage",
"Arguments": {
"ImageBuildVersionArn": "{% $states.input.Tags[Key = 'Ec2ImageBuilderArn'].Value %}"
},
"Pass (1)": {
"Type": "Pass",
"End": true
}
}
},
{
"StartAt": "ProcessSnapshots",
"States": {
"ProcessSnapshots": {
"Type": "Map",
"Items": "{% [$states.input.BlockDeviceMappings[$exists(Ebs)]] %}",
"ItemProcessor": {
"ProcessorConfig": {
"Mode": "INLINE"
},
"StartAt": "DeleteSnapshotInMap",
"States": {
"DeleteSnapshotInMap": {
"Type": "Task",
"Resource": "arn:aws:states:::aws-sdk:ec2:deleteSnapshot",
"Arguments": {
"SnapshotId": "{% $states.input.Ebs.SnapshotId %}"
},
"Next": "Pass (2)",
"Catch": [
{
"ErrorEquals": [
"States.ALL"
],
"Next": "Pass (2)"
}
]
"Next": "DeregisterImage",
"Catch": [
{
"ErrorEquals": [
"States.ALL"
],
"Next": "DeregisterImage"
}
]
},
"DeregisterImage": {
"Type": "Task",
"Resource": "arn:aws:states:::aws-sdk:ec2:deregisterImage",
"Arguments": {
"ImageId": "{% $states.input.ImageId %}"
},
"Next": "ProcessSnapshots",
"Catch": [
{
"ErrorEquals": [
"States.ALL"
],
"Next": "Pass"
}
]
},
"ProcessSnapshots": {
"Type": "Map",
"Items": "{% [$states.input.BlockDeviceMappings[$exists(Ebs)]] %}",
"ItemProcessor": {
"ProcessorConfig": {
"Mode": "INLINE"
},
"StartAt": "DeleteSnapshotInMap",
"States": {
"DeleteSnapshotInMap": {
"Type": "Task",
"Resource": "arn:aws:states:::aws-sdk:ec2:deleteSnapshot",
"Arguments": {
"SnapshotId": "{% $states.input.Ebs.SnapshotId %}"
},
"Pass (2)": {
"Type": "Pass",
"End": true
}
"Next": "Pass (2)",
"Catch": [
{
"ErrorEquals": [
"States.ALL"
],
"Next": "Pass (2)"
}
]
},
"Pass (2)": {
"Type": "Pass",
"End": true
}
},
"MaxConcurrency": 5,
"End": true
}
}
},
"MaxConcurrency": 5,
"Next": "Pass"
},
"Pass": {
"Type": "Pass",
"End": true
}
}
],
},
"MaxConcurrency": 3,
"End": true
}
}}
}
},
"MaxConcurrency": 3,
Expand Down