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

Update to Subnet support for Private Link #5200

Merged
merged 3 commits into from
Dec 18, 2019
Merged

Update to Subnet support for Private Link #5200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3313659
removed exclusive private link/service option from subnet
Dec 17, 2019
f8983ed
removed duplicate documentation for enforce_private_link_service_netw…
Dec 17, 2019
f5ed4c7
go fmt
Dec 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions azurerm/resource_arm_subnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,17 +141,15 @@ func resourceArmSubnet() *schema.Resource {
},

"enforce_private_link_endpoint_network_policies": {
Type: schema.TypeBool,
Optional: true,
ConflictsWith: []string{"enforce_private_link_service_network_policies"},
Default: false,
Type: schema.TypeBool,
Optional: true,
Default: false,
},

"enforce_private_link_service_network_policies": {
Type: schema.TypeBool,
Optional: true,
ConflictsWith: []string{"enforce_private_link_endpoint_network_policies"},
Default: false,
Type: schema.TypeBool,
Optional: true,
Default: false,
},
},
}
Expand Down
4 changes: 0 additions & 4 deletions website/docs/r/subnet.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ The following arguments are supported:

* `address_prefix` - (Required) The address prefix to use for the subnet.

* `enforce_private_link_service_network_policies` - (Optional) Enable or Disable network policies on the `private link service` in the subnet. Default is `false`.

-> **NOTE:** Network policies like network security groups (NSG) are not supported for the private link service. In order to deploy a private link service on a given subnet, an explicit disable setting is required on that subnet(e.g. `enforce_private_link_service_network_policies` = `true`). This setting is only applicable for the private link service. For other resources in the subnet, access is controlled based on Network Security Groups (NSG) security rules definition.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(note for anyone else passing through) this is removed since it's documented below: https://github.com/terraform-providers/terraform-provider-azurerm/pull/5200/files#diff-cebb216a55611aafe1034f892e79a8ffR75-R81


* `network_security_group_id` - (Optional / **Deprecated**) The ID of the Network Security Group to associate with the subnet.

-> **NOTE:** At this time Subnet `<->` Network Security Group associations need to be configured both using this field (which is now Deprecated) and using the `azurerm_subnet_network_security_group_association` resource. This field is deprecated and will be removed in favour of that resource in the next major version (2.0) of the AzureRM Provider.
Expand Down