Add compression_type option for publish #3367
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pedro-psb
force-pushed
the
feature/add-compression-type
branch
2 times, most recently
from
7d9fc35 to
319c067
Compare
dralley
reviewed
Dec 12, 2023
| ALLOWED_CHECKSUM_ERROR_MSG, | ||
| CHECKSUM_TYPES, | ||
| PACKAGES_DIRECTORY, | ||
| COMPRESSION_TYPES, |
There was a problem hiding this comment.
Would you mind alphabetizing the imports?
dralley
reviewed
Dec 12, 2023
| """Sync and publish an RPM repository w/ zstd compression and verify it exists.""" | ||
| # 1. Publish and distribute | ||
| publish_data = RpmRpmPublication( | ||
| repository=rpm_unsigned_repo_immediate.pulp_href, compression_type="zstd" |
There was a problem hiding this comment.
The compression_type value here isn't actually parameterized, it's only using zstd
dralley
reviewed
Dec 12, 2023
| ) | ||
| for elem in metadata_elements: | ||
| elem_href = elem.find(xpath_location).get("href") | ||
| assert elem_href.endswith(".zst") |
There was a problem hiding this comment.
Likewise the test is only checking for a .zst extension regardless of the value of compression_type
dralley
reviewed
Dec 12, 2023
| requests.get(os.path.join(distribution.base_url, "repodata/repomd.xml")).text | ||
| ) | ||
| xpath_data = "{{{}}}data".format(RPM_NAMESPACES["metadata/repo"]) | ||
| xpath_location = "{{{}}}location".format(RPM_NAMESPACES["metadata/repo"]) |
There was a problem hiding this comment.
We can refactor this along with _get_updateinfo_xml_path into a shared helper function that returns the "data" value (primary, filelists, other, updateinfo, etc.) as dictionary keys and the href as dictionary values.
def get_repomd_metadata_urls(self, repomd_url: str):
repomd_xml = requests.get(os.path.join(distribution.base_url, "repodata/repomd.xml")).text
repomd = ElementTree.fromstring(repomd_xml)
xpath_data = "{{{}}}data".format(RPM_NAMESPACES["metadata/repo"])
xpath_location = "{{{}}}location".format(RPM_NAMESPACES["metadata/repo"])
hrefs = {}
for elem in repomd.findall(xpath_data):
md_type = elem.get("type")
hrefs[md_type] = elem.find(xpath_location).get("href")
return hrefs# usage
for md_type, location in self.get_repomd_metadata_urls(url).items():
if md_type in {"primary", "filelists", "other"}:
assert location.endswith(".zst")update_xml_url = self._get_updateinfo_xml_path(repomd)["updateinfo"]
# ...
Add compression_type option for publishing with support for zstd. closes pulp#3316
pedro-psb
force-pushed
the
feature/add-compression-type
branch
from
319c067 to
0d11485
Compare
github-actions
bot
added
the
multi-commit
dralley
reviewed
Dec 13, 2023
| >>> get_repomd_metadata(distribution.base_url) | ||
| { | ||
| "primary": "repodata/.../primary.xml.gz", | ||
| "filelists": "repodata/.../listfiles.xml.gz", |
There was a problem hiding this comment.
listfiles.xml.gz -> filelists.xml.gz
dralley
approved these changes
Dec 13, 2023
- Use new "get_repomd_metadata_urls" helper function in the "test_validate_no_checksum_tag" and remove the old specific helper function. - Typos [noissue]
pedro-psb
force-pushed
the
feature/add-compression-type
branch
from
0d11485 to
46648a0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With support for zstd compression.
closes #3316