-
Notifications
You must be signed in to change notification settings - Fork 331
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
add KnativeReference #1030
Merged
+186
−0
Merged
add KnativeReference #1030
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
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,66 @@ | ||
/* | ||
Copyright 2020 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" | ||
|
||
"knative.dev/pkg/apis" | ||
) | ||
|
||
// KnativeReference contains enough information to refer to another object. | ||
// It's a trimmed down version of corev1.ObjectReference. | ||
type KnativeReference struct { | ||
// Kind of the referent. | ||
// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds | ||
Kind string `json:"kind,omitempty"` | ||
|
||
// Namespace of the referent. | ||
// More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/ | ||
Namespace string `json:"namespace,omitempty"` | ||
|
||
// Name of the referent. | ||
// More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names | ||
Name string `json:"name,omitempty"` | ||
|
||
// API version of the referent. | ||
APIVersion string `json:"apiVersion,omitempty"` | ||
} | ||
|
||
func (kr *KnativeReference) Validate(ctx context.Context) *apis.FieldError { | ||
var errs *apis.FieldError | ||
if kr == nil { | ||
errs = errs.Also(apis.ErrMissingField("namespace")) | ||
errs = errs.Also(apis.ErrMissingField("name")) | ||
errs = errs.Also(apis.ErrMissingField("apiVersion")) | ||
errs = errs.Also(apis.ErrMissingField("kind")) | ||
return errs | ||
} | ||
if kr.Namespace == "" { | ||
errs = errs.Also(apis.ErrMissingField("namespace")) | ||
} | ||
if kr.Name == "" { | ||
errs = errs.Also(apis.ErrMissingField("name")) | ||
} | ||
if kr.APIVersion == "" { | ||
errs = errs.Also(apis.ErrMissingField("apiVersion")) | ||
} | ||
if kr.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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
/* | ||
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" | ||
"testing" | ||
|
||
"github.com/google/go-cmp/cmp" | ||
"knative.dev/pkg/apis" | ||
) | ||
|
||
func TestValidate(t *testing.T) { | ||
ctx := context.TODO() | ||
|
||
validRef := KnativeReference{ | ||
Kind: kind, | ||
APIVersion: apiVersion, | ||
Name: name, | ||
Namespace: namespace, | ||
} | ||
|
||
tests := map[string]struct { | ||
ref *KnativeReference | ||
want *apis.FieldError | ||
}{ | ||
"nil valid": { | ||
ref: nil, | ||
want: func() *apis.FieldError { | ||
fe := apis.ErrMissingField("name", "namespace", "kind", "apiVersion") | ||
return fe | ||
}(), | ||
}, | ||
"valid ref": { | ||
ref: &validRef, | ||
want: nil, | ||
}, | ||
"invalid ref, empty": { | ||
ref: &KnativeReference{}, | ||
want: apis.ErrMissingField("name", "namespace", "kind", "apiVersion"), | ||
}, | ||
"invalid ref, missing namespace": { | ||
ref: &KnativeReference{ | ||
Name: name, | ||
Kind: kind, | ||
APIVersion: apiVersion, | ||
}, | ||
want: func() *apis.FieldError { | ||
fe := apis.ErrMissingField("namespace") | ||
return fe | ||
}(), | ||
}, | ||
"invalid ref, missing kind": { | ||
ref: &KnativeReference{ | ||
Namespace: namespace, | ||
Name: name, | ||
APIVersion: apiVersion, | ||
}, | ||
want: func() *apis.FieldError { | ||
fe := apis.ErrMissingField("kind") | ||
return fe | ||
}(), | ||
}, | ||
"invalid ref, missing api version": { | ||
ref: &KnativeReference{ | ||
Namespace: namespace, | ||
Name: name, | ||
Kind: kind, | ||
}, | ||
want: func() *apis.FieldError { | ||
return apis.ErrMissingField("apiVersion") | ||
}(), | ||
}, | ||
} | ||
|
||
for name, tc := range tests { | ||
t.Run(name, func(t *testing.T) { | ||
gotErr := tc.ref.Validate(ctx) | ||
|
||
if tc.want != nil { | ||
if diff := cmp.Diff(tc.want.Error(), gotErr.Error()); diff != "" { | ||
t.Errorf("%s: got: %v wanted %v", name, gotErr, tc.want) | ||
} | ||
} else if gotErr != nil { | ||
t.Errorf("%s: Validate() = %v, wanted nil", name, gotErr) | ||
} | ||
}) | ||
} | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
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.
Can you also add a default and a method to inject the current object's namespace into the context? It can be a follow up
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.
I can add the method to inject it from an object, but I'm unclear what you think the default method should do?