Skip to content

Commit

Permalink
Remove the long-deprecated space trusted_ip_ranges attribute (#307)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mars
mars authored May 10, 2021
1 parent cfb547c commit 573d4d0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 141 deletions.
2 changes: 0 additions & 2 deletions heroku/data_source_heroku_app_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ resource "heroku_space" "foobar" {
name = "%s"
organization = "%s"
region = "virginia"
trusted_ip_ranges = [ "0.0.0.0/0" ]
}
resource "heroku_app" "foobar" {
Expand All @@ -148,7 +147,6 @@ resource "heroku_space" "foobar" {
name = "%s"
organization = "%s"
region = "virginia"
trusted_ip_ranges = [ "0.0.0.0/0" ]
}
resource "heroku_app" "foobar" {
Expand Down
10 changes: 1 addition & 9 deletions heroku/data_source_heroku_space.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,6 @@ func dataSourceHerokuSpace() *schema.Resource {
Type: schema.TypeBool,
Computed: true,
},

"trusted_ip_ranges": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
},
}
}
Expand All @@ -77,7 +69,7 @@ func dataSourceHerokuSpaceRead(d *schema.ResourceData, m interface{}) error {
return err
}

space := spaceRaw.(*spaceWithRanges)
space := spaceRaw.(*spaceWithNAT)

d.SetId(name)
d.Set("state", space.State)
Expand Down
84 changes: 4 additions & 80 deletions heroku/resource_heroku_space.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ import (
heroku "github.com/heroku/heroku-go/v5"
)

type spaceWithRanges struct {
type spaceWithNAT struct {
heroku.Space
TrustedIPRanges []string
NAT heroku.SpaceNAT
NAT heroku.SpaceNAT
}

func resourceHerokuSpace() *schema.Resource {
Expand Down Expand Up @@ -74,17 +73,6 @@ func resourceHerokuSpace() *schema.Resource {
Default: false,
ForceNew: true,
},

"trusted_ip_ranges": {
Type: schema.TypeSet,
Computed: true,
Optional: true,
MinItems: 0,
Deprecated: "This attribute is deprecated in favor of heroku_space_inbound_ruleset. Using both at the same time will likely cause unexpected behavior.",
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
},
}
}
Expand Down Expand Up @@ -140,32 +128,6 @@ func resourceHerokuSpaceCreate(d *schema.ResourceData, meta interface{}) error {
return fmt.Errorf("Error waiting for Space (%s) to become available: %s", d.Id(), err)
}

if ranges, ok := d.GetOk("trusted_ip_ranges"); ok {
ips := ranges.(*schema.Set)

var rules []*struct {
Action string `json:"action" url:"action,key"`
Source string `json:"source" url:"source,key"`
}

for _, r := range ips.List() {
rules = append(rules, &struct {
Action string `json:"action" url:"action,key"`
Source string `json:"source" url:"source,key"`
}{
Action: "allow",
Source: r.(string),
})
}

opts := heroku.InboundRulesetCreateOpts{Rules: rules}
_, err := client.InboundRulesetCreate(context.TODO(), space.ID, opts)
if err != nil {
return fmt.Errorf("Error creating Trusted IP Ranges for Space (%s): %s", space.ID, err)
}
log.Printf("[DEBUG] Set Trusted IP Ranges to %s for Space %s", ips.List(), d.Id())
}

config := meta.(*Config)
time.Sleep(time.Duration(config.PostSpaceCreateDelay) * time.Second)

Expand All @@ -180,12 +142,11 @@ func resourceHerokuSpaceRead(d *schema.ResourceData, meta interface{}) error {
return err
}

space := spaceRaw.(*spaceWithRanges)
space := spaceRaw.(*spaceWithNAT)

d.Set("name", space.Name)
d.Set("organization", space.Organization.Name)
d.Set("region", space.Region.Name)
d.Set("trusted_ip_ranges", space.TrustedIPRanges)
d.Set("outbound_ips", space.NAT.Sources)
d.Set("shield", space.Shield)
d.Set("cidr", space.CIDR)
Expand All @@ -209,31 +170,6 @@ func resourceHerokuSpaceUpdate(d *schema.ResourceData, meta interface{}) error {
}
}

if d.HasChange("trusted_ip_ranges") {
var rules []*struct {
Action string `json:"action" url:"action,key"`
Source string `json:"source" url:"source,key"`
}
ranges := d.Get("trusted_ip_ranges").(*schema.Set)
for _, r := range ranges.List() {
rules = append(rules, &struct {
Action string `json:"action" url:"action,key"`
Source string `json:"source" url:"source,key"`
}{
Action: "allow",
Source: r.(string),
})
}

opts := heroku.InboundRulesetCreateOpts{Rules: rules}
_, err := client.InboundRulesetCreate(context.TODO(), d.Id(), opts)
if err != nil {
return fmt.Errorf("Error creating Trusted IP Ranges for Space (%s): %s", d.Id(), err)
}

d.Set("trusted_ip_ranges", ranges)
}

return nil
}

Expand All @@ -260,7 +196,7 @@ func SpaceStateRefreshFunc(client *heroku.Service, id string) resource.StateRefr
return nil, "", err
}

s := spaceWithRanges{
s := spaceWithNAT{
Space: *space,
}

Expand All @@ -269,25 +205,13 @@ func SpaceStateRefreshFunc(client *heroku.Service, id string) resource.StateRefr
return &s, space.State, nil
}

ruleset, err := client.InboundRulesetCurrent(context.TODO(), id)
if err != nil {
log.Printf("[DEBUG] %s (%s)", err, id)
return nil, "", err
}

s.TrustedIPRanges = make([]string, len(ruleset.Rules))
for i, r := range ruleset.Rules {
s.TrustedIPRanges[i] = r.Source
}

nat, err := client.SpaceNATInfo(context.TODO(), id)
if err != nil {
return nil, "", err
}
s.NAT = *nat

log.Printf("[DEBUG] Outbound NAT IPs: %s (%s)", s.NAT.Sources, id)
log.Printf("[DEBUG] Trusted IP ranges: %s (%s)", s.TrustedIPRanges, id)

return &s, space.State, nil
}
Expand Down
50 changes: 0 additions & 50 deletions heroku/resource_heroku_space_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package heroku
import (
"context"
"fmt"
"strings"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
Expand All @@ -30,7 +29,6 @@ func TestAccHerokuSpace_Basic(t *testing.T) {
Config: testAccCheckHerokuSpaceConfig_basic(spaceName, org),
Check: resource.ComposeTestCheckFunc(
testAccCheckHerokuSpaceExists("heroku_space.foobar", &space),
resource.TestCheckResourceAttr("heroku_space.foobar", "trusted_ip_ranges.#", "2"),
testAccCheckHerokuSpaceAttributes(&space, spaceName),
resource.TestCheckResourceAttrSet(
"heroku_space.foobar", "outbound_ips.#"),
Expand Down Expand Up @@ -73,38 +71,6 @@ func TestAccHerokuSpace_Shield(t *testing.T) {
})
}

func TestAccHerokuSpace_IPRange(t *testing.T) {
var space heroku.Space
spaceName := fmt.Sprintf("tftest1-%s", acctest.RandString(10))
org := testAccConfig.GetAnyOrganizationOrSkip(t)

resource.Test(t, resource.TestCase{
PreCheck: func() {
testAccPreCheck(t)
},
Providers: testAccProviders,
CheckDestroy: testAccCheckHerokuSpaceDestroy,
Steps: []resource.TestStep{
{
ResourceName: "heroku_space.foobar",
Config: testAccCheckHerokuSpaceConfig_iprange(spaceName, org, []string{"8.8.8.8/32"}),
Check: resource.ComposeTestCheckFunc(
testAccCheckHerokuSpaceExists("heroku_space.foobar", &space),
resource.TestCheckResourceAttr("heroku_space.foobar", "trusted_ip_ranges.#", "1"),
),
},
{
ResourceName: "heroku_space.foobar",
Config: testAccCheckHerokuSpaceConfig_iprange(spaceName, org, []string{"8.8.8.8/32", "8.8.8.0/24"}),
Check: resource.ComposeTestCheckFunc(
testAccCheckHerokuSpaceExists("heroku_space.foobar", &space),
resource.TestCheckResourceAttr("heroku_space.foobar", "trusted_ip_ranges.#", "2"),
),
},
},
})
}

func TestAccHerokuSpace_CIDRs(t *testing.T) {
var space heroku.Space
spaceName := fmt.Sprintf("tfcidrtest-%s", acctest.RandString(10))
Expand Down Expand Up @@ -143,10 +109,6 @@ resource "heroku_space" "foobar" {
name = "%s"
organization = "%s"
region = "virginia"
trusted_ip_ranges = [
"8.8.8.8/32",
"8.8.8.0/24",
]
}
`, spaceName, orgName)
}
Expand All @@ -162,18 +124,6 @@ resource "heroku_space" "foobar" {
`, spaceName, orgName)
}

func testAccCheckHerokuSpaceConfig_iprange(spaceName, orgName string, ips []string) string {
ipsStr := fmt.Sprintf("\"%s\"", strings.Join(ips, "\", \""))
return fmt.Sprintf(`
resource "heroku_space" "foobar" {
name = "%s"
organization = "%s"
region = "virginia"
trusted_ip_ranges = [%s]
}
`, spaceName, orgName, ipsStr)
}

func testAccCheckHerokuSpaceConfig_cidr(spaceName, orgName string, cidr string) string {
return fmt.Sprintf(`
resource "heroku_space" "foobar" {
Expand Down

0 comments on commit 573d4d0

Please sign in to comment.