Add support for approximateCount and approximate Size of the objects within the bucket as bucket statistics

Author: abhilash-av

oci/object_storage_bucket_data_source.go

@@ -4,6 +4,7 @@ package provider
 
 import (
 	"context"
+	"strconv"
 
 	"github.com/hashicorp/terraform/helper/schema"
 	oci_object_storage "github.com/oracle/oci-go-sdk/objectstorage"
@@ -26,6 +27,14 @@ func BucketDataSource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"approximate_count": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"approximate_size": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"compartment_id": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -104,6 +113,7 @@ func (s *BucketDataSourceCrud) Get() error {
 		request.NamespaceName = &tmp
 	}
 
+	request.Fields = oci_object_storage.GetGetBucketFieldsEnumValues()
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(true, "object_storage")
 
 	response, err := s.Client.GetBucket(context.Background(), request)
@@ -124,6 +134,14 @@ func (s *BucketDataSourceCrud) SetData() error {
 
 	s.D.Set("access_type", s.Res.PublicAccessType)
 
+	if s.Res.ApproximateCount != nil {
+		s.D.Set("approximate_count", strconv.FormatInt(*s.Res.ApproximateCount, 10))
+	}
+
+	if s.Res.ApproximateSize != nil {
+		s.D.Set("approximate_size", strconv.FormatInt(*s.Res.ApproximateSize, 10))
+	}
+
 	if s.Res.CompartmentId != nil {
 		s.D.Set("compartment_id", *s.Res.CompartmentId)
 	}

oci/object_storage_bucket_resource.go

@@ -5,6 +5,7 @@ package provider
 import (
 	"context"
 	"log"
+	"strconv"
 
 	"github.com/hashicorp/terraform/helper/schema"
 
@@ -72,6 +73,14 @@ func BucketResource() *schema.Resource {
 			},
 
 			// Computed
+			"approximate_count": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"approximate_size": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"created_by": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -211,6 +220,7 @@ func (s *BucketResourceCrud) Get() error {
 		request.NamespaceName = &tmp
 	}
 
+	request.Fields = oci_object_storage.GetGetBucketFieldsEnumValues()
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "object_storage")
 
 	response, err := s.Client.GetBucket(context.Background(), request)
@@ -314,6 +324,14 @@ func (s *BucketResourceCrud) Delete() error {
 func (s *BucketResourceCrud) SetData() error {
 	s.D.Set("access_type", s.Res.PublicAccessType)
 
+	if s.Res.ApproximateCount != nil {
+		s.D.Set("approximate_count", strconv.FormatInt(*s.Res.ApproximateCount, 10))
+	}
+
+	if s.Res.ApproximateSize != nil {
+		s.D.Set("approximate_size", strconv.FormatInt(*s.Res.ApproximateSize, 10))
+	}
+
 	if s.Res.CompartmentId != nil {
 		s.D.Set("compartment_id", *s.Res.CompartmentId)
 	}

oci/object_storage_bucket_test.go

@@ -119,7 +119,19 @@ func TestObjectStorageBucketResource_basic(t *testing.T) {
 					},
 				),
 			},
+			{
+				Config: config + compartmentIdVariableStr + BucketResourceDependencies +
+					generateResourceFromRepresentationMap("oci_objectstorage_bucket", "test_bucket", Optional, Create, bucketRepresentation),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrSet(resourceName, "approximate_count"),
+					resource.TestCheckResourceAttrSet(resourceName, "approximate_size"),
 
+					func(s *terraform.State) (err error) {
+						resId, err = fromInstanceState(s, resourceName, "id")
+						return err
+					},
+				),
+			},
 			// verify updates to compartment
 			{
 				Config: config + compartmentId2VariableStr + BucketResourceDependencies +
@@ -136,6 +148,8 @@ func TestObjectStorageBucketResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceName, "namespace"),
 					resource.TestCheckResourceAttr(resourceName, "storage_tier", "Standard"),
 					resource.TestCheckResourceAttrSet(resourceName, "time_created"),
+					resource.TestCheckResourceAttrSet(resourceName, "approximate_count"),
+					resource.TestCheckResourceAttrSet(resourceName, "approximate_size"),
 
 					func(s *terraform.State) (err error) {
 						resId2, err = fromInstanceState(s, resourceName, "id")
@@ -218,6 +232,8 @@ func TestObjectStorageBucketResource_basic(t *testing.T) {
 					//resource.TestCheckResourceAttrSet(singularDatasourceName, "object_lifecycle_policy_etag"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "storage_tier", "Standard"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "approximate_count"),
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "approximate_size"),
 				),
 			},
 		},

website/docs/d/object_storage_bucket.html.markdown

@@ -35,6 +35,8 @@ The following arguments are supported:
 The following attributes are exported:
 
 * `access_type` - The type of public access enabled on this bucket. A bucket is set to `NoPublicAccess` by default, which only allows an authenticated caller to access the bucket and its contents. When `ObjectRead` is enabled on the bucket, public access is allowed for the `GetObject`, `HeadObject`, and `ListObjects` operations. When `ObjectReadWithoutList` is enabled on the bucket, public access is allowed for the `GetObject` and `HeadObject` operations. 
+* `approximate_count` - The approximate number of objects in the bucket. Count statistics are reported periodically. You will see a lag between what is displayed and the actual object count. 
+* `approximate_size` - The approximate total size in bytes of all objects in the bucket. Size statistics are reported periodically. You will see a lag between what is displayed and the actual size of the bucket. 
 * `compartment_id` - The compartment ID in which the bucket is authorized.
 * `created_by` - The OCID of the user who created the bucket.
 * `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/object_storage_bucket.html.markdown

@@ -54,6 +54,8 @@ Any change to a property that does not support update will force the destruction
 The following attributes are exported:
 
 * `access_type` - The type of public access enabled on this bucket. A bucket is set to `NoPublicAccess` by default, which only allows an authenticated caller to access the bucket and its contents. When `ObjectRead` is enabled on the bucket, public access is allowed for the `GetObject`, `HeadObject`, and `ListObjects` operations. When `ObjectReadWithoutList` is enabled on the bucket, public access is allowed for the `GetObject` and `HeadObject` operations. 
+* `approximate_count` - The approximate number of objects in the bucket. Count statistics are reported periodically. You will see a lag between what is displayed and the actual object count. 
+* `approximate_size` - The approximate total size in bytes of all objects in the bucket. Size statistics are reported periodically. You will see a lag between what is displayed and the actual size of the bucket. 
 * `compartment_id` - The compartment ID in which the bucket is authorized.
 * `created_by` - The OCID of the user who created the bucket.
 * `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"}`