From 1fae4f61c189338bf4b8f456134a6d4959119f56 Mon Sep 17 00:00:00 2001
From: pa250194 <pa250194@ncr.com>
Date: Tue, 14 Sep 2021 09:34:02 -0500
Subject: [PATCH] Tests for GCP Bucket Provider

Signed-off-by: pa250194 <pa250194@ncr.com>
---
 docs/spec/v1alpha1/buckets.md     |  2 +-
 pkg/gcp/gcp.go                    |  8 ++------
 pkg/gcp/gcp_test.go               |  2 +-
 pkg/gcp/mocks/mock_gcp_storage.go | 28 ----------------------------
 4 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/docs/spec/v1alpha1/buckets.md b/docs/spec/v1alpha1/buckets.md
index 0ad60f41..53838e25 100644
--- a/docs/spec/v1alpha1/buckets.md
+++ b/docs/spec/v1alpha1/buckets.md
@@ -11,7 +11,7 @@ Bucket:
 // BucketSpec defines the desired state of an S3 compatible bucket
 type BucketSpec struct {
 	// The S3 compatible storage provider name, default ('generic').
-	// +kubebuilder:validation:Enum=generic;aws
+	// +kubebuilder:validation:Enum=generic;aws;gcp
 	// +optional
 	Provider string `json:"provider,omitempty"`
 
diff --git a/pkg/gcp/gcp.go b/pkg/gcp/gcp.go
index 8f2f8811..2c372e9e 100644
--- a/pkg/gcp/gcp.go
+++ b/pkg/gcp/gcp.go
@@ -55,8 +55,6 @@ type Client interface {
 }
 
 type BucketHandle interface {
-	Create(context.Context, string, *gcpStorage.BucketAttrs) error
-	Delete(context.Context) error
 	Attrs(context.Context) (*gcpStorage.BucketAttrs, error)
 	Object(string) *gcpStorage.ObjectHandle
 	Objects(context.Context, *gcpStorage.Query) *gcpStorage.ObjectIterator
@@ -66,10 +64,11 @@ type ObjectHandle interface {
 	Attrs(context.Context) (*gcpStorage.ObjectAttrs, error)
 	NewRangeReader(context.Context, int64, int64) (*gcpStorage.Reader, error)
 }
+
 type GCPClient struct {
 	// client for interacting with the Google Cloud
 	// Storage APIs.
-	Client Client
+	Client
 	// startRange is the starting read value for
 	// reading the object from bucket.
 	StartRange int64
@@ -165,9 +164,6 @@ func ValidateSecret(secret map[string][]byte, name string) error {
 	if _, exists := secret["clientemail"]; !exists {
 		return fmt.Errorf("invalid '%s' secret data: required fields 'clientemail'", name)
 	}
-	if _, exists := secret["clientemail"]; !exists {
-		return fmt.Errorf("invalid '%s' secret data: required fields 'clientemail'", name)
-	}
 	if _, exists := secret["clientid"]; !exists {
 		return fmt.Errorf("invalid '%s' secret data: required fields 'clientid'", name)
 	}
diff --git a/pkg/gcp/gcp_test.go b/pkg/gcp/gcp_test.go
index f30774ac..ed72f9d2 100644
--- a/pkg/gcp/gcp_test.go
+++ b/pkg/gcp/gcp_test.go
@@ -57,7 +57,7 @@ var _ = BeforeSuite(func() {
 		Expect(err).ToNot(HaveOccurred())
 	}
 	localPath = filepath.Join(tempDir, objectName)
-	MockClient.EXPECT().Bucket(bucketName).Return(MockBucketHandle).AnyTimes()
+	MockClient.EXPECT().Bucket(bucketName).Return(&gcpStorage.BucketHandle{}).AnyTimes()
 	MockBucketHandle.EXPECT().Object(objectName).Return(&gcpStorage.ObjectHandle{}).AnyTimes()
 	MockBucketHandle.EXPECT().Attrs(context.Background()).Return(&gcpStorage.BucketAttrs{
 		Name:    bucketName,
diff --git a/pkg/gcp/mocks/mock_gcp_storage.go b/pkg/gcp/mocks/mock_gcp_storage.go
index 54b78be1..25b5e9c1 100644
--- a/pkg/gcp/mocks/mock_gcp_storage.go
+++ b/pkg/gcp/mocks/mock_gcp_storage.go
@@ -101,34 +101,6 @@ func (mr *MockBucketHandleMockRecorder) Attrs(arg0 interface{}) *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Attrs", reflect.TypeOf((*MockBucketHandle)(nil).Attrs), arg0)
 }
 
-// Create mocks base method.
-func (m *MockBucketHandle) Create(arg0 context.Context, arg1 string, arg2 *storage.BucketAttrs) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Create", arg0, arg1, arg2)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// Create indicates an expected call of Create.
-func (mr *MockBucketHandleMockRecorder) Create(arg0, arg1, arg2 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockBucketHandle)(nil).Create), arg0, arg1, arg2)
-}
-
-// Delete mocks base method.
-func (m *MockBucketHandle) Delete(arg0 context.Context) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Delete", arg0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// Delete indicates an expected call of Delete.
-func (mr *MockBucketHandleMockRecorder) Delete(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockBucketHandle)(nil).Delete), arg0)
-}
-
 // Object mocks base method.
 func (m *MockBucketHandle) Object(arg0 string) *storage.ObjectHandle {
 	m.ctrl.T.Helper()