Return tags on listInstanceConfig/Pools and listAutoscalingConfiguration

varmax2511 · varmax2511 · commit 8e520a73a4c4 · 2019-05-16T18:45:06.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Added
 - Support for setting `compartment_id` argument in `object_storage_namespace` data source
 - Support BGP dynamic routing and allow customer to input PSK for IPSec tunnels
+- ListInstanceConfig/Pools and ListAutoscalingConfiguration return tags
 
 ## 3.25.0 (May 15, 2019)
 
diff --git a/oci/autoscaling_auto_scaling_configuration_test.go b/oci/autoscaling_auto_scaling_configuration_test.go
@@ -29,7 +29,7 @@ var (
 
 	autoScalingConfigurationDataSourceRepresentation = map[string]interface{}{
 		"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
-		"display_name":   Representation{repType: Optional, create: `displayName`, update: `displayName2`},
+		"display_name":   Representation{repType: Optional, create: `example_autoscaling_configuration`, update: `displayName2`},
 		"filter":         RepresentationGroup{Required, autoScalingConfigurationDataSourceFilterRepresentation}}
 	autoScalingConfigurationDataSourceFilterRepresentation = map[string]interface{}{
 		"name":   Representation{repType: Required, create: `id`},
@@ -42,7 +42,7 @@ var (
 		"policies":               RepresentationGroup{Required, autoScalingConfigurationPoliciesRepresentation},
 		"cool_down_in_seconds":   Representation{repType: Optional, create: `300`, update: `400`},
 		"defined_tags":           Representation{repType: Optional, create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
-		"display_name":           Representation{repType: Optional, create: `displayName`, update: `displayName2`},
+		"display_name":           Representation{repType: Optional, create: `example_autoscaling_configuration`, update: `displayName2`},
 		"freeform_tags":          Representation{repType: Optional, create: map[string]string{"Department": "Finance"}, update: map[string]string{"Department": "Accounting"}},
 		"is_enabled":             Representation{repType: Optional, create: `false`, update: `true`},
 	}
@@ -54,7 +54,7 @@ var (
 		"capacity":     RepresentationGroup{Required, autoScalingConfigurationPoliciesCapacityRepresentation},
 		"policy_type":  Representation{repType: Required, create: `threshold`, update: `threshold`},
 		"rules":        []RepresentationGroup{{Required, autoScalingConfigurationPoliciesScaleOutRuleRepresentation}, {Required, autoScalingConfigurationPoliciesScaleInRuleRepresentation}},
-		"display_name": Representation{repType: Optional, create: `displayName`, update: `displayName2`},
+		"display_name": Representation{repType: Optional, create: `example_autoscaling_configuration`, update: `displayName2`},
 	}
 	autoScalingConfigurationPoliciesCapacityRepresentation = map[string]interface{}{
 		"initial": Representation{repType: Required, create: `2`, update: `4`},
@@ -184,7 +184,7 @@ func TestAutoscalingAutoScalingConfigurationResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 					resource.TestCheckResourceAttr(resourceName, "cool_down_in_seconds", "300"),
 					resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
-					resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
+					resource.TestCheckResourceAttr(resourceName, "display_name", "example_autoscaling_configuration"),
 					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 					resource.TestCheckResourceAttr(resourceName, "is_enabled", "false"),
@@ -194,7 +194,7 @@ func TestAutoscalingAutoScalingConfigurationResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "policies.0.capacity.0.initial", "2"),
 					resource.TestCheckResourceAttr(resourceName, "policies.0.capacity.0.max", "3"),
 					resource.TestCheckResourceAttr(resourceName, "policies.0.capacity.0.min", "2"),
-					resource.TestCheckResourceAttr(resourceName, "policies.0.display_name", "displayName"),
+					resource.TestCheckResourceAttr(resourceName, "policies.0.display_name", "example_autoscaling_configuration"),
 					resource.TestCheckResourceAttr(resourceName, "policies.0.policy_type", "threshold"),
 					resource.TestCheckResourceAttr(resourceName, "policies.0.rules.#", "2"),
 					CheckResourceSetContainsElementWithProperties(resourceName, "policies.0.rules", map[string]string{
@@ -307,7 +307,9 @@ func TestAutoscalingAutoScalingConfigurationResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(datasourceName, "auto_scaling_configurations.0.auto_scaling_resources.0.type", "instancePool"),
 					resource.TestCheckResourceAttr(datasourceName, "auto_scaling_configurations.0.compartment_id", compartmentId),
 					resource.TestCheckResourceAttr(datasourceName, "auto_scaling_configurations.0.cool_down_in_seconds", "400"),
+					resource.TestCheckResourceAttr(datasourceName, "auto_scaling_configurations.0.defined_tags.%", "1"),
 					resource.TestCheckResourceAttr(datasourceName, "auto_scaling_configurations.0.display_name", "displayName2"),
+					resource.TestCheckResourceAttr(datasourceName, "auto_scaling_configurations.0.freeform_tags.%", "1"),
 					resource.TestCheckResourceAttrSet(datasourceName, "auto_scaling_configurations.0.id"),
 					resource.TestCheckResourceAttr(datasourceName, "auto_scaling_configurations.0.is_enabled", "true"),
 					resource.TestCheckResourceAttrSet(datasourceName, "auto_scaling_configurations.0.time_created"),
diff --git a/oci/autoscaling_auto_scaling_configurations_data_source.go b/oci/autoscaling_auto_scaling_configurations_data_source.go
@@ -102,10 +102,16 @@ func (s *AutoscalingAutoScalingConfigurationsDataSourceCrud) SetData() error {
 			autoScalingConfiguration["cool_down_in_seconds"] = *r.CoolDownInSeconds
 		}
 
+		if r.DefinedTags != nil {
+			autoScalingConfiguration["defined_tags"] = definedTagsToMap(r.DefinedTags)
+		}
+
 		if r.DisplayName != nil {
 			autoScalingConfiguration["display_name"] = *r.DisplayName
 		}
 
+		autoScalingConfiguration["freeform_tags"] = r.FreeformTags
+
 		if r.Id != nil {
 			autoScalingConfiguration["id"] = *r.Id
 		}
diff --git a/oci/core_instance_configuration_test.go b/oci/core_instance_configuration_test.go
@@ -354,7 +354,9 @@ func TestCoreInstanceConfigurationResource_basic(t *testing.T) {
 
 					resource.TestCheckResourceAttr(datasourceName, "instance_configurations.#", "1"),
 					resource.TestCheckResourceAttr(datasourceName, "instance_configurations.0.compartment_id", compartmentId),
+					resource.TestCheckResourceAttr(datasourceName, "instance_configurations.0.defined_tags.%", "1"),
 					resource.TestCheckResourceAttr(datasourceName, "instance_configurations.0.display_name", "displayName2"),
+					resource.TestCheckResourceAttr(datasourceName, "instance_configurations.0.freeform_tags.%", "1"),
 					resource.TestCheckResourceAttrSet(datasourceName, "instance_configurations.0.id"),
 					resource.TestCheckResourceAttrSet(datasourceName, "instance_configurations.0.time_created"),
 				),
diff --git a/oci/core_instance_configurations_data_source.go b/oci/core_instance_configurations_data_source.go
@@ -89,10 +89,16 @@ func (s *CoreInstanceConfigurationsDataSourceCrud) SetData() error {
 			"compartment_id": *r.CompartmentId,
 		}
 
+		if r.DefinedTags != nil {
+			instanceConfiguration["defined_tags"] = definedTagsToMap(r.DefinedTags)
+		}
+
 		if r.DisplayName != nil {
 			instanceConfiguration["display_name"] = *r.DisplayName
 		}
 
+		instanceConfiguration["freeform_tags"] = r.FreeformTags
+
 		if r.Id != nil {
 			instanceConfiguration["id"] = *r.Id
 		}
diff --git a/oci/core_instance_pool_test.go b/oci/core_instance_pool_test.go
@@ -294,7 +294,9 @@ func TestCoreInstancePoolResource_basic(t *testing.T) {
 
 					resource.TestCheckResourceAttr(datasourceName, "instance_pools.#", "1"),
 					resource.TestCheckResourceAttr(datasourceName, "instance_pools.0.compartment_id", compartmentId),
+					resource.TestCheckResourceAttr(datasourceName, "instance_pools.0.defined_tags.%", "1"),
 					resource.TestCheckResourceAttr(datasourceName, "instance_pools.0.display_name", "displayName2"),
+					resource.TestCheckResourceAttr(datasourceName, "instance_pools.0.freeform_tags.%", "1"),
 					resource.TestCheckResourceAttrSet(datasourceName, "instance_pools.0.id"),
 					resource.TestCheckResourceAttrSet(datasourceName, "instance_pools.0.instance_configuration_id"),
 					resource.TestCheckResourceAttr(datasourceName, "instance_pools.0.size", "3"),
diff --git a/oci/core_instance_pools_data_source.go b/oci/core_instance_pools_data_source.go
@@ -106,10 +106,16 @@ func (s *CoreInstancePoolsDataSourceCrud) SetData() error {
 			"compartment_id": *r.CompartmentId,
 		}
 
+		if r.DefinedTags != nil {
+			instancePool["defined_tags"] = definedTagsToMap(r.DefinedTags)
+		}
+
 		if r.DisplayName != nil {
 			instancePool["display_name"] = *r.DisplayName
 		}
 
+		instancePool["freeform_tags"] = r.FreeformTags
+
 		if r.Id != nil {
 			instancePool["id"] = *r.Id
 		}
diff --git a/website/docs/d/autoscaling_auto_scaling_configuration.html.markdown b/website/docs/d/autoscaling_auto_scaling_configuration.html.markdown
@@ -9,7 +9,7 @@ description: |-
 # Data Source: oci_autoscaling_auto_scaling_configuration
 This data source provides details about a specific Auto Scaling Configuration resource in Oracle Cloud Infrastructure Autoscaling service.
 
-Get AutoScalingConfiguration
+Gets information about the specified autoscaling configuration.
 
 ## Example Usage
 
@@ -24,42 +24,44 @@ data "oci_autoscaling_auto_scaling_configuration" "test_auto_scaling_configurati
 
 The following arguments are supported:
 
-* `auto_scaling_configuration_id` - (Required) The OCID of the auto scaling configuration.
+* `auto_scaling_configuration_id` - (Required) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the autoscaling configuration.
 
 
 ## Attributes Reference
 
 The following attributes are exported:
 
 * `auto_scaling_resources` - 
-	* `id` - The OCID of resource that the AutoScalingConfiguration will manage. 
-	* `type` - Indicates type of derived class
-* `compartment_id` - The OCID of the compartment containing the AutoScalingConfiguration. 
-* `cool_down_in_seconds` - The minimum period of time between scaling actions. The default is 300 seconds. 
+	* `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the resource that is managed by the autoscaling configuration. 
+	* `type` - The type of resource.
+* `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment containing the autoscaling configuration. 
+* `cool_down_in_seconds` - The minimum period of time to wait between scaling actions. The cooldown period gives the system time to stabilize before rescaling. The minimum value is 300 seconds, which is also the default. 
 * `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}` 
-* `display_name` - A user-friendly name for the AutoScalingConfiguration. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
+* `display_name` - A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
 * `freeform_tags` - Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}` 
-* `id` - The OCID of the AutoScalingConfiguration
-* `is_enabled` - If the AutoScalingConfiguration is enabled
-* `policies` - AutoScalingConfiguration policy definitions 
-	* `capacity` - The capacity requirements of the Policy
-		* `initial` - The initial size of the pool
-		* `max` - The maximum size the pool is allowed to increase to
-		* `min` - The minimum size the pool is allowed to decrease to
-	* `display_name` - A user-friendly name for the Policy. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
-	* `id` - The ID of the policy that is assigned after creation
-	* `policy_type` - Indicates type of Policy
+* `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the autoscaling configuration.
+* `is_enabled` - Whether the autoscaling configuration is enabled.
+* `policies` - Autoscaling policy definitions for the autoscaling configuration. An autoscaling policy defines the criteria that trigger autoscaling actions and the actions to take.
+
+	Each autoscaling configuration can have one autoscaling policy. 
+	* `capacity` - The capacity requirements of the autoscaling policy.
+		* `initial` - The initial number of instances to launch in the instance pool immediately after autoscaling is enabled. After autoscaling retrieves performance metrics, the number of instances is automatically adjusted from this initial number to a number that is based on the limits that you set. 
+		* `max` - The maximum number of instances the instance pool is allowed to increase to (scale out).
+		* `min` - The minimum number of instances the instance pool is allowed to decrease to (scale in).
+	* `display_name` - A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
+	* `id` - The ID of the autoscaling policy that is assigned after creation.
+	* `policy_type` - The type of autoscaling policy.
 	* `rules` - 
 		* `action` - 
-			* `type` - Action type to take
-			* `value` - 
-		* `display_name` - A user-friendly name for the AutoScalingConfiguration condition details. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
-		* `id` - Id of the condition that is assigned after creation
+			* `type` - The type of action to take.
+			* `value` - To scale out (increase the number of instances), provide a positive value. To scale in (decrease the number of instances), provide a negative value. 
+		* `display_name` - A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
+		* `id` - ID of the condition that is assigned after creation.
 		* `metric` - 
 			* `metric_type` - 
 			* `threshold` - 
-				* `operator` - Support for the following operators GT  - Greater than GTE - Greater than equal to LT  - Less than LTE - Less than equal to 
+				* `operator` - The comparison operator to use. Options are greater than (`GT`), greater than or equal to (`GTE`), less than (`LT`), and less than or equal to (`LTE`). 
 				* `value` - 
-	* `time_created` - The date and time the AutoScalingConfiguration was created, in the format defined by RFC3339. Example: `2016-08-25T21:10:29.600Z` 
-* `time_created` - The date and time the AutoScalingConfiguration was created, in the format defined by RFC3339. Example: `2016-08-25T21:10:29.600Z` 
+	* `time_created` - The date and time the autoscaling configuration was created, in the format defined by RFC3339.  Example: `2016-08-25T21:10:29.600Z` 
+* `time_created` - The date and time the AutoScalingConfiguration was created, in the format defined by RFC3339.  Example: `2016-08-25T21:10:29.600Z` 
 
diff --git a/website/docs/d/autoscaling_auto_scaling_configurations.html.markdown b/website/docs/d/autoscaling_auto_scaling_configurations.html.markdown
@@ -9,7 +9,7 @@ description: |-
 # Data Source: oci_autoscaling_auto_scaling_configurations
 This data source provides the list of Auto Scaling Configurations in Oracle Cloud Infrastructure Autoscaling service.
 
-Lists AutoScalingConfigurations in the specific compartment.
+Lists autoscaling configurations in the specifed compartment.
 
 
 ## Example Usage
@@ -43,15 +43,14 @@ The following attributes are exported:
 The following attributes are exported:
 
 * `auto_scaling_resources` - 
-	* `id` - The OCID of resource that the AutoScalingConfiguration will manage. 
-	* `type` - Indicates type of derived class
-* `compartment_id` - The OCID of the compartment containing the AutoScalingConfiguration. 
-* `cool_down_in_seconds` - The minimum period of time between scaling actions. The default is 300 seconds. 
+	* `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the resource that is managed by the autoscaling configuration. 
+	* `type` - The type of resource.
+* `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment containing the autoscaling configuration. 
+* `cool_down_in_seconds` - The minimum period of time to wait between scaling actions. The cooldown period gives the system time to stabilize before rescaling. The minimum value is 300 seconds, which is also the default. 
 * `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}` 
-* `display_name` - A user-friendly name for the AutoScalingConfiguration. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
+* `display_name` - A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
 * `freeform_tags` - Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}` 
-* `id` - The OCID of the AutoScalingConfiguration
-* `is_enabled` - If the AutoScalingConfiguration is enabled
-* `policies` - AutoScalingConfiguration policy definitions 
-* `time_created` - The date and time the AutoScalingConfiguration was created, in the format defined by RFC3339. Example: `2016-08-25T21:10:29.600Z` 
-
+* `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the autoscaling configuration.
+* `is_enabled` - Whether the autoscaling configuration is enabled.
+* `policies` - Autoscaling policy definitions for the autoscaling configuration. An autoscaling policy defines the criteria that trigger autoscaling actions and the actions to take.
+* `time_created` - The date and time the AutoScalingConfiguration was created, in the format defined by RFC3339.  Example: `2016-08-25T21:10:29.600Z` 
diff --git a/website/docs/r/autoscaling_auto_scaling_configuration.html.markdown b/website/docs/r/autoscaling_auto_scaling_configuration.html.markdown

Original file line number	Diff line number	Diff line change
`@@ -102,10 +102,16 @@ func (s *AutoscalingAutoScalingConfigurationsDataSourceCrud) SetData() error {`
`102`	`102`	`autoScalingConfiguration["cool_down_in_seconds"] = *r.CoolDownInSeconds`
`103`	`103`	`}`
`104`	`104`
	`105`	`+ if r.DefinedTags != nil {`
	`106`	`+ autoScalingConfiguration["defined_tags"] = definedTagsToMap(r.DefinedTags)`
	`107`	`+ }`
	`108`	`+`
`105`	`109`	`if r.DisplayName != nil {`
`106`	`110`	`autoScalingConfiguration["display_name"] = *r.DisplayName`
`107`	`111`	`}`
`108`	`112`
	`113`	`+ autoScalingConfiguration["freeform_tags"] = r.FreeformTags`
	`114`	`+`
`109`	`115`	`if r.Id != nil {`
`110`	`116`	`autoScalingConfiguration["id"] = *r.Id`
`111`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,16 @@ func (s *CoreInstanceConfigurationsDataSourceCrud) SetData() error {`
`89`	`89`	`"compartment_id": *r.CompartmentId,`
`90`	`90`	`}`
`91`	`91`
	`92`	`+ if r.DefinedTags != nil {`
	`93`	`+ instanceConfiguration["defined_tags"] = definedTagsToMap(r.DefinedTags)`
	`94`	`+ }`
	`95`	`+`
`92`	`96`	`if r.DisplayName != nil {`
`93`	`97`	`instanceConfiguration["display_name"] = *r.DisplayName`
`94`	`98`	`}`
`95`	`99`
	`100`	`+ instanceConfiguration["freeform_tags"] = r.FreeformTags`
	`101`	`+`
`96`	`102`	`if r.Id != nil {`
`97`	`103`	`instanceConfiguration["id"] = *r.Id`
`98`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,10 +106,16 @@ func (s *CoreInstancePoolsDataSourceCrud) SetData() error {`
`106`	`106`	`"compartment_id": *r.CompartmentId,`
`107`	`107`	`}`
`108`	`108`
	`109`	`+ if r.DefinedTags != nil {`
	`110`	`+ instancePool["defined_tags"] = definedTagsToMap(r.DefinedTags)`
	`111`	`+ }`
	`112`	`+`
`109`	`113`	`if r.DisplayName != nil {`
`110`	`114`	`instancePool["display_name"] = *r.DisplayName`
`111`	`115`	`}`
`112`	`116`
	`117`	`+ instancePool["freeform_tags"] = r.FreeformTags`
	`118`	`+`
`113`	`119`	`if r.Id != nil {`
`114`	`120`	`instancePool["id"] = *r.Id`
`115`	`121`	`}`