fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tests for GCP Bucket Provider 

Signed-off-by: pa250194 <pa250194@ncr.com>
This commit is contained in:
pa250194 2021-09-14 09:34:02 -05:00
parent 0444c6e16d
commit eeb38bdf2c
4 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/spec/v1alpha1/buckets.md
View File

@ -11,7 +11,7 @@ Bucket:
// BucketSpec defines the desired state of an S3 compatible bucket // BucketSpec defines the desired state of an S3 compatible bucket
type BucketSpec struct { type BucketSpec struct {
// The S3 compatible storage provider name, default ('generic'). // The S3 compatible storage provider name, default ('generic').
// +kubebuilder:validation:Enum=generic;aws // +kubebuilder:validation:Enum=generic;aws;gcp
// +optional // +optional
Provider string `json:"provider,omitempty"` Provider string `json:"provider,omitempty"`

8
pkg/gcp/gcp.go
View File

@ -55,8 +55,6 @@ type Client interface {
} }
type BucketHandle interface { type BucketHandle interface {
Create(context.Context, string, *gcpStorage.BucketAttrs) error
Delete(context.Context) error
Attrs(context.Context) (*gcpStorage.BucketAttrs, error) Attrs(context.Context) (*gcpStorage.BucketAttrs, error)
Object(string) *gcpStorage.ObjectHandle Object(string) *gcpStorage.ObjectHandle
Objects(context.Context, *gcpStorage.Query) *gcpStorage.ObjectIterator Objects(context.Context, *gcpStorage.Query) *gcpStorage.ObjectIterator
@ -66,10 +64,11 @@ type ObjectHandle interface {
Attrs(context.Context) (*gcpStorage.ObjectAttrs, error) Attrs(context.Context) (*gcpStorage.ObjectAttrs, error)
NewRangeReader(context.Context, int64, int64) (*gcpStorage.Reader, error) NewRangeReader(context.Context, int64, int64) (*gcpStorage.Reader, error)
} }
type GCPClient struct { type GCPClient struct {
// client for interacting with the Google Cloud // client for interacting with the Google Cloud
// Storage APIs. // Storage APIs.
Client Client Client
// startRange is the starting read value for // startRange is the starting read value for
// reading the object from bucket. // reading the object from bucket.
StartRange int64 StartRange int64
@ -165,9 +164,6 @@ func ValidateSecret(secret map[string][]byte, name string) error {
if _, exists := secret["clientemail"]; !exists { if _, exists := secret["clientemail"]; !exists {
return fmt.Errorf("invalid '%s' secret data: required fields 'clientemail'", name) 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 { if _, exists := secret["clientid"]; !exists {
return fmt.Errorf("invalid '%s' secret data: required fields 'clientid'", name) return fmt.Errorf("invalid '%s' secret data: required fields 'clientid'", name)
} }

2
pkg/gcp/gcp_test.go
View File

@ -57,7 +57,7 @@ var _ = BeforeSuite(func() {
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
} }
localPath = filepath.Join(tempDir, objectName) 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().Object(objectName).Return(&gcpStorage.ObjectHandle{}).AnyTimes()
MockBucketHandle.EXPECT().Attrs(context.Background()).Return(&gcpStorage.BucketAttrs{ MockBucketHandle.EXPECT().Attrs(context.Background()).Return(&gcpStorage.BucketAttrs{
Name: bucketName, Name: bucketName,

28
pkg/gcp/mocks/mock_gcp_storage.go
View File

@ -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) 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. // Object mocks base method.
func (m *MockBucketHandle) Object(arg0 string) *storage.ObjectHandle { func (m *MockBucketHandle) Object(arg0 string) *storage.ObjectHandle {
m.ctrl.T.Helper() m.ctrl.T.Helper()