-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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.
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
Split apart defaulting and validation webhooks #5947
Merged
+1,344
−2,141
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| Copyright 2019 The Knative Authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package v1 | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| corev1 "k8s.io/api/core/v1" | ||
| "knative.dev/pkg/apis" | ||
| ) | ||
|
|
||
| // Destination represents a target of an invocation over HTTP. | ||
| type Destination struct { | ||
| // Ref points to an Addressable. | ||
| // +optional | ||
| Ref *corev1.ObjectReference `json:"ref,omitempty"` | ||
|
|
||
| // URI can be an absolute URL(non-empty scheme and non-empty host) pointing to the target or a relative URI. Relative URIs will be resolved using the base URI retrieved from Ref. | ||
| // +optional | ||
| URI *apis.URL `json:"uri,omitempty"` | ||
| } | ||
|
|
||
| func (dest *Destination) Validate(ctx context.Context) *apis.FieldError { | ||
| if dest == nil { | ||
| return nil | ||
| } | ||
| return ValidateDestination(*dest).ViaField(apis.CurrentField) | ||
| } | ||
|
|
||
| // ValidateDestination validates Destination. | ||
| func ValidateDestination(dest Destination) *apis.FieldError { | ||
| var ref *corev1.ObjectReference | ||
| if dest.Ref != nil { | ||
| ref = dest.Ref | ||
| } | ||
| if ref == nil && dest.URI == nil { | ||
| return apis.ErrGeneric("expected at least one, got none", "ref", "uri") | ||
| } | ||
|
|
||
| if ref != nil && dest.URI != nil && dest.URI.URL().IsAbs() { | ||
| return apis.ErrGeneric("Absolute URI is not allowed when Ref or [apiVersion, kind, name] is present", "[apiVersion, kind, name]", "ref", "uri") | ||
| } | ||
| // IsAbs() check whether the URL has a non-empty scheme. Besides the non-empty scheme, we also require dest.URI has a non-empty host | ||
| if ref == nil && dest.URI != nil && (!dest.URI.URL().IsAbs() || dest.URI.Host == "") { | ||
| return apis.ErrInvalidValue("Relative URI is not allowed when Ref and [apiVersion, kind, name] is absent", "uri") | ||
| } | ||
| if ref != nil && dest.URI == nil { | ||
| if dest.Ref != nil { | ||
| return validateDestinationRef(*ref).ViaField("ref") | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // GetRef gets the ObjectReference from this Destination, if one is present. If no ref is present, | ||
| // then nil is returned. | ||
| func (dest *Destination) GetRef() *corev1.ObjectReference { | ||
| if dest == nil { | ||
| return nil | ||
| } | ||
| return dest.Ref | ||
| } | ||
|
|
||
| func validateDestinationRef(ref corev1.ObjectReference) *apis.FieldError { | ||
| // Check the object. | ||
| var errs *apis.FieldError | ||
| // Required Fields | ||
| if ref.Name == "" { | ||
| errs = errs.Also(apis.ErrMissingField("name")) | ||
| } | ||
| if ref.APIVersion == "" { | ||
| errs = errs.Also(apis.ErrMissingField("apiVersion")) | ||
| } | ||
| if ref.Kind == "" { | ||
| errs = errs.Also(apis.ErrMissingField("kind")) | ||
| } | ||
|
|
||
| return errs | ||
| } |
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SO AWESOME