Skip to content

Commit 34e1439

Browse files
committed
Ensure S3 artifact metadata suffix is not missing content
This commit ensures `suffix` contains whatever is added to the base name. Signed-off-by: Tobias Wolf <wolf@b1-systems.de> On-behalf-of: SAP <tobias.wolf@sap.com>
1 parent 1294c05 commit 34e1439

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/gardenlinux/s3/s3_artifacts.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,13 +210,11 @@ def upload_from_directory(
210210
md5sum = file_digest(fp, "md5").hexdigest()
211211
sha256sum = file_digest(fp, "sha256").hexdigest()
212212

213-
suffixes = "".join(artifact.name)[1 + base_name_length :]
214-
215213
artifact_metadata = {
216214
"name": artifact.name,
217215
"s3_bucket_name": self._bucket.name,
218216
"s3_key": s3_key,
219-
"suffix": re_object.sub("+", suffixes),
217+
"suffix": re_object.sub("+", artifact.name[base_name_length:]),
220218
"md5sum": md5sum,
221219
"sha256sum": sha256sum,
222220
}

tests/s3/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
- name: container-amd64-1234.1-abc123lo.release
3434
s3_bucket_name: test-bucket
3535
s3_key: objects/container-amd64-1234.1-abc123lo/container-amd64-1234.1-abc123lo.release
36-
suffix: release
36+
suffix: .release
3737
md5sum: {md5sum}
3838
sha256sum: {sha256sum}
3939
""".strip()

0 commit comments

Comments
 (0)