Add support for cost tracking in tags

alexng-canuck · rcohenma · commit 1b8dc75dae85 · 2018-10-31T19:48:10.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Support for encrypting the contents of an Object Storage bucket using a Key Management Service key
 - Support for specifying a Key Management Service key when launching a compute instance in the Compute service
 - Support for specifying a Key Management Service key when backing up or restoring a block storage volume in the Block Volume service
+- Support for cost tracking in tags
 
 ### Fixed
 - Data type for properties with type as TypeSet to TypeList in following datasources: `oci_core_route_tables`, `oci_core_security_lists`, `oci_core_volume`, and `oci_core_service_gateways` to allow referencing by indexes in Terraform configs.
diff --git a/oci/identity_tag_resource.go b/oci/identity_tag_resource.go
@@ -53,6 +53,11 @@ func TagResource() *schema.Resource {
 				Computed: true,
 				Elem:     schema.TypeString,
 			},
+			"is_cost_tracking": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Computed: true,
+			},
 			"is_retired": {
 				Type:     schema.TypeBool,
 				Optional: true,
@@ -127,6 +132,11 @@ func (s *TagResourceCrud) Create() error {
 		request.FreeformTags = objectMapToStringMap(freeformTags.(map[string]interface{}))
 	}
 
+	if isCostTracking, ok := s.D.GetOkExists("is_cost_tracking"); ok {
+		tmp := isCostTracking.(bool)
+		request.IsCostTracking = &tmp
+	}
+
 	if name, ok := s.D.GetOkExists("name"); ok {
 		tmp := name.(string)
 		request.Name = &tmp
@@ -228,6 +238,11 @@ func (s *TagResourceCrud) Update() error {
 		request.FreeformTags = objectMapToStringMap(freeformTags.(map[string]interface{}))
 	}
 
+	if isCostTracking, ok := s.D.GetOkExists("is_cost_tracking"); ok {
+		tmp := isCostTracking.(bool)
+		request.IsCostTracking = &tmp
+	}
+
 	if isRetired, ok := s.D.GetOkExists("is_retired"); ok {
 		tmp := isRetired.(bool)
 		request.IsRetired = &tmp
@@ -265,6 +280,10 @@ func (s *TagResourceCrud) SetData() error {
 
 	s.D.Set("freeform_tags", s.Res.FreeformTags)
 
+	if s.Res.IsCostTracking != nil {
+		s.D.Set("is_cost_tracking", *s.Res.IsCostTracking)
+	}
+
 	if s.Res.IsRetired != nil {
 		s.D.Set("is_retired", *s.Res.IsRetired)
 	}
diff --git a/oci/identity_tag_test.go b/oci/identity_tag_test.go
@@ -51,6 +51,7 @@ var (
 		"tag_namespace_id": Representation{repType: Required, create: `${oci_identity_tag_namespace.test_tag_namespace.id}`},
 		"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")}`},
 		"freeform_tags":    Representation{repType: Optional, create: map[string]string{"Department": "Finance"}, update: map[string]string{"Department": "Accounting"}},
+		"is_cost_tracking": Representation{repType: Optional, create: `false`, update: `true`},
 	}
 
 	TagResourceDependencies = TagNamespaceRequiredOnlyResource
@@ -103,6 +104,7 @@ func TestIdentityTagResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "description", "This tag will show the cost center that will be used for billing of associated resources."),
 					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
+					resource.TestCheckResourceAttr(resourceName, "is_cost_tracking", "false"),
 					resource.TestCheckResourceAttrSet(resourceName, "is_retired"),
 					resource.TestCheckResourceAttr(resourceName, "name", "CostCenter"),
 					resource.TestCheckResourceAttrSet(resourceName, "tag_namespace_id"),
@@ -124,6 +126,7 @@ func TestIdentityTagResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "description", "description2"),
 					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
+					resource.TestCheckResourceAttr(resourceName, "is_cost_tracking", "true"),
 					resource.TestCheckResourceAttrSet(resourceName, "is_retired"),
 					resource.TestCheckResourceAttr(resourceName, "name", "CostCenter"),
 					resource.TestCheckResourceAttrSet(resourceName, "tag_namespace_id"),
@@ -152,6 +155,7 @@ func TestIdentityTagResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(datasourceName, "tags.0.description", "description2"),
 					resource.TestCheckResourceAttr(datasourceName, "tags.0.freeform_tags.%", "1"),
 					resource.TestCheckResourceAttrSet(datasourceName, "tags.0.id"),
+					resource.TestCheckResourceAttr(datasourceName, "tags.0.is_cost_tracking", "true"),
 					resource.TestCheckResourceAttrSet(datasourceName, "tags.0.is_retired"),
 					resource.TestCheckResourceAttr(datasourceName, "tags.0.name", "CostCenter"),
 					resource.TestCheckResourceAttrSet(datasourceName, "tags.0.time_created"),
diff --git a/oci/identity_tags_data_source.go b/oci/identity_tags_data_source.go
@@ -101,6 +101,10 @@ func (s *TagsDataSourceCrud) SetData() error {
 			tag["id"] = *r.Id
 		}
 
+		if r.IsCostTracking != nil {
+			tag["is_cost_tracking"] = *r.IsCostTracking
+		}
+
 		if r.IsRetired != nil {
 			tag["is_retired"] = *r.IsRetired
 		}
diff --git a/website/docs/d/identity_dynamic_groups.html.markdown b/website/docs/d/identity_dynamic_groups.html.markdown
@@ -27,7 +27,7 @@ data "oci_identity_dynamic_groups" "test_dynamic_groups" {
 
 The following arguments are supported:
 
-* `compartment_id` - (Required) The OCID of the compartment (remember that the tenancy is simply the root compartment). 
+* `compartment_id` - (Required) The OCID of the parent compartment (remember that the tenancy is simply the root compartment). 
 
 
 ## Attributes Reference
diff --git a/website/docs/d/identity_fault_domains.html.markdown b/website/docs/d/identity_fault_domains.html.markdown
@@ -29,7 +29,7 @@ data "oci_identity_fault_domains" "test_fault_domains" {
 The following arguments are supported:
 
 * `availability_domain` - (Required) The name of the availibilityDomain. 
-* `compartment_id` - (Required) The OCID of the compartment (remember that the tenancy is simply the root compartment). 
+* `compartment_id` - (Required) The OCID of the parent compartment (remember that the tenancy is simply the root compartment). 
 
 
 ## Attributes Reference
diff --git a/website/docs/d/identity_groups.html.markdown b/website/docs/d/identity_groups.html.markdown
@@ -27,7 +27,7 @@ data "oci_identity_groups" "test_groups" {
 
 The following arguments are supported:
 
-* `compartment_id` - (Required) The OCID of the compartment (remember that the tenancy is simply the root compartment). 
+* `compartment_id` - (Required) The OCID of the parent compartment (remember that the tenancy is simply the root compartment). 
 
 
 ## Attributes Reference
diff --git a/website/docs/d/identity_identity_providers.html.markdown b/website/docs/d/identity_identity_providers.html.markdown
@@ -29,7 +29,7 @@ data "oci_identity_identity_providers" "test_identity_providers" {
 
 The following arguments are supported:
 
-* `compartment_id` - (Required) The OCID of the compartment (remember that the tenancy is simply the root compartment). 
+* `compartment_id` - (Required) The OCID of the parent compartment (remember that the tenancy is simply the root compartment). 
 * `protocol` - (Required) The protocol used for federation.
 
 
diff --git a/website/docs/d/identity_policies.html.markdown b/website/docs/d/identity_policies.html.markdown
@@ -29,7 +29,7 @@ data "oci_identity_policies" "test_policies" {
 
 The following arguments are supported:
 
-* `compartment_id` - (Required) The OCID of the compartment (remember that the tenancy is simply the root compartment). 
+* `compartment_id` - (Required) The OCID of the parent compartment (remember that the tenancy is simply the root compartment). 
 
 
 ## Attributes Reference
diff --git a/website/docs/d/identity_tag_namespaces.html.markdown b/website/docs/d/identity_tag_namespaces.html.markdown
@@ -28,7 +28,7 @@ data "oci_identity_tag_namespaces" "test_tag_namespaces" {
 
 The following arguments are supported:
 
-* `compartment_id` - (Required) The OCID of the compartment (remember that the tenancy is simply the root compartment). 
+* `compartment_id` - (Required) The OCID of the parent compartment (remember that the tenancy is simply the root compartment). 
 * `include_subcompartments` - (Optional) An optional boolean parameter indicating whether to retrieve all tag namespaces in subcompartments. If this parameter is not specified, only the tag namespaces defined in the specified compartment are retrieved. 
 
 
diff --git a/website/docs/d/identity_tags.html.markdown b/website/docs/d/identity_tags.html.markdown
@@ -42,6 +42,7 @@ The following attributes are exported:
 * `description` - The description you assign to the tag.
 * `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 tag definition.
+* `is_cost_tracking` - Indicates whether the tag is enabled for cost tracking. 
 * `is_retired` - Indicates whether the tag is retired. See [Retiring Key Definitions and Namespace Definitions](https://docs.cloud.oracle.com/iaas/Content/Identity/Concepts/taggingoverview.htm#Retiring). 
 * `name` - The name of the tag. The name must be unique across all tags in the tag namespace and can't be changed. 
 * `tag_namespace_id` - The OCID of the namespace that contains the tag definition.
diff --git a/website/docs/d/identity_user_group_memberships.html.markdown b/website/docs/d/identity_user_group_memberships.html.markdown
@@ -38,7 +38,7 @@ data "oci_identity_user_group_memberships" "test_user_group_memberships" {
 
 The following arguments are supported:
 
-* `compartment_id` - (Required) The OCID of the compartment (remember that the tenancy is simply the root compartment). 
+* `compartment_id` - (Required) The OCID of the parent compartment (remember that the tenancy is simply the root compartment). 
 * `group_id` - (Optional) The OCID of the group.
 * `user_id` - (Optional) The OCID of the user.
 
diff --git a/website/docs/d/identity_users.html.markdown b/website/docs/d/identity_users.html.markdown
@@ -27,7 +27,7 @@ data "oci_identity_users" "test_users" {
 
 The following arguments are supported:
 
-* `compartment_id` - (Required) The OCID of the compartment (remember that the tenancy is simply the root compartment). 
+* `compartment_id` - (Required) The OCID of the parent compartment (remember that the tenancy is simply the root compartment). 
 
 
 ## Attributes Reference
diff --git a/website/docs/r/identity_tag.html.markdown b/website/docs/r/identity_tag.html.markdown
@@ -35,6 +35,7 @@ resource "oci_identity_tag" "test_tag" {
 	#Optional
 	defined_tags = {"Operations.CostCenter"= "42"}
 	freeform_tags = {"Department"= "Finance"}
+	is_cost_tracking = "${var.tag_is_cost_tracking}"
     is_retired = false
 }
 ```
@@ -46,6 +47,7 @@ The following arguments are supported:
 * `defined_tags` - (Optional) (Updatable) 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"}` 
 * `description` - (Required) (Updatable) The description you assign to the tag during creation.
 * `freeform_tags` - (Optional) (Updatable) 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"}` 
+* `is_cost_tracking` - (Optional) (Updatable) Indicates whether the tag is enabled for cost tracking. 
 * `name` - (Required) The name you assign to the tag during creation. The name must be unique within the tag namespace and cannot be changed. 
 * `tag_namespace_id` - (Required) The OCID of the tag namespace. 
 * `is_retired` - (Optional) (Updatable) Indicates whether the tag is retired. See [Retiring Key Definitions and Namespace Definitions](https://docs.us-phoenix-1.oraclecloud.com/Content/Identity/Concepts/taggingoverview.htm#Retiring). 
@@ -62,6 +64,7 @@ The following attributes are exported:
 * `description` - The description you assign to the tag.
 * `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 tag definition.
+* `is_cost_tracking` - Indicates whether the tag is enabled for cost tracking. 
 * `is_retired` - Indicates whether the tag is retired. See [Retiring Key Definitions and Namespace Definitions](https://docs.cloud.oracle.com/iaas/Content/Identity/Concepts/taggingoverview.htm#Retiring). 
 * `name` - The name of the tag. The name must be unique across all tags in the tag namespace and can't be changed. 
 * `tag_namespace_id` - The OCID of the namespace that contains the tag definition.

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,10 @@ func (s *TagsDataSourceCrud) SetData() error {`
`101`	`101`	`tag["id"] = *r.Id`
`102`	`102`	`}`
`103`	`103`
	`104`	`+ if r.IsCostTracking != nil {`
	`105`	`+ tag["is_cost_tracking"] = *r.IsCostTracking`
	`106`	`+ }`
	`107`	`+`
`104`	`108`	`if r.IsRetired != nil {`
`105`	`109`	`tag["is_retired"] = *r.IsRetired`
`106`	`110`	`}`