Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix secretsmanager PutSecretValue on empty secret #9077

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

Merged
merged 2 commits into from
Sep 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 18 additions & 3 deletions localstack/services/secretsmanager/provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,8 @@ def backend_update_secret(
return json.dumps(resp)


@patch(SecretsManagerResponse.update_secret)
def response_update_secret(_, self):
@patch(SecretsManagerResponse.update_secret, pass_target=False)
def response_update_secret(self):
secret_id = self._get_param("SecretId")
description = self._get_param("Description")
secret_string = self._get_param("SecretString")
Expand Down Expand Up @@ -495,7 +495,22 @@ def backend_update_secret_version_stage(

@patch(FakeSecret.reset_default_version)
def fake_secret_reset_default_version(fn, self, secret_version, version_id):
fn(self, secret_version, version_id)
# fn(self, secret_version, version_id)
# FIXME: remove for the next moto bump (above 4.2.post1) and uncomment line above
# remove all old AWSPREVIOUS stages
Comment on lines +499 to +500
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Completely unrelated and task for futures us:
Would be great if we can find a way to unify this kind of thing across the code base a bit. In a lot of cases this is just forgotten and then causes issues down the road when upstream changes.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could also imagine adding a unit test that will fail as soon as we update moto, so that we are automatically reminded to fix this 🤔

again: not really something that needs any action right now

for old_version in self.versions.values():
if "AWSPREVIOUS" in old_version["version_stages"]:
old_version["version_stages"].remove("AWSPREVIOUS")

# set old AWSCURRENT secret to AWSPREVIOUS
if self.default_version_id in self.versions:
previous_current_version_id = self.default_version_id
self.versions[previous_current_version_id]["version_stages"] = ["AWSPREVIOUS"] # type: ignore

self.versions[version_id] = secret_version
self.default_version_id = version_id
# Remove until here ^

# Remove versions with no version stages.
versions_no_stages = [
version_id for version_id, version in self.versions.items() if not version["version_stages"]
Expand Down
24 changes: 24 additions & 0 deletions tests/aws/services/secretsmanager/test_secretsmanager.py
Original file line number Diff line number Diff line change
Expand Up @@ -1973,3 +1973,27 @@ def test_no_client_request_token(
exc_response = {"Error": response.json(), "Metadata": {"StatusCode": response.status_code}}

sm_snapshot.match("no-client-request-exc", exc_response)

@markers.aws.validated
def test_create_secret_version_from_empty_secret(self, aws_client, snapshot, cleanups):
snapshot.add_transformer(snapshot.transform.resource_name("secret-version"), priority=-1)
snapshot.add_transformer(snapshot.transform.key_value("Name"))

response = aws_client.secretsmanager.create_secret(
Name=f"test-version-{short_uid()}", Description=""
)
snapshot.match("create-empty-secret", response)
secret_id = response["ARN"]
cleanups.append(
lambda: aws_client.secretsmanager.delete_secret(
SecretId=secret_id, ForceDeleteWithoutRecovery=True
)
)

response = aws_client.secretsmanager.describe_secret(SecretId=secret_id)
snapshot.match("describe-secret", response)

response = aws_client.secretsmanager.put_secret_value(
SecretId=secret_id, SecretString="example-string-to-protect"
)
snapshot.match("put-secret-value", response)
Original file line number Diff line number Diff line change
Expand Up @@ -3650,5 +3650,40 @@
}
}
}
},
"tests/aws/services/secretsmanager/test_secretsmanager.py::TestSecretsManager::test_create_secret_version_from_empty_secret": {
"recorded-date": "05-09-2023, 22:19:06",
"recorded-content": {
"create-empty-secret": {
"ARN": "arn:aws:secretsmanager:<region>:111111111111:secret:<secret-version:1>",
"Name": "<name:1>",
"ResponseMetadata": {
"HTTPHeaders": {},
"HTTPStatusCode": 200
}
},
"describe-secret": {
"ARN": "arn:aws:secretsmanager:<region>:111111111111:secret:<secret-version:1>",
"CreatedDate": "datetime",
"LastChangedDate": "datetime",
"Name": "<name:1>",
"ResponseMetadata": {
"HTTPHeaders": {},
"HTTPStatusCode": 200
}
},
"put-secret-value": {
"ARN": "arn:aws:secretsmanager:<region>:111111111111:secret:<secret-version:1>",
"Name": "<name:1>",
"VersionId": "<uuid:1>",
"VersionStages": [
"AWSCURRENT"
],
"ResponseMetadata": {
"HTTPHeaders": {},
"HTTPStatusCode": 200
}
}
}
}
}