Fix error message on invalid scheme-prefixed ref #185
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
relu
force-pushed
the
err-invalid-image-ref
branch
from
7acdbb2 to
8f919d4
Compare
relu
force-pushed
the
err-invalid-image-ref
branch
from
8f919d4 to
b7c65b7
Compare
squaremo
reviewed
Oct 27, 2021
controllers/scan_test.go
Outdated
| Eventually(func() bool { | ||
| _ = r.Get(ctx, objectName, &repo) | ||
| ready = apimeta.FindStatusCondition(*repo.GetStatusConditions(), meta.ReadyCondition) | ||
| fmt.Printf("%v", ready) |
| @@ -143,6 +143,9 @@ func (r *ImageRepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Requ | |||
|
|
|||
| ref, err := name.ParseReference(imageRepo.Spec.Image) | |||
| if err != nil { | |||
| if u, _ := url.Parse(imageRepo.Spec.Image); u != nil && u.Scheme != "" { | |||
| err = fmt.Errorf("image repository attribute should not be scheme-prefixed ('%s://')", u.Scheme) | |||
There was a problem hiding this comment.
Suggested change
| err = fmt.Errorf("image repository attribute should not be scheme-prefixed ('%s://')", u.Scheme) | |
| err = fmt.Errorf(".spec.image value should not be scheme-prefixed ('%s://')", u.Scheme) |
(i.e., refer to the field by path)
relu
force-pushed
the
err-invalid-image-ref
branch
from
b7c65b7 to
e46d73d
Compare
squaremo
approved these changes
Oct 27, 2021
relu
force-pushed
the
err-invalid-image-ref
branch
from
e46d73d to
2f9119e
Compare
darkowlzz
reviewed
Oct 27, 2021
Adds a descriptive error when an invalid image ref containing a scheme is given to the ImageRepository. Fixes #146 Signed-off-by: Aurel Canciu <[email protected]>
relu
force-pushed
the
err-invalid-image-ref
branch
from
2f9119e to
b745ca8
Compare
|
Oh -- except parsing image repositories (no scheme, but port numbers with a colon) as though they are URLs (scheme with a colon expected) is going to give spurious errors: #220 |
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.
Adds a descriptive error when an invalid image ref containing a scheme
is given to the ImageRepository.
Fixes #146