Merge pull request #58 from NetApp/integration/main

Integration/main
NetApp · Jul 15, 2021 · 60a2a95 · 60a2a95
2 parents 640d1bc + afbe66f
commit 60a2a95
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cloudmanager/helper.go b/cloudmanager/helper.go
@@ -549,15 +549,14 @@ func updateCVOSVMPassword(d *schema.ResourceData, meta interface{}) error {
 	client.ClientID = d.Get("client_id").(string)
 	var request setPasswordRequest
 	request.Password = d.Get("svm_password").(string)
-	log.Print("Update svm_password: ", request.Password)
 	// Update password
 	id := d.Id()
 	baseURL := fmt.Sprintf("/working-environments/%s/set-password", id)
 	updateErr := client.callCMUpdateAPI("PUT", request, baseURL, id, "updateCVOSVMPassword")
 	if updateErr != nil {
 		return updateErr
 	}
-	log.Printf("Updated %s svm_password: %v", id, request.Password)
+	log.Printf("Updated %s svm_password", id)
 	return nil
 }
 

diff --git a/cloudmanager/resource_netapp_cloudmanager_cvo_gcp.go b/cloudmanager/resource_netapp_cloudmanager_cvo_gcp.go
@@ -320,6 +320,8 @@ func resourceCVOGCPCreate(d *schema.ResourceData, meta interface{}) error {
 	hasSelfLink := strings.HasPrefix(subnetID, "https://www.googleapis.com/compute/") || strings.HasPrefix(subnetID, "projects/")
 	if hasSelfLink != true {
 		cvoDetails.SubnetID = fmt.Sprintf("projects/%s/regions/%s/subnetworks/%s", networkProjectID, cvoDetails.Region[0:len(cvoDetails.Region)-2], subnetID)
+	} else {
+		cvoDetails.SubnetID = subnetID
 	}
 	cvoDetails.SubnetPath = cvoDetails.SubnetID