update controllers, test and sample driver to use updated api/spec

Author: Krish Chowdhary

cmd/objectstorage-sidecar/app/objectstorage-sidecar.go

@@ -54,15 +54,18 @@ func (so *SidecarOptions) Run() {
 
 	klog.Infof("creating provisioner client")
 	provisionerClient := osspec.NewProvisionerClient(grpcConn)
+	identityClient := osspec.NewIdentityClient(grpcConn)
 
 	klog.Infof("discovering driver name")
 	req := osspec.ProvisionerGetInfoRequest{}
-	rsp, err := provisionerClient.ProvisionerGetInfo(ctx, &req)
+	rsp, err := identityClient.ProvisionerGetInfo(ctx, &req)
 	if err != nil {
 		klog.Errorf("error calling ProvisionerGetInfo: %v", err)
 		os.Exit(1)
 	}
 
+	// TODO: go routine with health check to vendor driver
+
 	provisionerName := rsp.Name
 	// TODO: Register provisioner using internal type
 	klog.Info("This sidecar is working with the driver identified as: ", provisionerName)

cmd/sample-driver/driver-server.go

@@ -63,41 +63,54 @@ func (ds DriverServer) ProvisionerCreateBucket(ctx context.Context, req *cosi.Pr
 		return nil, status.Error(codes.Unavailable, "Driver is missing version")
 	}
 
-	err := ds.S3Client.MakeBucket(req.BucketName, "")
+	s3 := req.Protocol.GetS3()
+	if s3 == nil {
+		return nil, status.Error(codes.Unavailable, "Driver is missing protocol")
+	}
+
+	err := ds.S3Client.MakeBucket(s3.BucketName, "")
 	if err != nil {
 		// Check to see if the bucket already exists
-		exists, errBucketExists := ds.S3Client.BucketExists(req.BucketName)
+		exists, errBucketExists := ds.S3Client.BucketExists(s3.BucketName)
 		if errBucketExists == nil && exists {
-			klog.Info("Backend Bucket already exists", req.BucketName)
+			klog.Info("Backend Bucket already exists", s3.BucketName)
 			return &cosi.ProvisionerCreateBucketResponse{}, nil
 		} else {
 			klog.Error(err)
 			return &cosi.ProvisionerCreateBucketResponse{}, err
 		}
 	}
-	klog.Info("Successfully created Backend Bucket", req.BucketName)
+	klog.Info("Successfully created Backend Bucket", s3.BucketName)
 
 	return &cosi.ProvisionerCreateBucketResponse{}, nil
 }
 
 func (ds *DriverServer) ProvisionerDeleteBucket(ctx context.Context, req *cosi.ProvisionerDeleteBucketRequest) (*cosi.ProvisionerDeleteBucketResponse, error) {
+	s3 := req.Protocol.GetS3()
+	if s3 == nil {
+		return nil, status.Error(codes.Unavailable, "Driver is missing protocol")
+	}
 
-	if err := ds.S3Client.RemoveBucket(req.BucketName); err != nil {
-		klog.Info("failed to delete bucket", req.BucketName)
+	if err := ds.S3Client.RemoveBucket(s3.BucketName); err != nil {
+		klog.Info("failed to delete bucket", s3.BucketName)
 		return nil, err
-
 	}
+
 	return &cosi.ProvisionerDeleteBucketResponse{}, nil
 }
 
 func (ds *DriverServer) ProvisionerGrantBucketAccess(ctx context.Context, req *cosi.ProvisionerGrantBucketAccessRequest) (*cosi.ProvisionerGrantBucketAccessResponse, error) {
-
 	creds, err := auth.GetNewCredentials()
 	if err != nil {
 		klog.Error("failed to generate new credentails")
 		return nil, err
 	}
 
+	s3 := req.Protocol.GetS3()
+	if s3 == nil {
+		return nil, status.Error(codes.Unavailable, "Driver is missing protocol")
+	}
+
 	if err := ds.S3AdminClient.AddUser(context.Background(), creds.AccessKey, creds.SecretKey); err != nil {
 		klog.Error("failed to create user", err)
 		return nil, err
@@ -110,7 +123,7 @@ func (ds *DriverServer) ProvisionerGrantBucketAccess(ctx context.Context, req *c
 			iampolicy.NewStatement(
 				policy.Allow,
 				iampolicy.NewActionSet("s3:*"),
-				iampolicy.NewResourceSet(iampolicy.NewResource(req.GetBucketName()+"/*", "")),
+				iampolicy.NewResourceSet(iampolicy.NewResource(s3.BucketName+"/*", "")),
 				condition.NewFunctions(),
 			)},
 	}

pkg/controller/bucket/bucket_controller.go

@@ -19,6 +19,7 @@ package bucket
 import (
 	"context"
 	"fmt"
+	"github.com/pkg/errors"
 	"strings"
 	"time"
 
@@ -101,20 +102,28 @@ func (bl *bucketListener) Add(ctx context.Context, obj *v1alpha1.Bucket) error {
 	}
 
 	req := osspec.ProvisionerCreateBucketRequest{
-		BucketName:    obj.Name,
-		BucketContext: bl.getParams(obj),
+		Parameters: bl.getParams(obj),
 	}
+	if req.Parameters == nil {
+		req.Parameters = make(map[string]string)
+	}
+
+	proto, err := obj.Spec.Protocol.ConvertToExternal()
+	if err != nil {
+		return errors.Wrap(err, "failed to parse protocol for API")
+	}
+	req.Protocol = proto
 
-	req.BucketContext["ProtocolVersion"] = obj.Spec.Protocol.Version
+	req.Parameters["ProtocolVersion"] = obj.Spec.Protocol.Version
 
 	if obj.Spec.AnonymousAccessMode.Private {
-		req.AnonymousBucketAccessMode = osspec.ProvisionerCreateBucketRequest_BUCKET_PRIVATE
+		req.AnonymousBucketAccessMode = osspec.AnonymousBucketAccessMode_Private
 	} else if obj.Spec.AnonymousAccessMode.PublicReadOnly {
-		req.AnonymousBucketAccessMode = osspec.ProvisionerCreateBucketRequest_BUCKET_READ_ONLY
+		req.AnonymousBucketAccessMode = osspec.AnonymousBucketAccessMode_ReadOnly
 	} else if obj.Spec.AnonymousAccessMode.PublicReadWrite {
-		req.AnonymousBucketAccessMode = osspec.ProvisionerCreateBucketRequest_BUCKET_WRITE_ONLY
+		req.AnonymousBucketAccessMode = osspec.AnonymousBucketAccessMode_ReadWrite
 	} else if obj.Spec.AnonymousAccessMode.PublicWriteOnly {
-		req.AnonymousBucketAccessMode = osspec.ProvisionerCreateBucketRequest_BUCKET_READ_WRITE
+		req.AnonymousBucketAccessMode = osspec.AnonymousBucketAccessMode_WriteOnly
 	}
 
 	// TODO set grpc timeout
@@ -147,28 +156,19 @@ func (bl *bucketListener) Delete(ctx context.Context, obj *v1alpha1.Bucket) erro
 	}
 
 	req := osspec.ProvisionerDeleteBucketRequest{
-		BucketContext: bl.getParams(obj),
+		Parameters: bl.getParams(obj),
+	}
+	if req.Parameters == nil {
+		req.Parameters = make(map[string]string)
 	}
 
-	switch obj.Spec.Protocol.Name {
-	case v1alpha1.ProtocolNameS3:
-		req.BucketName = obj.Spec.Protocol.S3.BucketName
-		req.BucketContext["Region"] = obj.Spec.Protocol.S3.Region
-		req.BucketContext["SignatureVersion"] = string(obj.Spec.Protocol.S3.SignatureVersion)
-		req.BucketContext["Endpoint"] = obj.Spec.Protocol.S3.Endpoint
-	case v1alpha1.ProtocolNameAzure:
-		req.BucketName = obj.Spec.Protocol.AzureBlob.ContainerName
-		req.BucketContext["StorageAccount"] = obj.Spec.Protocol.AzureBlob.StorageAccount
-	case v1alpha1.ProtocolNameGCS:
-		req.BucketName = obj.Spec.Protocol.GCS.BucketName
-		req.BucketContext["ServiceAccount"] = obj.Spec.Protocol.GCS.ServiceAccount
-		req.BucketContext["PrivateKeyName"] = obj.Spec.Protocol.GCS.PrivateKeyName
-		req.BucketContext["ProjectID"] = obj.Spec.Protocol.GCS.ProjectID
-	default:
-		return fmt.Errorf("unknown protocol: %s", obj.Spec.Protocol.Name)
+	proto, err := obj.Spec.Protocol.ConvertToExternal()
+	if err != nil {
+		return errors.Wrap(err, "failed to parse protocol for API")
 	}
+	req.Protocol = proto
 
-	req.BucketContext["ProtocolVersion"] = obj.Spec.Protocol.Version
+	req.Parameters["ProtocolVersion"] = obj.Spec.Protocol.Version
 
 	// TODO set grpc timeout
 	rsp, err := bl.provisionerClient.ProvisionerDeleteBucket(ctx, &req)