Added more parameterization and fixed the create user usage.

Author: jdmuntacb

connection_producer.go

@@ -21,13 +21,16 @@ type couchbaseCapellaDBConnectionProducer struct {
 	ClusterType          string `json:"cluster_type"`
 	CloudAPIBaseURL      string `json:"cloud_api_base_url"`
 	CloudAPIClustersPath string `json:"cloud_api_clusters_path"`
-	Hosts                string `json:"hosts"`
-	Username             string `json:"username"`
-	Password             string `json:"password"`
-	TLS                  bool   `json:"tls"`
-	InsecureTLS          bool   `json:"insecure_tls"`
-	Base64Pem            string `json:"base64pem"`
 	BucketName           string `json:"bucket_name"`
+	ScopeName            string `json:"scope_name"`
+	AccessRole           string `json:"access_role"`
+
+	Hosts       string `json:"hosts"`
+	Username    string `json:"username"`
+	Password    string `json:"password"`
+	TLS         bool   `json:"tls"`
+	InsecureTLS bool   `json:"insecure_tls"`
+	Base64Pem   string `json:"base64pem"`
 
 	Initialized bool
 	rawConfig   map[string]interface{}
@@ -73,15 +76,25 @@ func (c *couchbaseCapellaDBConnectionProducer) Init(ctx context.Context, initCon
 		return nil, fmt.Errorf("access_key cannot be empty")
 	case len(c.SecretKey) == 0:
 		return nil, fmt.Errorf("secret_key cannot be empty")
-	case len(c.CloudAPIBaseURL) == 0:
+	}
+
+	if len(c.CloudAPIBaseURL) == 0 {
 		c.CloudAPIBaseURL = "https://cloudapi.cloud.couchbase.com"
-	case len(c.ClusterType) == 0:
+	}
+	if len(c.ClusterType) == 0 {
 		c.ClusterType = "provisioned"
-	case len(c.CloudAPIClustersPath) == 0 && c.ClusterType == "provisioned":
+	}
+	if len(c.CloudAPIClustersPath) == 0 && c.ClusterType == "provisioned" {
 		c.CloudAPIClustersPath = "/v3/clusters"
-	case len(c.CloudAPIClustersPath) == 0 && c.ClusterType == "invpc":
+	} else if len(c.CloudAPIClustersPath) == 0 && c.ClusterType == "invpc" {
 		c.CloudAPIClustersPath = "/v2/clusters"
 	}
+	if len(c.AccessRole) == 0 {
+		c.AccessRole = "data_writer"
+	}
+	if len(c.ScopeName) == 0 {
+		c.ScopeName = "*"
+	}
 
 	if c.TLS {
 		if len(c.Base64Pem) == 0 {

couchbasecapella.go

@@ -148,7 +148,8 @@ func newUser(ctx context.Context, c *couchbaseCapellaDBConnectionProducer, usern
 		return errwrap.Wrapf("error unmarshalling roles and groups creation statement JSON: {{err}}", err)
 	}
 
-	err = CreateCapellaUser(c.CloudAPIBaseURL, c.ClusterID, c.AccessKey, c.SecretKey, c.CloudAPIClustersPath, "*", username, req.Password, "")
+	err = CreateCapellaUser(c.CloudAPIBaseURL, c.ClusterID, c.AccessKey, c.SecretKey, c.CloudAPIClustersPath, c.BucketName,
+		c.ScopeName, username, req.Password, c.AccessRole)
 	if err != nil {
 		return err
 	}

httputils.go

@@ -259,31 +259,30 @@ type UserCreateAccess struct {
 }
 
 func CreateCapellaUser(baseUrl string, clusterID string, accessKey string, secretKey,
-	cloudAPIclustersEndPoint string, bucketName string, username string, password string, roleName string) error {
+	cloudAPIclustersEndPoint string, bucketName string, scopeName string, username string, password string, roleName string) error {
 
 	c := NewCapellaClient(baseUrl, accessKey, secretKey)
 	if c == nil {
 		return fmt.Errorf("Failed in creating capella client, %v", c)
 	}
 
-	if roleName == "" || len(roleName) == 0 {
-		roleName = "data_writer"
-	}
 	var userCreatePayload UserCreatePayload
-	if bucketName != "" || len(bucketName) == 0 {
+	if len(bucketName) != 0 {
 		userCreatePayload = UserCreatePayload{
 			Username: username,
 			Password: password,
 			Buckets: []UserCreateAccess{
 				{
 					Name:  bucketName,
-					Scope: "*",
+					Scope: scopeName,
 					Roles: roleName,
 				},
 			},
 		}
 	} else {
 		userCreatePayload = UserCreatePayload{
+			Username:         username,
+			Password:         password,
 			AllBucketsAccess: roleName,
 		}
 	}
@@ -293,11 +292,11 @@ func CreateCapellaUser(baseUrl string, clusterID string, accessKey string, secre
 		defer resp.Body.Close()
 		b, err1 := io.ReadAll(resp.Body)
 		if err1 != nil {
-			return fmt.Errorf("Failed during capella user creation, reading response error = %v, ep = %s, user = %v",
-				err1, cloudAPIclustersEndPoint+"/"+clusterID+"/users", userCreatePayload.Username)
+			return fmt.Errorf("Failed during capella user creation, reading response error = %v, ep = %s, user = %v, payload=%v",
+				err1, cloudAPIclustersEndPoint+"/"+clusterID+"/users", userCreatePayload.Username, userCreatePayload)
 		}
-		return fmt.Errorf("Failed during capella user creation, response = %s, ep = %s, user = %v",
-			string(b), cloudAPIclustersEndPoint+"/"+clusterID+"/users", userCreatePayload.Username)
+		return fmt.Errorf("Failed during capella user creation, response = %s, ep = %s, user = %v, payload = %v",
+			string(b), cloudAPIclustersEndPoint+"/"+clusterID+"/users", userCreatePayload.Username, userCreatePayload)
 	}
 	if err != nil {
 		return err