refreshing the provider for build 4375 (#110)

* refreshing the provider for build 4375

* version upgrade and changelog edits

Co-authored-by: code-lucidal58 <[email protected]>

CHANGELOG.md

@@ -1,7 +1,17 @@
 # Change Logs
 
+## v1.0.12
+Release Date: 9th July 2021
+* Refreshes the terraform module to be in sync with the latest Cisco Intersight model (build 4375)
+* Unit tests for flatten functions
+* Fixes to flattenFunctions to handle nil parameters and empty user configs
+* Support for JSON type model properties
+* Support for Object type model properties
+* Adds "provider" as a reserved keyword.
+* Documentation updates to reflect the above changes
+
 ## v1.0.11
-Release Date: 21 June 2021
+Release Date: 21st June 2021
 * Refreshes the terraform module to be in sync with the latest Cisco Intersight model (build 4334)
 * Fixes an issue with flatten functions that was causing some reads to panic
 

GNUmakefile

@@ -1,5 +1,5 @@
 PKG_NAME=intersight
-VERSION=1.0.11
+VERSION=1.0.12
 TEST?=$$(go list ./... |grep -v 'vendor')
 GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
 WEBSITE_REPO=github.com/hashicorp/terraform-website

examples/sample_modules/os_install/main.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     intersight = {
       source = "CiscoDevNet/intersight"
-      version = "1.0.11"
+      version = "1.0.12"
     }
   }
 }

examples/sample_modules/server_configurations/main.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     intersight = {
       source = "CiscoDevNet/intersight"
-      version = "1.0.11"
+      version = "1.0.12"
     }
   }
 }

examples/sample_modules/server_deployment/main.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     intersight = {
       source = "CiscoDevNet/intersight"
-      version = "1.0.11"
+      version = "1.0.12"
     }
   }
 }

intersight/data_source_intersight_appliance_device_claim.go

@@ -92,7 +92,7 @@ func dataSourceApplianceDeviceClaim() *schema.Resource {
 				Optional:    true,
 			},
 			"platform_type": {
-				Description: "Platform type of the endpoint device.\n* `` - The device reported an empty or unrecognized platform type.\n* `APIC` - An Application Policy Infrastructure Controller cluster.\n* `DCNM` - A Data Center Network Manager instance. Data Center Network Manager (DCNM) is the network management platform for all NX-OS-enabled deployments, spanning new fabric architectures, IP Fabric for Media, and storage networking deployments for the Cisco Nexus-powered data center.\n* `UCSFI` - A UCS Fabric Interconnect in HA or standalone mode, which is being managed by UCS Manager (UCSM).\n* `UCSFIISM` - A UCS Fabric Interconnect in HA or standalone mode, managed directly by Intersight.\n* `IMC` - A standalone UCS Server Integrated Management Controller.\n* `IMCM4` - A standalone UCS M4 Server.\n* `IMCM5` - A standalone UCS M5 server.\n* `IMCRack` - A standalone UCS M6 and above server.\n* `UCSIOM` - An UCS Chassis IO module.\n* `HX` - A HyperFlex storage controller.\n* `HyperFlexAP` - A HyperFlex Application Platform.\n* `UCSD` - A UCS Director virtual appliance. Cisco UCS Director automates, orchestrates, and manages Cisco and third-party hardware.\n* `IntersightAppliance` - A Cisco Intersight Connected Virtual Appliance.\n* `IntersightAssist` - A Cisco Intersight Assist.\n* `PureStorageFlashArray` - A Pure Storage FlashArray device.\n* `NetAppOntap` - A NetApp ONTAP storage system.\n* `NetAppActiveIqUnifiedManager` - A NetApp Active IQ Unified Manager.\n* `EmcScaleIo` - An EMC ScaleIO storage system.\n* `EmcVmax` - An EMC VMAX storage system.\n* `EmcVplex` - An EMC VPLEX storage system.\n* `EmcXtremIo` - An EMC XtremIO storage system.\n* `VmwareVcenter` - A VMware vCenter device that manages Virtual Machines.\n* `MicrosoftHyperV` - A Microsoft HyperV system that manages Virtual Machines.\n* `AppDynamics` - An AppDynamics controller that monitors applications.\n* `Dynatrace` - A software-intelligence monitoring platform that simplifies enterprise cloud complexity and accelerates digital transformation.\n* `ReadHatOpenStack` - An OpenStack target manages Virtual Machines, Physical Machines, Datacenters and Virtual Datacenters using different OpenStack services as administrative endpoints.\n* `CloudFoundry` - An open source cloud platform on which developers can build, deploy, run and scale applications.\n* `MicrosoftAzureApplicationInsights` - A feature of Azure Monitor, is an extensible Application Performance Management service for developers and DevOps professionals to monitor their live applications.\n* `OpenStack` - An OpenStack target manages Virtual Machines, Physical Machines, Datacenters and Virtual Datacenters using different OpenStack services as administrative endpoints.\n* `MicrosoftSqlServer` - A Microsoft SQL database server.\n* `Kubernetes` - A Kubernetes cluster that runs containerized applications.\n* `AmazonWebService` - A Amazon web service target that discovers and monitors different services like EC2. It discovers entities like VMs, Volumes, regions etc. and monitors attributes like Mem, CPU, cost.\n* `AmazonWebServiceBilling` - A Amazon web service billing target to retrieve billing information stored in S3 bucket.\n* `MicrosoftAzureServicePrincipal` - A Microsoft Azure Service Principal target that discovers all the associated Azure subscriptions.\n* `MicrosoftAzureEnterpriseAgreement` - A Microsoft Azure Enterprise Agreement target that discovers cost, billing and RIs.\n* `DellCompellent` - A Dell Compellent storage system.\n* `HPE3Par` - A HPE 3PAR storage system.\n* `RedHatEnterpriseVirtualization` - A Red Hat Enterprise Virtualization Hypervisor system that manages Virtual Machines.\n* `NutanixAcropolis` - A Nutanix Acropolis system that combines servers and storage into a distributed infrastructure platform.\n* `HPEOneView` - A HPE Oneview management system that manages compute, storage, and networking.\n* `ServiceEngine` - Cisco Application Services Engine. Cisco Application Services Engine is a platform to deploy and manage applications.\n* `HitachiVirtualStoragePlatform` - A Hitachi Virtual Storage Platform also referred to as Hitachi VSP. It includes various storage systems designed for data centers.\n* `IMCBlade` - An Intersight managed UCS Blade Server.\n* `TerraformCloud` - A Terraform Cloud account.\n* `TerraformAgent` - A Terraform Cloud Agent that Intersight will deploy in datacenter. The agent will execute Terraform plan for Terraform Cloud workspace configured to use the agent.\n* `CustomTarget` - An external endpoint added as Target that can be accessed through its HTTP API interface in Intersight Orchestrator automation workflow.Standard HTTP authentication scheme supported: Basic.\n* `HTTPEndpoint` - An external endpoint added as Target that can be accessed through its HTTP API interface in Intersight Orchestrator automation workflow.Standard HTTP authentication scheme supported: Basic.\n* `CiscoCatalyst` - A Cisco Catalyst networking switch device.",
+				Description: "Platform type of the endpoint device.\n* `` - The device reported an empty or unrecognized platform type.\n* `APIC` - An Application Policy Infrastructure Controller cluster.\n* `DCNM` - A Data Center Network Manager instance. Data Center Network Manager (DCNM) is the network management platform for all NX-OS-enabled deployments, spanning new fabric architectures, IP Fabric for Media, and storage networking deployments for the Cisco Nexus-powered data center.\n* `UCSFI` - A UCS Fabric Interconnect in HA or standalone mode, which is being managed by UCS Manager (UCSM).\n* `UCSFIISM` - A UCS Fabric Interconnect in HA or standalone mode, managed directly by Intersight.\n* `IMC` - A standalone UCS Server Integrated Management Controller.\n* `IMCM4` - A standalone UCS M4 Server.\n* `IMCM5` - A standalone UCS M5 server.\n* `IMCRack` - A standalone UCS M6 and above server.\n* `UCSIOM` - An UCS Chassis IO module.\n* `HX` - A HyperFlex storage controller.\n* `HyperFlexAP` - A HyperFlex Application Platform.\n* `UCSD` - A UCS Director virtual appliance. Cisco UCS Director automates, orchestrates, and manages Cisco and third-party hardware.\n* `IntersightAppliance` - A Cisco Intersight Connected Virtual Appliance.\n* `IntersightAssist` - A Cisco Intersight Assist.\n* `PureStorageFlashArray` - A Pure Storage FlashArray device.\n* `NetAppOntap` - A NetApp ONTAP storage system.\n* `NetAppActiveIqUnifiedManager` - A NetApp Active IQ Unified Manager.\n* `EmcScaleIo` - An EMC ScaleIO storage system.\n* `EmcVmax` - An EMC VMAX storage system.\n* `EmcVplex` - An EMC VPLEX storage system.\n* `EmcXtremIo` - An EMC XtremIO storage system.\n* `VmwareVcenter` - A VMware vCenter device that manages Virtual Machines.\n* `MicrosoftHyperV` - A Microsoft Hyper-V system that manages Virtual Machines.\n* `AppDynamics` - An AppDynamics controller that monitors applications.\n* `Dynatrace` - A software-intelligence monitoring platform that simplifies enterprise cloud complexity and accelerates digital transformation.\n* `ReadHatOpenStack` - An OpenStack target manages Virtual Machines, Physical Machines, Datacenters and Virtual Datacenters using different OpenStack services as administrative endpoints.\n* `CloudFoundry` - An open source cloud platform on which developers can build, deploy, run and scale applications.\n* `MicrosoftAzureApplicationInsights` - A feature of Azure Monitor, is an extensible Application Performance Management service for developers and DevOps professionals to monitor their live applications.\n* `OpenStack` - An OpenStack target manages Virtual Machines, Physical Machines, Datacenters and Virtual Datacenters using different OpenStack services as administrative endpoints.\n* `MicrosoftSqlServer` - A Microsoft SQL database server.\n* `Kubernetes` - A Kubernetes cluster that runs containerized applications.\n* `AmazonWebService` - A Amazon web service target that discovers and monitors different services like EC2. It discovers entities like VMs, Volumes, regions etc. and monitors attributes like Mem, CPU, cost.\n* `AmazonWebServiceBilling` - A Amazon web service billing target to retrieve billing information stored in S3 bucket.\n* `MicrosoftAzureServicePrincipal` - A Microsoft Azure Service Principal target that discovers all the associated Azure subscriptions.\n* `MicrosoftAzureEnterpriseAgreement` - A Microsoft Azure Enterprise Agreement target that discovers cost, billing and RIs.\n* `DellCompellent` - A Dell Compellent storage system.\n* `HPE3Par` - A HPE 3PAR storage system.\n* `RedHatEnterpriseVirtualization` - A Red Hat Enterprise Virtualization Hypervisor system that manages Virtual Machines.\n* `NutanixAcropolis` - A Nutanix Acropolis system that combines servers and storage into a distributed infrastructure platform.\n* `HPEOneView` - A HPE Oneview management system that manages compute, storage, and networking.\n* `ServiceEngine` - Cisco Application Services Engine. Cisco Application Services Engine is a platform to deploy and manage applications.\n* `HitachiVirtualStoragePlatform` - A Hitachi Virtual Storage Platform also referred to as Hitachi VSP. It includes various storage systems designed for data centers.\n* `IMCBlade` - An Intersight managed UCS Blade Server.\n* `TerraformCloud` - A Terraform Cloud account.\n* `TerraformAgent` - A Terraform Cloud Agent that Intersight will deploy in datacenter. The agent will execute Terraform plan for Terraform Cloud workspace configured to use the agent.\n* `CustomTarget` - An external endpoint added as Target that can be accessed through its HTTP API interface in Intersight Orchestrator automation workflow.Standard HTTP authentication scheme supported: Basic.\n* `HTTPEndpoint` - An external endpoint added as Target that can be accessed through its HTTP API interface in Intersight Orchestrator automation workflow.Standard HTTP authentication scheme supported: Basic.\n* `CiscoCatalyst` - A Cisco Catalyst networking switch device.",
 				Type:        schema.TypeString,
 				Optional:    true,
 			},

intersight/data_source_intersight_asset_deployment.go

@@ -100,12 +100,6 @@ func dataSourceAssetDeployment() *schema.Resource {
 				Optional:    true,
 				Computed:    true,
 			},
-			"workload": {
-				Description: "Workload/Usecase running on the deployment.",
-				Type:        schema.TypeString,
-				Optional:    true,
-				Computed:    true,
-			},
 			"results": {
 				Type: schema.TypeList,
 				Elem: &schema.Resource{Schema: map[string]*schema.Schema{"account_moid": {
@@ -560,7 +554,7 @@ func dataSourceAssetDeployment() *schema.Resource {
 									Optional:    true,
 								},
 								"name": {
-									Description: "Metric type used to calculate metering for the device sent from the IB Contract. example  Node, vMemory, vCPU.\n* `None` - A default value to catch cases where metric type is not correctly detected.\n* `Node` - The metering of the device is on the basis of Power state.\n* `Storage` - The metering of the device is on the basis of used Storage.\n* `vMemory` - The metering of the device is on the basis of VM Memory.\n* `vCPU` - The metering of the device is on the basis of vCPU.\n* `vStorage` - The metering of the device is on the basis of used virtual Storage.",
+									Description: "Metric type used to calculate metering for the device sent from the IB Contract. example  Node, vMemory, vCPU.\n* `None` - A default value to catch cases where metric type is not correctly detected.\n* `Node` - The metering of the device is on the basis of Power state.\n* `Storage` - The metering of the device is on the basis of used Storage.\n* `vMemory` - The metering of the device is on the basis of VM Memory.\n* `vCPU` - The metering of the device is on the basis of vCPU.\n* `vStorage` - The metering of the device is on the basis of used virtual Storage.\n* `Switch` - The metering of the device is on the basis of Switch.",
 									Type:        schema.TypeString,
 									Optional:    true,
 									Computed:    true,
@@ -572,7 +566,7 @@ func dataSourceAssetDeployment() *schema.Resource {
 									Computed:    true,
 								},
 								"unit": {
-									Description: "Metric unit used to calculate metering for the device sent from the IB Contract. example  Node, GiB, Cores.\n* `None` - A default value to catch cases where metric unit is not correctly detected.\n* `Node` - It is applicable for Node Metric type.\n* `GiB` - It is applicable for VMemory, vStorage and Storage Metric types.\n* `TiB` - It is applicable for VMemory, vStorage and Storage Metric types.\n* `Cores` - It is applicable for vCPU Metric type.",
+									Description: "Metric unit used to calculate metering for the device sent from the IB Contract. example  Node, GiB, Cores.\n* `None` - A default value to catch cases where metric unit is not correctly detected.\n* `Node` - It is applicable for Node Metric type.\n* `GiB` - It is applicable for VMemory, vStorage and Storage Metric types.\n* `TiB` - It is applicable for VMemory, vStorage and Storage Metric types.\n* `Cores` - It is applicable for vCPU Metric type.\n* `Switch` - It is applicable for Switch Metric type.\n* `Port` - It is applicable for Switch Metric type.",
 									Type:        schema.TypeString,
 									Optional:    true,
 									Computed:    true,
@@ -700,12 +694,11 @@ func dataSourceAssetDeployment() *schema.Resource {
 							},
 						},
 					},
-					"workload": {
-						Description: "Workload/Usecase running on the deployment.",
-						Type:        schema.TypeString,
-						Optional:    true,
-						Computed:    true,
-					},
+					"workloads": {
+						Type:     schema.TypeList,
+						Optional: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString}},
 				}},
 				Computed: true,
 			}},
@@ -774,10 +767,6 @@ func dataSourceAssetDeploymentRead(c context.Context, d *schema.ResourceData, me
 		x := (v.(string))
 		o.SetSubscriptionRefId(x)
 	}
-	if v, ok := d.GetOk("workload"); ok {
-		x := (v.(string))
-		o.SetWorkload(x)
-	}
 
 	data, err := o.MarshalJSON()
 	if err != nil {
@@ -853,7 +842,7 @@ func dataSourceAssetDeploymentRead(c context.Context, d *schema.ResourceData, me
 				temp["unit_of_measure"] = flattenListAssetMeteringType(s.GetUnitOfMeasure(), d)
 
 				temp["version_context"] = flattenMapMoVersionContext(s.GetVersionContext(), d)
-				temp["workload"] = (s.GetWorkload())
+				temp["workloads"] = (s.GetWorkloads())
 				assetDeploymentResults[j] = temp
 				j += 1
 			}