Skip to content

make suffix in s3 artifact manifest not contain cname #137

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
yeoldegrove merged 2 commits into from
Jul 10, 2025
Merged

make suffix in s3 artifact manifest not contain cname #137

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
8ee6e36
make suffix in s3 artifact manifest not contain cname
yeoldegrove Jul 10, 2025
7ab35e3
github actions: bump default version to 0.8.3
yeoldegrove Jul 10, 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
2 changes: 1 addition & 1 deletion .github/actions/features_parse/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ outputs:
runs:
using: composite
steps:
- uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.2
- uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.3
- id: result
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/flavors_parse/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ outputs:
runs:
using: composite
steps:
- uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.2
- uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.3
- id: matrix
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Installs the given GardenLinux Python library
inputs:
version:
description: GardenLinux Python library version
default: "0.8.2"
default: "0.8.3"
runs:
using: composite
steps:
Expand Down
9 changes: 8 additions & 1 deletion src/gardenlinux/s3/s3_artifacts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,18 @@ def upload_from_directory(
md5sum = file_digest(fp, "md5").hexdigest()
sha256sum = file_digest(fp, "sha256").hexdigest()

if artifact.name.startswith(cname):
suffix = artifact.name[len(cname) :]
Copy link

@moritzkirchnersap moritzkirchnersap Jul 10, 2025

Choose a reason for hiding this comment

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

Curious choice, I would do artifacte.name.replace(cname, '') but I like the smiley :]

Copy link
Contributor Author

@yeoldegrove yeoldegrove Jul 10, 2025

Choose a reason for hiding this comment

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

Both solutions will work of course ;)

else:
raise RuntimeError(
f"Artifact name '{artifact.name}' does not start with cname '{cname}'"
)

artifact_metadata = {
"name": artifact.name,
"s3_bucket_name": self._bucket.name,
"s3_key": s3_key,
"suffix": "".join(artifact.suffixes),
"suffix": suffix,
"md5sum": md5sum,
"sha256sum": sha256sum,
}
Expand Down