8000 Force delete secrets when deleting a cloudformation stack (#11676) · localstack/localstack@145d16a · GitHub
[go: up one dir, main page]
Skip to content

Commit 145d16a

Browse files
dfanglmacnev2013
dfangl
authored and
macnev2013
committed
Force delete secrets when deleting a cloudformation stack (#11676)
1 parent d6ec573 commit 145d16a

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

‎localstack-core/localstack/services/secretsmanager/resource_providers/aws_secretsmanager_secret.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def delete(
204204
model = request.desired_state
205205
secrets_manager = request.aws_client_factory.secretsmanager
206206

207-
secrets_manager.delete_secret(SecretId=model["Name"])
207+
secrets_manager.delete_secret(SecretId=model["Name"], ForceDeleteWithoutRecovery=True)
208208

209209
return ProgressEvent(
210210
status=OperationStatus.SUCCESS,

‎tests/aws/services/cloudformation/resources/test_secretsmanager.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ def test_cfn_secretsmanager_gen_secret(deploy_cfn_template, aws_client, snapshot
3434

3535
@markers.aws.validated
3636
@markers.snapshot.skip_snapshot_verify(paths=["$..Tags", "$..VersionIdsToStages"])
37-
@pytest.mark.skip(reason="Fails with moto due to not deleting the secret")
3837
def test_cfn_handle_secretsmanager_secret(deploy_cfn_template, aws_client, snapshot):
3938
secret_name = f"secret-{short_uid()}"
4039
stack = deploy_cfn_template(

‎tests/aws/services/cloudformation/resources/test_secretsmanager.snapshot.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
}
115115
},
116116
"tests/aws/services/cloudformation/resources/test_secretsmanager.py::test_cfn_handle_secretsmanager_secret": {
117-
"recorded-date": "03-07-2024, 18:36:35",
117+
"recorded-date": "11-10-2024, 17:00:31",
118118
"recorded-content": {
119119
"secret": {
120120
"ARN": "arn:<partition>:secretsmanager:<region>:111111111111:secret:<secret-id>",
@@ -125,19 +125,19 @@
125125
"Tags": [
126126
{
127127
"Key": "aws:cloudformation:stack-name",
128-
"Value": "stack-b2b068a4"
128+
"Value": "stack-ab33fda4"
129129
},
130130
{
131131
"Key": "aws:cloudformation:logical-id",
132132
"Value": "Secret"
133133
},
134134
{
135135
"Key": "aws:cloudformation:stack-id",
136-
"Value": "arn:<partition>:cloudformation:<region>:111111111111:stack/stack-b2b068a4/21d202b0-396b-11ef-8c92-0affdaa413bd"
136+
"Value": "arn:<partition>:cloudformation:<region>:111111111111:stack/stack-ab33fda4/47ecee80-87f2-11ef-8f16-0a113fcea55f"
137137
}
138138
],
139139
"VersionIdsToStages": {
140-
"c3bde5e8-9909-9176-6878-5723a03ae521": [
140+
"c80fca61-0302-7921-4b9b-c2c16bc6f457": [
141141
"AWSCURRENT"
142142
]
143143
},

‎tests/aws/services/cloudformation/resources/test_secretsmanager.validation.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"last_validated_date": "2024-05-23T17:15:31+00:00"
44
},
55
"tests/aws/services/cloudformation/resources/test_secretsmanager.py::test_cfn_handle_secretsmanager_secret": {
6-
"last_validated_date": "2024-07-03T18:36:35+00:00"
6+
"last_validated_date": "2024-10-11T17:00:31+00:00"
77
},
88
"tests/aws/services/cloudformation/resources/test_secretsmanager.py::test_cfn_secret_policy[default]": {
99
"last_validated_date": "2024-08-01T12:22:53+00:00"

0 commit comments

Comments
 (0)
0