Merge pull request #3701 from lwander/f-gcp-global-address

provider/google: global address + tests & documentation

builtin/providers/google/provider.go

@@ -40,6 +40,7 @@ func Provider() terraform.ResourceProvider {
  "google_compute_disk": resourceComputeDisk(),
  "google_compute_firewall": resourceComputeFirewall(),
  "google_compute_forwarding_rule": resourceComputeForwardingRule(),
+ "google_compute_global_address": resourceComputeGlobalAddress(),
  "google_compute_http_health_check": resourceComputeHttpHealthCheck(),
  "google_compute_instance": resourceComputeInstance(),
  "google_compute_instance_template": resourceComputeInstanceTemplate(),

builtin/providers/google/resource_compute_global_address.go

@@ -0,0 +1,100 @@
+package google
+
+import (
+ "fmt"
+ "log"
+
+ "github.com/hashicorp/terraform/helper/schema"
+ "google.golang.org/api/compute/v1"
+ "google.golang.org/api/googleapi"
+)
+
+func resourceComputeGlobalAddress() *schema.Resource {
+ return &schema.Resource{
+ Create: resourceComputeGlobalAddressCreate,
+ Read: resourceComputeGlobalAddressRead,
+ Delete: resourceComputeGlobalAddressDelete,
+
+ Schema: map[string]*schema.Schema{
+ "name": &schema.Schema{
+ Type: schema.TypeString,
+ Required: true,
+ ForceNew: true,
+ },
+
+ "address": &schema.Schema{
+ Type: schema.TypeString,
+ Computed: true,
+ },
+
+ "self_link": &schema.Schema{
+ Type: schema.TypeString,
+ Computed: true,
+ },
+ },
+ }
+}
+
+func resourceComputeGlobalAddressCreate(d *schema.ResourceData, meta interface{}) error {
+ config := meta.(*Config)
+
+ // Build the address parameter
+ addr := &compute.Address{Name: d.Get("name").(string)}
+ op, err := config.clientCompute.GlobalAddresses.Insert(
+ config.Project, addr).Do()
+ if err != nil {
+ return fmt.Errorf("Error creating address: %s", err)
+ }
+
+ // It probably maybe worked, so store the ID now
+ d.SetId(addr.Name)
+
+ err = computeOperationWaitGlobal(config, op, "Creating Global Address")
+ if err != nil {
+ return err
+ }
+
+ return resourceComputeGlobalAddressRead(d, meta)
+}
+
+func resourceComputeGlobalAddressRead(d *schema.ResourceData, meta interface{}) error {
+ config := meta.(*Config)
+
+ addr, err := config.clientCompute.GlobalAddresses.Get(
+ config.Project, d.Id()).Do()
+ if err != nil {
+ if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
+ // The resource doesn't exist anymore
+ d.SetId("")
+
+ return nil
+ }
+
+ return fmt.Errorf("Error reading address: %s", err)
+ }
+
+ d.Set("address", addr.Address)
+ d.Set("self_link", addr.SelfLink)
+
+ return nil
+}
+
+func resourceComputeGlobalAddressDelete(d *schema.ResourceData, meta interface{}) error {
+ config := meta.(*Config)
+
+ // Delete the address
+ log.Printf("[DEBUG] address delete request")
+ op, err := config.clientCompute.GlobalAddresses.Delete(
+ config.Project, d.Id()).Do()
+ if err != nil {
+ return fmt.Errorf("Error deleting address: %s", err)
+ }
+
+ err = computeOperationWaitGlobal(config, op, "Deleting Global Address")
+ if err != nil {
+ return err
+ }
+
+ d.SetId("")
+ return nil
+}

builtin/providers/google/resource_compute_global_address_test.go

@@ -0,0 +1,81 @@
+package google
+
+import (
+ "fmt"
+ "testing"
+
+ "github.com/hashicorp/terraform/helper/resource"
+ "github.com/hashicorp/terraform/terraform"
+ "google.golang.org/api/compute/v1"
+)
+
+func TestAccComputeGlobalAddress_basic(t *testing.T) {
+ var addr compute.Address
+
+ resource.Test(t, resource.TestCase{
+ PreCheck: func() { testAccPreCheck(t) },
+ Providers: testAccProviders,
+ CheckDestroy: testAccCheckComputeGlobalAddressDestroy,
+ Steps: []resource.TestStep{
+ resource.TestStep{
+ Config: testAccComputeGlobalAddress_basic,
+ Check: resource.ComposeTestCheckFunc(
+ testAccCheckComputeGlobalAddressExists(
+ "google_compute_global_address.foobar", &addr),
+ ),
+ },
+ },
+ })
+}
+
+func testAccCheckComputeGlobalAddressDestroy(s *terraform.State) error {
+ config := testAccProvider.Meta().(*Config)
+
+ for _, rs := range s.RootModule().Resources {
+ if rs.Type != "google_compute_global_address" {
+ continue
+ }
+
+ _, err := config.clientCompute.GlobalAddresses.Get(
+ config.Project, rs.Primary.ID).Do()
+ if err == nil {
+ return fmt.Errorf("Address still exists")
+ }
+ }
+
+ return nil
+}
+
+func testAccCheckComputeGlobalAddressExists(n string, addr *compute.Address) 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.GlobalAddresses.Get(
+ config.Project, rs.Primary.ID).Do()
+ if err != nil {
+ return err
+ }
+
+ if found.Name != rs.Primary.ID {
+ return fmt.Errorf("Addr not found")
+ }
+
+ *addr = *found
+
+ return nil
+ }
+}
+
+const testAccComputeGlobalAddress_basic = `
+resource "google_compute_global_address" "foobar" {
+ name = "terraform-test"
+}`

website/source/docs/providers/google/r/compute_global_address.html.markdown

@@ -0,0 +1,37 @@
+---
+layout: "google"
+page_title: "Google: google_compute_global_address"
+sidebar_current: "docs-google-compute-global-address"
+description: |-
+ Creates a static global IP address resource for a Google Compute Engine project.
+---
+
+# google\_compute\_global\_address
+
+Creates a static IP address resource global to a Google Compute Engine project. For more information see
+[the official documentation](https://cloud.google.com/compute/docs/instances-and-network) and
+[API](https://cloud.google.com/compute/docs/reference/latest/globalAddresses).
+
+
+## Example Usage
+
+```
+resource "google_compute_global_address" "default" {
+ name = "test-address"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `name` - (Required) A unique name for the resource, required by GCE.
+ Changing this forces a new resource to be created.
+
+## Attributes Reference
+
+The following attributes are exported:
+
+* `name` - The name of the resource.
+* `address` - The IP address that was allocated.
+* `self_link` - The URI of the created resource.

website/source/layouts/google.erb

@@ -37,6 +37,10 @@
  <a href="/docs/providers/google/r/compute_forwarding_rule.html">google_compute_forwarding_rule</a>
  </li>
 
+ <li<%= sidebar_current("docs-google-compute-global-address") %>>
+ <a href="/docs/providers/google/r/compute_global_address.html">google_compute_global_address</a>
+ </li>
+
  <li<%= sidebar_current("docs-google-compute-http-health-check") %>>
  <a href="/docs/providers/google/r/compute_http_health_check.html">google_compute_http_health_check</a>
  </li>