[CASCL-1323] kubectl-datadog: delegate OCI image parsing to go-containerregistry#2971
Merged
[CASCL-1323] kubectl-datadog: delegate OCI image parsing to go-containerregistry#2971
kubectl-datadog: delegate OCI image parsing to go-containerregistry#2971Conversation
L3n41c
changed the title
kubectl-datadog: delegate OCI image parsing to go-containerregistry
…nerregistry imageRepoEndsWith (renamed to imageRepoPathHasSuffix) and imageTag now use name.ParseReference from github.com/google/go-containerregistry/pkg/name (already a direct dep) instead of open-coding the registry-port-vs-tag heuristic. The @digest pre-strip handles combined tag@digest forms (parsed as Digest by pkg/name) and malformed digests. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
L3n41c
force-pushed
the
worktree-std_docker_image_parse
branch
from
4d7fcf9 to
995ae59
Compare
tbavelier
approved these changes
May 5, 2026
Member
Author
|
@codex review |
1 similar comment
Member
Author
|
@codex review |
The new dependency introduced when delegating OCI image parsing to go-containerregistry must be recorded in LICENSE-3rdparty.csv; fix the failing `verify-licenses` CI check. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
|
Codex Review: Didn't find any major issues. Hooray! ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
|
🎯 Code Coverage (details) 🔗 Commit SHA: 1b0e22f | Docs | Datadog PR Page | Give us feedback! |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #2971 +/- ##
==========================================
- Coverage 41.40% 41.39% -0.01%
==========================================
Files 331 331
Lines 28908 28911 +3
==========================================
Hits 11969 11969
- Misses 16084 16086 +2
- Partials 855 856 +1
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report in Codecov by Sentry.
🚀 New features to boost your workflow:
|
Add a malformed-input case to TestImageRepoPathHasSuffix and a "malformed image falls back to label" case to TestClassify_ClusterAutoscalerVersion to exercise the `name.ParseReference` error branches in imageRepoPathHasSuffix and imageTag. Lifts patch coverage above the Datadog gate threshold. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
What does this PR do?
Replaces two hand-rolled OCI image-reference parsers under
cmd/kubectl-datadog/autoscaling/cluster/with calls togithub.com/google/go-containerregistry/pkg/name(already a direct dependency of the project).imageRepoEndsWith→ renamedimageRepoPathHasSuffixto reflect component-aware suffix matching against the registry-stripped repository path.imageTag→ returns the OCI tag, or empty for digest-only / tagless images.Both helpers pre-strip a trailing
@digestso combinedtag@digestforms (whichpkg/nameparses as aname.Digest, dropping the tag) and malformed digests parse uniformly.Motivation
The two helpers re-implemented the subtle "
:is a registry port vs. a tag separator" logic by hand. Delegating to the canonicalpkg/nameparser makes the intent clearer and removes a chunk of bespoke parsing.Additional Notes
No behavior change on the existing test corpus (combined
tag@digest, registries with port, digest-only, single-component image names, plural-form false-positive guard).Minimum Agent Versions
N/A —
kubectl-datadogplugin only.Describe your test plan
go test ./cmd/kubectl-datadog/autoscaling/cluster/install/guess/... ./cmd/kubectl-datadog/autoscaling/cluster/common/clusterinfo/...— passesmake lint— passesmake kubectl-datadog— buildsChecklist
/label refactoring
/label qa/skip-qa