Adding more configuration to handle different cluster types

Author: jdmuntacb

connection_producer.go

@@ -15,16 +15,19 @@ import (
 )
 
 type couchbaseCapellaDBConnectionProducer struct {
-	AccessKey   string `json:"access_key"`
-	SecretKey   string `json:"secret_key"`
-	ClusterID   string `json:"cluster_id"`
-	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"`
+	AccessKey            string `json:"access_key"`
+	SecretKey            string `json:"secret_key"`
+	ClusterID            string `json:"cluster_id"`
+	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"`
 
 	Initialized bool
 	rawConfig   map[string]interface{}
@@ -70,6 +73,14 @@ 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:
+		c.CloudAPIBaseURL = "https://cloudapi.cloud.couchbase.com"
+	case len(c.ClusterType) == 0:
+		c.ClusterType = "provisioned"
+	case len(c.CloudAPIClustersPath) == 0 && c.ClusterType == "provisioned":
+		c.CloudAPIClustersPath = "/v3/clusters"
+	case len(c.CloudAPIClustersPath) == 0 && c.ClusterType == "invpc":
+		c.CloudAPIClustersPath = "/v2/clusters"
 	}
 
 	if c.TLS {

couchbasecapella.go

@@ -121,9 +121,10 @@ func (c *CouchbaseCapellaDB) DeleteUser(ctx context.Context, req dbplugin.Delete
 	c.RLock()
 	defer c.RUnlock()
 
-	err := DeleteCapellaUser("https://cloudapi.cloud.couchbase.com", c.couchbaseCapellaDBConnectionProducer.ClusterID,
+	err := DeleteCapellaUser(c.CloudAPIBaseURL, c.couchbaseCapellaDBConnectionProducer.ClusterID,
 		c.couchbaseCapellaDBConnectionProducer.AccessKey,
 		c.couchbaseCapellaDBConnectionProducer.SecretKey,
+		c.couchbaseCapellaDBConnectionProducer.CloudAPIClustersPath,
 		req.Username)
 	if err != nil {
 		return dbplugin.DeleteUserResponse{}, err
@@ -147,7 +148,7 @@ func newUser(ctx context.Context, c *couchbaseCapellaDBConnectionProducer, usern
 		return errwrap.Wrapf("error unmarshalling roles and groups creation statement JSON: {{err}}", err)
 	}
 
-	err = CreateCapellaUser("https://cloudapi.cloud.couchbase.com", c.ClusterID, c.AccessKey, c.SecretKey, "*", username, req.Password, "")
+	err = CreateCapellaUser(c.CloudAPIBaseURL, c.ClusterID, c.AccessKey, c.SecretKey, c.CloudAPIClustersPath, "*", username, req.Password, "")
 	if err != nil {
 		return err
 	}

httputils.go

@@ -7,7 +7,6 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
-	"os"
 	"strings"
 	"testing"
 	"time"
@@ -180,7 +179,6 @@ const (
 	headerKeyTimestamp     = "Couchbase-Timestamp"
 	headerKeyAuthorization = "Authorization"
 	headerKeyContentType   = "Content-Type"
-	clusterAPIEndpoint     = "/v3/clusters/"
 )
 
 type CapellaClient struct {
@@ -191,12 +189,6 @@ type CapellaClient struct {
 }
 
 func NewClient(baseURL, access, secret string) *CapellaClient {
-	if baseURL == "" {
-		defaultBaseUrl := "https://cloudapi.cloud.couchbase.com"
-		if baseURL = os.Getenv("BASE_URL"); baseURL == "" {
-			baseURL = defaultBaseUrl
-		}
-	}
 	return &CapellaClient{
 		baseURL:    baseURL,
 		access:     access,
@@ -267,7 +259,7 @@ type UserCreateAccess struct {
 }
 
 func CreateCapellaUser(baseUrl string, clusterID string, accessKey string, secretKey,
-	bucketName string, username string, password string, roleName string) error {
+	cloudAPIclustersEndPoint string, bucketName string, username string, password string, roleName string) error {
 
 	c := NewCapellaClient(baseUrl, accessKey, secretKey)
 	if c == nil {
@@ -296,16 +288,16 @@ func CreateCapellaUser(baseUrl string, clusterID string, accessKey string, secre
 		}
 	}
 
-	resp, err := c.Do(http.MethodPost, clusterAPIEndpoint+clusterID+"/users", userCreatePayload)
+	resp, err := c.Do(http.MethodPost, cloudAPIclustersEndPoint+"/"+clusterID+"/users", userCreatePayload)
 	if resp != nil && resp.StatusCode != 201 {
 		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, clusterAPIEndpoint+clusterID+"/users", userCreatePayload.Username)
+				err1, cloudAPIclustersEndPoint+"/"+clusterID+"/users", userCreatePayload.Username)
 		}
 		return fmt.Errorf("Failed during capella user creation, response = %s, ep = %s, user = %v",
-			string(b), clusterAPIEndpoint+clusterID+"/users", userCreatePayload.Username)
+			string(b), cloudAPIclustersEndPoint+"/"+clusterID+"/users", userCreatePayload.Username)
 	}
 	if err != nil {
 		return err
@@ -314,12 +306,12 @@ func CreateCapellaUser(baseUrl string, clusterID string, accessKey string, secre
 	return nil
 }
 
-func DeleteCapellaUser(baseUrl string, clusterID string, accessKey string, secretKey, username string) error {
+func DeleteCapellaUser(baseUrl string, clusterID string, accessKey string, secretKey, cloudAPIclustersEndPoint string, username string) error {
 	c := NewCapellaClient(baseUrl, accessKey, secretKey)
-	resp, err := c.Do(http.MethodDelete, clusterAPIEndpoint+clusterID+"/users/"+username, nil)
+	resp, err := c.Do(http.MethodDelete, cloudAPIclustersEndPoint+"/"+clusterID+"/users/"+username, nil)
 	if resp != nil && resp.StatusCode != 204 {
 		return fmt.Errorf("Failed during capella user deletion, response = %v, ep = %s",
-			resp, clusterAPIEndpoint+clusterID+"/users/"+username)
+			resp, cloudAPIclustersEndPoint+"/"+clusterID+"/users/"+username)
 	}
 	if err != nil {
 		return err