Add ocid to object storage bucket

Author: parrneet

CHANGELOG.md

@@ -1,10 +1,11 @@
 ## 3.55.0 (Unreleased)
 
 ### Added
-- Support Etag for ListObjects
+- Support Etag in `oci_objectstorage_objects` resource
 - Support for Network Security Groups in `oci_file_storage_mount_target` resource
 - Support for multi-attach for block storage
 - Support for cache control and control-disposition headers in `oci_objectstorage_object`
+- Support for OCID in Bucket Resource
 
 ## 3.54.0 (November 27, 2019)
 

oci/objectstorage_bucket_data_source.go

@@ -101,6 +101,10 @@ func (s *ObjectStorageBucketDataSourceCrud) SetData() error {
 
 	s.D.Set("freeform_tags", s.Res.FreeformTags)
 
+	if s.Res.Id != nil {
+		s.D.Set("bucket_id", *s.Res.Id)
+	}
+
 	if s.Res.KmsKeyId != nil {
 		s.D.Set("kms_key_id", *s.Res.KmsKeyId)
 	}

oci/objectstorage_bucket_resource.go

@@ -93,6 +93,10 @@ func ObjectStorageBucketResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"bucket_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"created_by": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -342,6 +346,8 @@ func (s *ObjectStorageBucketResourceCrud) Delete() error {
 
 func (s *ObjectStorageBucketResourceCrud) SetData() error {
 
+	s.D.Set("bucket_id", *s.Res.Id)
+
 	bucket, namespace, err := parseBucketCompositeId(s.D.Id())
 	if err == nil {
 		s.D.Set("bucket", &bucket)

oci/objectstorage_bucket_summaries_data_source.go

@@ -25,7 +25,7 @@ func ObjectStorageBucketsDataSource() *schema.Resource {
 			"bucket_summaries": {
 				Type:     schema.TypeList,
 				Computed: true,
-				Elem:     ObjectStorageBucketResource(),
+				Elem:     GetDataSourceItemSchema(ObjectStorageBucketResource()),
 			},
 		},
 	}

oci/objectstorage_bucket_test.go

@@ -91,6 +91,7 @@ func TestObjectStorageBucketResource_basic(t *testing.T) {
 				Config: config + compartmentIdVariableStr + BucketResourceDependencies +
 					generateResourceFromRepresentationMap("oci_objectstorage_bucket", "test_bucket", Required, Create, bucketRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrSet(resourceName, "bucket_id"),
 					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 					resource.TestCheckResourceAttr(resourceName, "name", testBucketName),
 					resource.TestCheckResourceAttrSet(resourceName, "namespace"),
@@ -112,6 +113,7 @@ func TestObjectStorageBucketResource_basic(t *testing.T) {
 					generateResourceFromRepresentationMap("oci_objectstorage_bucket", "test_bucket", Optional, Create, bucketRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "access_type", "NoPublicAccess"),
+					resource.TestCheckResourceAttrSet(resourceName, "bucket_id"),
 					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 					resource.TestCheckResourceAttrSet(resourceName, "created_by"),
 					resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
@@ -155,6 +157,7 @@ func TestObjectStorageBucketResource_basic(t *testing.T) {
 					generateResourceFromRepresentationMap("oci_objectstorage_bucket", "test_bucket", Optional, Create, bucketRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "access_type", "NoPublicAccess"),
+					resource.TestCheckResourceAttrSet(resourceName, "bucket_id"),
 					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId2),
 					resource.TestCheckResourceAttrSet(resourceName, "created_by"),
 					resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
@@ -183,6 +186,7 @@ func TestObjectStorageBucketResource_basic(t *testing.T) {
 					generateResourceFromRepresentationMap("oci_objectstorage_bucket", "test_bucket", Optional, Update, bucketRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "access_type", "ObjectRead"),
+					resource.TestCheckResourceAttrSet(resourceName, "bucket_id"),
 					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 					resource.TestCheckResourceAttrSet(resourceName, "created_by"),
 					resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
@@ -239,11 +243,13 @@ func TestObjectStorageBucketResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(singularDatasourceName, "access_type", "ObjectRead"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "approximate_count"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "approximate_size"),
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "bucket_id"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "created_by"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "defined_tags.%", "1"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "etag"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "metadata.%", "1"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "name", testBucketName2),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "namespace"),
@@ -253,8 +259,6 @@ func TestObjectStorageBucketResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(singularDatasourceName, "object_events_enabled", "true"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "storage_tier", "Standard"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
-					resource.TestCheckResourceAttrSet(singularDatasourceName, "approximate_count"),
-					resource.TestCheckResourceAttrSet(singularDatasourceName, "approximate_size"),
 				),
 			},
 			// remove singular datasource from previous step so that it doesn't conflict with import tests

website/docs/d/objectstorage_bucket.html.markdown

@@ -38,6 +38,7 @@ 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. 
+* `bucket_id` - The OCID of the bucket which is a Oracle assigned unique identifier for this resource type (bucket). `bucket_id` cannot be used for bucket lookup.
 * `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/objectstorage_bucket.html.markdown

@@ -60,6 +60,7 @@ 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. 
+* `bucket_id` - The OCID of the bucket which is a Oracle assigned unique identifier for this resource type (bucket). `bucket_id` cannot be used for bucket lookup.
 * `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"}`