From 83fc8329aecfddcc96e8f7b4fbf3453f56a5358d Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 30 Oct 2018 16:26:58 +0000 Subject: [PATCH] Documentation fixes / making `availability_set_id` conflict with `zones` (#2185) * azurerm_subnet: listing all the possible subnet endpoints Fixes #2144 * Availability Zones are now out of preview * vm: Availability Set ID now conflicts with Zones * Fixing the linting --- azurerm/resource_arm_eventhub_namespace.go | 2 +- azurerm/resource_arm_managed_disk.go | 2 +- azurerm/resource_arm_virtual_machine.go | 1 + website/docs/d/managed_disk.html.markdown | 6 ++---- website/docs/r/loadbalancer.html.markdown | 2 +- website/docs/r/managed_disk.html.markdown | 2 +- website/docs/r/public_ip.html.markdown | 2 +- website/docs/r/subnet.html.markdown | 2 +- website/docs/r/virtual_machine.html.markdown | 2 +- website/docs/r/virtual_machine_scale_set.html.markdown | 6 +++--- 10 files changed, 13 insertions(+), 14 deletions(-) diff --git a/azurerm/resource_arm_eventhub_namespace.go b/azurerm/resource_arm_eventhub_namespace.go index 62aeacbacaa2..260ee9433478 100644 --- a/azurerm/resource_arm_eventhub_namespace.go +++ b/azurerm/resource_arm_eventhub_namespace.go @@ -3,7 +3,6 @@ package azurerm import ( "context" "fmt" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "log" "strconv" "time" @@ -14,6 +13,7 @@ import ( "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) diff --git a/azurerm/resource_arm_managed_disk.go b/azurerm/resource_arm_managed_disk.go index d4511382ef0a..5c9682dfafd7 100644 --- a/azurerm/resource_arm_managed_disk.go +++ b/azurerm/resource_arm_managed_disk.go @@ -2,7 +2,6 @@ package azurerm import ( "fmt" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "log" "strings" @@ -10,6 +9,7 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) diff --git a/azurerm/resource_arm_virtual_machine.go b/azurerm/resource_arm_virtual_machine.go index a5fad7973b86..d38d168ccff2 100644 --- a/azurerm/resource_arm_virtual_machine.go +++ b/azurerm/resource_arm_virtual_machine.go @@ -74,6 +74,7 @@ func resourceArmVirtualMachine() *schema.Resource { StateFunc: func(id interface{}) string { return strings.ToLower(id.(string)) }, + ConflictsWith: []string{"zones"}, }, "identity": { diff --git a/website/docs/d/managed_disk.html.markdown b/website/docs/d/managed_disk.html.markdown index 82787af00c9f..5bbe55038954 100644 --- a/website/docs/d/managed_disk.html.markdown +++ b/website/docs/d/managed_disk.html.markdown @@ -100,8 +100,8 @@ resource "azurerm_virtual_machine" "test" { ## Argument Reference * `name` - (Required) Specifies the name of the Managed Disk. -* `resource_group_name` - (Required) Specifies the name of the resource group. +* `resource_group_name` - (Required) Specifies the name of the resource group. ## Attributes Reference @@ -111,6 +111,4 @@ resource "azurerm_virtual_machine" "test" { * `os_type` - The operating system for managed disk. Valid values are `Linux` or `Windows` * `disk_size_gb` - The size of the managed disk in gigabytes. * `tags` - A mapping of tags assigned to the resource. -* `zones` - (Optional) A collection containing the availability zone the managed disk is allocated in. - --> **Please Note**: Availability Zones are [in Preview and only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview) - as such you must be opted into the Preview to use this functionality. You can [opt into the Availability Zones Preview in the Azure Portal](http://aka.ms/azenroll). +* `zones` - A collection containing the availability zone the managed disk is allocated in. diff --git a/website/docs/r/loadbalancer.html.markdown b/website/docs/r/loadbalancer.html.markdown index 6d1011f733ff..9052d13619a8 100644 --- a/website/docs/r/loadbalancer.html.markdown +++ b/website/docs/r/loadbalancer.html.markdown @@ -58,7 +58,7 @@ The following arguments are supported: * `public_ip_address_id` - (Optional) Reference to Public IP address to be associated with the Load Balancer. * `zones` - (Optional) A collection containing the availability zone to allocate the IP in. --> **Please Note**: Availability Zones are [in Preview and only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview) - as such you must be opted into the Preview to use this functionality. You can [opt into the Availability Zones Preview in the Azure Portal](http://aka.ms/azenroll). +-> **Please Note**: Availability Zones are [only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview). ## Attributes Reference diff --git a/website/docs/r/managed_disk.html.markdown b/website/docs/r/managed_disk.html.markdown index b4fad3652356..fb893b59278c 100644 --- a/website/docs/r/managed_disk.html.markdown +++ b/website/docs/r/managed_disk.html.markdown @@ -108,7 +108,7 @@ The following arguments are supported: * `zones` - (Optional) A collection containing the availability zone to allocate the Managed Disk in. --> **Please Note**: Availability Zones are [in Preview and only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview) - as such you must be opted into the Preview to use this functionality. You can [opt into the Availability Zones Preview in the Azure Portal](http://aka.ms/azenroll). +-> **Please Note**: Availability Zones are [only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview). For more information on managed disks, such as sizing options and pricing, please check out the [azure documentation](https://docs.microsoft.com/en-us/azure/storage/storage-managed-disks-overview). diff --git a/website/docs/r/public_ip.html.markdown b/website/docs/r/public_ip.html.markdown index 8f5df3f4d488..d505dc972b42 100644 --- a/website/docs/r/public_ip.html.markdown +++ b/website/docs/r/public_ip.html.markdown @@ -66,7 +66,7 @@ The following arguments are supported: * `zones` - (Optional) A collection containing the availability zone to allocate the Public IP in. --> **Please Note**: Availability Zones are [in Preview and only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview) - as such you must be opted into the Preview to use this functionality. You can [opt into the Availability Zones Preview in the Azure Portal](http://aka.ms/azenroll). +-> **Please Note**: Availability Zones are [only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview). ## Attributes Reference diff --git a/website/docs/r/subnet.html.markdown b/website/docs/r/subnet.html.markdown index a703e5fab301..514b64d6a88f 100644 --- a/website/docs/r/subnet.html.markdown +++ b/website/docs/r/subnet.html.markdown @@ -58,7 +58,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.Storage`, `Microsoft.Sql`. +* `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`. ## Attributes Reference diff --git a/website/docs/r/virtual_machine.html.markdown b/website/docs/r/virtual_machine.html.markdown index 8d4664c2eb72..1fa9fce3d172 100644 --- a/website/docs/r/virtual_machine.html.markdown +++ b/website/docs/r/virtual_machine.html.markdown @@ -144,7 +144,7 @@ The following arguments are supported: * `zones` - (Optional) A list of a single item of the Availability Zone which the Virtual Machine should be allocated in. --> **Please Note**: Availability Zones are [in Preview and only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview) - as such you must be opted into the Preview to use this functionality. You can [opt into the Availability Zones Preview in the Azure Portal](http://aka.ms/azenroll). +-> **Please Note**: Availability Zones are [only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview). For more information on the different example configurations, please check out the [Azure documentation](https://docs.microsoft.com/en-gb/rest/api/compute/virtualmachines/createorupdate#examples) diff --git a/website/docs/r/virtual_machine_scale_set.html.markdown b/website/docs/r/virtual_machine_scale_set.html.markdown index ae8d17d39c90..b231661bf74c 100644 --- a/website/docs/r/virtual_machine_scale_set.html.markdown +++ b/website/docs/r/virtual_machine_scale_set.html.markdown @@ -98,10 +98,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { max_unhealthy_upgraded_instance_percent = 5 pause_time_between_batches = "PT0S" } - + # required when using rolling upgrade policy health_probe_id = "${azurerm_lb_probe.test.id}" - + sku { name = "Standard_F2" @@ -290,7 +290,7 @@ The following arguments are supported: * `tags` - (Optional) A mapping of tags to assign to the resource. * `zones` - (Optional) A collection of availability zones to spread the Virtual Machines over. --> **Please Note**: Availability Zones are [in Preview and only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview) - as such you must be opted into the Preview to use this functionality. You can [opt into the Availability Zones Preview in the Azure Portal](http://aka.ms/azenroll). +-> **Please Note**: Availability Zones are [only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview). `sku` supports the following: