Support for Charge for Custom Images in core resource

Author: srishtipmishra

CHANGELOG.md

@@ -11,6 +11,7 @@
 - Support for E3 Flex Notebooks added to `datascience`
 - Support for Non-Rolling patch mode added to `database_maintenance_run_resource`
 - Support for update compartment for `oci_core_default_security_list`, `oci_core_default_dhcp_options`, `oci_core_default_route_table`
+- Support for Charge for Custom Images in core resource
 
 ## 4.27.0 (May 19, 2021)
 

oci/core_image_data_source.go

@@ -78,6 +78,10 @@ func (s *CoreImageDataSourceCrud) SetData() error {
 		s.D.Set("base_image_id", *s.Res.BaseImageId)
 	}
 
+	if s.Res.BillableSizeInGBs != nil {
+		s.D.Set("billable_size_in_gbs", strconv.FormatInt(*s.Res.BillableSizeInGBs, 10))
+	}
+
 	if s.Res.CompartmentId != nil {
 		s.D.Set("compartment_id", *s.Res.CompartmentId)
 	}

oci/core_image_resource.go

@@ -161,6 +161,10 @@ func CoreImageResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"billable_size_in_gbs": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"create_image_allowed": {
 				Type:     schema.TypeBool,
 				Computed: true,
@@ -453,6 +457,10 @@ func (s *CoreImageResourceCrud) SetData() error {
 		s.D.Set("base_image_id", *s.Res.BaseImageId)
 	}
 
+	if s.Res.BillableSizeInGBs != nil {
+		s.D.Set("billable_size_in_gbs", strconv.FormatInt(*s.Res.BillableSizeInGBs, 10))
+	}
+
 	if s.Res.CompartmentId != nil {
 		s.D.Set("compartment_id", *s.Res.CompartmentId)
 	}

oci/core_image_test.go

@@ -212,6 +212,7 @@ func TestCoreImageResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(datasourceName, "images.#", "1"),
 					resource.TestCheckResourceAttr(datasourceName, "images.0.agent_features.#", "0"),
 					resource.TestCheckResourceAttrSet(datasourceName, "images.0.base_image_id"),
+					resource.TestCheckResourceAttrSet(datasourceName, "images.0.billable_size_in_gbs"),
 					resource.TestCheckResourceAttr(datasourceName, "images.0.compartment_id", compartmentId),
 					resource.TestCheckResourceAttrSet(datasourceName, "images.0.create_image_allowed"),
 					resource.TestCheckResourceAttr(datasourceName, "images.0.defined_tags.%", "1"),
@@ -237,6 +238,7 @@ func TestCoreImageResource_basic(t *testing.T) {
 
 					resource.TestCheckResourceAttr(singularDatasourceName, "agent_features.#", "0"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "base_image_id"),
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "billable_size_in_gbs"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "create_image_allowed"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "defined_tags.%", "1"),

oci/core_images_data_source.go

@@ -177,6 +177,10 @@ func (s *CoreImagesDataSourceCrud) SetData() error {
 			image["base_image_id"] = *r.BaseImageId
 		}
 
+		if r.BillableSizeInGBs != nil {
+			image["billable_size_in_gbs"] = strconv.FormatInt(*r.BillableSizeInGBs, 10)
+		}
+
 		if r.CreateImageAllowed != nil {
 			image["create_image_allowed"] = *r.CreateImageAllowed
 		}

website/docs/d/core_image.html.markdown

@@ -36,6 +36,7 @@ The following attributes are exported:
 	* `is_management_supported` - Whether Oracle Cloud Agent can run all the available management plugins. 
 	* `is_monitoring_supported` - Whether Oracle Cloud Agent can gather performance metrics and monitor the instance. 
 * `base_image_id` - The OCID of the image originally used to launch the instance.
+* `billable_size_in_gbs` - The size of the internal storage for this image that is subject to billing (1 GB = 1,073,741,824 bytes).  Example: `100` 
 * `compartment_id` - The OCID of the compartment containing the instance you want to use as the basis for the image. 
 * `create_image_allowed` - Whether instances launched with this image can be used to create new images. For example, you cannot create an image of an Oracle Database instance.  Example: `true` 
 * `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"}` 

website/docs/d/core_images.html.markdown

@@ -65,6 +65,7 @@ The following attributes are exported:
 	* `is_management_supported` - Whether Oracle Cloud Agent can run all the available management plugins. 
 	* `is_monitoring_supported` - Whether Oracle Cloud Agent can gather performance metrics and monitor the instance. 
 * `base_image_id` - The OCID of the image originally used to launch the instance.
+* `billable_size_in_gbs` - The size of the internal storage for this image that is subject to billing (1 GB = 1,073,741,824 bytes).  Example: `100` 
 * `compartment_id` - The OCID of the compartment containing the instance you want to use as the basis for the image. 
 * `create_image_allowed` - Whether instances launched with this image can be used to create new images. For example, you cannot create an image of an Oracle Database instance.  Example: `true` 
 * `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"}` 

website/docs/r/core_image.html.markdown

@@ -140,6 +140,7 @@ The following attributes are exported:
 	* `is_management_supported` - Whether Oracle Cloud Agent can run all the available management plugins. 
 	* `is_monitoring_supported` - Whether Oracle Cloud Agent can gather performance metrics and monitor the instance. 
 * `base_image_id` - The OCID of the image originally used to launch the instance.
+* `billable_size_in_gbs` - The size of the internal storage for this image that is subject to billing (1 GB = 1,073,741,824 bytes).  Example: `100` 
 * `compartment_id` - The OCID of the compartment containing the instance you want to use as the basis for the image. 
 * `create_image_allowed` - Whether instances launched with this image can be used to create new images. For example, you cannot create an image of an Oracle Database instance.  Example: `true` 
 * `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"}`