feat(object): versioning should be enabled with object locking (#1679)

Author: quantumsheep

scaleway/resource_object_bucket.go

@@ -197,12 +197,21 @@ func resourceScalewayObjectBucket() *schema.Resource {
 							Description: "Enable versioning. Once you version-enable a bucket, it can never return to an unversioned state",
 							Type:        schema.TypeBool,
 							Optional:    true,
-							Default:     false,
+							Computed:    true,
 						},
 					},
 				},
 			},
 		},
+		CustomizeDiff: func(ctx context.Context, diff *schema.ResourceDiff, meta interface{}) error {
+			if diff.Get("object_lock_enabled").(bool) {
+				if diff.HasChange("versioning") && !diff.Get("versioning.0.enabled").(bool) {
+					return fmt.Errorf("versioning must be enabled when object lock is enabled")
+				}
+			}
+
+			return nil
+		},
 	}
 }
 
@@ -267,7 +276,9 @@ func resourceScalewayObjectBucketUpdate(ctx context.Context, d *schema.ResourceD
 		}
 	}
 
-	if d.HasChange("versioning") {
+	// Object Lock enables versioning so we don't want to update versioning it is enabled
+	objectLockEnabled := d.Get("object_lock_enabled").(bool)
+	if !objectLockEnabled && d.HasChange("versioning") {
 		if err := resourceScalewayObjectBucketVersioningUpdate(ctx, s3Client, d); err != nil {
 			return diag.FromErr(err)
 		}

scaleway/resource_object_bucket_test.go

@@ -32,6 +32,7 @@ func TestAccScalewayObjectBucket_Basic(t *testing.T) {
 	bucketAms := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-bucket-ams")
 	bucketPar := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-bucket-par")
 	bucketLifecycle := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-bucket-lifecycle")
+	bucketObjectLock := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-bucket-lock")
 	resourceNameLifecycle := "scaleway_object_bucket.par-bucket-lifecycle"
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
@@ -325,6 +326,55 @@ func TestAccScalewayObjectBucket_Basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceNameLifecycle, "lifecycle_rule.0.abort_incomplete_multipart_upload_days", "30"),
 				),
 			},
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_object_bucket" "object-locked-bucket"{
+						name = "%s"
+						region = "fr-par"
+
+						object_lock_enabled = true
+					}
+				`, bucketObjectLock),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("scaleway_object_bucket.object-locked-bucket", "name", bucketObjectLock),
+					resource.TestCheckResourceAttr("scaleway_object_bucket.object-locked-bucket", "object_lock_enabled", "true"),
+					resource.TestCheckResourceAttr("scaleway_object_bucket.object-locked-bucket", "versioning.0.enabled", "true"),
+				),
+			},
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_object_bucket" "object-locked-bucket"{
+						name = "%s"
+						region = "fr-par"
+
+						object_lock_enabled = true
+
+						versioning {
+							enabled = true
+						}
+					}
+				`, bucketObjectLock),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("scaleway_object_bucket.object-locked-bucket", "name", bucketObjectLock),
+					resource.TestCheckResourceAttr("scaleway_object_bucket.object-locked-bucket", "object_lock_enabled", "true"),
+					resource.TestCheckResourceAttr("scaleway_object_bucket.object-locked-bucket", "versioning.0.enabled", "true"),
+				),
+			},
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_object_bucket" "object-locked-bucket"{
+						name = "%s"
+						region = "fr-par"
+
+						object_lock_enabled = true
+
+						versioning {
+							enabled = false
+						}
+					}
+				`, bucketObjectLock),
+				ExpectError: regexp.MustCompile("versioning must be enabled when object lock is enabled"),
+			},
 		},
 	})
 }