bij1
/
terraform-provider-greenhost
19
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

r/firewall: Suppress diff for 'all' port range

This commit is contained in:
Radek Simko 2017-09-14 17:14:48 +01:00
parent 15ed8eebf8
commit 6b3fe79d0e
No known key found for this signature in database
GPG Key ID: 6823F3DCCE01BB19
2 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
digitalocean/resource_digitalocean_firewall.go
View File

@ -85,6 +85,12 @@ func resourceDigitalOceanFirewall() *schema.Resource {
"port_range": {
Type: schema.TypeString,
Optional: true,
DiffSuppressFunc: func(k, oldV, newV string, d *schema.ResourceData) bool {
if oldV == "0" && newV == "all" {
return true
}
return (oldV == newV)
},
},
"source_addresses": {
Type: schema.TypeList,
@ -122,6 +128,12 @@ func resourceDigitalOceanFirewall() *schema.Resource {
"port_range": {
Type: schema.TypeString,
Optional: true,
DiffSuppressFunc: func(k, oldV, newV string, d *schema.ResourceData) bool {
if oldV == "0" && newV == "all" {
return true
}
return (oldV == newV)
},
},
"destination_addresses": {
Type: schema.TypeList,

47
digitalocean/resource_digitalocean_firewall_test.go
View File

@ -167,6 +167,35 @@ func TestAccDigitalOceanFirewall_MultipleInboundAndOutbound(t *testing.T) {
})
}
func TestAccDigitalOceanFirewall_fullPortRange(t *testing.T) {
rName := acctest.RandString(10)
var firewall godo.Firewall
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckDigitalOceanFirewallDestroy,
Steps: []resource.TestStep{
{
Config: testAccDigitalOceanFirewallConfig_fullPortRange(rName),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckDigitalOceanFirewallExists("digitalocean_firewall.foobar", &firewall),
resource.TestCheckResourceAttr("digitalocean_firewall.foobar", "inbound_rule.#", "1"),
resource.TestCheckResourceAttr("digitalocean_firewall.foobar", "inbound_rule.0.port_range", "0"),
resource.TestCheckResourceAttr("digitalocean_firewall.foobar", "inbound_rule.0.protocol", "tcp"),
resource.TestCheckResourceAttr("digitalocean_firewall.foobar", "inbound_rule.0.source_addresses.#", "1"),
resource.TestCheckResourceAttr("digitalocean_firewall.foobar", "inbound_rule.0.source_addresses.0", "192.168.1.1/32"),
resource.TestCheckResourceAttr("digitalocean_firewall.foobar", "outbound_rule.#", "1"),
resource.TestCheckResourceAttr("digitalocean_firewall.foobar", "outbound_rule.0.port_range", "0"),
resource.TestCheckResourceAttr("digitalocean_firewall.foobar", "outbound_rule.0.protocol", "tcp"),
resource.TestCheckResourceAttr("digitalocean_firewall.foobar", "outbound_rule.0.destination_addresses.#", "1"),
resource.TestCheckResourceAttr("digitalocean_firewall.foobar", "outbound_rule.0.destination_addresses.0", "192.168.1.2/32"),
),
},
},
})
}
func TestAccDigitalOceanFirewall_ImportMultipleRules(t *testing.T) {
resourceName := "digitalocean_firewall.foobar"
rName := acctest.RandString(10)
@ -290,6 +319,24 @@ func testAccDigitalOceanFirewallConfig_MultipleInboundAndOutbound(tagName string
`, tagName, rName, tagName, tagName)
}
func testAccDigitalOceanFirewallConfig_fullPortRange(rName string) string {
return fmt.Sprintf(`
resource "digitalocean_firewall" "foobar" {
name = "%s"
inbound_rule {
protocol = "tcp"
port_range = "all"
source_addresses = ["192.168.1.1/32"]
}
outbound_rule {
protocol = "tcp"
port_range = "all"
destination_addresses = ["192.168.1.2/32"]
}
}
`, rName)
}
func testAccCheckDigitalOceanFirewallDestroy(s *terraform.State) error {
client := testAccProvider.Meta().(*godo.Client)