r/storage_blob: support for inline content

tombuildsstuff · tombuildsstuff · commit af6abe4666c5 · 2019-09-04T14:04:49.000+02:00
fixes #3876
diff --git a/azurerm/internal/services/storage/blobs.go b/azurerm/internal/services/storage/blobs.go
@@ -5,6 +5,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
 	"runtime"
 	"strings"
@@ -24,27 +25,33 @@ type BlobUpload struct {
 	BlobName      string
 	ContainerName string
 
-	BlobType    string
-	ContentType string
-	MetaData    map[string]string
-	Parallelism int
-	Size        int
-	Source      string
-	SourceUri   string
+	BlobType      string
+	ContentType   string
+	MetaData      map[string]string
+	Parallelism   int
+	Size          int
+	Source        string
+	SourceContent string
+	SourceUri     string
 }
 
 func (sbu BlobUpload) Create(ctx context.Context) error {
+	// TODO: should we move this into the Block and Page blocks?
 	if sbu.SourceUri != "" {
 		return sbu.copy(ctx)
 	}
 
 	blobType := strings.ToLower(sbu.BlobType)
 
 	if blobType == "append" {
+		// TODO: if Source/SourceContent are set return an error
 		return sbu.createEmptyAppendBlob(ctx)
 	}
 
 	if blobType == "block" {
+		if sbu.SourceContent != "" {
+			return sbu.uploadBlockBlobFromContent(ctx)
+		}
 		if sbu.Source != "" {
 			return sbu.uploadBlockBlob(ctx)
 		}
@@ -53,6 +60,9 @@ func (sbu BlobUpload) Create(ctx context.Context) error {
 	}
 
 	if blobType == "page" {
+		if sbu.SourceContent != "" {
+			return sbu.uploadPageBlobFromContent(ctx)
+		}
 		if sbu.Source != "" {
 			return sbu.uploadPageBlob(ctx)
 		}
@@ -99,6 +109,22 @@ func (sbu BlobUpload) createEmptyBlockBlob(ctx context.Context) error {
 	return nil
 }
 
+func (sbu BlobUpload) uploadBlockBlobFromContent(ctx context.Context) error {
+	tmpFile, err := ioutil.TempFile(os.TempDir(), "upload-")
+	if err != nil {
+		return fmt.Errorf("Error creating temporary file: %s", err)
+	}
+	defer os.Remove(tmpFile.Name())
+
+	if _, err = tmpFile.Write([]byte(sbu.SourceContent)); err != nil {
+		return fmt.Errorf("Error writing Source Content to Temp File: %s", err)
+	}
+	defer tmpFile.Close()
+
+	sbu.Source = tmpFile.Name()
+	return sbu.uploadBlockBlob(ctx)
+}
+
 func (sbu BlobUpload) uploadBlockBlob(ctx context.Context) error {
 	file, err := os.Open(sbu.Source)
 	if err != nil {
@@ -134,6 +160,22 @@ func (sbu BlobUpload) createEmptyPageBlob(ctx context.Context) error {
 	return nil
 }
 
+func (sbu BlobUpload) uploadPageBlobFromContent(ctx context.Context) error {
+	tmpFile, err := ioutil.TempFile(os.TempDir(), "upload-")
+	if err != nil {
+		return fmt.Errorf("Error creating temporary file: %s", err)
+	}
+	defer os.Remove(tmpFile.Name())
+
+	if _, err = tmpFile.Write([]byte(sbu.SourceContent)); err != nil {
+		return fmt.Errorf("Error writing Source Content to Temp File: %s", err)
+	}
+	defer tmpFile.Close()
+
+	sbu.Source = tmpFile.Name()
+	return sbu.uploadPageBlob(ctx)
+}
+
 func (sbu BlobUpload) uploadPageBlob(ctx context.Context) error {
 	if sbu.Size != 0 {
 		return fmt.Errorf("`size` cannot be set for an uploaded page blob")
diff --git a/azurerm/resource_arm_storage_blob.go b/azurerm/resource_arm_storage_blob.go
@@ -74,7 +74,7 @@ func resourceArmStorageBlob() *schema.Resource {
 			"access_tier": {
 				Type:     schema.TypeString,
 				Optional: true,
-				Default:  string(blobs.Hot),
+				Computed: true,
 				ValidateFunc: validation.StringInSlice([]string{
 					string(blobs.Archive),
 					string(blobs.Cool),
@@ -92,14 +92,21 @@ func resourceArmStorageBlob() *schema.Resource {
 				Type:          schema.TypeString,
 				Optional:      true,
 				ForceNew:      true,
-				ConflictsWith: []string{"source_uri"},
+				ConflictsWith: []string{"source_uri", "source_content"},
+			},
+
+			"source_content": {
+				Type:          schema.TypeString,
+				Optional:      true,
+				ForceNew:      true,
+				ConflictsWith: []string{"source", "source_uri"},
 			},
 
 			"source_uri": {
 				Type:          schema.TypeString,
 				Optional:      true,
 				ForceNew:      true,
-				ConflictsWith: []string{"source"},
+				ConflictsWith: []string{"source", "source_content"},
 			},
 
 			"url": {
@@ -176,13 +183,14 @@ func resourceArmStorageBlobCreate(d *schema.ResourceData, meta interface{}) erro
 		BlobName:      name,
 		Client:        blobsClient,
 
-		BlobType:    d.Get("type").(string),
-		ContentType: d.Get("content_type").(string),
-		MetaData:    storage.ExpandMetaData(metaDataRaw),
-		Parallelism: d.Get("parallelism").(int),
-		Size:        d.Get("size").(int),
-		Source:      d.Get("source").(string),
-		SourceUri:   d.Get("source_uri").(string),
+		BlobType:      d.Get("type").(string),
+		ContentType:   d.Get("content_type").(string),
+		MetaData:      storage.ExpandMetaData(metaDataRaw),
+		Parallelism:   d.Get("parallelism").(int),
+		Size:          d.Get("size").(int),
+		Source:        d.Get("source").(string),
+		SourceContent: d.Get("source_content").(string),
+		SourceUri:     d.Get("source_uri").(string),
 	}
 	if err := blobInput.Create(ctx); err != nil {
 		return fmt.Errorf("Error creating Blob %q (Container %q / Account %q): %s", name, containerName, accountName, err)
@@ -217,6 +225,7 @@ func resourceArmStorageBlobUpdate(d *schema.ResourceData, meta interface{}) erro
 	}
 
 	if d.HasChange("access_tier") {
+		// this is only applicable for Gen2/BlobStorage accounts
 		log.Printf("[DEBUG] Updating Access Tier for Blob %q (Container %q / Account %q)...", id.BlobName, id.ContainerName, id.AccountName)
 		accessTier := blobs.AccessTier(d.Get("access_tier").(string))
 
diff --git a/azurerm/resource_arm_storage_blob_test.go b/azurerm/resource_arm_storage_blob_test.go
@@ -190,6 +190,33 @@ func TestAccAzureRMStorageBlob_blockEmptyAccessTier(t *testing.T) {
 	})
 }
 
+func TestAccAzureRMStorageBlob_blockFromInlineContent(t *testing.T) {
+	resourceName := "azurerm_storage_blob.test"
+	ri := tf.AccRandTimeInt()
+	rs := strings.ToLower(acctest.RandString(11))
+	location := testLocation()
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMStorageBlobDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAzureRMStorageBlob_blockFromInlineContent(ri, rs, location),
+				Check: resource.ComposeTestCheckFunc(
+					testCheckAzureRMStorageBlobExists(resourceName),
+				),
+			},
+			{
+				ResourceName:            resourceName,
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "source_content", "type"},
+			},
+		},
+	})
+}
+
 func TestAccAzureRMStorageBlob_blockFromPublicBlob(t *testing.T) {
 	resourceName := "azurerm_storage_blob.test"
 	ri := tf.AccRandTimeInt()
@@ -428,6 +455,33 @@ func TestAccAzureRMStorageBlob_pageFromExistingBlob(t *testing.T) {
 	})
 }
 
+func TestAccAzureRMStorageBlob_pageFromInlineContent(t *testing.T) {
+	resourceName := "azurerm_storage_blob.test"
+	ri := tf.AccRandTimeInt()
+	rs := strings.ToLower(acctest.RandString(11))
+	location := testLocation()
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMStorageBlobDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAzureRMStorageBlob_pageFromInlineContent(ri, rs, location),
+				Check: resource.ComposeTestCheckFunc(
+					testCheckAzureRMStorageBlobExists(resourceName),
+				),
+			},
+			{
+				ResourceName:            resourceName,
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "source_content", "type"},
+			},
+		},
+	})
+}
+
 func TestAccAzureRMStorageBlob_pageFromLocalFile(t *testing.T) {
 	sourceBlob, err := ioutil.TempFile("", "")
 	if err != nil {
@@ -788,6 +842,22 @@ resource "azurerm_storage_blob" "test" {
 `, template, string(accessTier))
 }
 
+func testAccAzureRMStorageBlob_blockFromInlineContent(rInt int, rString, location string) string {
+	template := testAccAzureRMStorageBlob_template(rInt, rString, location, "blob")
+	return fmt.Sprintf(`
+%s
+
+resource "azurerm_storage_blob" "test" {
+  name                   = "rick.morty"
+  resource_group_name    = "${azurerm_resource_group.test.name}"
+  storage_account_name   = "${azurerm_storage_account.test.name}"
+  storage_container_name = "${azurerm_storage_container.test.name}"
+  type                   = "block"
+  source_content         = "Wubba Lubba Dub Dub"
+}
+`, template)
+}
+
 func testAccAzureRMStorageBlob_blockFromPublicBlob(rInt int, rString, location string) string {
 	template := testAccAzureRMStorageBlob_template(rInt, rString, location, "blob")
 	return fmt.Sprintf(`
@@ -979,6 +1049,22 @@ resource "azurerm_storage_blob" "test" {
 `, template)
 }
 
+func testAccAzureRMStorageBlob_pageFromInlineContent(rInt int, rString, location string) string {
+	template := testAccAzureRMStorageBlob_template(rInt, rString, location, "private")
+	return fmt.Sprintf(`
+%s
+
+resource "azurerm_storage_blob" "test" {
+  name                   = "rick.morty"
+  resource_group_name    = "${azurerm_resource_group.test.name}"
+  storage_account_name   = "${azurerm_storage_account.test.name}"
+  storage_container_name = "${azurerm_storage_container.test.name}"
+  type                   = "page"
+  source_content         = "Wubba Lubba Dub Dub"
+}
+`, template)
+}
+
 func testAccAzureRMStorageBlob_pageFromLocalBlob(rInt int, rString, location, fileName string) string {
 	template := testAccAzureRMStorageBlob_template(rInt, rString, location, "private")
 	return fmt.Sprintf(`
diff --git a/website/docs/r/storage_blob.html.markdown b/website/docs/r/storage_blob.html.markdown
@@ -58,14 +58,16 @@ The following arguments are supported:
 
 * `size` - (Optional) Used only for `page` blobs to specify the size in bytes of the blob to be created. Must be a multiple of 512. Defaults to 0.
 
-* `access_tier` - (Optional) The access tier of the storage blob. Possible values are `Archive`, `Cool` and `Hot`. Defaults to `Hot`.
+* `access_tier` - (Optional) The access tier of the storage blob. Possible values are `Archive`, `Cool` and `Hot`.
 
 * `content_type` - (Optional) The content type of the storage blob. Cannot be defined if `source_uri` is defined. Defaults to `application/octet-stream`.
 
-* `source` - (Optional) An absolute path to a file on the local system. Cannot be defined if `source_uri` is defined.
+* `source` - (Optional) An absolute path to a file on the local system. Cannot be specified if `source_content` or `source_uri` is specified.
+
+* `source_content` - (Optional) The content for this blob which should be defined inline. Cannot be specified if `source` or `source_uri` is specified.
 
 * `source_uri` - (Optional) The URI of an existing blob, or a file in the Azure File service, to use as the source contents
-    for the blob to be created. Changing this forces a new resource to be created. Cannot be defined if `source` is defined.
+    for the blob to be created. Changing this forces a new resource to be created. Cannot be specified if `source` or `source_content` is specified.
 
 * `parallelism` - (Optional) The number of workers per CPU core to run for concurrent uploads. Defaults to `8`.
 
