knative
/
pkg
mirror of https://github.com/knative/pkg.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Test for and fix URIResolver being idempotent (#606) 

* write test for modify original

* test idempotency in an easier way

* and fix the bug
This commit is contained in:
Spencer Peterson 2019-08-27 10:43:39 -07:00 committed by Knative Prow Robot
parent c73ee7b5d2
commit 2e33eeae84
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resolver/addressable_resolver.go
View File

@ -70,11 +70,11 @@ func (r *URIResolver) URIFromDestination(dest apisv1alpha1.Destination, parent i
if err != nil { if err != nil {
return "", err return "", err
} }
return extendPath(url, dest.Path).String(), nil return extendPath(url.DeepCopy(), dest.Path).String(), nil
} }
if dest.URI != nil { if dest.URI != nil {
return extendPath(dest.URI, dest.Path).String(), nil return extendPath(dest.URI.DeepCopy(), dest.Path).String(), nil
} }
return "", fmt.Errorf("destination missing ObjectReference and URI, expected exactly one") return "", fmt.Errorf("destination missing ObjectReference and URI, expected exactly one")

7
resolver/addressable_resolver_test.go
View File

@ -28,6 +28,7 @@ import (
"k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/kubernetes/scheme"
"knative.dev/pkg/apis" "knative.dev/pkg/apis"
duckv1alpha1 "knative.dev/pkg/apis/duck/v1alpha1" duckv1alpha1 "knative.dev/pkg/apis/duck/v1alpha1"
duckv1beta1 "knative.dev/pkg/apis/duck/v1beta1"
apisv1alpha1 "knative.dev/pkg/apis/v1alpha1" apisv1alpha1 "knative.dev/pkg/apis/v1alpha1"
fakedynamicclient "knative.dev/pkg/injection/clients/dynamicclient/fake" fakedynamicclient "knative.dev/pkg/injection/clients/dynamicclient/fake"
"knative.dev/pkg/ptr" "knative.dev/pkg/ptr"
@ -52,6 +53,7 @@ var (
func init() { func init() {
// Add types to scheme // Add types to scheme
duckv1alpha1.AddToScheme(scheme.Scheme) duckv1alpha1.AddToScheme(scheme.Scheme)
duckv1beta1.AddToScheme(scheme.Scheme)
} }
func TestGetURI_ObjectReference(t *testing.T) { func TestGetURI_ObjectReference(t *testing.T) {
@ -159,7 +161,12 @@ func TestGetURI_ObjectReference(t *testing.T) {
t.Run(n, func(t *testing.T) { t.Run(n, func(t *testing.T) {
ctx, _ := fakedynamicclient.With(context.Background(), scheme.Scheme, tc.objects...) ctx, _ := fakedynamicclient.With(context.Background(), scheme.Scheme, tc.objects...)
r := resolver.NewURIResolver(ctx, func(string) {}) r := resolver.NewURIResolver(ctx, func(string) {})
// Run it twice since this should be idempotent. URI Resolver should
// not modify the cache's copy.
_, _ = r.URIFromDestination(tc.dest, getAddressable())
uri, gotErr := r.URIFromDestination(tc.dest, getAddressable()) uri, gotErr := r.URIFromDestination(tc.dest, getAddressable())
if gotErr != nil { if gotErr != nil {
if tc.wantErr != nil { if tc.wantErr != nil {
if diff := cmp.Diff(tc.wantErr.Error(), gotErr.Error()); diff != "" { if diff := cmp.Diff(tc.wantErr.Error(), gotErr.Error()); diff != "" {