refreshing the provider for intersight version 9783 (#229)

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Logs
 
+## v1.0.34 
+* Refreshes the terraform module to be in sync with the latest Cisco Intersight model (build 9783)
+
 ## v1.0.33 
 * Refreshes the terraform module to be in sync with the latest Cisco Intersight model (build 9661)
 

GNUmakefile

@@ -1,5 +1,5 @@
 PKG_NAME=intersight
-VERSION=1.0.33
+VERSION=1.0.34
 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.33"
+      version = "1.0.34"
     }
   }
 }

examples/sample_modules/server_configurations/main.tf

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

examples/sample_modules/server_deployment/main.tf

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

intersight/data_source_intersight_cond_alarm_aggregation.go

@@ -79,7 +79,17 @@ func getCondAlarmAggregationSchema() map[string]*schema.Schema {
 						Optional:    true,
 					},
 					"critical": {
-						Description: "The count of alarms that have severity type Critical.",
+						Description: "The count of active alarms that have severity type Critical.",
+						Type:        schema.TypeInt,
+						Optional:    true,
+					},
+					"health": {
+						Description: "Health of the managed end point. The highest severity computed from alarmSummary property is set as the health.\n* `Healthy` - The Enum value represents that the entity is healthy.\n* `Warning` - The Enum value Warning represents that the entity has one or more active warnings on it.\n* `Critical` - The Enum value Critical represents that the entity is in a critical state.",
+						Type:        schema.TypeString,
+						Optional:    true,
+					},
+					"info": {
+						Description: "The count of active alarms that have severity type Info.",
 						Type:        schema.TypeInt,
 						Optional:    true,
 					},
@@ -89,7 +99,7 @@ func getCondAlarmAggregationSchema() map[string]*schema.Schema {
 						Optional:    true,
 					},
 					"warning": {
-						Description: "The count of alarms that have severity type Warning.",
+						Description: "The count of active alarms that have severity type Warning.",
 						Type:        schema.TypeInt,
 						Optional:    true,
 					},

intersight/data_source_intersight_hyperflex_cluster.go

@@ -82,6 +82,16 @@ func getHyperflexClusterSchema() map[string]*schema.Schema {
 						Type:        schema.TypeInt,
 						Optional:    true,
 					},
+					"health": {
+						Description: "The health of the managed endpoint. The health is computed from the highest-severity alarm raised on the endpoint.\n* `Healthy` - The Enum value represents that the entity is healthy.\n* `Warning` - The Enum value Warning represents that the entity has one or more active warnings on it.\n* `Critical` - The Enum value Critical represents that the entity is in a critical state.",
+						Type:        schema.TypeString,
+						Optional:    true,
+					},
+					"info": {
+						Description: "The count of alarms that have severity type Info.",
+						Type:        schema.TypeInt,
+						Optional:    true,
+					},
 					"object_type": {
 						Description: "The fully-qualified name of the instantiated, concrete type.\nThe value should be the same as the 'ClassId' property.",
 						Type:        schema.TypeString,
@@ -1257,24 +1267,12 @@ func dataSourceHyperflexClusterRead(c context.Context, d *schema.ResourceData, m
 				}
 			}
 			o.SetClassId("hyperflex.AlarmSummary")
-			if v, ok := l["critical"]; ok {
-				{
-					x := int64(v.(int))
-					o.SetCritical(x)
-				}
-			}
 			if v, ok := l["object_type"]; ok {
 				{
 					x := (v.(string))
 					o.SetObjectType(x)
 				}
 			}
-			if v, ok := l["warning"]; ok {
-				{
-					x := int64(v.(int))
-					o.SetWarning(x)
-				}
-			}
 			p = append(p, *o)
 		}
 		if len(p) > 0 {

intersight/data_source_intersight_niatelemetry_nia_feature_usage.go

@@ -396,7 +396,7 @@ func getNiatelemetryNiaFeatureUsageSchema() map[string]*schema.Schema {
 			Optional:    true,
 		},
 		"nicc_version": {
-			Description: "NICC version.",
+			Description: "NICC version. NiccVersion is used to check the compatibility.",
 			Type:        schema.TypeString,
 			Optional:    true,
 		},

intersight/data_source_intersight_storage_storage_policy.go

@@ -71,7 +71,7 @@ func getStorageStoragePolicySchema() map[string]*schema.Schema {
 			Optional:    true,
 		},
 		"default_drive_mode": {
-			Description: "Newly inserted drives or on reboot, drives will be moved to the corresponding disk state on supported storage controller based on this setting. Unused Disks State should be 'No Change' if Default Drive Mode is set to JBOD or RAID 0. This setting is applicable only to FI attached servers.\n* `UnconfiguredGood` - Newly inserted drives or on reboot, drives will remain the same state.\n* `Jbod` - Newly inserted drives or on reboot, drives will automatically move to JBOD state if drive state was UnconfiguredGood.\n* `RAID0` - Newly inserted drives or on reboot, virtual drives will be created, respective drives will move to Online state.",
+			Description: "Unconfigured drives at the time of deployment will move to the selected state. Newly inserted drives will move to the selected state. Select Unconfigured Good option to retain the existing configuration. Select JBOD to move the unconfigured drives to JBOD state. Select RAID0 to create a RAID0 virtual drive on each of the unconfigured drives. If JBOD is selected, unconfigured drives will move to JBOD state on host reboot. If JBOD is selected, 'Use JBOD for Virtual Drive creation' must be disabled. Unused Disks State should be 'No Change' if Default Drive Mode is set to JBOD or RAID 0. This setting is applicable only to selected set of controllers on FI attached servers.\n* `UnconfiguredGood` - Newly inserted drives or on reboot, drives will remain the same state.\n* `Jbod` - Newly inserted drives or on reboot, drives will automatically move to JBOD state if drive state was UnconfiguredGood.\n* `RAID0` - Newly inserted drives or on reboot, virtual drives will be created, respective drives will move to Online state.",
 			Type:        schema.TypeString,
 			Optional:    true,
 		},

intersight/data_source_intersight_virtualization_iwe_cluster.go

@@ -44,7 +44,17 @@ func getVirtualizationIweClusterSchema() map[string]*schema.Schema {
 						Optional:    true,
 					},
 					"critical": {
-						Description: "The count of alarms that have severity type Critical.",
+						Description: "The count of active alarms that have severity type Critical.",
+						Type:        schema.TypeInt,
+						Optional:    true,
+					},
+					"health": {
+						Description: "Health of the managed end point. The highest severity computed from alarmSummary property is set as the health.\n* `Healthy` - The Enum value represents that the entity is healthy.\n* `Warning` - The Enum value Warning represents that the entity has one or more active warnings on it.\n* `Critical` - The Enum value Critical represents that the entity is in a critical state.",
+						Type:        schema.TypeString,
+						Optional:    true,
+					},
+					"info": {
+						Description: "The count of active alarms that have severity type Info.",
 						Type:        schema.TypeInt,
 						Optional:    true,
 					},
@@ -54,7 +64,7 @@ func getVirtualizationIweClusterSchema() map[string]*schema.Schema {
 						Optional:    true,
 					},
 					"warning": {
-						Description: "The count of alarms that have severity type Warning.",
+						Description: "The count of active alarms that have severity type Warning.",
 						Type:        schema.TypeInt,
 						Optional:    true,
 					},

intersight/data_source_intersight_virtualization_vmware_cluster.go

@@ -44,7 +44,17 @@ func getVirtualizationVmwareClusterSchema() map[string]*schema.Schema {
 						Optional:    true,
 					},
 					"critical": {
-						Description: "The count of alarms that have severity type Critical.",
+						Description: "The count of active alarms that have severity type Critical.",
+						Type:        schema.TypeInt,
+						Optional:    true,
+					},
+					"health": {
+						Description: "Health of the managed end point. The highest severity computed from alarmSummary property is set as the health.\n* `Healthy` - The Enum value represents that the entity is healthy.\n* `Warning` - The Enum value Warning represents that the entity has one or more active warnings on it.\n* `Critical` - The Enum value Critical represents that the entity is in a critical state.",
+						Type:        schema.TypeString,
+						Optional:    true,
+					},
+					"info": {
+						Description: "The count of active alarms that have severity type Info.",
 						Type:        schema.TypeInt,
 						Optional:    true,
 					},
@@ -54,7 +64,7 @@ func getVirtualizationVmwareClusterSchema() map[string]*schema.Schema {
 						Optional:    true,
 					},
 					"warning": {
-						Description: "The count of alarms that have severity type Warning.",
+						Description: "The count of active alarms that have severity type Warning.",
 						Type:        schema.TypeInt,
 						Optional:    true,
 					},

intersight/flatten_functions.go

@@ -9842,6 +9842,8 @@ func flattenMapCondAlarmSummary(p models.CondAlarmSummary, d *schema.ResourceDat
 	condalarmsummary["additional_properties"] = flattenAdditionalProperties(item.AdditionalProperties)
 	condalarmsummary["class_id"] = item.GetClassId()
 	condalarmsummary["critical"] = item.GetCritical()
+	condalarmsummary["health"] = item.GetHealth()
+	condalarmsummary["info"] = item.GetInfo()
 	condalarmsummary["object_type"] = item.GetObjectType()
 	condalarmsummary["warning"] = item.GetWarning()
 
@@ -11377,6 +11379,8 @@ func flattenMapHyperflexAlarmSummary(p models.HyperflexAlarmSummary, d *schema.R
 	hyperflexalarmsummary["additional_properties"] = flattenAdditionalProperties(item.AdditionalProperties)
 	hyperflexalarmsummary["class_id"] = item.GetClassId()
 	hyperflexalarmsummary["critical"] = item.GetCritical()
+	hyperflexalarmsummary["health"] = item.GetHealth()
+	hyperflexalarmsummary["info"] = item.GetInfo()
 	hyperflexalarmsummary["object_type"] = item.GetObjectType()
 	hyperflexalarmsummary["warning"] = item.GetWarning()
 
@@ -14711,7 +14715,7 @@ func flattenMapKubernetesProxyConfig(p models.KubernetesProxyConfig, d *schema.R
 	kubernetesproxyconfig["hostname"] = item.GetHostname()
 	kubernetesproxyconfig["is_password_set"] = item.GetIsPasswordSet()
 	kubernetesproxyconfig["object_type"] = item.GetObjectType()
-	password_x, exists := d.GetOk("docker_http_proxy")
+	password_x, exists := d.GetOk("http_proxy")
 	if exists && password_x != nil {
 		password_y := password_x.([]interface{})[0].(map[string]interface{})
 		kubernetesproxyconfig["password"] = password_y["password"]