Adding Etag to ListObjects

Author: jotruon

CHANGELOG.md

@@ -1,4 +1,8 @@
 ## 3.54.1 (Unreleased)
+
+### Added
+- Support Etag for ListObjects
+
 ## 3.54.0 (November 27, 2019)
 
 ### Added

oci/objectstorage_object_resource.go

@@ -888,6 +888,10 @@ func (s *ObjectStorageObjectResourceCrud) setDataObject() error {
 func ObjectSummaryToMap(obj oci_object_storage.ObjectSummary) map[string]interface{} {
 	result := map[string]interface{}{}
 
+	if obj.Etag != nil {
+		result["etag"] = string(*obj.Etag)
+	}
+
 	if obj.Md5 != nil {
 		result["md5"] = string(*obj.Md5)
 	}

oci/objectstorage_object_test.go

@@ -260,6 +260,7 @@ func TestObjectStorageObjectResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(datasourceName, "namespace"),
 
 					resource.TestCheckResourceAttr(datasourceName, "objects.#", "1"),
+					resource.TestCheckResourceAttrSet(datasourceName, "objects.0.etag"),
 				),
 			},
 			// verify datasource for delimiter and prefix

oci/objectstorage_objects_data_source.go

@@ -68,6 +68,10 @@ func ObjectStorageObjectsDataSource() *schema.Resource {
 							Type:     schema.TypeString,
 							Computed: true,
 						},
+						"etag": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
 					},
 				},
 			},
@@ -93,7 +97,7 @@ func (s *ObjectStorageObjectsDataSourceCrud) VoidState() {
 	s.D.SetId("")
 }
 
-var listObjectsFields = "name,size,md5,timeCreated"
+var listObjectsFields = "name,size,md5,timeCreated,etag"
 
 func (s *ObjectStorageObjectsDataSourceCrud) Get() error {
 	request := oci_object_storage.ListObjectsRequest{

website/docs/d/objectstorage_bucket.html.markdown

@@ -43,11 +43,11 @@ The following attributes are exported:
 * `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"}` 
 * `etag` - The entity tag (ETag) for the bucket.
 * `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"}` 
-* `kms_key_id` - The OCID of a KMS key id used to call KMS to generate data key or decrypt the encrypted data key. 
+* `kms_key_id` - The OCID of a master encryption key used to call the Key Management service to generate a data encryption key  or to encrypt or decrypt a data encryption key. 
 * `metadata` - Arbitrary string keys and values for user-defined metadata.
 * `name` - The name of the bucket. Avoid entering confidential information. Example: my-new-bucket1 
 * `namespace` - The Object Storage namespace in which the bucket lives.
-* `object_events_enabled` - A property that determines whether events will be generated for operations on objects in this bucket. This is false by default. 
+* `object_events_enabled` - Whether or not events are emitted for object state changes in this bucket. By default, `objectEventsEnabled` is set to `false`. Set `objectEventsEnabled` to `true` to emit events for object state changes. For more information about events, see [Overview of Events](https://docs.cloud.oracle.com/iaas/Content/Events/Concepts/eventsoverview.htm). 
 * `object_lifecycle_policy_etag` - The entity tag (ETag) for the live object lifecycle policy on the bucket.
 * `storage_tier` - The storage tier type assigned to the bucket. A bucket is set to 'Standard' tier by default, which means objects uploaded or copied to the bucket will be in the standard storage tier. When the 'Archive' tier type is set explicitly for a bucket, objects uploaded or copied to the bucket will be stored in archive storage. The 'storageTier' property is immutable after bucket is created. 
 * `time_created` - The date and time the bucket was created, as described in [RFC 2616](https://tools.ietf.org/rfc/rfc2616), section 14.29.

website/docs/d/objectstorage_bucket_summaries.html.markdown

@@ -54,11 +54,11 @@ The following attributes are exported:
 * `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"}` 
 * `etag` - The entity tag (ETag) for the bucket.
 * `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"}` 
-* `kms_key_id` - The OCID of a KMS key id used to call KMS to generate data key or decrypt the encrypted data key. 
+* `kms_key_id` - The OCID of a master encryption key used to call the Key Management service to generate a data encryption key  or to encrypt or decrypt a data encryption key. 
 * `metadata` - Arbitrary string keys and values for user-defined metadata.
 * `name` - The name of the bucket. Avoid entering confidential information. Example: my-new-bucket1 
 * `namespace` - The Object Storage namespace in which the bucket lives.
-* `object_events_enabled` - A property that determines whether events will be generated for operations on objects in this bucket. This is false by default. 
+* `object_events_enabled` - Whether or not events are emitted for object state changes in this bucket. By default, `objectEventsEnabled` is set to `false`. Set `objectEventsEnabled` to `true` to emit events for object state changes. For more information about events, see [Overview of Events](https://docs.cloud.oracle.com/iaas/Content/Events/Concepts/eventsoverview.htm). 
 * `object_lifecycle_policy_etag` - The entity tag (ETag) for the live object lifecycle policy on the bucket.
 * `storage_tier` - The storage tier type assigned to the bucket. A bucket is set to 'Standard' tier by default, which means objects uploaded or copied to the bucket will be in the standard storage tier. When the 'Archive' tier type is set explicitly for a bucket, objects uploaded or copied to the bucket will be stored in archive storage. The 'storageTier' property is immutable after bucket is created. 
 * `time_created` - The date and time the bucket was created, as described in [RFC 2616](https://tools.ietf.org/rfc/rfc2616), section 14.29.

website/docs/d/objectstorage_object_lifecycle_policy.html.markdown

@@ -39,7 +39,7 @@ The following attributes are exported:
 
 	For an example of this value, see the [PutObjectLifecyclePolicy API documentation](https://docs.cloud.oracle.com/iaas/api/#/en/objectstorage/20160918/ObjectLifecyclePolicy/PutObjectLifecyclePolicy). 
 	* `action` - The action of the object lifecycle policy rule. Rules using the action 'ARCHIVE' move objects into the [Archive Storage tier](https://docs.cloud.oracle.com/iaas/Content/Archive/Concepts/archivestorageoverview.htm). Rules using the action 'DELETE' permanently delete objects from buckets. 'ARCHIVE' and 'DELETE' are the only two supported actions at this time. 
-	* `is_enabled` - A boolean that determines whether this rule is currently enabled.
+	* `is_enabled` - A Boolean that determines whether this rule is currently enabled.
 	* `name` - The name of the lifecycle rule to be applied.
 	* `object_name_filter` - A filter limiting object names that the rule will apply to.
 		* `exclusion_patterns` - An array of glob patterns to match the object names to exclude. An empty array is ignored. Exclusion patterns take precedence over inclusion patterns. A Glob pattern is a sequence of characters to match text. Any character that appears in the pattern, other than the special pattern characters described below, matches itself. Glob patterns must be between 1 and 1024 characters.

website/docs/d/objectstorage_objects.html.markdown

@@ -62,6 +62,7 @@ The following attributes are exported:
 * `content_length` - The content length of the body.
 * `content_md5` - The base-64 encoded MD5 hash of the body.
 * `content_type` - The content type of the object.  Defaults to 'application/octet-stream' if not overridden during the PutObject call.
+* `etag` - The current entity tag (ETag) for the object.
 * `metadata` - Optional user-defined metadata key and value.
 Note: Metadata keys are case-insensitive and all returned keys will be lower case.
 * `namespace` - The top-level namespace used for the request.

website/docs/r/objectstorage_bucket.html.markdown

@@ -42,11 +42,11 @@ The following arguments are supported:
 * `compartment_id` - (Required) (Updatable) The ID of the compartment in which to create the bucket.
 * `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"}` 
 * `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"}` 
-* `kms_key_id` - (Optional) (Updatable) The OCID of a KMS key id used to call KMS to generate the data key or decrypt the encrypted data key.
+* `kms_key_id` - (Optional) (Updatable) The OCID of a master encryption key used to call the Key Management service to generate a data  encryption key or to encrypt or decrypt a data encryption key. 
 * `metadata` - (Optional) (Updatable) Arbitrary string, up to 4KB, of keys and values for user-defined metadata.
 * `name` - (Required) The name of the bucket. Valid characters are uppercase or lowercase letters, numbers, and dashes. Bucket names must be unique within an Object Storage namespace. Avoid entering confidential information. example: Example: my-new-bucket1 
 * `namespace` - (Required) The Object Storage namespace used for the request.
-* `object_events_enabled` - (Optional) (Updatable) A property that determines whether events will be generated for operations on objects in this bucket. This is false by default. 
+* `object_events_enabled` - (Optional) (Updatable) Whether or not events are emitted for object state changes in this bucket. By default, `objectEventsEnabled` is set to `false`. Set `objectEventsEnabled` to `true` to emit events for object state changes. For more information about events, see [Overview of Events](https://docs.cloud.oracle.com/iaas/Content/Events/Concepts/eventsoverview.htm). 
 * `storage_tier` - (Optional) The type of storage tier of this bucket. A bucket is set to 'Standard' tier by default, which means the bucket will be put in the standard storage tier. When 'Archive' tier type is set explicitly, the bucket is put in the Archive Storage tier. The 'storageTier' property is immutable after bucket is created. 
 
 
@@ -65,11 +65,11 @@ The following attributes are exported:
 * `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"}` 
 * `etag` - The entity tag (ETag) for the bucket.
 * `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"}` 
-* `kms_key_id` - The OCID of a KMS key id used to call KMS to generate data key or decrypt the encrypted data key. 
+* `kms_key_id` - The OCID of a master encryption key used to call the Key Management service to generate a data encryption key  or to encrypt or decrypt a data encryption key. 
 * `metadata` - Arbitrary string keys and values for user-defined metadata.
 * `name` - The name of the bucket. Avoid entering confidential information. Example: my-new-bucket1 
 * `namespace` - The Object Storage namespace in which the bucket lives.
-* `object_events_enabled` - A property that determines whether events will be generated for operations on objects in this bucket. This is false by default. 
+* `object_events_enabled` - Whether or not events are emitted for object state changes in this bucket. By default, `objectEventsEnabled` is set to `false`. Set `objectEventsEnabled` to `true` to emit events for object state changes. For more information about events, see [Overview of Events](https://docs.cloud.oracle.com/iaas/Content/Events/Concepts/eventsoverview.htm). 
 * `object_lifecycle_policy_etag` - The entity tag (ETag) for the live object lifecycle policy on the bucket.
 * `storage_tier` - The storage tier type assigned to the bucket. A bucket is set to 'Standard' tier by default, which means objects uploaded or copied to the bucket will be in the standard storage tier. When the 'Archive' tier type is set explicitly for a bucket, objects uploaded or copied to the bucket will be stored in archive storage. The 'storageTier' property is immutable after bucket is created. 
 * `time_created` - The date and time the bucket was created, as described in [RFC 2616](https://tools.ietf.org/rfc/rfc2616), section 14.29.

website/docs/r/objectstorage_object_lifecycle_policy.html.markdown

@@ -50,7 +50,7 @@ The following arguments are supported:
 * `namespace` - (Required) The Object Storage namespace used for the request.
 * `rules` - (Optional) (Updatable) The bucket's set of lifecycle policy rules.
 	* `action` - (Required) (Updatable) The action of the object lifecycle policy rule. Rules using the action 'ARCHIVE' move objects into the [Archive Storage tier](https://docs.cloud.oracle.com/iaas/Content/Archive/Concepts/archivestorageoverview.htm). Rules using the action 'DELETE' permanently delete objects from buckets. 'ARCHIVE' and 'DELETE' are the only two supported actions at this time. 
-	* `is_enabled` - (Required) (Updatable) A boolean that determines whether this rule is currently enabled.
+	* `is_enabled` - (Required) (Updatable) A Boolean that determines whether this rule is currently enabled.
 	* `name` - (Required) (Updatable) The name of the lifecycle rule to be applied.
 	* `object_name_filter` - (Optional) (Updatable) A filter limiting object names that the rule will apply to.
 		* `exclusion_patterns` - (Optional) (Updatable) An array of glob patterns to match the object names to exclude. An empty array is ignored. Exclusion patterns take precedence over inclusion patterns. A Glob pattern is a sequence of characters to match text. Any character that appears in the pattern, other than the special pattern characters described below, matches itself. Glob patterns must be between 1 and 1024 characters.
@@ -81,7 +81,7 @@ The following attributes are exported:
 
 	For an example of this value, see the [PutObjectLifecyclePolicy API documentation](https://docs.cloud.oracle.com/iaas/api/#/en/objectstorage/20160918/ObjectLifecyclePolicy/PutObjectLifecyclePolicy). 
 	* `action` - The action of the object lifecycle policy rule. Rules using the action 'ARCHIVE' move objects into the [Archive Storage tier](https://docs.cloud.oracle.com/iaas/Content/Archive/Concepts/archivestorageoverview.htm). Rules using the action 'DELETE' permanently delete objects from buckets. 'ARCHIVE' and 'DELETE' are the only two supported actions at this time. 
-	* `is_enabled` - A boolean that determines whether this rule is currently enabled.
+	* `is_enabled` - A Boolean that determines whether this rule is currently enabled.
 	* `name` - The name of the lifecycle rule to be applied.
 	* `object_name_filter` - A filter limiting object names that the rule will apply to.
 		* `exclusion_patterns` - An array of glob patterns to match the object names to exclude. An empty array is ignored. Exclusion patterns take precedence over inclusion patterns. A Glob pattern is a sequence of characters to match text. Any character that appears in the pattern, other than the special pattern characters described below, matches itself. Glob patterns must be between 1 and 1024 characters.