From c3ec9c79487c19d12410586669f5428fb259e108 Mon Sep 17 00:00:00 2001 From: Paul Stack Date: Thu, 28 Jul 2016 13:32:40 +0100 Subject: [PATCH] provider/azurerm: `azurerm_storage_blob` validation fix (#7328) The validation for the `azurerm_storage_blob` `type` parameter was checking for `blob` where it should have been `block` This commits fixes it up ``` make testacc TEST=./builtin/providers/azurerm TESTARGS='-run=TestResourceAzureRMStorageBlobType_validation' ==> Checking that code complies with gofmt requirements... go generate $(go list ./... | grep -v /vendor/) TF_ACC=1 go test ./builtin/providers/azurerm -v -run=TestResourceAzureRMStorageBlobType_validation -timeout 120m === RUN TestResourceAzureRMStorageBlobType_validation --- PASS: TestResourceAzureRMStorageBlobType_validation (0.00s) PASS ok github.com/hashicorp/terraform/builtin/providers/azurerm 0.014s ``` --- builtin/providers/azurerm/resource_arm_storage_blob.go | 6 +++--- builtin/providers/azurerm/resource_arm_storage_blob_test.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/providers/azurerm/resource_arm_storage_blob.go b/builtin/providers/azurerm/resource_arm_storage_blob.go index 83f3c83822..80a3aed92e 100644 --- a/builtin/providers/azurerm/resource_arm_storage_blob.go +++ b/builtin/providers/azurerm/resource_arm_storage_blob.go @@ -70,12 +70,12 @@ func validateArmStorageBlobSize(v interface{}, k string) (ws []string, errors [] func validateArmStorageBlobType(v interface{}, k string) (ws []string, errors []error) { value := strings.ToLower(v.(string)) validTypes := map[string]struct{}{ - "blob": struct{}{}, - "page": struct{}{}, + "block": struct{}{}, + "page": struct{}{}, } if _, ok := validTypes[value]; !ok { - errors = append(errors, fmt.Errorf("Blob type %q is invalid, must be %q or %q", value, "blob", "page")) + errors = append(errors, fmt.Errorf("Blob type %q is invalid, must be %q or %q", value, "block", "page")) } return } diff --git a/builtin/providers/azurerm/resource_arm_storage_blob_test.go b/builtin/providers/azurerm/resource_arm_storage_blob_test.go index bbea47d7ab..d4fc5dc743 100644 --- a/builtin/providers/azurerm/resource_arm_storage_blob_test.go +++ b/builtin/providers/azurerm/resource_arm_storage_blob_test.go @@ -25,15 +25,15 @@ func TestResourceAzureRMStorageBlobType_validation(t *testing.T) { ErrCount: 0, }, { - Value: "blob", + Value: "block", ErrCount: 0, }, { - Value: "BLOB", + Value: "BLOCK", ErrCount: 0, }, { - Value: "Blob", + Value: "Block", ErrCount: 0, }, }