feat: add logic to add image to possible list when auth is needed #4011
Conversation
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
…auth, but is not available Signed-off-by: Allen Conlon <[email protected]>
✅ Deploy Preview for zarf-docs ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
a1994sc
commented
Jul 21, 2025
| @@ -683,8 +683,10 @@ func (o *devFindImagesOptions) run(cmd *cobra.Command, args []string) error { | |||
|
|
|||
| componentDefinition := "\ncomponents:\n" | |||
| for _, finding := range imagesScans { | |||
| if len(finding.Matches) > 0 { | |||
| if len(finding.Matches)+len(finding.PotentialMatches)+len(finding.CosignArtifacts) > 0 { | |||
There was a problem hiding this comment.
This was a slight rework because at present will render like the following:
There was a problem hiding this comment.
Good catch - this does fix formatting
Signed-off-by: Allen Conlon <[email protected]>
Codecov ReportAttention: Patch coverage is
... and 3 files with indirect coverage changes 🚀 New features to boost your workflow:
|
…igured Signed-off-by: Allen Conlon <[email protected]>
brandtkeller
requested changes
Jul 22, 2025
src/pkg/packager/find_images.go
Outdated
| @@ -240,6 +242,12 @@ func FindImages(ctx context.Context, packagePath string, opts FindImagesOptions) | |||
| if descriptor, err := crane.Head(image, images.WithGlobalInsecureFlag()...); err != nil { | |||
| // Test if this is a real image, if not just quiet log to debug, this is normal | |||
| l.Debug("suspected image does not appear to be valid", "error", err) | |||
| // statusCheck is find if the error has an 40x error code | |||
| // shaCheck is remove false positives of sha256:aaaaa.... | |||
| if statusCheck.FindString(err.Error()) != "" && shaCheck.FindString(image) == "" { | |||
There was a problem hiding this comment.
This looks good - one additional edge case is that a dial tcp connect: connection refused error will still be silent.
For example:
./build/zarf dev find-images src/pkg/packager/testdata/find-images/fuzzy-registry-auth/ --skip-cosign -l debug
Will not return the same entries as the test case - as the logs indicate
2025-07-22 23:00:09 DBG found possible fuzzy match kind=ConfigMap value=localhost:65000/sig-storage/csi-node-driver-registrar:v2.13.0
2025-07-22 23:00:09 DBG found possible fuzzy match kind=ConfigMap value=localhost:65000/sig-storage/csi-resizer:v1.13.2
2025-07-22 23:00:09 DBG found possible fuzzy match kind=ConfigMap value=localhost:65000/sig-storage/csi-snapshotter:v8.2.1
2025-07-22 23:00:09 DBG suspected image does not appear to be valid error=Get "https://localhost:65000/v2/": dial tcp 127.0.0.1:65000: connect: connection refused; Get "http://localhost:65000/v2/": dial tcp 127.0.0.1:65000: connect: connection refused
2025-07-22 23:00:09 DBG suspected image does not appear to be valid error=Get "https://localhost:65000/v2/": dial tcp 127.0.0.1:65000: connect: connection refused; Get "http://localhost:65000/v2/": dial tcp 127.0.0.1:65000: connect: connection refused
2025-07-22 23:00:09 DBG suspected image does not appear to be valid error=Get "https://localhost:65000/v2/": dial tcp 127.0.0.1:65000: connect: connection refused; Get "http://localhost:65000/v2/": dial tcp 127.0.0.1:65000: connect: connection refused
Should this be captured as well?
There was a problem hiding this comment.
Personally I think that makes sense to me, especially because Zarf detects this as match without checking:
apiVersion: apps/v1
kind: Pod
metadata:
labels:
app: agent
spec:
containers:
- name: agent
image: localhost:65000/sig-storage/csi-snapshotter:v8.2.0| @@ -683,8 +683,10 @@ func (o *devFindImagesOptions) run(cmd *cobra.Command, args []string) error { | |||
|
|
|||
| componentDefinition := "\ncomponents:\n" | |||
| for _, finding := range imagesScans { | |||
| if len(finding.Matches) > 0 { | |||
| if len(finding.Matches)+len(finding.PotentialMatches)+len(finding.CosignArtifacts) > 0 { | |||
There was a problem hiding this comment.
Good catch - this does fix formatting
Signed-off-by: Allen Conlon <[email protected]>
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.
Description
Updates logic that when trying to use
zarf dev find-imagesa package, it will silently fail if the registry, in this case registry1.dso.mil, needs auth to check it.Related Issue
Fixes #4007
Checklist before merging