Merge pull request #47 from NetApp/integration/main

Sync bitbucket and GitHub
NetApp · May 20, 2021 · dc73d50 · dc73d50
2 parents 3069c85 + be7847e
commit dc73d50
Showing 1 changed file with 15 additions and 21 deletions.
diff --git a/cloudmanager/resource_netapp_cloudmanager_cvo_gcp.go b/cloudmanager/resource_netapp_cloudmanager_cvo_gcp.go
@@ -317,13 +317,12 @@ func resourceCVOGCPCreate(d *schema.ResourceData, meta interface{}) error {
 	var networkProjectID string
 	if c, ok := d.GetOk("network_project_id"); ok {
 		networkProjectID = c.(string)
-	}
-
-	if networkProjectID != "" {
-		cvoDetails.SubnetID = fmt.Sprintf("projects/%s/regions/%s/subnetworks/%s", networkProjectID, cvoDetails.Region[0:len(cvoDetails.Region)-2], subnetID)
 	} else {
-		cvoDetails.SubnetID = fmt.Sprintf("projects/%s/regions/%s/subnetworks/%s", cvoDetails.Project, cvoDetails.Region[0:len(cvoDetails.Region)-2], subnetID)
+		networkProjectID = cvoDetails.Project
 	}
+
+	cvoDetails.SubnetID = fmt.Sprintf("projects/%s/regions/%s/subnetworks/%s", networkProjectID, cvoDetails.Region[0:len(cvoDetails.Region)-2], subnetID)
+
 	cvoDetails.SubnetPath = cvoDetails.SubnetID
 
 	if c, ok := d.GetOk("firewall_rule"); ok {
@@ -369,36 +368,31 @@ func resourceCVOGCPCreate(d *schema.ResourceData, meta interface{}) error {
 			cvoDetails.HAParams.MediatorZone = c.(string)
 		}
 		if c, ok := d.GetOk("vpc0_node_and_data_connectivity"); ok {
-			if networkProjectID != "" {
-				cvoDetails.HAParams.VPC0NodeAndDataConnectivity = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/global/networks/%s", networkProjectID, c.(string))
-			} else {
-				cvoDetails.HAParams.VPC0NodeAndDataConnectivity = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/global/networks/%s", cvoDetails.Project, c.(string))
-			}
+			cvoDetails.HAParams.VPC0NodeAndDataConnectivity = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/global/networks/%s", networkProjectID, c.(string))
+
 		}
 		if c, ok := d.GetOk("vpc1_cluster_connectivity"); ok {
-			cvoDetails.HAParams.VPC1ClusterConnectivity = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/global/networks/%s", cvoDetails.Project, c.(string))
+			cvoDetails.HAParams.VPC1ClusterConnectivity = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/global/networks/%s", networkProjectID, c.(string))
+
 		}
 		if c, ok := d.GetOk("vpc2_ha_connectivity"); ok {
-			cvoDetails.HAParams.VPC2HAConnectivity = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/global/networks/%s", cvoDetails.Project, c.(string))
+			cvoDetails.HAParams.VPC2HAConnectivity = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/global/networks/%s", networkProjectID, c.(string))
+
 		}
 		if c, ok := d.GetOk("vpc3_data_replication"); ok {
-			cvoDetails.HAParams.VPC3DataReplication = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/global/networks/%s", cvoDetails.Project, c.(string))
+			cvoDetails.HAParams.VPC3DataReplication = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/global/networks/%s", networkProjectID, c.(string))
 		}
 		if c, ok := d.GetOk("subnet0_node_and_data_connectivity"); ok {
-			if networkProjectID != "" {
-				cvoDetails.HAParams.Subnet0NodeAndDataConnectivity = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/regions/%s/subnetworks/%s", networkProjectID, cvoDetails.Region[0:len(cvoDetails.Region)-2], c.(string))
-			} else {
-				cvoDetails.HAParams.Subnet0NodeAndDataConnectivity = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/regions/%s/subnetworks/%s", cvoDetails.Project, cvoDetails.Region[0:len(cvoDetails.Region)-2], c.(string))
-			}
+			cvoDetails.HAParams.Subnet0NodeAndDataConnectivity = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/regions/%s/subnetworks/%s", networkProjectID, cvoDetails.Region[0:len(cvoDetails.Region)-2], c.(string))
 		}
 		if c, ok := d.GetOk("subnet1_cluster_connectivity"); ok {
-			cvoDetails.HAParams.Subnet1ClusterConnectivity = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/regions/%s/subnetworks/%s", cvoDetails.Project, cvoDetails.Region[0:len(cvoDetails.Region)-2], c.(string))
+			cvoDetails.HAParams.Subnet1ClusterConnectivity = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/regions/%s/subnetworks/%s", networkProjectID, cvoDetails.Region[0:len(cvoDetails.Region)-2], c.(string))
 		}
 		if c, ok := d.GetOk("subnet2_ha_connectivity"); ok {
-			cvoDetails.HAParams.Subnet2HAConnectivity = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/regions/%s/subnetworks/%s", cvoDetails.Project, cvoDetails.Region[0:len(cvoDetails.Region)-2], c.(string))
+			cvoDetails.HAParams.Subnet2HAConnectivity = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/regions/%s/subnetworks/%s", networkProjectID, cvoDetails.Region[0:len(cvoDetails.Region)-2], c.(string))
 		}
 		if c, ok := d.GetOk("subnet3_data_replication"); ok {
-			cvoDetails.HAParams.Subnet3DataReplication = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/regions/%s/subnetworks/%s", cvoDetails.Project, cvoDetails.Region[0:len(cvoDetails.Region)-2], c.(string))
+			cvoDetails.HAParams.Subnet3DataReplication = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/regions/%s/subnetworks/%s", networkProjectID, cvoDetails.Region[0:len(cvoDetails.Region)-2], c.(string))
 		}
 		if c, ok := d.GetOk("vpc0_firewall_rule_name"); ok {
 			cvoDetails.HAParams.VPC0FirewallRuleName = c.(string)