Test fixes and compilation fixes

Author: mukhoakash

Diff for: container-object-storage-interface-provisioner-sidecar/pkg/bucket/bucket_controller.go

@@ -39,7 +39,7 @@ import (
 // BucketListener manages Bucket objects
 type BucketListener struct {
 	provisionerClient cosi.ProvisionerClient
-	driverName   string
+	driverName        string
 
 	kubeClient   kube.Interface
 	bucketClient buckets.Interface
@@ -121,7 +121,6 @@ func (b *BucketListener) Add(ctx context.Context, inputBucket *v1alpha1.Bucket)
 			return err
 		}
 
-
 		// Now we update the BucketReady status of BucketClaim
 		if bucket.Spec.BucketClaim != nil {
 			ref := bucket.Spec.BucketClaim
@@ -253,7 +252,7 @@ func (b *BucketListener) deleteBucketOp(ctx context.Context, bucket *v1alpha1.Bu
 
 	if bucket.Spec.BucketClaim != nil {
 		ref := bucket.Spec.BucketClaim
-		bucketClaim, err := b.bucketClaims(ref.ObjectMeta.Namespace).Get(ctx, ref.ObjectMeta.Name, metav1.GetOptions{})
+		bucketClaim, err := b.bucketClaims(ref.Namespace).Get(ctx, ref.Name, metav1.GetOptions{})
 		if err != nil {
 			return err
 		}
@@ -280,14 +279,12 @@ func (b *BucketListener) bucketClaims(namespace string) bucketapi.BucketClaimInt
 		return b.bucketClient.ObjectstorageV1alpha1().BucketClaims(namespace)
 	}
 
-	panic ("uninitialized listener")
+	panic("uninitialized listener")
 }
 
-
 func (b *BucketListener) bucketAccesses(namespace string) bucketapi.BucketAccessInterface {
 	if b.bucketClient != nil {
 		return b.bucketClient.ObjectstorageV1alpha1().BucketAccesses(namespace)
 	}
 	panic("uninitialized listener")
 }
-

Diff for: container-object-storage-interface-provisioner-sidecar/pkg/bucket/bucket_controller_test.go

@@ -25,7 +25,6 @@ import (
 	cosi "sigs.k8s.io/container-object-storage-interface-spec"
 	fakespec "sigs.k8s.io/container-object-storage-interface-spec/fake"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	utilversion "k8s.io/apimachinery/pkg/util/version"
 	"k8s.io/apimachinery/pkg/version"
 	fakediscovery "k8s.io/client-go/discovery/fake"
@@ -71,23 +70,23 @@ func TestInitializeBucketClient(t *testing.T) {
 }
 
 func TestAddWrongProvisioner(t *testing.T) {
-	provisioner := "provisioner1"
+	driver := "driver1"
 	mpc := struct{ fakespec.FakeProvisionerClient }{}
-	mpc.FakeProvisionerCreateBucket = func(ctx context.Context,
-		in *cosi.ProvisionerCreateBucketRequest,
-		opts ...grpc.CallOption) (*cosi.ProvisionerCreateBucketResponse, error) {
+	mpc.FakeDriverCreateBucket = func(ctx context.Context,
+		in *cosi.DriverCreateBucketRequest,
+		opts ...grpc.CallOption) (*cosi.DriverCreateBucketResponse, error) {
 		t.Errorf("grpc client called")
 		return nil, nil
 	}
 
 	bl := BucketListener{
-		provisionerName:   provisioner,
+		driverName:        driver,
 		provisionerClient: &mpc,
 	}
 
 	b := v1alpha1.Bucket{
 		Spec: v1alpha1.BucketSpec{
-			Provisioner: "provisioner2",
+			DriverName: "driver2",
 		},
 	}
 	ctx := context.TODO()
@@ -96,92 +95,3 @@ func TestAddWrongProvisioner(t *testing.T) {
 		t.Errorf("Error returned: %+v", err)
 	}
 }
-
-func TestDeleteWrongProvisioner(t *testing.T) {
-	provisioner := "provisioner1"
-	mpc := struct{ fakespec.FakeProvisionerClient }{}
-	mpc.FakeProvisionerDeleteBucket = func(ctx context.Context,
-		in *cosi.ProvisionerDeleteBucketRequest,
-		opts ...grpc.CallOption) (*cosi.ProvisionerDeleteBucketResponse, error) {
-		t.Errorf("grpc client called")
-		return nil, nil
-	}
-
-	bl := BucketListener{
-		provisionerName:   provisioner,
-		provisionerClient: &mpc,
-	}
-
-	b := v1alpha1.Bucket{
-		Spec: v1alpha1.BucketSpec{
-			Provisioner: "provisioner2",
-		},
-	}
-	ctx := context.TODO()
-	err := bl.Delete(ctx, &b)
-	if err != nil {
-		t.Errorf("error returned: %+v", err)
-	}
-}
-
-func TestBucketDeletion(t *testing.T) {
-	provisioner := "provisioner1"
-	bucketId := "bucket1"
-	mpc := struct{ fakespec.FakeProvisionerClient }{}
-
-	testCases := []struct {
-		name       string
-		setFields  func(*v1alpha1.Bucket)
-		deleteFunc func(ctx context.Context,
-			in *cosi.ProvisionerDeleteBucketRequest,
-			opts ...grpc.CallOption) (*cosi.ProvisionerDeleteBucketResponse, error)
-	}{
-		{
-			name: "BucketDeletion",
-			setFields: func(b *v1alpha1.Bucket) {
-				b.Status.BucketID = bucketId
-			},
-			deleteFunc: func(ctx context.Context,
-				req *cosi.ProvisionerDeleteBucketRequest,
-				opts ...grpc.CallOption) (*cosi.ProvisionerDeleteBucketResponse, error) {
-				inBucketId := req.BucketId
-				if inBucketId != bucketId {
-					t.Errorf("expected %s, got %s", bucketId, inBucketId)
-				}
-				return &cosi.ProvisionerDeleteBucketResponse{}, nil
-			},
-		},
-	}
-
-	for _, tc := range testCases {
-		b := v1alpha1.Bucket{
-			Spec: v1alpha1.BucketSpec{
-				Provisioner: provisioner,
-			},
-			Status: v1alpha1.BucketStatus{
-				BucketAvailable: true,
-			},
-		}
-
-		ctx := context.TODO()
-		client := fakebucketclientset.NewSimpleClientset(&b)
-		mpc.FakeProvisionerDeleteBucket = tc.deleteFunc
-		bl := BucketListener{
-			provisionerName:   provisioner,
-			provisionerClient: &mpc,
-			bucketClient:      client,
-		}
-
-		tc.setFields(&b)
-		t.Logf(tc.name)
-		err := bl.Delete(ctx, &b)
-		if err != nil {
-			t.Errorf("Error running TestBucketDeletion: %v", err)
-		}
-
-		updatedB, _ := client.ObjectstorageV1alpha1().Buckets().Get(ctx, b.Name, metav1.GetOptions{})
-		if updatedB.Status.BucketAvailable != false {
-			t.Errorf("Expected %t, got %t", false, b.Status.BucketAvailable)
-		}
-	}
-}