diff --git a/pkg/registry/generic/registry/dryrun_test.go b/pkg/registry/generic/registry/dryrun_test.go index 9b1fbb186..7a04ec03b 100644 --- a/pkg/registry/generic/registry/dryrun_test.go +++ b/pkg/registry/generic/registry/dryrun_test.go @@ -31,12 +31,12 @@ import ( examplev1 "k8s.io/apiserver/pkg/apis/example/v1" "k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/storage" - etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" + etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing" "k8s.io/apiserver/pkg/storage/storagebackend/factory" ) func NewDryRunnableTestStorage(t *testing.T) (DryRunnableStorage, func()) { - server, sc := etcdtesting.NewUnsecuredEtcd3TestClientServer(t) + server, sc := etcd3testing.NewUnsecuredEtcd3TestClientServer(t) sc.Codec = apitesting.TestStorageCodec(codecs, examplev1.SchemeGroupVersion) s, destroy, err := factory.Create(*sc) if err != nil { diff --git a/pkg/registry/generic/registry/store_test.go b/pkg/registry/generic/registry/store_test.go index 2bbbcdf22..a753bdb14 100644 --- a/pkg/registry/generic/registry/store_test.go +++ b/pkg/registry/generic/registry/store_test.go @@ -49,8 +49,8 @@ import ( "k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/storage" cacherstorage "k8s.io/apiserver/pkg/storage/cacher" - etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/apiserver/pkg/storage/etcd3" + etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing" "k8s.io/apiserver/pkg/storage/names" "k8s.io/apiserver/pkg/storage/storagebackend/factory" storagetesting "k8s.io/apiserver/pkg/storage/testing" @@ -1537,7 +1537,7 @@ func TestStoreWatch(t *testing.T) { func newTestGenericStoreRegistry(t *testing.T, scheme *runtime.Scheme, hasCacheEnabled bool) (factory.DestroyFunc, *Store) { podPrefix := "/pods" - server, sc := etcdtesting.NewUnsecuredEtcd3TestClientServer(t) + server, sc := etcd3testing.NewUnsecuredEtcd3TestClientServer(t) strategy := &testRESTStrategy{scheme, names.SimpleNameGenerator, true, false, true} sc.Codec = apitesting.TestStorageCodec(codecs, examplev1.SchemeGroupVersion) diff --git a/pkg/storage/etcd/testing/test_server.go b/pkg/storage/etcd3/testing/test_server.go similarity index 96% rename from pkg/storage/etcd/testing/test_server.go rename to pkg/storage/etcd3/testing/test_server.go index fda24d200..7ac487f3d 100644 --- a/pkg/storage/etcd/testing/test_server.go +++ b/pkg/storage/etcd3/testing/test_server.go @@ -28,7 +28,7 @@ import ( "time" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/apiserver/pkg/storage/etcd/testing/testingcert" + "k8s.io/apiserver/pkg/storage/etcd3/testing/testingcert" "k8s.io/apiserver/pkg/storage/storagebackend" "context" @@ -100,7 +100,8 @@ func newSecuredLocalListener(t *testing.T, certFile, keyFile, caFile string) net return l } -func newHttpTransport(t *testing.T, certFile, keyFile, caFile string) etcd.CancelableTransport { +// newHTTPTransport create a new tls-based transport. +func newHTTPTransport(t *testing.T, certFile, keyFile, caFile string) etcd.CancelableTransport { tlsInfo := transport.TLSInfo{ CertFile: certFile, KeyFile: keyFile, @@ -269,7 +270,7 @@ func NewEtcdTestClientServer(t *testing.T) *EtcdTestServer { cfg := etcd.Config{ Endpoints: server.ClientURLs.StringSlice(), - Transport: newHttpTransport(t, server.CertFile, server.KeyFile, server.CAFile), + Transport: newHTTPTransport(t, server.CertFile, server.KeyFile, server.CAFile), } server.Client, err = etcd.New(cfg) if err != nil { @@ -285,7 +286,7 @@ func NewEtcdTestClientServer(t *testing.T) *EtcdTestServer { return server } -// NewEtcd3TestClientServer creates a new client and server for testing +// NewUnsecuredEtcd3TestClientServer creates a new client and server for testing func NewUnsecuredEtcd3TestClientServer(t *testing.T) (*EtcdTestServer, *storagebackend.Config) { server := &EtcdTestServer{ v3Cluster: integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}), diff --git a/pkg/storage/etcd/testing/testingcert/certificates.go b/pkg/storage/etcd3/testing/testingcert/certificates.go similarity index 100% rename from pkg/storage/etcd/testing/testingcert/certificates.go rename to pkg/storage/etcd3/testing/testingcert/certificates.go diff --git a/pkg/storage/etcd/testing/utils.go b/pkg/storage/etcd3/testing/utils.go similarity index 85% rename from pkg/storage/etcd/testing/utils.go rename to pkg/storage/etcd3/testing/utils.go index a6fa02cce..0b5505d46 100644 --- a/pkg/storage/etcd/testing/utils.go +++ b/pkg/storage/etcd3/testing/utils.go @@ -21,7 +21,7 @@ import ( "path" ) -// Returns the prefix set via the ETCD_PREFIX environment variable (if any). +// PathPrefix returns the prefix set via the ETCD_PREFIX environment variable (if any). func PathPrefix() string { pref := os.Getenv("ETCD_PREFIX") if pref == "" { @@ -30,7 +30,7 @@ func PathPrefix() string { return path.Join("/", pref) } -// Adds the ETCD_PREFIX to the provided key +// AddPrefix adds the ETCD_PREFIX to the provided key func AddPrefix(in string) string { return path.Join(PathPrefix(), in) } diff --git a/pkg/storage/storagebackend/factory/tls_test.go b/pkg/storage/storagebackend/factory/tls_test.go index 0646de89b..32b7b5cab 100644 --- a/pkg/storage/storagebackend/factory/tls_test.go +++ b/pkg/storage/storagebackend/factory/tls_test.go @@ -34,7 +34,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apiserver/pkg/apis/example" examplev1 "k8s.io/apiserver/pkg/apis/example/v1" - "k8s.io/apiserver/pkg/storage/etcd/testing/testingcert" + "k8s.io/apiserver/pkg/storage/etcd3/testing/testingcert" "k8s.io/apiserver/pkg/storage/storagebackend" ) diff --git a/pkg/storage/tests/cacher_test.go b/pkg/storage/tests/cacher_test.go index d1b90dabe..76accf824 100644 --- a/pkg/storage/tests/cacher_test.go +++ b/pkg/storage/tests/cacher_test.go @@ -43,8 +43,8 @@ import ( "k8s.io/apiserver/pkg/features" "k8s.io/apiserver/pkg/storage" cacherstorage "k8s.io/apiserver/pkg/storage/cacher" - etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/apiserver/pkg/storage/etcd3" + etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing" storagetesting "k8s.io/apiserver/pkg/storage/testing" "k8s.io/apiserver/pkg/storage/value" utilfeature "k8s.io/apiserver/pkg/util/feature" @@ -93,8 +93,8 @@ func AddObjectMetaFieldsSet(source fields.Set, objectMeta *metav1.ObjectMeta, ha return source } -func newEtcdTestStorage(t *testing.T, prefix string) (*etcdtesting.EtcdTestServer, storage.Interface) { - server, _ := etcdtesting.NewUnsecuredEtcd3TestClientServer(t) +func newEtcdTestStorage(t *testing.T, prefix string) (*etcd3testing.EtcdTestServer, storage.Interface) { + server, _ := etcd3testing.NewUnsecuredEtcd3TestClientServer(t) storage := etcd3.New(server.V3Client, apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion), prefix, value.IdentityTransformer, true) return server, storage } @@ -146,7 +146,7 @@ func updatePod(t *testing.T, s storage.Interface, obj, old *example.Pod) *exampl } func TestGet(t *testing.T) { - server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) + server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) cacher, _ := newTestCacher(etcdStorage, 10) defer cacher.Stop() @@ -177,7 +177,7 @@ func TestGet(t *testing.T) { } func TestGetToList(t *testing.T) { - server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) + server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) cacher, _ := newTestCacher(etcdStorage, 10) defer cacher.Stop() @@ -233,7 +233,7 @@ func TestGetToList(t *testing.T) { } func TestList(t *testing.T) { - server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) + server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) cacher, _ := newTestCacher(etcdStorage, 10) defer cacher.Stop() @@ -314,7 +314,7 @@ func TestList(t *testing.T) { } func TestInfiniteList(t *testing.T) { - server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) + server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) cacher, v := newTestCacher(etcdStorage, 10) defer cacher.Stop() @@ -368,7 +368,7 @@ func (self *injectListError) List(ctx context.Context, key string, resourceVersi } func TestWatch(t *testing.T) { - server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) + server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) // Inject one list error to make sure we test the relist case. etcdStorage = &injectListError{errors: 1, Interface: etcdStorage} defer server.Terminate(t) @@ -445,7 +445,7 @@ func TestWatch(t *testing.T) { } func TestWatcherTimeout(t *testing.T) { - server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) + server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) cacher, _ := newTestCacher(etcdStorage, 10) defer cacher.Stop() @@ -487,7 +487,7 @@ func TestWatcherTimeout(t *testing.T) { } func TestFiltering(t *testing.T) { - server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) + server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) cacher, _ := newTestCacher(etcdStorage, 10) defer cacher.Stop() @@ -549,7 +549,7 @@ func TestFiltering(t *testing.T) { } func TestStartingResourceVersion(t *testing.T) { - server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) + server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) cacher, v := newTestCacher(etcdStorage, 10) defer cacher.Stop() @@ -597,7 +597,7 @@ func TestStartingResourceVersion(t *testing.T) { } func TestEmptyWatchEventCache(t *testing.T) { - server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) + server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) // add a few objects @@ -661,7 +661,7 @@ func TestEmptyWatchEventCache(t *testing.T) { } func TestRandomWatchDeliver(t *testing.T) { - server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) + server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) cacher, v := newTestCacher(etcdStorage, 10) defer cacher.Stop() @@ -787,7 +787,7 @@ func TestCacherListerWatcherPagination(t *testing.T) { func TestWatchDispatchBookmarkEvents(t *testing.T) { defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.WatchBookmark, true)() - server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) + server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) cacher, v := newTestCacher(etcdStorage, 10) defer cacher.Stop() @@ -849,7 +849,7 @@ func TestWatchDispatchBookmarkEvents(t *testing.T) { func TestWatchBookmarksWithCorrectResourceVersion(t *testing.T) { defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.WatchBookmark, true)() - server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) + server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix()) defer server.Terminate(t) cacher, v := newTestCacher(etcdStorage, 10) defer cacher.Stop()