mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-01 16:21:06 +00:00
Merge pull request #117 from rileykarson/115-gcs-bucket-uppercase-location
Represent GCS Bucket locations as uppercase in state.
This commit is contained in:
commit
7554df9754
@ -4,6 +4,7 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"log"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/hashicorp/terraform/helper/resource"
|
||||
@ -41,6 +42,9 @@ func resourceStorageBucket() *schema.Resource {
|
||||
Default: "US",
|
||||
Optional: true,
|
||||
ForceNew: true,
|
||||
StateFunc: func(s interface{}) string {
|
||||
return strings.ToUpper(s.(string))
|
||||
},
|
||||
},
|
||||
|
||||
"predefined_acl": &schema.Schema{
|
||||
|
@ -38,6 +38,26 @@ func TestAccStorageBucket_basic(t *testing.T) {
|
||||
})
|
||||
}
|
||||
|
||||
func TestAccStorageBucket_lowercaseLocation(t *testing.T) {
|
||||
var bucket storage.Bucket
|
||||
bucketName := fmt.Sprintf("tf-test-acl-bucket-%d", acctest.RandInt())
|
||||
|
||||
resource.Test(t, resource.TestCase{
|
||||
PreCheck: func() { testAccPreCheck(t) },
|
||||
Providers: testAccProviders,
|
||||
CheckDestroy: testAccStorageBucketDestroy,
|
||||
Steps: []resource.TestStep{
|
||||
resource.TestStep{
|
||||
Config: testAccStorageBucket_lowercaseLocation(bucketName),
|
||||
Check: resource.ComposeTestCheckFunc(
|
||||
testAccCheckStorageBucketExists(
|
||||
"google_storage_bucket.bucket", bucketName, &bucket),
|
||||
),
|
||||
},
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func TestAccStorageBucket_customAttributes(t *testing.T) {
|
||||
var bucket storage.Bucket
|
||||
bucketName := fmt.Sprintf("tf-test-acl-bucket-%d", acctest.RandInt())
|
||||
@ -335,6 +355,15 @@ resource "google_storage_bucket" "bucket" {
|
||||
`, bucketName)
|
||||
}
|
||||
|
||||
func testAccStorageBucket_lowercaseLocation(bucketName string) string {
|
||||
return fmt.Sprintf(`
|
||||
resource "google_storage_bucket" "bucket" {
|
||||
name = "%s"
|
||||
location = "eu"
|
||||
}
|
||||
`, bucketName)
|
||||
}
|
||||
|
||||
func testAccStorageBucket_customAttributes(bucketName string) string {
|
||||
return fmt.Sprintf(`
|
||||
resource "google_storage_bucket" "bucket" {
|
||||
|
Loading…
Reference in New Issue
Block a user