Merge pull request #167 from NetApp/integration/main

Sync bitbucket and GitHub

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 23.5.2
+NEW ENHANCEMENTS:
+* resource/cvo_azure: add `saas_subscription_id`.
+* provider: add `connector_host` for restricted mode.
+
+
 ## 23.5.1
 NEW ENHANCEMENTS:
 * resoruce/cvo_aws: add `assume_role_arn` for AWS CVO HA.

cloudmanager/config.go

@@ -3,6 +3,7 @@ package cloudmanager
 import (
 	"fmt"
 	"log"
+	"strings"
 )
 
 // Config is a struct for user input
@@ -16,6 +17,7 @@ type configStruct struct {
 	AWSProfile         string
 	AWSProfileFilePath string
 	AzureAuthMethods   []string
+	ConnectorHost      string
 }
 
 // Client is the main function to connect to the APi
@@ -66,6 +68,16 @@ func (c *configStruct) clientFun() (*Client, error) {
 		return &Client{}, fmt.Errorf("expected refresh_token or sa_secret_key and sa_client_id")
 	}
 
+	if c.ConnectorHost != "" {
+		if strings.HasPrefix(c.ConnectorHost, "https://") {
+			client.CloudManagerHost = c.ConnectorHost
+		} else if strings.HasPrefix(c.ConnectorHost, "http://") {
+			client.CloudManagerHost = c.ConnectorHost
+		} else {
+			client.CloudManagerHost = fmt.Sprintf("https://%s", c.ConnectorHost)
+		}
+	}
+
 	if c.Simulator {
 		client.SetSimulator(c.Simulator)
 	}

cloudmanager/cvo_azure.go

@@ -21,6 +21,7 @@ type createCVOAzureDetails struct {
 	WorkspaceID                 string                    `structs:"tenantId,omitempty"`
 	Region                      string                    `structs:"region"`
 	SubscriptionID              string                    `structs:"subscriptionId"`
+	SaasSubscriptionID          string                    `structs:"saasSubscriptionId,omitempty"`
 	VnetID                      string                    `structs:"vnetId,omitempty"`
 	SvmPassword                 string                    `structs:"svmPassword"`
 	SvmName                     string                    `structs:"svmName,omitempty"`

cloudmanager/provider.go

@@ -17,6 +17,12 @@ func Provider() terraform.ResourceProvider {
 				DefaultFunc: schema.EnvDefaultFunc("CLOUDMANAGER_REFRESH_TOKEN", nil),
 				Description: "The refresh_token for OCCM operations.",
 			},
+			"connector_host": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("CONNECTOR_HOST", nil),
+				Description: "Connector Host when not using BlueXP.",
+			},
 			"environment": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -109,6 +115,9 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	if v, ok := d.GetOk("aws_profile_file_path"); ok {
 		config.AWSProfileFilePath = v.(string)
 	}
+	if v, ok := d.GetOk("connector_host"); ok {
+		config.ConnectorHost = v.(string)
+	}
 	if v, ok := d.GetOk("azure_auth_methods"); ok {
 		// a bit complicated, as the type is only known at runtime
 		intMethods := v.([]interface{})

cloudmanager/resource_netapp_cloudmanager_cvo_azure.go

@@ -37,6 +37,11 @@ func resourceCVOAzure() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+			"saas_subscription_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
 			"workspace_id": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -322,6 +327,10 @@ func resourceCVOAzureCreate(d *schema.ResourceData, meta interface{}) error {
 	cvoDetails.WorkspaceID = d.Get("workspace_id").(string)
 	cvoDetails.StorageType = d.Get("storage_type").(string)
 	cvoDetails.SvmPassword = d.Get("svm_password").(string)
+
+	if c, ok := d.GetOk("saas_subscription_id"); ok {
+		cvoDetails.SaasSubscriptionID = c.(string)
+	}
 	if c, ok := d.GetOk("svm_name"); ok {
 		cvoDetails.SvmName = c.(string)
 	}