Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

azurerm_app_service Added support for Action of Allow or Deny in ip_restriction. #6967

Merged
merged 6 commits into from May 20, 2020
Merged

azurerm_app_service Added support for Action of Allow or Deny in ip_restriction. #6967

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ff82716
Support for Action of Allow or Deny in ip_restriction
SebRosander May 16, 2020
3f39bbe
Added verification for datatest
SebRosander May 16, 2020
f996d02
Updates
SebRosander May 16, 2020
c005c41
Update app_service.html.markdown
katbyte May 20, 2020
21c3880
Update app_service.html.markdown
katbyte May 20, 2020
b5edf31
Update azurerm/helpers/azure/app_service.go
katbyte May 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 23 additions & 0 deletions azurerm/helpers/azure/app_service.go
View file
Open in desktop
Expand Up @@ -328,6 +328,15 @@ func SchemaAppServiceSiteConfig() *schema.Schema {
Computed: true,
ValidateFunc: validation.IntBetween(1, 2147483647),
},
"action": {
Type: schema.TypeString,
Default: "Allow",
Optional: true,
ValidateFunc: validation.StringInSlice([]string{
"Allow",
"Deny",
}, true),
katbyte marked this conversation as resolved.
Show resolved Hide resolved
},
},
},
},
Expand Down Expand Up @@ -705,6 +714,10 @@ func SchemaAppServiceDataSourceSiteConfig() *schema.Schema {
Type: schema.TypeInt,
Computed: true,
},
"action": {
Type: schema.TypeString,
Computed: true,
},
},
},
},
Expand Down Expand Up @@ -1452,6 +1465,7 @@ func ExpandAppServiceSiteConfig(input interface{}) (*web.SiteConfig, error) {
vNetSubnetID := restriction["virtual_network_subnet_id"].(string)
name := restriction["name"].(string)
priority := restriction["priority"].(int)
action := restriction["action"].(string)
if vNetSubnetID != "" && ipAddress != "" {
return siteConfig, fmt.Errorf(fmt.Sprintf("only one of `ip_address` or `virtual_network_subnet_id` can be set for `site_config.0.ip_restriction.%d`", i))
}
Expand Down Expand Up @@ -1481,6 +1495,10 @@ func ExpandAppServiceSiteConfig(input interface{}) (*web.SiteConfig, error) {
ipSecurityRestriction.Priority = utils.Int32(int32(priority))
}

if action != "" {
ipSecurityRestriction.Action = &action
}

restrictions = append(restrictions, ipSecurityRestriction)
}
siteConfig.IPSecurityRestrictions = &restrictions
Expand Down Expand Up @@ -1615,6 +1633,11 @@ func FlattenAppServiceSiteConfig(input *web.SiteConfig) []interface{} {
if priority := v.Priority; priority != nil {
block["priority"] = *priority
}

if action := v.Action; action != nil {
block["action"] = *action
}

restrictions = append(restrictions, block)
}
}
Expand Down
1 change: 1 addition & 0 deletions azurerm/internal/services/web/tests/data_source_app_service_test.go
View file
Open in desktop
Expand Up @@ -139,6 +139,7 @@ func TestAccDataSourceAzureRMAppService_ipRestriction(t *testing.T) {
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.ip_address", "10.10.10.10/32"),
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.name", "test-restriction"),
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.priority", "123"),
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.action", "Allow"),
),
},
},
Expand Down
9 changes: 9 additions & 0 deletions azurerm/internal/services/web/tests/resource_arm_app_service_test.go
View file
Open in desktop
Expand Up @@ -507,6 +507,7 @@ func TestAccAzureRMAppService_oneIpRestriction(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMAppServiceExists(data.ResourceName),
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.ip_address", "10.10.10.10/32"),
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.action", "Allow"),
),
},
data.ImportStep(),
Expand All @@ -529,6 +530,7 @@ func TestAccAzureRMAppService_completeIpRestriction(t *testing.T) {
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.ip_address", "10.10.10.10/32"),
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.name", "test-restriction"),
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.priority", "123"),
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.action", "Allow"),
),
},
data.ImportStep(),
Expand All @@ -540,9 +542,11 @@ func TestAccAzureRMAppService_completeIpRestriction(t *testing.T) {
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.ip_address", "10.10.10.10/32"),
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.name", "test-restriction"),
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.priority", "123"),
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.action", "Allow"),
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.1.ip_address", "20.20.20.0/24"),
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.1.name", "test-restriction-2"),
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.1.priority", "1234"),
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.1.action", "Deny"),
),
},
data.ImportStep(),
Expand All @@ -554,6 +558,7 @@ func TestAccAzureRMAppService_completeIpRestriction(t *testing.T) {
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.ip_address", "10.10.10.10/32"),
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.name", "test-restriction"),
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.priority", "123"),
resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.action", "Allow"),
),
},
data.ImportStep(),
Expand Down Expand Up @@ -2643,6 +2648,7 @@ resource "azurerm_app_service" "test" {
site_config {
ip_restriction {
ip_address = "10.10.10.10/32"
action = "Allow"
}
}
}
Expand Down Expand Up @@ -2682,6 +2688,7 @@ resource "azurerm_app_service" "test" {
ip_address = "10.10.10.10/32"
name = "test-restriction"
priority = 123
action = "Allow"
}
}
}
Expand Down Expand Up @@ -2721,12 +2728,14 @@ resource "azurerm_app_service" "test" {
ip_address = "10.10.10.10/32"
name = "test-restriction"
priority = 123
action = "Allow"
}

ip_restriction {
ip_address = "20.20.20.0/24"
name = "test-restriction-2"
priority = 1234
action = "Deny"
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions website/docs/d/app_service.html.markdown
View file
Open in desktop
Expand Up @@ -89,6 +89,8 @@ A `ip_restriction` block exports the following:

* `priority` - The priority for this IP Restriction.

* `action` - Does this restriction `Allow` or `Deny` access for this IP range?

---

`site_config` supports the following:
Expand Down
2 changes: 2 additions & 0 deletions website/docs/r/app_service.html.markdown
View file
Open in desktop
Expand Up @@ -319,6 +319,8 @@ A `ip_restriction` block supports the following:

* `priority` - (Optional) The priority for this IP Restriction. Restrictions are enforced in priority order. By default, priority is set to 65000 if not specified.

* `action` - (Optional) Does this restriction `Allow` or `Deny` access for this IP range. Defaults to `Allow`.

---

A `microsoft` block supports the following:
Expand Down