Skip to content

test: delete created change sets in companion stack if empty #3807

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

Merged
merged 2 commits into from
Aug 26, 2025
Merged

test: delete created change sets in companion stack if empty #3807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd7b8ed
test: delete created change sets in companion stack if empty
reedham-aws Aug 26, 2025
8e34018
format
reedham-aws Aug 26, 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
6 changes: 3 additions & 3 deletions integration/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ def clean_all_integ_buckets():
@pytest.fixture()
def setup_companion_stack_once(tmpdir_factory, get_prefix):
tests_integ_dir = Path(__file__).resolve().parents[1]
template_foler = Path(tests_integ_dir, "integration", "setup")
companion_stack_tempalte_path = Path(template_foler, COMPANION_STACK_TEMPLATE)
template_folder = Path(tests_integ_dir, "integration", "setup")
companion_stack_template_path = Path(template_folder, COMPANION_STACK_TEMPLATE)
cfn_client = ClientProvider().cfn_client
output_dir = tmpdir_factory.mktemp("data")
stack_name = get_prefix + COMPANION_STACK_NAME
companion_stack = Stack(stack_name, companion_stack_tempalte_path, cfn_client, output_dir)
companion_stack = Stack(stack_name, companion_stack_template_path, cfn_client, output_dir)
companion_stack.create_or_update(_stack_exists(stack_name))


Expand Down
10 changes: 10 additions & 0 deletions integration/helpers/deployer/deployer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,16 @@ def create_and_wait_for_changeset(
self.describe_changeset(result["Id"], stack_name)
return result
except deploy_exceptions.ChangeEmptyError:
try:
# Delete the most recent change set that failed to create because it was empty
changeset = sorted(
self._client.list_change_sets(StackName=stack_name).get("Summaries"),
key=lambda c: c["CreationTime"],
)[-1]
if changeset.get("Status") == "FAILED" and changeset.get("ExecutionStatus") == "UNAVAILABLE":
self._client.delete_change_set(ChangeSetName=changeset["ChangeSetId"], StackName=stack_name)
except Exception as ex:
LOG.warning("Failed to clean up empty changeset", exc_info=ex)
return {}
except botocore.exceptions.ClientError as ex:
raise deploy_exceptions.DeployFailedError(stack_name=stack_name, msg=str(ex))
Expand Down