feat(object): create object by string content (#2011)

Author: Mia-Cross

docs/resources/object.md

@@ -31,8 +31,9 @@ The following arguments are supported:
 
 * `bucket` - (Required) The name of the bucket.
 * `key` - (Required) The path of the object.
-* `file` - (Optional) The name of the file to upload, defaults to an empty file. Only one of `file` or `content` can be defined.
-* `content` - (Optional) The content of the file to upload. Only one of `file` or `content` can be defined.
+* `file` - (Optional) The name of the file to upload, defaults to an empty file. Only one of `file`, `content` or `content_base64` can be defined.
+* `content` - (Optional) The content of the file to upload. Only one of `file`, `content` or `content_base64` can be defined.
+* `content_base64` - (Optional) The base64-encoded content of the file to upload. Only one of `file`, `content` or `content_base64` can be defined.
 * `hash` - (Optional) Hash of the file, used to trigger upload on file change
 * `storage_class` - (Optional) Specifies the Scaleway [storage class](https://www.scaleway.com/en/docs/storage/object/concepts/#storage-class) `STANDARD`, `GLACIER`, `ONEZONE_IA` used to store the object.
 * `visibility` - (Optional) Visibility of the object, `public-read` or `private`

scaleway/resource_object.go

@@ -46,13 +46,19 @@ func resourceScalewayObject() *schema.Resource {
 				Type:          schema.TypeString,
 				Optional:      true,
 				Description:   "Path of the file to upload, defaults to an empty file",
-				ConflictsWith: []string{"content"},
+				ConflictsWith: []string{"content", "content_base64"},
 			},
 			"content": {
+				Type:          schema.TypeString,
+				Optional:      true,
+				Description:   "Content of the file to upload",
+				ConflictsWith: []string{"file", "content_base64"},
+			},
+			"content_base64": {
 				Type:          schema.TypeString,
 				Optional:      true,
 				Description:   "Content of the file to upload, should be base64 encoded",
-				ConflictsWith: []string{"file"},
+				ConflictsWith: []string{"file", "content"},
 			},
 			"hash": {
 				Type:        schema.TypeString,
@@ -125,6 +131,9 @@ func resourceScalewayObjectCreate(ctx context.Context, d *schema.ResourceData, m
 		}
 		req.Body = file
 	} else if content, hasContent := d.GetOk("content"); hasContent {
+		contentString := []byte(content.(string))
+		req.Body = bytes.NewReader(contentString)
+	} else if content, hasContent := d.GetOk("content_base64"); hasContent {
 		contentString := []byte(content.(string))
 		decoded := make([]byte, base64.StdEncoding.DecodedLen(len(contentString)))
 		_, err = base64.StdEncoding.Decode(decoded, contentString)

scaleway/resource_object_test.go

@@ -490,8 +490,6 @@ func TestAccScalewayObject_ByContent(t *testing.T) {
 
 	fileContentStep1 := "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
 	fileContentStep2 := "This is a different content"
-	fileEncodedStep1 := base64.StdEncoding.EncodeToString([]byte(fileContentStep1))
-	fileEncodedStep2 := base64.StdEncoding.EncodeToString([]byte(fileContentStep2))
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
@@ -507,12 +505,12 @@ func TestAccScalewayObject_ByContent(t *testing.T) {
 					resource scaleway_object "by-content" {
 						bucket = scaleway_object_bucket.base-01.name
 						key = "test-by-content"
-						content = base64encode("%s")
+						content = "%s"
 					}
 				`, bucketName, fileContentStep1),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckScalewayObjectExists(tt, "scaleway_object.by-content"),
-					resource.TestCheckResourceAttr("scaleway_object.by-content", "content", fileEncodedStep1),
+					resource.TestCheckResourceAttr("scaleway_object.by-content", "content", fileContentStep1),
 				),
 			},
 			{
@@ -524,24 +522,77 @@ func TestAccScalewayObject_ByContent(t *testing.T) {
 					resource scaleway_object "by-content" {
 						bucket = scaleway_object_bucket.base-01.name
 						key = "test-by-content"
-						content = base64encode("%s")
+						content = "%s"
 					}
 				`, bucketName, fileContentStep2),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckScalewayObjectExists(tt, "scaleway_object.by-content"),
-					resource.TestCheckResourceAttr("scaleway_object.by-content", "content", fileEncodedStep2),
+					resource.TestCheckResourceAttr("scaleway_object.by-content", "content", fileContentStep2),
 				),
 			},
+		},
+	})
+}
+
+func TestAccScalewayObject_ByContentBase64(t *testing.T) {
+	tt := NewTestTools(t)
+	defer tt.Cleanup()
+	bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-by-content-base64")
+
+	fileContentStep1 := "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+	fileContentStep2 := "This is a different content"
+	fileEncodedStep1 := base64.StdEncoding.EncodeToString([]byte(fileContentStep1))
+	fileEncodedStep2 := base64.StdEncoding.EncodeToString([]byte(fileContentStep2))
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      testAccCheckScalewayObjectDestroy(tt),
+		Steps: []resource.TestStep{
 			{
 				Config: fmt.Sprintf(`
 					resource "scaleway_object_bucket" "base-01" {
 						name = "%s"
 					}
 					
-					resource scaleway_object "by-content" {
+					resource scaleway_object "by-content-base64" {
 						bucket = scaleway_object_bucket.base-01.name
-						key = "test-by-content"
-						content = "%s"
+						key = "test-by-content-base64"
+						content_base64 = base64encode("%s")
+					}
+				`, bucketName, fileContentStep1),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayObjectExists(tt, "scaleway_object.by-content-base64"),
+					resource.TestCheckResourceAttr("scaleway_object.by-content-base64", "content_base64", fileEncodedStep1),
+				),
+			},
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_object_bucket" "base-01" {
+						name = "%s"
+					}
+					
+					resource scaleway_object "by-content-base64" {
+						bucket = scaleway_object_bucket.base-01.name
+						key = "test-by-content-base64"
+						content_base64 = base64encode("%s")
+					}
+				`, bucketName, fileContentStep2),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayObjectExists(tt, "scaleway_object.by-content-base64"),
+					resource.TestCheckResourceAttr("scaleway_object.by-content-base64", "content_base64", fileEncodedStep2),
+				),
+			},
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_object_bucket" "base-01" {
+						name = "%s"
+					}
+					
+					resource scaleway_object "by-content-base64" {
+						bucket = scaleway_object_bucket.base-01.name
+						key = "test-by-content-base64"
+						content_base64 = "%s"
 					}
 				`, bucketName, fileContentStep2),
 				ExpectError: regexp.MustCompile("illegal base64 data at input byte 4"),