Skip to content

Commit

Permalink
Give addresses beta support, add internal addresses.
Browse files Browse the repository at this point in the history 
Update the `google_compute_address` resource to take advantage of
differing API versions. Use this new functionality to support internal
reserved IP addresses. Fixes #366.
  • Loading branch information
@paddycarver @radeksimko
paddycarver authored and radeksimko committed Oct 8, 2017
1 parent 888df75 commit 2889551
Show file tree
Hide file tree
Showing 2 changed files with 172 additions and 19 deletions.
119 changes: 100 additions & 19 deletions google/resource_compute_address.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,23 @@ import (
"fmt"
"log"

"github.com/hashicorp/terraform/helper/schema"
"google.golang.org/api/compute/v1"
"regexp"
"strings"

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
computeBeta "google.golang.org/api/compute/v0.beta"
"google.golang.org/api/compute/v1"
)

var (
computeAddressIdTemplate = "projects/%s/regions/%s/addresses/%s"
computeAddressLinkRegex = regexp.MustCompile("projects/(.+)/regions/(.+)/addresses/(.+)$")
AddressBaseApiVersion = v1
AddressVersionedFeatures = []Feature{
{Version: v0beta, Item: "address_type"},
{Version: v0beta, Item: "subnetwork"},
}
)

func resourceComputeAddress() *schema.Resource {
Expand All @@ -34,6 +42,21 @@ func resourceComputeAddress() *schema.Resource {
ForceNew: true,
},

"address_type": &schema.Schema{
Type: schema.TypeString,
Optional: true,
ForceNew: true,
ValidateFunc: validation.StringInSlice(
[]string{"INTERNAL", "EXTERNAL"}, false),
},

"subnetwork": &schema.Schema{
Type: schema.TypeString,
Optional: true,
ForceNew: true,
DiffSuppressFunc: linkDiffSuppress,
},

"address": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Expand Down Expand Up @@ -61,6 +84,7 @@ func resourceComputeAddress() *schema.Resource {
}

func resourceComputeAddressCreate(d *schema.ResourceData, meta interface{}) error {
computeApiVersion := getComputeApiVersion(d, AddressBaseApiVersion, AddressVersionedFeatures)
config := meta.(*Config)

region, err := getRegion(d, config)
Expand All @@ -74,11 +98,36 @@ func resourceComputeAddressCreate(d *schema.ResourceData, meta interface{}) erro
}

// Build the address parameter
addr := &compute.Address{Name: d.Get("name").(string)}
op, err := config.clientCompute.Addresses.Insert(
project, region, addr).Do()
if err != nil {
return fmt.Errorf("Error creating address: %s", err)
addr := &computeBeta.Address{
Name: d.Get("name").(string),
AddressType: d.Get("address_type").(string),
Subnetwork: d.Get("subnetwork").(string),
}

var op interface{}
switch computeApiVersion {
case v1:
v1Address := &compute.Address{}
err = Convert(addr, v1Address)
if err != nil {
return err
}
op, err = config.clientCompute.Addresses.Insert(
project, region, v1Address).Do()
if err != nil {
return fmt.Errorf("Error creating address: %s", err)
}
case v0beta:
v0BetaAddress := &computeBeta.Address{}
err = Convert(addr, v0BetaAddress)
if err != nil {
return err
}
op, err = config.clientComputeBeta.Addresses.Insert(
project, region, v0BetaAddress).Do()
if err != nil {
return fmt.Errorf("Error creating address: %s", err)
}
}

// It probably maybe worked, so store the ID now
Expand All @@ -88,7 +137,7 @@ func resourceComputeAddressCreate(d *schema.ResourceData, meta interface{}) erro
Name: addr.Name,
}.canonicalId())

err = computeOperationWait(config, op, project, "Creating Address")
err = computeSharedOperationWait(config, op, project, "Creating Address")
if err != nil {
return err
}
Expand All @@ -97,17 +146,38 @@ func resourceComputeAddressCreate(d *schema.ResourceData, meta interface{}) erro
}

func resourceComputeAddressRead(d *schema.ResourceData, meta interface{}) error {
computeApiVersion := getComputeApiVersion(d, AddressBaseApiVersion, AddressVersionedFeatures)
config := meta.(*Config)

addressId, err := parseComputeAddressId(d.Id(), config)
if err != nil {
return err
}

addr, err := config.clientCompute.Addresses.Get(
addressId.Project, addressId.Region, addressId.Name).Do()
if err != nil {
return handleNotFoundError(err, d, fmt.Sprintf("Address %q", d.Get("name").(string)))
addr := &computeBeta.Address{}
switch computeApiVersion {
case v1:
v1Address, err := config.clientCompute.Addresses.Get(
addressId.Project, addressId.Region, addressId.Name).Do()
if err != nil {
return handleNotFoundError(err, d, fmt.Sprintf("Address %q", d.Get("name").(string)))
}

err = Convert(v1Address, addr)
if err != nil {
return err
}
case v0beta:
v0BetaAddr, err := config.clientComputeBeta.Addresses.Get(
addressId.Project, addressId.Region, addressId.Name).Do()
if err != nil {
return handleNotFoundError(err, d, fmt.Sprintf("Address %q", d.Get("name").(string)))
}

err = Convert(v0BetaAddr, addr)
if err != nil {
return err
}
}

d.Set("address", addr.Address)
Expand All @@ -119,22 +189,33 @@ func resourceComputeAddressRead(d *schema.ResourceData, meta interface{}) error
}

func resourceComputeAddressDelete(d *schema.ResourceData, meta interface{}) error {
computeApiVersion := getComputeApiVersion(d, AddressBaseApiVersion, AddressVersionedFeatures)
config := meta.(*Config)

addressId, err := parseComputeAddressId(d.Id(), config)
if err != nil {
return err
}

// Delete the address
log.Printf("[DEBUG] address delete request")
op, err := config.clientCompute.Addresses.Delete(
addressId.Project, addressId.Region, addressId.Name).Do()
if err != nil {
return fmt.Errorf("Error deleting address: %s", err)
var op interface{}
switch computeApiVersion {
case v1:
// Delete the address
log.Printf("[DEBUG] address delete request")
op, err = config.clientCompute.Addresses.Delete(
addressId.Project, addressId.Region, addressId.Name).Do()
if err != nil {
return fmt.Errorf("Error deleting address: %s", err)
}
case v0beta:
op, err = config.clientComputeBeta.Addresses.Delete(
addressId.Project, addressId.Region, addressId.Name).Do()
if err != nil {
return fmt.Errorf("Error deleting address: %s", err)
}
}

err = computeOperationWait(config, op, addressId.Project, "Deleting Address")
err = computeSharedOperationWait(config, op, addressId.Project, "Deleting Address")
if err != nil {
return err
}
Expand Down
72 changes: 72 additions & 0 deletions google/resource_compute_address_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
computeBeta "google.golang.org/api/compute/v0.beta"
"google.golang.org/api/compute/v1"
)

Expand Down Expand Up @@ -93,6 +94,27 @@ func TestAccComputeAddress_basic(t *testing.T) {
})
}

func TestAccComputeAddress_internal(t *testing.T) {
var addr computeBeta.Address

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeAddressDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccComputeAddress_internal,
Check: resource.ComposeTestCheckFunc(
testAccCheckComputeBetaAddressExists(
"google_compute_address.foobar", &addr),
resource.TestCheckResourceAttr(
"google_compute_address.foobar", "address_type", "INTERNAL"),
),
},
},
})
}

func testAccCheckComputeAddressDestroy(s *terraform.State) error {
config := testAccProvider.Meta().(*Config)

Expand Down Expand Up @@ -144,7 +166,57 @@ func testAccCheckComputeAddressExists(n string, addr *compute.Address) resource.
}
}

func testAccCheckComputeBetaAddressExists(n string, addr *computeBeta.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)

addressId, err := parseComputeAddressId(rs.Primary.ID, nil)

found, err := config.clientComputeBeta.Addresses.Get(
config.Project, addressId.Region, addressId.Name).Do()
if err != nil {
return err
}

if found.Name != addressId.Name {
return fmt.Errorf("Addr not found")
}

*addr = *found

return nil
}
}

var testAccComputeAddress_basic = fmt.Sprintf(`
resource "google_compute_address" "foobar" {
name = "address-test-%s"
}`, acctest.RandString(10))

var testAccComputeAddress_internal = fmt.Sprintf(`
resource "google_compute_network" "default" {
name = "network-test-%s"
}
resource "google_compute_subnetwork" "foo" {
name = "subnetwork-test-%s"
ip_cidr_range = "10.0.0.0/16"
region = "us-east1"
network = "${google_compute_network.default.self_link}"
}
resource "google_compute_address" "foobar" {
name = "address-test-%s"
subnetwork = "${google_compute_subnetwork.foo.self_link}"
address_type = "INTERNAL"
region = "us-east1"
}`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10))

0 comments on commit 2889551

Please sign in to comment.