From 98d87a4f03e22bb8e4d22460855913d23930685a Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Wed, 10 Jul 2019 18:35:45 -0400 Subject: [PATCH] Rename metadata.NewConfigOrDie to be consistent Updated name to match dynamic client --- staging/src/k8s.io/client-go/metadata/metadata.go | 4 ++-- staging/src/k8s.io/client-go/metadata/metadata_test.go | 2 +- test/integration/apiserver/apiserver_test.go | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/staging/src/k8s.io/client-go/metadata/metadata.go b/staging/src/k8s.io/client-go/metadata/metadata.go index 1380659ab8f..db06cfd5e68 100644 --- a/staging/src/k8s.io/client-go/metadata/metadata.go +++ b/staging/src/k8s.io/client-go/metadata/metadata.go @@ -70,9 +70,9 @@ func ConfigFor(inConfig *rest.Config) *rest.Config { return config } -// NewConfigOrDie creates a new metadata client for the given config and +// NewForConfigOrDie creates a new metadata client for the given config and // panics if there is an error in the config. -func NewConfigOrDie(c *rest.Config) Interface { +func NewForConfigOrDie(c *rest.Config) Interface { ret, err := NewForConfig(c) if err != nil { panic(err) diff --git a/staging/src/k8s.io/client-go/metadata/metadata_test.go b/staging/src/k8s.io/client-go/metadata/metadata_test.go index c5643714b78..792dfe45311 100644 --- a/staging/src/k8s.io/client-go/metadata/metadata_test.go +++ b/staging/src/k8s.io/client-go/metadata/metadata_test.go @@ -236,7 +236,7 @@ func TestClient(t *testing.T) { defer s.Close() cfg := ConfigFor(&rest.Config{Host: s.URL}) - client := NewConfigOrDie(cfg).(*Client) + client := NewForConfigOrDie(cfg).(*Client) tt.want(t, client) }) } diff --git a/test/integration/apiserver/apiserver_test.go b/test/integration/apiserver/apiserver_test.go index 7e459e837c6..8665988c9d5 100644 --- a/test/integration/apiserver/apiserver_test.go +++ b/test/integration/apiserver/apiserver_test.go @@ -545,7 +545,7 @@ func TestMetadataClient(t *testing.T) { return wrapper }) - client := metadata.NewConfigOrDie(cfg).Resource(v1.SchemeGroupVersion.WithResource("services")) + client := metadata.NewForConfigOrDie(cfg).Resource(v1.SchemeGroupVersion.WithResource("services")) items, err := client.Namespace(ns).List(metav1.ListOptions{}) if err != nil { t.Fatal(err) @@ -622,7 +622,7 @@ func TestMetadataClient(t *testing.T) { return wrapper }) - client := metadata.NewConfigOrDie(cfg).Resource(crdGVR) + client := metadata.NewForConfigOrDie(cfg).Resource(crdGVR) items, err := client.Namespace(ns).List(metav1.ListOptions{}) if err != nil { t.Fatal(err) @@ -688,7 +688,7 @@ func TestMetadataClient(t *testing.T) { return wrapper }) - client := metadata.NewConfigOrDie(cfg).Resource(v1.SchemeGroupVersion.WithResource("services")) + client := metadata.NewForConfigOrDie(cfg).Resource(v1.SchemeGroupVersion.WithResource("services")) w, err := client.Namespace(ns).Watch(metav1.ListOptions{ResourceVersion: svc.ResourceVersion, Watch: true}) if err != nil { t.Fatal(err) @@ -744,7 +744,7 @@ func TestMetadataClient(t *testing.T) { } cfg := metadata.ConfigFor(config) - client := metadata.NewConfigOrDie(cfg).Resource(crdGVR) + client := metadata.NewForConfigOrDie(cfg).Resource(crdGVR) patched, err := client.Namespace(ns).Patch("test-2", types.MergePatchType, []byte(`{"metadata":{"annotations":{"test":"1"}}}`), metav1.PatchOptions{}) if err != nil { @@ -759,7 +759,7 @@ func TestMetadataClient(t *testing.T) { wrapper.nested = rt return wrapper }) - client = metadata.NewConfigOrDie(cfg).Resource(crdGVR) + client = metadata.NewForConfigOrDie(cfg).Resource(crdGVR) w, err := client.Namespace(ns).Watch(metav1.ListOptions{ResourceVersion: cr.GetResourceVersion(), Watch: true}) if err != nil {