Skip to content

Commit

Permalink
Merge pull request #4115 from bentterp/f-subnetdelegation
Browse files Browse the repository at this point in the history
Subnet delegations and service endpoints
  • Loading branch information
tombuildsstuff authored Aug 20, 2019
2 parents 7542b59 + 8573366 commit 9afafb2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions azurerm/resource_arm_subnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,18 @@ func resourceArmSubnet() *schema.Resource {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{
"Microsoft.BareMetal/AzureVMware",
"Microsoft.BareMetal/CrayServers",
"Microsoft.Batch/batchAccounts",
"Microsoft.ContainerInstance/containerGroups",
"Microsoft.Databricks/workspaces",
"Microsoft.HardwareSecurityModules/dedicatedHSMs",
"Microsoft.Logic/integrationServiceEnvironments",
"Microsoft.Netapp/volumes",
"Microsoft.ServiceFabricMesh/networks",
"Microsoft.Sql/managedInstances",
"Microsoft.Sql/servers",
"Microsoft.Web/hostingEnvironments",
"Microsoft.Web/serverFarms",
}, false),
},
Expand Down
5 changes: 3 additions & 2 deletions website/docs/r/subnet.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ The following arguments are supported:

-> **NOTE:** At this time Subnet `<->` Route Table associations need to be configured both using this field (which is now Deprecated) and/or using the `azurerm_subnet_route_table_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.

* `service_endpoints` - (Optional) The list of Service endpoints to associate with the subnet. Possible values include: `Microsoft.AzureActiveDirectory`, `Microsoft.AzureCosmosDB`, `Microsoft.EventHub`, `Microsoft.KeyVault`, `Microsoft.ServiceBus`, `Microsoft.Sql` and `Microsoft.Storage`.
* `service_endpoints` - (Optional) The list of Service endpoints to associate with the subnet. Possible values include: `Microsoft.AzureActiveDirectory`, `Microsoft.AzureCosmosDB`, `Microsoft.ContainerRegistry`, `Microsoft.EventHub`, `Microsoft.KeyVault`, `Microsoft.ServiceBus`, `Microsoft.Sql`, `Microsoft.Storage` and `Microsoft.Web`.

* `delegation` - (Optional) One or more `delegation` blocks as defined below.

Expand All @@ -83,7 +83,8 @@ A `service_delegation` block supports the following:

-> **NOTE:** Delegating to services may not be available in all regions. Check that the service you are delegating to is available in your region using the [Azure CLI](https://docs.microsoft.com/en-us/cli/azure/network/vnet/subnet?view=azure-cli-latest#az-network-vnet-subnet-list-available-delegations)

* `name` - (Required) The name of service to delegate to. Possible values include: `Microsoft.Batch/batchAccounts`, `Microsoft.ContainerInstance/containerGroups`, `Microsoft.HardwareSecurityModules/dedicatedHSMs`, `Microsoft.Logic/integrationServiceEnvironments`, `Microsoft.Netapp/volumes`, `Microsoft.ServiceFabricMesh/networks`, `Microsoft.Sql/managedInstances`, `Microsoft.Sql/servers` or `Microsoft.Web/serverFarms`.
* `name` - (Required) The name of service to delegate to. Possible values include: `Microsoft.BareMetal/AzureVMware`,
`Microsoft.BareMetal/CrayServers`, `Microsoft.Batch/batchAccounts`, `Microsoft.ContainerInstance/containerGroups`, `Microsoft.Databricks/workspaces`, `Microsoft.HardwareSecurityModules/dedicatedHSMs`, `Microsoft.Logic/integrationServiceEnvironments`, `Microsoft.Netapp/volumes`, `Microsoft.ServiceFabricMesh/networks`, `Microsoft.Sql/managedInstances`, `Microsoft.Sql/servers`, `Microsoft.Web/hostingEnvironments` or `Microsoft.Web/serverFarms`.
* `actions` - (Optional) A list of Actions which should be delegated. Possible values include: `Microsoft.Network/virtualNetworks/subnets/action`.

## Attributes Reference
Expand Down

0 comments on commit 9afafb2

Please sign in to comment.