Allow move of bucket to other compartment

Add changelog for move compartment functionality for bucket

Author: kilokahn

CHANGELOG.md

@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ### Changed
 - Default timeout changed from 5 minutes to 15 minutes to accommodate more resources that don't time out quicker.
+- Ability to update compartment of a bucket
 
 ## 2.1.13 - 2018-07-02
 

docs/object_storage/buckets.md

@@ -6,44 +6,43 @@
 
 The following attributes are exported:
 
-* `access_type` - The type of public access available on this bucket. Allows authenticated caller to access the bucket or contents of this bucket. By default a bucket is set to NoPublicAccess. It is treated as NoPublicAccess when this value is not specified. When the type is NoPublicAccess the bucket does not allow any public access. When the type is ObjectRead the bucket allows public access to the GetObject, HeadObject, ListObjects. 
+* `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. 
 * `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.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). Example: `{"Operations.CostCenter": "42"}` 
 * `etag` - The entity tag 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.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). Example: `{"Department": "Finance"}` 
 * `metadata` - Arbitrary string keys and values for user-defined metadata.
-* `name` - The name of the bucket.
+* `name` - The name of the bucket. Avoid entering confidential information. Example: my-new-bucket1 
 * `namespace` - The namespace in which the bucket lives.
 * `storage_tier` - 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. 
-* `time_created` - The date and time at which the bucket was 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.
 
 
 
 ### Create Operation
 Creates a bucket in the given namespace with a bucket name and optional user-defined metadata.
 
-To use this and other API operations, you must be authorized in an IAM policy. If you're not authorized, 
-talk to an administrator. If you're an administrator who needs to write policies to give users access, see 
-[Getting Started with Policies](https://docs.us-phoenix-1.oraclecloud.com/Content/Identity/Concepts/policygetstarted.htm).
-
 
 The following arguments are supported:
 
-* `access_type` - (Optional) The type of public access available on this bucket. Allows authenticated caller to access the bucket or contents of this bucket. By default a bucket is set to NoPublicAccess. It is treated as NoPublicAccess when this value is not specified. When the type is NoPublicAccess the bucket does not allow any public access. When the type is ObjectRead the bucket allows public access to the GetObject, HeadObject, ListObjects. 
+* `access_type` - (Optional) 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. 
 * `compartment_id` - (Required) The ID of the compartment in which to create the bucket.
 * `defined_tags` - (Optional) Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). Example: `{"Operations.CostCenter": "42"}` 
 * `freeform_tags` - (Optional) 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.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). Example: `{"Department": "Finance"}` 
 * `metadata` - (Optional) 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 the namespace. 
+* `name` - (Required) The name of the bucket. Valid characters are uppercase or lowercase letters, numbers, and dashes. Bucket names must be unique within the namespace. Avoid entering confidential information. example: Example: my-new-bucket1 
 * `namespace` - (Required) The top-level namespace used for the request.
 * `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. 
 
 
 ### Update Operation
+Performs a partial or full update of a bucket's user-defined metadata.
+
 
 The following arguments support updates:
-* `access_type` - The type of public access available on this bucket. Allows authenticated caller to access the bucket or contents of this bucket. By default a bucket is set to NoPublicAccess. It is treated as NoPublicAccess when this value is not specified. When the type is NoPublicAccess the bucket does not allow any public access. When the type is ObjectRead the bucket allows public access to the GetObject, HeadObject, ListObjects. 
+* `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. 
+* `compartment_id` - The ID of the compartment in which to create 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.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). Example: `{"Operations.CostCenter": "42"}` 
 * `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.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). Example: `{"Department": "Finance"}` 
 * `metadata` - Arbitrary string, up to 4KB, of keys and values for user-defined metadata.
@@ -79,8 +78,8 @@ Gets a list of buckets.
 Gets a list of all `BucketSummary`s in a compartment. A `BucketSummary` contains only summary fields for the bucket
 and does not contain fields like the user-defined metadata.
 
-To use this and other API operations, you must be authorized in an IAM policy. If you're not authorized, 
-talk to an administrator. If you're an administrator who needs to write policies to give users access, see 
+To use this and other API operations, you must be authorized in an IAM policy. If you're not authorized,
+talk to an administrator. If you're an administrator who needs to write policies to give users access, see
 [Getting Started with Policies](https://docs.us-phoenix-1.oraclecloud.com/Content/Identity/Concepts/policygetstarted.htm).
 
 The following arguments are supported:

provider/object_storage_bucket_resource.go

@@ -28,7 +28,6 @@ func BucketResource() *schema.Resource {
 			"compartment_id": {
 				Type:     schema.TypeString,
 				Required: true,
-				ForceNew: true,
 			},
 			"name": {
 				Type:     schema.TypeString,
@@ -130,7 +129,6 @@ type BucketResourceCrud struct {
 	DisableNotFoundRetries bool
 }
 
-// @CODEGEN 2/2018: Remove ID() function from here. This resource doesn't have an ID property.
 func (s *BucketResourceCrud) ID() string {
 	if s.Res.Namespace == nil || s.Res.Name == nil {
 		log.Printf("Could not get ID for bucket. The bucket namespace and/or name is nil")
@@ -195,8 +193,8 @@ func (s *BucketResourceCrud) Create() error {
 func (s *BucketResourceCrud) Get() error {
 	request := oci_object_storage.GetBucketRequest{}
 
-	if bucketName, ok := s.D.GetOkExists("name"); ok {
-		tmp := bucketName.(string)
+	if name, ok := s.D.GetOkExists("name"); ok {
+		tmp := name.(string)
 		request.BucketName = &tmp
 	}
 
@@ -223,11 +221,16 @@ func (s *BucketResourceCrud) Update() error {
 		request.PublicAccessType = oci_object_storage.UpdateBucketDetailsPublicAccessTypeEnum(accessType.(string))
 	}
 
-	if bucketName, ok := s.D.GetOkExists("name"); ok {
-		tmp := bucketName.(string)
+	if bucket, ok := s.D.GetOkExists("name"); ok {
+		tmp := bucket.(string)
 		request.BucketName = &tmp
 	}
 
+	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
+		tmp := compartmentId.(string)
+		request.CompartmentId = &tmp
+	}
+
 	if definedTags, ok := s.D.GetOkExists("defined_tags"); ok {
 		convertedDefinedTags, err := mapToDefinedTags(definedTags.(map[string]interface{}))
 		if err != nil {
@@ -279,8 +282,8 @@ func (s *BucketResourceCrud) Update() error {
 func (s *BucketResourceCrud) Delete() error {
 	request := oci_object_storage.DeleteBucketRequest{}
 
-	if bucketName, ok := s.D.GetOkExists("name"); ok {
-		tmp := bucketName.(string)
+	if name, ok := s.D.GetOkExists("name"); ok {
+		tmp := name.(string)
 		request.BucketName = &tmp
 	}
 
@@ -335,7 +338,3 @@ func (s *BucketResourceCrud) SetData() {
 	}
 
 }
-
-// @CODEGEN 2/2018: mapToObject functions are generated here because generator doesn't handle map types from the spec.
-// Metadata field actually needs to be converted to a map[string]string type.
-// Remove the mapToObject functions from here and use the converter from helpers_objectstorage.go

provider/object_storage_bucket_test.go

@@ -57,6 +57,9 @@ func TestObjectStorageBucketResource_basic(t *testing.T) {
 	compartmentId := getRequiredEnvSetting("compartment_ocid")
 	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
 
+	compartmentId2 := getRequiredEnvSetting("compartment_id_for_update")
+	compartmentId2VariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId2)
+
 	resourceName := "oci_objectstorage_bucket.test_bucket"
 	datasourceName := "data.oci_objectstorage_bucket_summaries.test_buckets"
 
@@ -111,6 +114,31 @@ func TestObjectStorageBucketResource_basic(t *testing.T) {
 				),
 			},
 
+			// verify updates to compartment
+			{
+				Config: config + BucketPropertyVariables + compartmentId2VariableStr + BucketResourceConfig,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "access_type", "NoPublicAccess"),
+					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId2),
+					resource.TestCheckResourceAttrSet(resourceName, "created_by"),
+					resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
+					resource.TestCheckResourceAttrSet(resourceName, "etag"),
+					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
+					resource.TestCheckResourceAttr(resourceName, "metadata.%", "1"),
+					resource.TestCheckResourceAttr(resourceName, "name", "my-test-1"),
+					resource.TestCheckResourceAttrSet(resourceName, "namespace"),
+					resource.TestCheckResourceAttr(resourceName, "storage_tier", "Standard"),
+					resource.TestCheckResourceAttrSet(resourceName, "time_created"),
+
+					func(s *terraform.State) (err error) {
+						resId2, err = fromInstanceState(s, resourceName, "id")
+						if resId != resId2 {
+							return fmt.Errorf("Resource recreated when it was supposed to be updated.")
+						}
+						return err
+					},
+				),
+			},
 			// verify updates to updatable parameters
 			{
 				Config: config + `
@@ -119,7 +147,7 @@ variable "bucket_defined_tags_value" { default = "updatedValue" }
 variable "bucket_freeform_tags" { default = {"Department"= "Accounting"} }
 variable "bucket_metadata" { default = {"content-type" = "text/xml"} }
 variable "bucket_name" { default = "name2" }
-variable "bucket_storage_tier" { default = "Standard" }
+variable "bucket_storage_tier" { default = "Archive" }
 
                 ` + compartmentIdVariableStr + BucketResourceConfig,
 				Check: resource.ComposeAggregateTestCheckFunc(
@@ -132,12 +160,12 @@ variable "bucket_storage_tier" { default = "Standard" }
 					resource.TestCheckResourceAttr(resourceName, "metadata.%", "1"),
 					resource.TestCheckResourceAttr(resourceName, "name", "name2"),
 					resource.TestCheckResourceAttrSet(resourceName, "namespace"),
-					resource.TestCheckResourceAttr(resourceName, "storage_tier", "Standard"),
+					resource.TestCheckResourceAttr(resourceName, "storage_tier", "Archive"),
 					resource.TestCheckResourceAttrSet(resourceName, "time_created"),
 
 					func(s *terraform.State) (err error) {
 						resId2, err = fromInstanceState(s, resourceName, "id")
-						// Reverse the check till we have absorbed the changes
+						// The id changes when the name changes
 						if resId == resId2 {
 							return fmt.Errorf("Resource updated when it was supposed to be recreated.")
 						}