Merge branch 'integration/main' into main

Author: suhasbshekar

CHANGELOG.md

@@ -1,3 +1,20 @@
+## 26.0.0
+BREAKING CHANGE:
+* resource/aggregate: `number_of_disks` and `disk_size_size` default value is removed.
+
+IMPROVEMENTS:
+* resource/connector_gcp: replaced GCP Deployment Manager API with individual GCP Compute Engine APIs for VM and disk management.
+
+NEW FEATURES:
+* resource/aggregate: added option `increase_capacity_size` and `increase_capacity_unit` to support increase capacity for EBS Elastic Volumes aggregate.
+* resource/aggregate: added option `initial_ev_aggregate_size` and `initial_ev_aggregate_unit` to support initial capacity for EBS Elastic Volumes aggregate.
+* resource/snapmirror: now supports import.
+* resource/snapmirror: add `delete_destination_volume` option to automatically delete destination volume when destroying snapmirror relationships.
+
+ENHANCEMENTS:
+* Update all the resources documenation by adding `Forces new resource` if the modification is not supported.
+* resource/cvo_aws and resource/cvo_azure: add `open_security_group` option to open security group to all IP ranges
+
 ## 25.3.0
 NEW FEATURES:
 * resource/volume supports import.
@@ -96,7 +113,7 @@ BUG FIXES:
 ## 23.8.0
 BUG FIXES:
 * resource/volume: fix documentation name for volume and add an example for creating on_prem volume.
-* ressource/cvo_aws, cvo_azure, cvo_gcp: remove force new from `retries`.
+* resource/cvo_aws, cvo_azure, cvo_gcp: remove force new from `retries`.
 
 NEW ENHANCEMENTS:
 * resource/cvo_aws and cvo_gcp: add `saas_subscription_id`.
@@ -198,12 +215,12 @@ NEW FEATURES:
 * resource/cvo_aws: add `retries` parameter to increase wait time when creating CVO.
 * resource/cvo_azure: add `retries` parameter to increase wait time when creating CVO.
 * resource/cvo_gcp: add `retries` parameter to increase wait time when creating CVO.
-* resoruce/cvs for AWS, AZURE and GCP: add `svm_name` an optional parameter. The modification is supported.
+* resource/cvs for AWS, AZURE and GCP: add `svm_name` an optional parameter. The modification is supported.
 
 NEW ENHANCEMENTS:
 * resource/connector_azure: display the deployed virtual machine principal_id in state file on the connector azure creation.
 * resource/cvo_azure: add `availability_zone_node1` and `availability_zone_node2` to support HA deployment.
-* resoruce/cvo_azure: add new support value "Premium_ZRS" in parameter `storage_type`.
+* resource/cvo_azure: add new support value "Premium_ZRS" in parameter `storage_type`.
 
 ## 22.9.1
 NEW FEATURES:
@@ -302,7 +319,7 @@ ENHANCEMENTS:
 NEW FEATURES:
 
 * resource/aws_fsx_volume: create, update and delete FSx volume.
-* resource/cvo_onnprem: This can be used to register an onprem ONTAP system into CloudManager.
+* resource/cvo_onprem: This can be used to register an onprem ONTAP system into CloudManager.
 
 ## 21.11.1
 ENHANCEMENTS:

cloudmanager/aggregate.go

@@ -13,15 +13,16 @@ import (
 
 // createAggregateRequest the users input for creating an Aggregate
 type createAggregateRequest struct {
-	Name                 string   `structs:"name"`
-	WorkingEnvironmentID string   `structs:"workingEnvironmentId"`
-	NumberOfDisks        int      `structs:"numberOfDisks"`
-	DiskSize             diskSize `structs:"diskSize"`
-	HomeNode             string   `structs:"homeNode,omitempty"`
-	ProviderVolumeType   string   `structs:"providerVolumeType,omitempty"`
-	CapacityTier         string   `structs:"capacityTier,omitempty"`
-	Iops                 int      `structs:"iops,omitempty"`
-	Throughput           int      `structs:"throughput,omitempty"`
+	Name                   string   `structs:"name"`
+	WorkingEnvironmentID   string   `structs:"workingEnvironmentId"`
+	NumberOfDisks          int      `structs:"numberOfDisks,omitempty"`
+	DiskSize               diskSize `structs:"diskSize,omitempty"`
+	HomeNode               string   `structs:"homeNode,omitempty"`
+	ProviderVolumeType     string   `structs:"providerVolumeType,omitempty"`
+	CapacityTier           string   `structs:"capacityTier,omitempty"`
+	Iops                   int      `structs:"iops,omitempty"`
+	Throughput             int      `structs:"throughput,omitempty"`
+	InitialEvAggregateSize diskSize `structs:"initialEvAggregateSize,omitempty"`
 }
 
 // diskSize struct
@@ -107,6 +108,12 @@ type updateAggregateRequest struct {
 	NumberOfDisks        int    `structs:"numberOfDisks"`
 }
 
+type increaseAggregateCapacityRequest struct {
+	WorkingEnvironmentID string   `structs:"workingEnvironmentId"`
+	AggregateName        string   `structs:"aggregateName"`
+	CapacityToAdd        diskSize `structs:"capacityToAdd"`
+}
+
 // get aggregate by workingEnvironmentId+aggregate name
 func (c *Client) getAggregate(request aggregateRequest, name string, sourceWorkingEnvironmentType string, clientID string, isSaaS bool, connectorIP string) (aggregateResult, error) {
 	log.Printf("getAggregate %s", name)
@@ -311,6 +318,53 @@ func (c *Client) updateAggregate(request updateAggregateRequest, clientID string
 	return err
 }
 
+// increaseAggregateCapacity increases the capacity of an aggregate using Amazon EBS Elastic Volumes
+func (c *Client) increaseAggregateCapacity(request increaseAggregateCapacityRequest, clientID string, isSaaS bool, connectorIP string) error {
+	log.Printf("increaseAggregateCapacity for aggregate %s by %d %s", request.AggregateName, request.CapacityToAdd.Size, request.CapacityToAdd.Unit)
+
+	params := structs.Map(request)
+	hostType := "CloudManagerHost"
+	if !isSaaS {
+		hostType = "http://" + connectorIP
+	}
+
+	var baseURL string
+	rootURL, cloudProviderName, err := c.getAPIRoot(request.WorkingEnvironmentID, clientID, isSaaS, connectorIP)
+
+	if err != nil {
+		log.Print("increaseAggregateCapacity: Cannot get API root.")
+		return err
+	}
+
+	// Only AWS supports aggregate capacity increase
+	if cloudProviderName != "Amazon" {
+		return fmt.Errorf("aggregate capacity increase is currently only supported for AWS")
+	}
+
+	// Build the API endpoint using the root URL from getAPIRoot
+	baseURL = fmt.Sprintf("%s/aggregates/%s/%s/add-capacity", rootURL, request.WorkingEnvironmentID, request.AggregateName)
+
+	statusCode, response, onCloudRequestID, err := c.CallAPIMethod("POST", baseURL, params, c.Token, hostType, clientID)
+	if err != nil {
+		log.Print("increaseAggregateCapacity request failed")
+		return err
+	}
+
+	responseError := apiResponseChecker(statusCode, response, "increaseAggregateCapacity")
+	if responseError != nil {
+		return responseError
+	}
+
+	log.Print("Wait for aggregate capacity increase.")
+	if isSaaS {
+		err = c.waitOnCompletion(onCloudRequestID, "Aggregate", "increase capacity", 15, 60, clientID)
+	} else {
+		err = c.waitOnCompletionForNotSaas(onCloudRequestID, "Aggregate", "increase capacity", 15, 60, clientID, connectorIP)
+	}
+
+	return err
+}
+
 // flattenCapacity: convert struct size + unit
 func flattenCapacity(c capacity) interface{} {
 	flattened := make(map[string]interface{})

cloudmanager/cbs.go

@@ -10,22 +10,19 @@ import (
 )
 
 type cbsRequest struct {
-	Provider string       `structs:"provider"`
-	Region   string       `structs:"region"`
-	Aws      awsDetails   `structs:"aws,omitempty"`
-	Azure    azureDetails `structs:"azure,omitempty"`
-	Gcp      gcpDetails   `structs:"gcp,omitempty"`
-	// Sgws
-	// ontap-s3
+	Provider                string       `structs:"provider"`
+	Region                  string       `structs:"region"`
+	Aws                     awsDetails   `structs:"aws,omitempty"`
+	Azure                   azureDetails `structs:"azure,omitempty"`
+	Gcp                     gcpDetails   `structs:"gcp,omitempty"`
 	Bucket                  string       `structs:"bucket,omitempty"`
 	IPSpace                 string       `structs:"ip-space,omitempty"`
 	BackupPolicy            backupPolicy `structs:"backup-policy"`
-	AutoBackupEnabled       bool         `structs:"auto-backup-enabled,omitempty"`
+	AutoBackupEnabled       bool         `structs:"auto-backup-enabled"`
 	MaxTransferRate         int          `structs:"max-transfer-rate,omitempty"`
-	ExportExistingSnapshots bool         `structs:"export-existing-snapshots,omitempty"`
-
-	WorkingEnvironmentID string `structs:"workingEnvironmentId"`
-	AccountID            string `structs:"account-id"`
+	ExportExistingSnapshots bool         `structs:"export-existing-snapshots"`
+	WorkingEnvironmentID    string       `structs:"workingEnvironmentId"`
+	AccountID               string       `structs:"account-id"`
 }
 
 type cbsVolumeRequest struct {
@@ -162,41 +159,6 @@ type fileDetails struct {
 	FileMtime int    `json:"mtime"`
 }
 
-// cbsStatusResult for creating a cbs
-type cbsStatusResult struct {
-	Name                    string             `json:"name"`
-	ID                      string             `json:"id"`
-	Region                  string             `json:"region"`
-	Status                  string             `json:"status"`
-	OntapVersion            string             `json:"ontap-version"`
-	BackupEnablementStatus  string             `json:"backup-enablement-status"`
-	CBSType                 string             `json:"type"`
-	CloudProvider           string             `json:"provider"`
-	ProviderAccountID       string             `json:"provider-account-id"`
-	ProviderAccountName     string             `json:"provider-account-name"`
-	Bucket                  string             `json:"bucket"`
-	ArchiveStorageClass     string             `json:"archive-storage-class"`
-	ResourceGroup           string             `json:"resource-group"`
-	StorageAccount          string             `json:"storage-account"`
-	StorageServer           string             `json:"storage-server"`
-	UsedCapacityGb          string             `json:"used-capacity-gb"`
-	ChargingCapacity        string             `json:"charging-capacity"`
-	LogicalUsedSize         string             `json:"logical-used-size"`
-	BackedUpVolumeCount     string             `json:"backed-up-volume-count"`
-	TotalVolumesCount       string             `json:"total-volumes-count"`
-	BackupPolicyCount       string             `json:"backup-policy-count"`
-	FailedBackupVolumeCount string             `json:"failed-backup-volume-count"`
-	CatalogEnabled          bool               `json:"catalog-enabled"`
-	AutoBackupEnabled       bool               `json:"auto-backup-enabled"`
-	BackupPolicy            backupPolicyResult `json:"backup-policy"`
-	PrivateEndpointRequired bool               `json:"private-endpoint-required"`
-	License                 licenseResult      `json:"license"`
-	IPSpace                 string             `json:"ip-space"`
-	ProviderAccessKey       string             `json:"provider-access-key"`
-	DeleteYearlySnapshots   bool               `json:"delete-yearly-snapshots"`
-	ExportExistingSnapshots bool               `json:"export-existing-snapshots"`
-}
-
 type backupPolicyResult struct {
 	Name            string       `json:"name"`
 	Rules           []ruleResult `json:"rule"`
@@ -262,15 +224,6 @@ type cbsVolumeResult struct {
 	SnapshotCount string `json:"snapshot-count"`
 }
 
-type cbsGetSnapshotVolumeResult struct {
-	Snapshot []cbsSnapshotVolumeResult `json:"snapshot"`
-}
-
-type cbsSnapshotVolumeResult struct {
-	Name string `json:"name"`
-	ID   string `json:"id"`
-}
-
 // Create working environment cloud backup
 func (c *Client) createCBS(cbs cbsRequest, clientID string) (cbsAPICallResult, error) {
 	log.Print("createCBS...")

cloudmanager/cvo_aws.go

@@ -44,6 +44,7 @@ type createCVOAWSDetails struct {
 	BackupVolumesToCbs          bool                    `structs:"backupVolumesToCbs"`
 	EnableCompliance            bool                    `structs:"enableCompliance"`
 	EnableMonitoring            bool                    `structs:"enableMonitoring"`
+	OpenSecurityGroup           bool                    `structs:"openSecurityGroup"`
 	AwsEncryptionParameters     awsEncryptionParameters `structs:"awsEncryptionParameters,omitempty"`
 	AwsTags                     []userTags              `structs:"awsTags,omitempty"`
 	IsHA                        bool
@@ -64,7 +65,7 @@ type haParamsAWS struct {
 	PlatformSerialNumberNode1   string   `structs:"platformSerialNumberNode1,omitempty"`
 	PlatformSerialNumberNode2   string   `structs:"platformSerialNumberNode2,omitempty"`
 	MediatorInstanceProfileName string   `structs:"mediatorInstanceProfileName,omitempty"`
-	MediatorAssignPublicIP      bool     `structs:"mediatorAssignPublicIP,omitempty"`
+	MediatorAssignPublicIP      bool     `structs:"mediatorAssignPublicIP"`
 	MediatorSecurityGroupID     string   `structs:"mediatorSecurityGroupId,omitempty"`
 	RouteTableIds               []string `structs:"routeTableIds,omitempty"`
 	AssumeRoleArn               string   `structs:"assumeRoleArn,omitempty"`
@@ -364,7 +365,7 @@ func (c *Client) deleteCVO(id string, isHA bool, clientID string) error {
 
 // validateCVOParams validates params
 func validateCVOParams(cvoDetails createCVOAWSDetails) error {
-	if cvoDetails.VsaMetadata.UseLatestVersion == true && cvoDetails.VsaMetadata.OntapVersion != "latest" {
+	if cvoDetails.VsaMetadata.UseLatestVersion && cvoDetails.VsaMetadata.OntapVersion != "latest" {
 		return fmt.Errorf("ontap_version parameter not required when having use_latest_version as true")
 	}
 
@@ -374,14 +375,14 @@ func validateCVOParams(cvoDetails createCVOAWSDetails) error {
 	}
 
 	// by Node byol license for existing customers
-	if cvoDetails.IsHA == true && cvoDetails.VsaMetadata.LicenseType == "ha-cot-premium-byol" {
+	if cvoDetails.IsHA && cvoDetails.VsaMetadata.LicenseType == "ha-cot-premium-byol" {
 		if cvoDetails.HAParams.PlatformSerialNumberNode1 == "" || cvoDetails.HAParams.PlatformSerialNumberNode2 == "" {
 			return fmt.Errorf("both platform_serial_number_node1 and platform_serial_number_node2 parameters are required when having ha type as true and license_type as ha-cot-premium-byol")
 		}
 	}
 
 	// by Node byol license for existing customers
-	if cvoDetails.IsHA == false && (cvoDetails.HAParams.PlatformSerialNumberNode1 != "" || cvoDetails.HAParams.PlatformSerialNumberNode2 != "") {
+	if !cvoDetails.IsHA && (cvoDetails.HAParams.PlatformSerialNumberNode1 != "" || cvoDetails.HAParams.PlatformSerialNumberNode2 != "") {
 		return fmt.Errorf("both platform_serial_number_node1 and platform_serial_number_node2 parameters are only required when having ha type as true and license_type as ha-cot-premium-byol")
 	}
 
@@ -397,17 +398,17 @@ func validateCVOParams(cvoDetails createCVOAWSDetails) error {
 		return fmt.Errorf("throughput parameter required when ebs_volume_type is gp3")
 	}
 
-	if cvoDetails.IsHA == true && cvoDetails.SubnetID != "" {
+	if cvoDetails.IsHA && cvoDetails.SubnetID != "" {
 		return fmt.Errorf("subnet_id not required when having ha as true")
 	}
 
 	// by Capacity license
 	if cvoDetails.VsaMetadata.CapacityPackageName != "" {
 		log.Print("Verify cvo parameter capacity_package_name is not empty")
-		if cvoDetails.IsHA == true && cvoDetails.VsaMetadata.LicenseType != "ha-capacity-paygo" {
+		if cvoDetails.IsHA && cvoDetails.VsaMetadata.LicenseType != "ha-capacity-paygo" {
 			return fmt.Errorf("license_type must be ha-capacity-paygo")
 		}
-		if cvoDetails.IsHA == false && cvoDetails.VsaMetadata.LicenseType != "capacity-paygo" {
+		if !cvoDetails.IsHA && cvoDetails.VsaMetadata.LicenseType != "capacity-paygo" {
 			return fmt.Errorf("license_type must be capacity-paygo")
 		}
 	}

cloudmanager/cvo_azure.go

@@ -43,7 +43,8 @@ type createCVOAzureDetails struct {
 	BackupVolumesToCbs          bool                      `structs:"backupVolumesToCbs"`
 	EnableCompliance            bool                      `structs:"enableCompliance"`
 	EnableMonitoring            bool                      `structs:"enableMonitoring"`
-	AllowDeployInExistingRg     bool                      `structs:"allowDeployInExistingRg,omitempty"`
+	AllowDeployInExistingRg     bool                      `structs:"allowDeployInExistingRg"`
+	OpenSecurityGroup           bool                      `structs:"openSecurityGroup"`
 	AzureTags                   []userTags                `structs:"azureTags,omitempty"`
 	IsHA                        bool
 	ResourceGroup               string `structs:"resourceGroup,omitempty"`

cloudmanager/data_source_netapp_cloudmanager_aws_fsx.go

@@ -18,7 +18,6 @@ func dataSourceAWSFSX() *schema.Resource {
 			"id": {
 				Type:     schema.TypeString,
 				Required: true,
-				ForceNew: true,
 			},
 			"status": {
 				Type:     schema.TypeString,

cloudmanager/data_source_netapp_cloudmanager_nss_account.go

@@ -15,17 +15,14 @@ func dataSourceCVONssAccount() *schema.Resource {
 			"username": {
 				Type:     schema.TypeString,
 				Required: true,
-				ForceNew: true,
 			},
 			"password": {
 				Type:     schema.TypeString,
 				Optional: true,
-				ForceNew: true,
 			},
 			"client_id": {
 				Type:     schema.TypeString,
 				Required: true,
-				ForceNew: true,
 			},
 		},
 	}

cloudmanager/gcp_volume.go

@@ -70,7 +70,7 @@ type gcpVolumeResponse struct {
 	LifeCycleStateDetails string         `json:"lifeCycleStateDetails"`
 	Zone                  string         `json:"zone,omitempty"`
 	StorageClass          string         `json:"storageClass,omitempty"`
-	TypeDP                bool           `json:"isDataProtection,omitempty"`
+	TypeDP                bool           `json:"isDataProtection"`
 	MountPoints           []mountPoints  `json:"mountPoints,omitempty"`
 }
 
@@ -264,7 +264,6 @@ func expandExportPolicy(set *schema.Set) []exportPolicyRule {
 		log.Printf("here here here here : %#v", v)
 		rules := v.(map[string]interface{})
 		ruleSet := rules["rule"].(*schema.Set).List()
-		ruleConfigs := make([]exportPolicyRule, 0, len(ruleSet))
 		for _, x := range ruleSet {
 			exportPolicyRule := exportPolicyRule{}
 			ruleConfig := x.(map[string]interface{})
@@ -274,7 +273,6 @@ func expandExportPolicy(set *schema.Set) []exportPolicyRule {
 			exportPolicyRule.UnixReadWrite = ruleConfig["unix_read_write"].(bool)
 			exportPolicyRule.Nfsv3 = ruleConfig["nfsv3"].(bool)
 			exportPolicyRule.Nfsv4 = ruleConfig["nfsv4"].(bool)
-			ruleConfigs = append(ruleConfigs, exportPolicyRule)
 			exportPolicy.Rules = append(exportPolicy.Rules, exportPolicyRule)
 		}
 	}