ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implements optional region for remaining GCE resources

This commit is contained in:
Lars Wander 2015-09-15 10:01:13 -04:00
parent 6bd40a7bf4
commit 1be8e85d44
4 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/providers/google/resource_compute_backend_service.go
View File

@ -66,6 +66,12 @@ func resourceComputeBackendService() *schema.Resource {
Optional: true, Optional: true,
}, },
"region": &schema.Schema{
Type: schema.TypeString,
ForceNew: true,
Optional: true,
},
"health_checks": &schema.Schema{ "health_checks": &schema.Schema{
Type: schema.TypeSet, Type: schema.TypeSet,
Elem: &schema.Schema{Type: schema.TypeString}, Elem: &schema.Schema{Type: schema.TypeString},

42
builtin/providers/google/resource_compute_target_pool.go
View File

@ -66,6 +66,12 @@ func resourceComputeTargetPool() *schema.Resource {
Optional: true, Optional: true,
ForceNew: true, ForceNew: true,
}, },
"region": &schema.Schema{
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
}, },
} }
} }
@ -115,6 +121,7 @@ func convertInstances(config *Config, names []string) ([]string, error) {
func resourceComputeTargetPoolCreate(d *schema.ResourceData, meta interface{}) error { func resourceComputeTargetPoolCreate(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config) config := meta.(*Config)
region := getOptionalRegion(d, config)
hchkUrls, err := convertHealthChecks( hchkUrls, err := convertHealthChecks(
config, convertStringArr(d.Get("health_checks").([]interface{}))) config, convertStringArr(d.Get("health_checks").([]interface{})))
@ -142,7 +149,7 @@ func resourceComputeTargetPoolCreate(d *schema.ResourceData, meta interface{}) e
} }
log.Printf("[DEBUG] TargetPool insert request: %#v", tpool) log.Printf("[DEBUG] TargetPool insert request: %#v", tpool)
op, err := config.clientCompute.TargetPools.Insert( op, err := config.clientCompute.TargetPools.Insert(
config.Project, config.Region, tpool).Do() config.Project, region, tpool).Do()
if err != nil { if err != nil {
return fmt.Errorf("Error creating TargetPool: %s", err) return fmt.Errorf("Error creating TargetPool: %s", err)
} }
@ -150,11 +157,10 @@ func resourceComputeTargetPoolCreate(d *schema.ResourceData, meta interface{}) e
// It probably maybe worked, so store the ID now // It probably maybe worked, so store the ID now
d.SetId(tpool.Name) d.SetId(tpool.Name)
err = computeOperationWaitRegion(config, op, config.Region, "Creating Target Pool") err = computeOperationWaitRegion(config, op, region, "Creating Target Pool")
if err != nil { if err != nil {
return err return err
} }
return resourceComputeTargetPoolRead(d, meta) return resourceComputeTargetPoolRead(d, meta)
} }
@ -190,6 +196,7 @@ func calcAddRemove(from []string, to []string) ([]string, []string) {
func resourceComputeTargetPoolUpdate(d *schema.ResourceData, meta interface{}) error { func resourceComputeTargetPoolUpdate(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config) config := meta.(*Config)
region := getOptionalRegion(d, config)
d.Partial(true) d.Partial(true)
@ -215,12 +222,12 @@ func resourceComputeTargetPoolUpdate(d *schema.ResourceData, meta interface{}) e
removeReq.HealthChecks[i] = &compute.HealthCheckReference{HealthCheck: v} removeReq.HealthChecks[i] = &compute.HealthCheckReference{HealthCheck: v}
} }
op, err := config.clientCompute.TargetPools.RemoveHealthCheck( op, err := config.clientCompute.TargetPools.RemoveHealthCheck(
config.Project, config.Region, d.Id(), removeReq).Do() config.Project, region, d.Id(), removeReq).Do()
if err != nil { if err != nil {
return fmt.Errorf("Error updating health_check: %s", err) return fmt.Errorf("Error updating health_check: %s", err)
} }
err = computeOperationWaitRegion(config, op, config.Region, "Updating Target Pool") err = computeOperationWaitRegion(config, op, region, "Updating Target Pool")
if err != nil { if err != nil {
return err return err
} }
@ -231,12 +238,12 @@ func resourceComputeTargetPoolUpdate(d *schema.ResourceData, meta interface{}) e
addReq.HealthChecks[i] = &compute.HealthCheckReference{HealthCheck: v} addReq.HealthChecks[i] = &compute.HealthCheckReference{HealthCheck: v}
} }
op, err = config.clientCompute.TargetPools.AddHealthCheck( op, err = config.clientCompute.TargetPools.AddHealthCheck(
config.Project, config.Region, d.Id(), addReq).Do() config.Project, region, d.Id(), addReq).Do()
if err != nil { if err != nil {
return fmt.Errorf("Error updating health_check: %s", err) return fmt.Errorf("Error updating health_check: %s", err)
} }
err = computeOperationWaitRegion(config, op, config.Region, "Updating Target Pool") err = computeOperationWaitRegion(config, op, region, "Updating Target Pool")
if err != nil { if err != nil {
return err return err
} }
@ -265,12 +272,12 @@ func resourceComputeTargetPoolUpdate(d *schema.ResourceData, meta interface{}) e
addReq.Instances[i] = &compute.InstanceReference{Instance: v} addReq.Instances[i] = &compute.InstanceReference{Instance: v}
} }
op, err := config.clientCompute.TargetPools.AddInstance( op, err := config.clientCompute.TargetPools.AddInstance(
config.Project, config.Region, d.Id(), addReq).Do() config.Project, region, d.Id(), addReq).Do()
if err != nil { if err != nil {
return fmt.Errorf("Error updating instances: %s", err) return fmt.Errorf("Error updating instances: %s", err)
} }
err = computeOperationWaitRegion(config, op, config.Region, "Updating Target Pool") err = computeOperationWaitRegion(config, op, region, "Updating Target Pool")
if err != nil { if err != nil {
return err return err
} }
@ -281,12 +288,11 @@ func resourceComputeTargetPoolUpdate(d *schema.ResourceData, meta interface{}) e
removeReq.Instances[i] = &compute.InstanceReference{Instance: v} removeReq.Instances[i] = &compute.InstanceReference{Instance: v}
} }
op, err = config.clientCompute.TargetPools.RemoveInstance( op, err = config.clientCompute.TargetPools.RemoveInstance(
config.Project, config.Region, d.Id(), removeReq).Do() config.Project, region, d.Id(), removeReq).Do()
if err != nil { if err != nil {
return fmt.Errorf("Error updating instances: %s", err) return fmt.Errorf("Error updating instances: %s", err)
} }
err = computeOperationWaitRegion(config, op, region, "Updating Target Pool")
err = computeOperationWaitRegion(config, op, config.Region, "Updating Target Pool")
if err != nil { if err != nil {
return err return err
} }
@ -299,12 +305,12 @@ func resourceComputeTargetPoolUpdate(d *schema.ResourceData, meta interface{}) e
Target: bpool_name, Target: bpool_name,
} }
op, err := config.clientCompute.TargetPools.SetBackup( op, err := config.clientCompute.TargetPools.SetBackup(
config.Project, config.Region, d.Id(), tref).Do() config.Project, region, d.Id(), tref).Do()
if err != nil { if err != nil {
return fmt.Errorf("Error updating backup_pool: %s", err) return fmt.Errorf("Error updating backup_pool: %s", err)
} }
err = computeOperationWaitRegion(config, op, config.Region, "Updating Target Pool") err = computeOperationWaitRegion(config, op, region, "Updating Target Pool")
if err != nil { if err != nil {
return err return err
} }
@ -318,9 +324,10 @@ func resourceComputeTargetPoolUpdate(d *schema.ResourceData, meta interface{}) e
func resourceComputeTargetPoolRead(d *schema.ResourceData, meta interface{}) error { func resourceComputeTargetPoolRead(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config) config := meta.(*Config)
region := getOptionalRegion(d, config)
tpool, err := config.clientCompute.TargetPools.Get( tpool, err := config.clientCompute.TargetPools.Get(
config.Project, config.Region, d.Id()).Do() config.Project, region, d.Id()).Do()
if err != nil { if err != nil {
if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 { if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
// The resource doesn't exist anymore // The resource doesn't exist anymore
@ -339,15 +346,16 @@ func resourceComputeTargetPoolRead(d *schema.ResourceData, meta interface{}) err
func resourceComputeTargetPoolDelete(d *schema.ResourceData, meta interface{}) error { func resourceComputeTargetPoolDelete(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config) config := meta.(*Config)
region := getOptionalRegion(d, config)
// Delete the TargetPool // Delete the TargetPool
op, err := config.clientCompute.TargetPools.Delete( op, err := config.clientCompute.TargetPools.Delete(
config.Project, config.Region, d.Id()).Do() config.Project, region, d.Id()).Do()
if err != nil { if err != nil {
return fmt.Errorf("Error deleting TargetPool: %s", err) return fmt.Errorf("Error deleting TargetPool: %s", err)
} }
err = computeOperationWaitRegion(config, op, config.Region, "Deleting Target Pool") err = computeOperationWaitRegion(config, op, region, "Deleting Target Pool")
if err != nil { if err != nil {
return err return err
} }

2
website/source/docs/providers/google/r/compute_backend_service.html.markdown
View File

@ -19,6 +19,7 @@ resource "google_compute_backend_service" "foobar" {
port_name = "http" port_name = "http"
protocol = "HTTP" protocol = "HTTP"
timeout_sec = 10 timeout_sec = 10
region = us-central1
backend { backend {
group = "${google_compute_instance_group_manager.foo.instance_group}" group = "${google_compute_instance_group_manager.foo.instance_group}"
@ -67,6 +68,7 @@ The following arguments are supported:
for checking the health of the backend service. for checking the health of the backend service.
* `description` - (Optional) The textual description for the backend service. * `description` - (Optional) The textual description for the backend service.
* `backend` - (Optional) The list of backends that serve this BackendService. See *Backend* below. * `backend` - (Optional) The list of backends that serve this BackendService. See *Backend* below.
* `region` - (Optional) The region the service sits in. If not specified, the project region is used.
* `port_name` - (Optional) The name of a service that has been added to * `port_name` - (Optional) The name of a service that has been added to
an instance group in this backend. See [related docs](https://cloud.google.com/compute/docs/instance-groups/#specifying_service_endpoints) an instance group in this backend. See [related docs](https://cloud.google.com/compute/docs/instance-groups/#specifying_service_endpoints)
for details. Defaults to http. for details. Defaults to http.

1
website/source/docs/providers/google/r/compute_target_pool.html.markdown
View File

@ -49,6 +49,7 @@ The following arguments are supported:
* `session_affinity` - (Optional) How to distribute load. Options are "NONE" (no affinity). "CLIENT\_IP" (hash of the source/dest addresses / ports), and "CLIENT\_IP\_PROTO" also includes the protocol (default "NONE"). * `session_affinity` - (Optional) How to distribute load. Options are "NONE" (no affinity). "CLIENT\_IP" (hash of the source/dest addresses / ports), and "CLIENT\_IP\_PROTO" also includes the protocol (default "NONE").
* `region` - (Optional) Where the target pool resides. Defaults to project region.
## Attributes Reference ## Attributes Reference