mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-03 01:01:06 +00:00
provider/google: Add support for backend buckets
Adds a new resource google_compute_backend_bucket according to https://cloud.google.com/compute/docs/reference/latest/backendBuckets Fixes hashicorp/terraform#12505
This commit is contained in:
parent
2368d8ee7e
commit
1054fb189d
@ -58,6 +58,7 @@ func Provider() terraform.ResourceProvider {
|
||||
"google_bigquery_dataset": resourceBigQueryDataset(),
|
||||
"google_compute_autoscaler": resourceComputeAutoscaler(),
|
||||
"google_compute_address": resourceComputeAddress(),
|
||||
"google_compute_backend_bucket": resourceComputeBackendBucket(),
|
||||
"google_compute_backend_service": resourceComputeBackendService(),
|
||||
"google_compute_disk": resourceComputeDisk(),
|
||||
"google_compute_firewall": resourceComputeFirewall(),
|
||||
|
201
resource_compute_backend_bucket.go
Normal file
201
resource_compute_backend_bucket.go
Normal file
@ -0,0 +1,201 @@
|
||||
package google
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"regexp"
|
||||
|
||||
"github.com/hashicorp/terraform/helper/schema"
|
||||
"google.golang.org/api/compute/v1"
|
||||
"google.golang.org/api/googleapi"
|
||||
)
|
||||
|
||||
func resourceComputeBackendBucket() *schema.Resource {
|
||||
return &schema.Resource{
|
||||
Create: resourceComputeBackendBucketCreate,
|
||||
Read: resourceComputeBackendBucketRead,
|
||||
Update: resourceComputeBackendBucketUpdate,
|
||||
Delete: resourceComputeBackendBucketDelete,
|
||||
|
||||
Schema: map[string]*schema.Schema{
|
||||
"name": &schema.Schema{
|
||||
Type: schema.TypeString,
|
||||
Required: true,
|
||||
ForceNew: true,
|
||||
ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
|
||||
value := v.(string)
|
||||
re := `^(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?)$`
|
||||
if !regexp.MustCompile(re).MatchString(value) {
|
||||
errors = append(errors, fmt.Errorf(
|
||||
"%q (%q) doesn't match regexp %q", k, value, re))
|
||||
}
|
||||
return
|
||||
},
|
||||
},
|
||||
|
||||
"bucket_name": &schema.Schema{
|
||||
Type: schema.TypeString,
|
||||
Required: true,
|
||||
},
|
||||
|
||||
"description": &schema.Schema{
|
||||
Type: schema.TypeString,
|
||||
Optional: true,
|
||||
},
|
||||
|
||||
"enable_cdn": &schema.Schema{
|
||||
Type: schema.TypeBool,
|
||||
Optional: true,
|
||||
Default: false,
|
||||
},
|
||||
|
||||
"project": &schema.Schema{
|
||||
Type: schema.TypeString,
|
||||
Optional: true,
|
||||
ForceNew: true,
|
||||
},
|
||||
|
||||
"self_link": &schema.Schema{
|
||||
Type: schema.TypeString,
|
||||
Computed: true,
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func resourceComputeBackendBucketCreate(d *schema.ResourceData, meta interface{}) error {
|
||||
config := meta.(*Config)
|
||||
|
||||
bucket := compute.BackendBucket{
|
||||
Name: d.Get("name").(string),
|
||||
BucketName: d.Get("bucket_name").(string),
|
||||
}
|
||||
|
||||
if v, ok := d.GetOk("description"); ok {
|
||||
bucket.Description = v.(string)
|
||||
}
|
||||
|
||||
if v, ok := d.GetOk("enable_cdn"); ok {
|
||||
bucket.EnableCdn = v.(bool)
|
||||
}
|
||||
|
||||
project, err := getProject(d, config)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
log.Printf("[DEBUG] Creating new Backend Bucket: %#v", bucket)
|
||||
op, err := config.clientCompute.BackendBuckets.Insert(
|
||||
project, &bucket).Do()
|
||||
if err != nil {
|
||||
return fmt.Errorf("Error creating backend bucket: %s", err)
|
||||
}
|
||||
|
||||
log.Printf("[DEBUG] Waiting for new backend bucket, operation: %#v", op)
|
||||
|
||||
// Store the ID now
|
||||
d.SetId(bucket.Name)
|
||||
|
||||
// Wait for the operation to complete
|
||||
waitErr := computeOperationWaitGlobal(config, op, project, "Creating Backend Bucket")
|
||||
if waitErr != nil {
|
||||
// The resource didn't actually create
|
||||
d.SetId("")
|
||||
return waitErr
|
||||
}
|
||||
|
||||
return resourceComputeBackendBucketRead(d, meta)
|
||||
}
|
||||
|
||||
func resourceComputeBackendBucketRead(d *schema.ResourceData, meta interface{}) error {
|
||||
config := meta.(*Config)
|
||||
|
||||
project, err := getProject(d, config)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
bucket, err := config.clientCompute.BackendBuckets.Get(
|
||||
project, d.Id()).Do()
|
||||
if err != nil {
|
||||
if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
|
||||
// The resource doesn't exist anymore
|
||||
log.Printf("[WARN] Removing Backend Bucket %q because it's gone", d.Get("name").(string))
|
||||
d.SetId("")
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
return fmt.Errorf("Error reading bucket: %s", err)
|
||||
}
|
||||
|
||||
d.Set("bucket_name", bucket.BucketName)
|
||||
d.Set("description", bucket.Description)
|
||||
d.Set("enable_cdn", bucket.EnableCdn)
|
||||
d.Set("self_link", bucket.SelfLink)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func resourceComputeBackendBucketUpdate(d *schema.ResourceData, meta interface{}) error {
|
||||
config := meta.(*Config)
|
||||
|
||||
project, err := getProject(d, config)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
bucket := compute.BackendBucket{
|
||||
Name: d.Get("name").(string),
|
||||
BucketName: d.Get("bucket_name").(string),
|
||||
}
|
||||
|
||||
// Optional things
|
||||
if v, ok := d.GetOk("description"); ok {
|
||||
bucket.Description = v.(string)
|
||||
}
|
||||
|
||||
if v, ok := d.GetOk("enable_cdn"); ok {
|
||||
bucket.EnableCdn = v.(bool)
|
||||
}
|
||||
|
||||
log.Printf("[DEBUG] Updating existing Backend Bucket %q: %#v", d.Id(), bucket)
|
||||
op, err := config.clientCompute.BackendBuckets.Update(
|
||||
project, d.Id(), &bucket).Do()
|
||||
if err != nil {
|
||||
return fmt.Errorf("Error updating backend bucket: %s", err)
|
||||
}
|
||||
|
||||
d.SetId(bucket.Name)
|
||||
|
||||
err = computeOperationWaitGlobal(config, op, project, "Updating Backend Bucket")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return resourceComputeBackendBucketRead(d, meta)
|
||||
}
|
||||
|
||||
func resourceComputeBackendBucketDelete(d *schema.ResourceData, meta interface{}) error {
|
||||
config := meta.(*Config)
|
||||
|
||||
project, err := getProject(d, config)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
log.Printf("[DEBUG] Deleting backend bucket %s", d.Id())
|
||||
op, err := config.clientCompute.BackendBuckets.Delete(
|
||||
project, d.Id()).Do()
|
||||
if err != nil {
|
||||
return fmt.Errorf("Error deleting backend bucket: %s", err)
|
||||
}
|
||||
|
||||
err = computeOperationWaitGlobal(config, op, project, "Deleting Backend Bucket")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
d.SetId("")
|
||||
return nil
|
||||
}
|
191
resource_compute_backend_bucket_test.go
Normal file
191
resource_compute_backend_bucket_test.go
Normal file
@ -0,0 +1,191 @@
|
||||
package google
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/hashicorp/terraform/helper/acctest"
|
||||
"github.com/hashicorp/terraform/helper/resource"
|
||||
"github.com/hashicorp/terraform/terraform"
|
||||
"google.golang.org/api/compute/v1"
|
||||
)
|
||||
|
||||
func TestAccComputeBackendBucket_basic(t *testing.T) {
|
||||
backendName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
|
||||
storageName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
|
||||
var svc compute.BackendBucket
|
||||
|
||||
resource.Test(t, resource.TestCase{
|
||||
PreCheck: func() { testAccPreCheck(t) },
|
||||
Providers: testAccProviders,
|
||||
CheckDestroy: testAccCheckComputeBackendBucketDestroy,
|
||||
Steps: []resource.TestStep{
|
||||
resource.TestStep{
|
||||
Config: testAccComputeBackendBucket_basic(backendName, storageName),
|
||||
Check: resource.ComposeTestCheckFunc(
|
||||
testAccCheckComputeBackendBucketExists(
|
||||
"google_compute_backend_bucket.foobar", &svc),
|
||||
),
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
if svc.BucketName != storageName {
|
||||
t.Errorf("Expected BucketName to be %q, got %q", storageName, svc.BucketName)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAccComputeBackendBucket_basicModified(t *testing.T) {
|
||||
backendName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
|
||||
storageName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
|
||||
secondStorageName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
|
||||
var svc compute.BackendBucket
|
||||
|
||||
resource.Test(t, resource.TestCase{
|
||||
PreCheck: func() { testAccPreCheck(t) },
|
||||
Providers: testAccProviders,
|
||||
CheckDestroy: testAccCheckComputeBackendBucketDestroy,
|
||||
Steps: []resource.TestStep{
|
||||
resource.TestStep{
|
||||
Config: testAccComputeBackendBucket_basic(backendName, storageName),
|
||||
Check: resource.ComposeTestCheckFunc(
|
||||
testAccCheckComputeBackendBucketExists(
|
||||
"google_compute_backend_bucket.foobar", &svc),
|
||||
),
|
||||
},
|
||||
resource.TestStep{
|
||||
Config: testAccComputeBackendBucket_basicModified(
|
||||
backendName, storageName, secondStorageName),
|
||||
Check: resource.ComposeTestCheckFunc(
|
||||
testAccCheckComputeBackendBucketExists(
|
||||
"google_compute_backend_bucket.foobar", &svc),
|
||||
),
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
if svc.BucketName != secondStorageName {
|
||||
t.Errorf("Expected BucketName to be %q, got %q", secondStorageName, svc.BucketName)
|
||||
}
|
||||
}
|
||||
|
||||
func testAccCheckComputeBackendBucketDestroy(s *terraform.State) error {
|
||||
config := testAccProvider.Meta().(*Config)
|
||||
|
||||
for _, rs := range s.RootModule().Resources {
|
||||
if rs.Type != "google_compute_backend_bucket" {
|
||||
continue
|
||||
}
|
||||
|
||||
_, err := config.clientCompute.BackendBuckets.Get(
|
||||
config.Project, rs.Primary.ID).Do()
|
||||
if err == nil {
|
||||
return fmt.Errorf("Backend bucket %s still exists", rs.Primary.ID)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func testAccCheckComputeBackendBucketExists(n string, svc *compute.BackendBucket) resource.TestCheckFunc {
|
||||
return func(s *terraform.State) error {
|
||||
rs, ok := s.RootModule().Resources[n]
|
||||
if !ok {
|
||||
return fmt.Errorf("Not found: %s", n)
|
||||
}
|
||||
|
||||
if rs.Primary.ID == "" {
|
||||
return fmt.Errorf("No ID is set")
|
||||
}
|
||||
|
||||
config := testAccProvider.Meta().(*Config)
|
||||
|
||||
found, err := config.clientCompute.BackendBuckets.Get(
|
||||
config.Project, rs.Primary.ID).Do()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if found.Name != rs.Primary.ID {
|
||||
return fmt.Errorf("Backend bucket %s not found", rs.Primary.ID)
|
||||
}
|
||||
|
||||
*svc = *found
|
||||
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func TestAccComputeBackendBucket_withCdnEnabled(t *testing.T) {
|
||||
backendName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
|
||||
storageName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
|
||||
var svc compute.BackendBucket
|
||||
|
||||
resource.Test(t, resource.TestCase{
|
||||
PreCheck: func() { testAccPreCheck(t) },
|
||||
Providers: testAccProviders,
|
||||
CheckDestroy: testAccCheckComputeBackendBucketDestroy,
|
||||
Steps: []resource.TestStep{
|
||||
resource.TestStep{
|
||||
Config: testAccComputeBackendBucket_withCdnEnabled(
|
||||
backendName, storageName),
|
||||
Check: resource.ComposeTestCheckFunc(
|
||||
testAccCheckComputeBackendBucketExists(
|
||||
"google_compute_backend_bucket.foobar", &svc),
|
||||
),
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
if svc.EnableCdn != true {
|
||||
t.Errorf("Expected EnableCdn == true, got %t", svc.EnableCdn)
|
||||
}
|
||||
}
|
||||
|
||||
func testAccComputeBackendBucket_basic(backendName, storageName string) string {
|
||||
return fmt.Sprintf(`
|
||||
resource "google_compute_backend_bucket" "foobar" {
|
||||
name = "%s"
|
||||
bucket_name = "${google_storage_bucket.bucket_one.name}"
|
||||
}
|
||||
|
||||
resource "google_storage_bucket" "bucket_one" {
|
||||
name = "%s"
|
||||
location = "EU"
|
||||
}
|
||||
`, backendName, storageName)
|
||||
}
|
||||
|
||||
func testAccComputeBackendBucket_basicModified(backendName, bucketOne, bucketTwo string) string {
|
||||
return fmt.Sprintf(`
|
||||
resource "google_compute_backend_bucket" "foobar" {
|
||||
name = "%s"
|
||||
bucket_name = "${google_storage_bucket.bucket_two.name}"
|
||||
}
|
||||
|
||||
resource "google_storage_bucket" "bucket_one" {
|
||||
name = "%s"
|
||||
location = "EU"
|
||||
}
|
||||
|
||||
resource "google_storage_bucket" "bucket_two" {
|
||||
name = "%s"
|
||||
location = "EU"
|
||||
}
|
||||
`, backendName, bucketOne, bucketTwo)
|
||||
}
|
||||
|
||||
func testAccComputeBackendBucket_withCdnEnabled(backendName, storageName string) string {
|
||||
return fmt.Sprintf(`
|
||||
resource "google_compute_backend_bucket" "foobar" {
|
||||
name = "%s"
|
||||
bucket_name = "${google_storage_bucket.bucket.name}"
|
||||
enable_cdn = true
|
||||
}
|
||||
|
||||
resource "google_storage_bucket" "bucket" {
|
||||
name = "%s"
|
||||
location = "EU"
|
||||
}
|
||||
`, backendName, storageName)
|
||||
}
|
Loading…
Reference in New Issue
Block a user