provider/azurerm: Fix azurerm_storage_container
``` HTTP_PROXY=http://localhost:8888 make testacc TEST=./builtin/providers/azurerm TESTARGS="-run TestAccAzureRMStorageContainer" ==> Checking that code complies with gofmt requirements... /Users/James/Code/go/bin/stringer go generate $(go list ./... | grep -v /vendor/) 2016/06/01 18:10:56 Generated command/internal_plugin_list.go TF_ACC=1 go test ./builtin/providers/azurerm -v -run TestAccAzureRMStorageContainer -timeout 120m === RUN TestAccAzureRMStorageContainer_basic --- PASS: TestAccAzureRMStorageContainer_basic (102.16s) === RUN TestAccAzureRMStorageContainer_disappears --- PASS: TestAccAzureRMStorageContainer_disappears (101.05s) PASS ok github.com/hashicorp/terraform/builtin/providers/azurerm 203.221s ```
This commit is contained in:
James Nugent
parent
26e2c9bec2
commit
5f45521795
|
|
@ -55,11 +55,11 @@ func Provider() terraform.ResourceProvider {
|
||||||
"azurerm_public_ip": resourceArmPublicIp(),
|
"azurerm_public_ip": resourceArmPublicIp(),
|
||||||
//"azurerm_route": resourceArmRoute(),
|
//"azurerm_route": resourceArmRoute(),
|
||||||
//"azurerm_route_table": resourceArmRouteTable(),
|
//"azurerm_route_table": resourceArmRouteTable(),
|
||||||
"azurerm_storage_account": resourceArmStorageAccount(),
|
"azurerm_storage_account": resourceArmStorageAccount(),
|
||||||
"azurerm_storage_blob": resourceArmStorageBlob(),
|
"azurerm_storage_blob": resourceArmStorageBlob(),
|
||||||
//"azurerm_storage_container": resourceArmStorageContainer(),
|
"azurerm_storage_container": resourceArmStorageContainer(),
|
||||||
"azurerm_storage_queue": resourceArmStorageQueue(),
|
"azurerm_storage_queue": resourceArmStorageQueue(),
|
||||||
"azurerm_subnet": resourceArmSubnet(),
|
"azurerm_subnet": resourceArmSubnet(),
|
||||||
//"azurerm_template_deployment": resourceArmTemplateDeployment(),
|
//"azurerm_template_deployment": resourceArmTemplateDeployment(),
|
||||||
//"azurerm_virtual_machine": resourceArmVirtualMachine(),
|
//"azurerm_virtual_machine": resourceArmVirtualMachine(),
|
||||||
"azurerm_virtual_network": resourceArmVirtualNetwork(),
|
"azurerm_virtual_network": resourceArmVirtualNetwork(),
|
||||||
|
|
|
||||||
|
|
@ -1,227 +1,227 @@
|
||||||
package azurerm
|
package azurerm
|
||||||
|
|
||||||
//import (
|
import (
|
||||||
// "fmt"
|
"fmt"
|
||||||
// "log"
|
"log"
|
||||||
// "strings"
|
"strings"
|
||||||
//
|
|
||||||
// "regexp"
|
"regexp"
|
||||||
//
|
|
||||||
// "github.com/Azure/azure-sdk-for-go/storage"
|
"github.com/Azure/azure-sdk-for-go/storage"
|
||||||
// "github.com/hashicorp/terraform/helper/schema"
|
"github.com/hashicorp/terraform/helper/schema"
|
||||||
//)
|
)
|
||||||
//
|
|
||||||
//func resourceArmStorageContainer() *schema.Resource {
|
func resourceArmStorageContainer() *schema.Resource {
|
||||||
// return &schema.Resource{
|
return &schema.Resource{
|
||||||
// Create: resourceArmStorageContainerCreate,
|
Create: resourceArmStorageContainerCreate,
|
||||||
// Read: resourceArmStorageContainerRead,
|
Read: resourceArmStorageContainerRead,
|
||||||
// Exists: resourceArmStorageContainerExists,
|
Exists: resourceArmStorageContainerExists,
|
||||||
// Delete: resourceArmStorageContainerDelete,
|
Delete: resourceArmStorageContainerDelete,
|
||||||
//
|
|
||||||
// Schema: map[string]*schema.Schema{
|
Schema: map[string]*schema.Schema{
|
||||||
// "name": &schema.Schema{
|
"name": {
|
||||||
// Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
// Required: true,
|
Required: true,
|
||||||
// ForceNew: true,
|
ForceNew: true,
|
||||||
// ValidateFunc: validateArmStorageContainerName,
|
ValidateFunc: validateArmStorageContainerName,
|
||||||
// },
|
},
|
||||||
// "resource_group_name": &schema.Schema{
|
"resource_group_name": {
|
||||||
// Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
// Required: true,
|
Required: true,
|
||||||
// ForceNew: true,
|
ForceNew: true,
|
||||||
// },
|
},
|
||||||
// "storage_account_name": &schema.Schema{
|
"storage_account_name": {
|
||||||
// Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
// Required: true,
|
Required: true,
|
||||||
// ForceNew: true,
|
ForceNew: true,
|
||||||
// },
|
},
|
||||||
// "container_access_type": &schema.Schema{
|
"container_access_type": {
|
||||||
// Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
// Optional: true,
|
Optional: true,
|
||||||
// ForceNew: true,
|
ForceNew: true,
|
||||||
// Default: "private",
|
Default: "private",
|
||||||
// ValidateFunc: validateArmStorageContainerAccessType,
|
ValidateFunc: validateArmStorageContainerAccessType,
|
||||||
// },
|
},
|
||||||
// "properties": &schema.Schema{
|
"properties": {
|
||||||
// Type: schema.TypeMap,
|
Type: schema.TypeMap,
|
||||||
// Computed: true,
|
Computed: true,
|
||||||
// },
|
},
|
||||||
// },
|
},
|
||||||
// }
|
}
|
||||||
//}
|
}
|
||||||
//
|
|
||||||
////Following the naming convention as laid out in the docs
|
//Following the naming convention as laid out in the docs
|
||||||
//func validateArmStorageContainerName(v interface{}, k string) (ws []string, errors []error) {
|
func validateArmStorageContainerName(v interface{}, k string) (ws []string, errors []error) {
|
||||||
// value := v.(string)
|
value := v.(string)
|
||||||
// if !regexp.MustCompile(`^[0-9a-z-]+$`).MatchString(value) {
|
if !regexp.MustCompile(`^[0-9a-z-]+$`).MatchString(value) {
|
||||||
// errors = append(errors, fmt.Errorf(
|
errors = append(errors, fmt.Errorf(
|
||||||
// "only lowercase alphanumeric characters and hyphens allowed in %q: %q",
|
"only lowercase alphanumeric characters and hyphens allowed in %q: %q",
|
||||||
// k, value))
|
k, value))
|
||||||
// }
|
}
|
||||||
// if len(value) < 3 || len(value) > 63 {
|
if len(value) < 3 || len(value) > 63 {
|
||||||
// errors = append(errors, fmt.Errorf(
|
errors = append(errors, fmt.Errorf(
|
||||||
// "%q must be between 3 and 63 characters: %q", k, value))
|
"%q must be between 3 and 63 characters: %q", k, value))
|
||||||
// }
|
}
|
||||||
// if regexp.MustCompile(`^-`).MatchString(value) {
|
if regexp.MustCompile(`^-`).MatchString(value) {
|
||||||
// errors = append(errors, fmt.Errorf(
|
errors = append(errors, fmt.Errorf(
|
||||||
// "%q cannot begin with a hyphen: %q", k, value))
|
"%q cannot begin with a hyphen: %q", k, value))
|
||||||
// }
|
}
|
||||||
// return
|
return
|
||||||
//}
|
}
|
||||||
//
|
|
||||||
//func validateArmStorageContainerAccessType(v interface{}, k string) (ws []string, errors []error) {
|
func validateArmStorageContainerAccessType(v interface{}, k string) (ws []string, errors []error) {
|
||||||
// value := strings.ToLower(v.(string))
|
value := strings.ToLower(v.(string))
|
||||||
// validTypes := map[string]struct{}{
|
validTypes := map[string]struct{}{
|
||||||
// "private": struct{}{},
|
"private": struct{}{},
|
||||||
// "blob": struct{}{},
|
"blob": struct{}{},
|
||||||
// "container": struct{}{},
|
"container": struct{}{},
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// if _, ok := validTypes[value]; !ok {
|
if _, ok := validTypes[value]; !ok {
|
||||||
// errors = append(errors, fmt.Errorf("Storage container access type %q is invalid, must be %q, %q or %q", value, "private", "blob", "page"))
|
errors = append(errors, fmt.Errorf("Storage container access type %q is invalid, must be %q, %q or %q", value, "private", "blob", "page"))
|
||||||
// }
|
}
|
||||||
// return
|
return
|
||||||
//}
|
}
|
||||||
//
|
|
||||||
//func resourceArmStorageContainerCreate(d *schema.ResourceData, meta interface{}) error {
|
func resourceArmStorageContainerCreate(d *schema.ResourceData, meta interface{}) error {
|
||||||
// armClient := meta.(*ArmClient)
|
armClient := meta.(*ArmClient)
|
||||||
//
|
|
||||||
// resourceGroupName := d.Get("resource_group_name").(string)
|
resourceGroupName := d.Get("resource_group_name").(string)
|
||||||
// storageAccountName := d.Get("storage_account_name").(string)
|
storageAccountName := d.Get("storage_account_name").(string)
|
||||||
//
|
|
||||||
// blobClient, accountExists, err := armClient.getBlobStorageClientForStorageAccount(resourceGroupName, storageAccountName)
|
blobClient, accountExists, err := armClient.getBlobStorageClientForStorageAccount(resourceGroupName, storageAccountName)
|
||||||
// if err != nil {
|
if err != nil {
|
||||||
// return err
|
return err
|
||||||
// }
|
}
|
||||||
// if !accountExists {
|
if !accountExists {
|
||||||
// return fmt.Errorf("Storage Account %q Not Found", storageAccountName)
|
return fmt.Errorf("Storage Account %q Not Found", storageAccountName)
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// name := d.Get("name").(string)
|
name := d.Get("name").(string)
|
||||||
//
|
|
||||||
// var accessType storage.ContainerAccessType
|
var accessType storage.ContainerAccessType
|
||||||
// if d.Get("container_access_type").(string) == "private" {
|
if d.Get("container_access_type").(string) == "private" {
|
||||||
// accessType = storage.ContainerAccessType("")
|
accessType = storage.ContainerAccessType("")
|
||||||
// } else {
|
} else {
|
||||||
// accessType = storage.ContainerAccessType(d.Get("container_access_type").(string))
|
accessType = storage.ContainerAccessType(d.Get("container_access_type").(string))
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// log.Printf("[INFO] Creating container %q in storage account %q.", name, storageAccountName)
|
log.Printf("[INFO] Creating container %q in storage account %q.", name, storageAccountName)
|
||||||
// _, err = blobClient.CreateContainerIfNotExists(name, accessType)
|
_, err = blobClient.CreateContainerIfNotExists(name, accessType)
|
||||||
// if err != nil {
|
if err != nil {
|
||||||
// return fmt.Errorf("Error creating container %q in storage account %q: %s", name, storageAccountName, err)
|
return fmt.Errorf("Error creating container %q in storage account %q: %s", name, storageAccountName, err)
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// d.SetId(name)
|
d.SetId(name)
|
||||||
// return resourceArmStorageContainerRead(d, meta)
|
return resourceArmStorageContainerRead(d, meta)
|
||||||
//}
|
}
|
||||||
//
|
|
||||||
//// resourceAzureStorageContainerRead does all the necessary API calls to
|
// resourceAzureStorageContainerRead does all the necessary API calls to
|
||||||
//// read the status of the storage container off Azure.
|
// read the status of the storage container off Azure.
|
||||||
//func resourceArmStorageContainerRead(d *schema.ResourceData, meta interface{}) error {
|
func resourceArmStorageContainerRead(d *schema.ResourceData, meta interface{}) error {
|
||||||
// armClient := meta.(*ArmClient)
|
armClient := meta.(*ArmClient)
|
||||||
//
|
|
||||||
// resourceGroupName := d.Get("resource_group_name").(string)
|
resourceGroupName := d.Get("resource_group_name").(string)
|
||||||
// storageAccountName := d.Get("storage_account_name").(string)
|
storageAccountName := d.Get("storage_account_name").(string)
|
||||||
//
|
|
||||||
// blobClient, accountExists, err := armClient.getBlobStorageClientForStorageAccount(resourceGroupName, storageAccountName)
|
blobClient, accountExists, err := armClient.getBlobStorageClientForStorageAccount(resourceGroupName, storageAccountName)
|
||||||
// if err != nil {
|
if err != nil {
|
||||||
// return err
|
return err
|
||||||
// }
|
}
|
||||||
// if !accountExists {
|
if !accountExists {
|
||||||
// log.Printf("[DEBUG] Storage account %q not found, removing container %q from state", storageAccountName, d.Id())
|
log.Printf("[DEBUG] Storage account %q not found, removing container %q from state", storageAccountName, d.Id())
|
||||||
// d.SetId("")
|
d.SetId("")
|
||||||
// return nil
|
return nil
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// name := d.Get("name").(string)
|
name := d.Get("name").(string)
|
||||||
// containers, err := blobClient.ListContainers(storage.ListContainersParameters{
|
containers, err := blobClient.ListContainers(storage.ListContainersParameters{
|
||||||
// Prefix: name,
|
Prefix: name,
|
||||||
// Timeout: 90,
|
Timeout: 90,
|
||||||
// })
|
})
|
||||||
// if err != nil {
|
if err != nil {
|
||||||
// return fmt.Errorf("Failed to retrieve storage containers in account %q: %s", name, err)
|
return fmt.Errorf("Failed to retrieve storage containers in account %q: %s", name, err)
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// var found bool
|
var found bool
|
||||||
// for _, cont := range containers.Containers {
|
for _, cont := range containers.Containers {
|
||||||
// if cont.Name == name {
|
if cont.Name == name {
|
||||||
// found = true
|
found = true
|
||||||
//
|
|
||||||
// props := make(map[string]interface{})
|
props := make(map[string]interface{})
|
||||||
// props["last_modified"] = cont.Properties.LastModified
|
props["last_modified"] = cont.Properties.LastModified
|
||||||
// props["lease_status"] = cont.Properties.LeaseStatus
|
props["lease_status"] = cont.Properties.LeaseStatus
|
||||||
// props["lease_state"] = cont.Properties.LeaseState
|
props["lease_state"] = cont.Properties.LeaseState
|
||||||
// props["lease_duration"] = cont.Properties.LeaseDuration
|
props["lease_duration"] = cont.Properties.LeaseDuration
|
||||||
//
|
|
||||||
// d.Set("properties", props)
|
d.Set("properties", props)
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// if !found {
|
if !found {
|
||||||
// log.Printf("[INFO] Storage container %q does not exist in account %q, removing from state...", name, storageAccountName)
|
log.Printf("[INFO] Storage container %q does not exist in account %q, removing from state...", name, storageAccountName)
|
||||||
// d.SetId("")
|
d.SetId("")
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// return nil
|
return nil
|
||||||
//}
|
}
|
||||||
//
|
|
||||||
//func resourceArmStorageContainerExists(d *schema.ResourceData, meta interface{}) (bool, error) {
|
func resourceArmStorageContainerExists(d *schema.ResourceData, meta interface{}) (bool, error) {
|
||||||
// armClient := meta.(*ArmClient)
|
armClient := meta.(*ArmClient)
|
||||||
//
|
|
||||||
// resourceGroupName := d.Get("resource_group_name").(string)
|
resourceGroupName := d.Get("resource_group_name").(string)
|
||||||
// storageAccountName := d.Get("storage_account_name").(string)
|
storageAccountName := d.Get("storage_account_name").(string)
|
||||||
//
|
|
||||||
// blobClient, accountExists, err := armClient.getBlobStorageClientForStorageAccount(resourceGroupName, storageAccountName)
|
blobClient, accountExists, err := armClient.getBlobStorageClientForStorageAccount(resourceGroupName, storageAccountName)
|
||||||
// if err != nil {
|
if err != nil {
|
||||||
// return false, err
|
return false, err
|
||||||
// }
|
}
|
||||||
// if !accountExists {
|
if !accountExists {
|
||||||
// log.Printf("[DEBUG] Storage account %q not found, removing container %q from state", storageAccountName, d.Id())
|
log.Printf("[DEBUG] Storage account %q not found, removing container %q from state", storageAccountName, d.Id())
|
||||||
// d.SetId("")
|
d.SetId("")
|
||||||
// return false, nil
|
return false, nil
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// name := d.Get("name").(string)
|
name := d.Get("name").(string)
|
||||||
//
|
|
||||||
// log.Printf("[INFO] Checking existence of storage container %q in storage account %q", name, storageAccountName)
|
log.Printf("[INFO] Checking existence of storage container %q in storage account %q", name, storageAccountName)
|
||||||
// exists, err := blobClient.ContainerExists(name)
|
exists, err := blobClient.ContainerExists(name)
|
||||||
// if err != nil {
|
if err != nil {
|
||||||
// return false, fmt.Errorf("Error querying existence of storage container %q in storage account %q: %s", name, storageAccountName, err)
|
return false, fmt.Errorf("Error querying existence of storage container %q in storage account %q: %s", name, storageAccountName, err)
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// if !exists {
|
if !exists {
|
||||||
// log.Printf("[INFO] Storage container %q does not exist in account %q, removing from state...", name, storageAccountName)
|
log.Printf("[INFO] Storage container %q does not exist in account %q, removing from state...", name, storageAccountName)
|
||||||
// d.SetId("")
|
d.SetId("")
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// return exists, nil
|
return exists, nil
|
||||||
//}
|
}
|
||||||
//
|
|
||||||
//// resourceAzureStorageContainerDelete does all the necessary API calls to
|
// resourceAzureStorageContainerDelete does all the necessary API calls to
|
||||||
//// delete a storage container off Azure.
|
// delete a storage container off Azure.
|
||||||
//func resourceArmStorageContainerDelete(d *schema.ResourceData, meta interface{}) error {
|
func resourceArmStorageContainerDelete(d *schema.ResourceData, meta interface{}) error {
|
||||||
// armClient := meta.(*ArmClient)
|
armClient := meta.(*ArmClient)
|
||||||
//
|
|
||||||
// resourceGroupName := d.Get("resource_group_name").(string)
|
resourceGroupName := d.Get("resource_group_name").(string)
|
||||||
// storageAccountName := d.Get("storage_account_name").(string)
|
storageAccountName := d.Get("storage_account_name").(string)
|
||||||
//
|
|
||||||
// blobClient, accountExists, err := armClient.getBlobStorageClientForStorageAccount(resourceGroupName, storageAccountName)
|
blobClient, accountExists, err := armClient.getBlobStorageClientForStorageAccount(resourceGroupName, storageAccountName)
|
||||||
// if err != nil {
|
if err != nil {
|
||||||
// return err
|
return err
|
||||||
// }
|
}
|
||||||
// if !accountExists {
|
if !accountExists {
|
||||||
// log.Printf("[INFO]Storage Account %q doesn't exist so the container won't exist", storageAccountName)
|
log.Printf("[INFO]Storage Account %q doesn't exist so the container won't exist", storageAccountName)
|
||||||
// return nil
|
return nil
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// name := d.Get("name").(string)
|
name := d.Get("name").(string)
|
||||||
//
|
|
||||||
// log.Printf("[INFO] Deleting storage container %q in account %q", name, storageAccountName)
|
log.Printf("[INFO] Deleting storage container %q in account %q", name, storageAccountName)
|
||||||
// if _, err := blobClient.DeleteContainerIfExists(name); err != nil {
|
if _, err := blobClient.DeleteContainerIfExists(name); err != nil {
|
||||||
// return fmt.Errorf("Error deleting storage container %q from storage account %q: %s", name, storageAccountName, err)
|
return fmt.Errorf("Error deleting storage container %q from storage account %q: %s", name, storageAccountName, err)
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// d.SetId("")
|
d.SetId("")
|
||||||
// return nil
|
return nil
|
||||||
//}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,241 +1,241 @@
|
||||||
package azurerm
|
package azurerm
|
||||||
|
|
||||||
//import (
|
import (
|
||||||
// "fmt"
|
"fmt"
|
||||||
// "log"
|
"log"
|
||||||
// "strings"
|
"strings"
|
||||||
// "testing"
|
"testing"
|
||||||
//
|
|
||||||
// "github.com/Azure/azure-sdk-for-go/storage"
|
"github.com/Azure/azure-sdk-for-go/storage"
|
||||||
// "github.com/hashicorp/terraform/helper/acctest"
|
"github.com/hashicorp/terraform/helper/acctest"
|
||||||
// "github.com/hashicorp/terraform/helper/resource"
|
"github.com/hashicorp/terraform/helper/resource"
|
||||||
// "github.com/hashicorp/terraform/terraform"
|
"github.com/hashicorp/terraform/terraform"
|
||||||
//)
|
)
|
||||||
//
|
|
||||||
//func TestAccAzureRMStorageContainer_basic(t *testing.T) {
|
func TestAccAzureRMStorageContainer_basic(t *testing.T) {
|
||||||
// var c storage.Container
|
var c storage.Container
|
||||||
//
|
|
||||||
// ri := acctest.RandInt()
|
ri := acctest.RandInt()
|
||||||
// rs := strings.ToLower(acctest.RandString(11))
|
rs := strings.ToLower(acctest.RandString(11))
|
||||||
// config := fmt.Sprintf(testAccAzureRMStorageContainer_basic, ri, rs)
|
config := fmt.Sprintf(testAccAzureRMStorageContainer_basic, ri, rs)
|
||||||
//
|
|
||||||
// resource.Test(t, resource.TestCase{
|
resource.Test(t, resource.TestCase{
|
||||||
// PreCheck: func() { testAccPreCheck(t) },
|
PreCheck: func() { testAccPreCheck(t) },
|
||||||
// Providers: testAccProviders,
|
Providers: testAccProviders,
|
||||||
// CheckDestroy: testCheckAzureRMStorageContainerDestroy,
|
CheckDestroy: testCheckAzureRMStorageContainerDestroy,
|
||||||
// Steps: []resource.TestStep{
|
Steps: []resource.TestStep{
|
||||||
// resource.TestStep{
|
{
|
||||||
// Config: config,
|
Config: config,
|
||||||
// Check: resource.ComposeTestCheckFunc(
|
Check: resource.ComposeTestCheckFunc(
|
||||||
// testCheckAzureRMStorageContainerExists("azurerm_storage_container.test", &c),
|
testCheckAzureRMStorageContainerExists("azurerm_storage_container.test", &c),
|
||||||
// ),
|
),
|
||||||
// },
|
},
|
||||||
// },
|
},
|
||||||
// })
|
})
|
||||||
//}
|
}
|
||||||
//
|
|
||||||
//func TestAccAzureRMStorageContainer_disappears(t *testing.T) {
|
func TestAccAzureRMStorageContainer_disappears(t *testing.T) {
|
||||||
// var c storage.Container
|
var c storage.Container
|
||||||
//
|
|
||||||
// ri := acctest.RandInt()
|
ri := acctest.RandInt()
|
||||||
// rs := strings.ToLower(acctest.RandString(11))
|
rs := strings.ToLower(acctest.RandString(11))
|
||||||
// config := fmt.Sprintf(testAccAzureRMStorageContainer_basic, ri, rs)
|
config := fmt.Sprintf(testAccAzureRMStorageContainer_basic, ri, rs)
|
||||||
//
|
|
||||||
// resource.Test(t, resource.TestCase{
|
resource.Test(t, resource.TestCase{
|
||||||
// PreCheck: func() { testAccPreCheck(t) },
|
PreCheck: func() { testAccPreCheck(t) },
|
||||||
// Providers: testAccProviders,
|
Providers: testAccProviders,
|
||||||
// CheckDestroy: testCheckAzureRMStorageContainerDestroy,
|
CheckDestroy: testCheckAzureRMStorageContainerDestroy,
|
||||||
// Steps: []resource.TestStep{
|
Steps: []resource.TestStep{
|
||||||
// resource.TestStep{
|
{
|
||||||
// Config: config,
|
Config: config,
|
||||||
// Check: resource.ComposeTestCheckFunc(
|
Check: resource.ComposeTestCheckFunc(
|
||||||
// testCheckAzureRMStorageContainerExists("azurerm_storage_container.test", &c),
|
testCheckAzureRMStorageContainerExists("azurerm_storage_container.test", &c),
|
||||||
// testAccARMStorageContainerDisappears("azurerm_storage_container.test", &c),
|
testAccARMStorageContainerDisappears("azurerm_storage_container.test", &c),
|
||||||
// ),
|
),
|
||||||
// ExpectNonEmptyPlan: true,
|
ExpectNonEmptyPlan: true,
|
||||||
// },
|
},
|
||||||
// },
|
},
|
||||||
// })
|
})
|
||||||
//}
|
}
|
||||||
//
|
|
||||||
//func testCheckAzureRMStorageContainerExists(name string, c *storage.Container) resource.TestCheckFunc {
|
func testCheckAzureRMStorageContainerExists(name string, c *storage.Container) resource.TestCheckFunc {
|
||||||
// return func(s *terraform.State) error {
|
return func(s *terraform.State) error {
|
||||||
//
|
|
||||||
// rs, ok := s.RootModule().Resources[name]
|
rs, ok := s.RootModule().Resources[name]
|
||||||
// if !ok {
|
if !ok {
|
||||||
// return fmt.Errorf("Not found: %s", name)
|
return fmt.Errorf("Not found: %s", name)
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// name := rs.Primary.Attributes["name"]
|
name := rs.Primary.Attributes["name"]
|
||||||
// storageAccountName := rs.Primary.Attributes["storage_account_name"]
|
storageAccountName := rs.Primary.Attributes["storage_account_name"]
|
||||||
// resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"]
|
resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"]
|
||||||
// if !hasResourceGroup {
|
if !hasResourceGroup {
|
||||||
// return fmt.Errorf("Bad: no resource group found in state for storage container: %s", name)
|
return fmt.Errorf("Bad: no resource group found in state for storage container: %s", name)
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// armClient := testAccProvider.Meta().(*ArmClient)
|
armClient := testAccProvider.Meta().(*ArmClient)
|
||||||
// blobClient, accountExists, err := armClient.getBlobStorageClientForStorageAccount(resourceGroup, storageAccountName)
|
blobClient, accountExists, err := armClient.getBlobStorageClientForStorageAccount(resourceGroup, storageAccountName)
|
||||||
// if err != nil {
|
if err != nil {
|
||||||
// return err
|
return err
|
||||||
// }
|
}
|
||||||
// if !accountExists {
|
if !accountExists {
|
||||||
// return fmt.Errorf("Bad: Storage Account %q does not exist", storageAccountName)
|
return fmt.Errorf("Bad: Storage Account %q does not exist", storageAccountName)
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// containers, err := blobClient.ListContainers(storage.ListContainersParameters{
|
containers, err := blobClient.ListContainers(storage.ListContainersParameters{
|
||||||
// Prefix: name,
|
Prefix: name,
|
||||||
// Timeout: 90,
|
Timeout: 90,
|
||||||
// })
|
})
|
||||||
//
|
|
||||||
// if len(containers.Containers) == 0 {
|
if len(containers.Containers) == 0 {
|
||||||
// return fmt.Errorf("Bad: Storage Container %q (storage account: %q) does not exist", name, storageAccountName)
|
return fmt.Errorf("Bad: Storage Container %q (storage account: %q) does not exist", name, storageAccountName)
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// var found bool
|
var found bool
|
||||||
// for _, container := range containers.Containers {
|
for _, container := range containers.Containers {
|
||||||
// if container.Name == name {
|
if container.Name == name {
|
||||||
// found = true
|
found = true
|
||||||
// *c = container
|
*c = container
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// if !found {
|
if !found {
|
||||||
// return fmt.Errorf("Bad: Storage Container %q (storage account: %q) does not exist", name, storageAccountName)
|
return fmt.Errorf("Bad: Storage Container %q (storage account: %q) does not exist", name, storageAccountName)
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// return nil
|
return nil
|
||||||
// }
|
}
|
||||||
//}
|
}
|
||||||
//
|
|
||||||
//func testAccARMStorageContainerDisappears(name string, c *storage.Container) resource.TestCheckFunc {
|
func testAccARMStorageContainerDisappears(name string, c *storage.Container) resource.TestCheckFunc {
|
||||||
// return func(s *terraform.State) error {
|
return func(s *terraform.State) error {
|
||||||
// rs, ok := s.RootModule().Resources[name]
|
rs, ok := s.RootModule().Resources[name]
|
||||||
// if !ok {
|
if !ok {
|
||||||
// return fmt.Errorf("Not found: %s", name)
|
return fmt.Errorf("Not found: %s", name)
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// armClient := testAccProvider.Meta().(*ArmClient)
|
armClient := testAccProvider.Meta().(*ArmClient)
|
||||||
//
|
|
||||||
// storageAccountName := rs.Primary.Attributes["storage_account_name"]
|
storageAccountName := rs.Primary.Attributes["storage_account_name"]
|
||||||
// resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"]
|
resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"]
|
||||||
// if !hasResourceGroup {
|
if !hasResourceGroup {
|
||||||
// return fmt.Errorf("Bad: no resource group found in state for storage container: %s", c.Name)
|
return fmt.Errorf("Bad: no resource group found in state for storage container: %s", c.Name)
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// blobClient, accountExists, err := armClient.getBlobStorageClientForStorageAccount(resourceGroup, storageAccountName)
|
blobClient, accountExists, err := armClient.getBlobStorageClientForStorageAccount(resourceGroup, storageAccountName)
|
||||||
// if err != nil {
|
if err != nil {
|
||||||
// return err
|
return err
|
||||||
// }
|
}
|
||||||
// if !accountExists {
|
if !accountExists {
|
||||||
// log.Printf("[INFO]Storage Account %q doesn't exist so the container won't exist", storageAccountName)
|
log.Printf("[INFO]Storage Account %q doesn't exist so the container won't exist", storageAccountName)
|
||||||
// return nil
|
return nil
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// _, err = blobClient.DeleteContainerIfExists(c.Name)
|
_, err = blobClient.DeleteContainerIfExists(c.Name)
|
||||||
// if err != nil {
|
if err != nil {
|
||||||
// return err
|
return err
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// return nil
|
return nil
|
||||||
// }
|
}
|
||||||
//}
|
}
|
||||||
//
|
|
||||||
//func testCheckAzureRMStorageContainerDestroy(s *terraform.State) error {
|
func testCheckAzureRMStorageContainerDestroy(s *terraform.State) error {
|
||||||
// for _, rs := range s.RootModule().Resources {
|
for _, rs := range s.RootModule().Resources {
|
||||||
// if rs.Type != "azurerm_storage_container" {
|
if rs.Type != "azurerm_storage_container" {
|
||||||
// continue
|
continue
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// name := rs.Primary.Attributes["name"]
|
name := rs.Primary.Attributes["name"]
|
||||||
// storageAccountName := rs.Primary.Attributes["storage_account_name"]
|
storageAccountName := rs.Primary.Attributes["storage_account_name"]
|
||||||
// resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"]
|
resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"]
|
||||||
// if !hasResourceGroup {
|
if !hasResourceGroup {
|
||||||
// return fmt.Errorf("Bad: no resource group found in state for storage container: %s", name)
|
return fmt.Errorf("Bad: no resource group found in state for storage container: %s", name)
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// armClient := testAccProvider.Meta().(*ArmClient)
|
armClient := testAccProvider.Meta().(*ArmClient)
|
||||||
// blobClient, accountExists, err := armClient.getBlobStorageClientForStorageAccount(resourceGroup, storageAccountName)
|
blobClient, accountExists, err := armClient.getBlobStorageClientForStorageAccount(resourceGroup, storageAccountName)
|
||||||
// if err != nil {
|
if err != nil {
|
||||||
// //If we can't get keys then the blob can't exist
|
//If we can't get keys then the blob can't exist
|
||||||
// return nil
|
return nil
|
||||||
// }
|
}
|
||||||
// if !accountExists {
|
if !accountExists {
|
||||||
// return nil
|
return nil
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// containers, err := blobClient.ListContainers(storage.ListContainersParameters{
|
containers, err := blobClient.ListContainers(storage.ListContainersParameters{
|
||||||
// Prefix: name,
|
Prefix: name,
|
||||||
// Timeout: 90,
|
Timeout: 90,
|
||||||
// })
|
})
|
||||||
//
|
|
||||||
// if err != nil {
|
if err != nil {
|
||||||
// return nil
|
return nil
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// var found bool
|
var found bool
|
||||||
// for _, container := range containers.Containers {
|
for _, container := range containers.Containers {
|
||||||
// if container.Name == name {
|
if container.Name == name {
|
||||||
// found = true
|
found = true
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// if found {
|
if found {
|
||||||
// return fmt.Errorf("Bad: Storage Container %q (storage account: %q) still exist", name, storageAccountName)
|
return fmt.Errorf("Bad: Storage Container %q (storage account: %q) still exist", name, storageAccountName)
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// return nil
|
return nil
|
||||||
//}
|
}
|
||||||
//
|
|
||||||
//func TestValidateArmStorageContainerName(t *testing.T) {
|
func TestValidateArmStorageContainerName(t *testing.T) {
|
||||||
// validNames := []string{
|
validNames := []string{
|
||||||
// "valid-name",
|
"valid-name",
|
||||||
// "valid02-name",
|
"valid02-name",
|
||||||
// }
|
}
|
||||||
// for _, v := range validNames {
|
for _, v := range validNames {
|
||||||
// _, errors := validateArmStorageContainerName(v, "name")
|
_, errors := validateArmStorageContainerName(v, "name")
|
||||||
// if len(errors) != 0 {
|
if len(errors) != 0 {
|
||||||
// t.Fatalf("%q should be a valid Storage Container Name: %q", v, errors)
|
t.Fatalf("%q should be a valid Storage Container Name: %q", v, errors)
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// invalidNames := []string{
|
invalidNames := []string{
|
||||||
// "InvalidName1",
|
"InvalidName1",
|
||||||
// "-invalidname1",
|
"-invalidname1",
|
||||||
// "invalid_name",
|
"invalid_name",
|
||||||
// "invalid!",
|
"invalid!",
|
||||||
// "ww",
|
"ww",
|
||||||
// strings.Repeat("w", 65),
|
strings.Repeat("w", 65),
|
||||||
// }
|
}
|
||||||
// for _, v := range invalidNames {
|
for _, v := range invalidNames {
|
||||||
// _, errors := validateArmStorageContainerName(v, "name")
|
_, errors := validateArmStorageContainerName(v, "name")
|
||||||
// if len(errors) == 0 {
|
if len(errors) == 0 {
|
||||||
// t.Fatalf("%q should be an invalid Storage Container Name", v)
|
t.Fatalf("%q should be an invalid Storage Container Name", v)
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
//}
|
}
|
||||||
//
|
|
||||||
//var testAccAzureRMStorageContainer_basic = `
|
var testAccAzureRMStorageContainer_basic = `
|
||||||
//resource "azurerm_resource_group" "test" {
|
resource "azurerm_resource_group" "test" {
|
||||||
// name = "acctestrg-%d"
|
name = "acctestrg-%d"
|
||||||
// location = "westus"
|
location = "westus"
|
||||||
//}
|
}
|
||||||
//
|
|
||||||
//resource "azurerm_storage_account" "test" {
|
resource "azurerm_storage_account" "test" {
|
||||||
// name = "acctestacc%s"
|
name = "acctestacc%s"
|
||||||
// resource_group_name = "${azurerm_resource_group.test.name}"
|
resource_group_name = "${azurerm_resource_group.test.name}"
|
||||||
// location = "westus"
|
location = "westus"
|
||||||
// account_type = "Standard_LRS"
|
account_type = "Standard_LRS"
|
||||||
//
|
|
||||||
// tags {
|
tags {
|
||||||
// environment = "staging"
|
environment = "staging"
|
||||||
// }
|
}
|
||||||
//}
|
}
|
||||||
//
|
|
||||||
//resource "azurerm_storage_container" "test" {
|
resource "azurerm_storage_container" "test" {
|
||||||
// name = "vhds"
|
name = "vhds"
|
||||||
// resource_group_name = "${azurerm_resource_group.test.name}"
|
resource_group_name = "${azurerm_resource_group.test.name}"
|
||||||
// storage_account_name = "${azurerm_storage_account.test.name}"
|
storage_account_name = "${azurerm_storage_account.test.name}"
|
||||||
// container_access_type = "private"
|
container_access_type = "private"
|
||||||
//}
|
}
|
||||||
//`
|
`
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue