From 4b1ceaed7573160dfca192e841a8714a9aca7a4f Mon Sep 17 00:00:00 2001 From: Matthew Sanabria <24284972+sudomateo@users.noreply.github.com> Date: Wed, 23 Oct 2019 12:47:21 -0400 Subject: [PATCH 1/7] Adding nil check when length greater than zero --- azurerm/resource_arm_kubernetes_cluster.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/resource_arm_kubernetes_cluster.go b/azurerm/resource_arm_kubernetes_cluster.go index 1eef2e794980..4b3b64c4e275 100644 --- a/azurerm/resource_arm_kubernetes_cluster.go +++ b/azurerm/resource_arm_kubernetes_cluster.go @@ -1641,7 +1641,7 @@ func flattenAzureRmKubernetesClusterServicePrincipalProfile(profile *containerse val = v.List() } - if len(val) > 0 { + if len(val) > 0 && val[0] != nil { raw := val[0].(map[string]interface{}) clientSecret = raw["client_secret"].(string) } From d88cea3396d509d4bb677da9c31e1d09061fbf15 Mon Sep 17 00:00:00 2001 From: mattiabaruffi <50654456+mattiabaruffi@users.noreply.github.com> Date: Thu, 24 Oct 2019 11:38:08 +0200 Subject: [PATCH 2/7] missing _ in module name --- website/docs/r/front_door.html.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/docs/r/front_door.html.markdown b/website/docs/r/front_door.html.markdown index 4d81863c5845..57caef52604e 100644 --- a/website/docs/r/front_door.html.markdown +++ b/website/docs/r/front_door.html.markdown @@ -1,12 +1,12 @@ --- layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_frontdoor" +page_title: "Azure Resource Manager: azurerm_front_door" sidebar_current: "docs-azurerm-resource-front-door" description: |- Manages an Azure Front Door instance. --- -# azurerm_frontdoor +# azurerm_front_door Manages an Azure Front Door instance. @@ -20,7 +20,7 @@ Below are some of the key scenarios that Azure Front Door Service addresses: ## Example Usage ```hcl -resource "azurerm_frontdoor" "example" { +resource "azurerm_front_door" "example" { name = "example-FrontDoor" location = "${azurerm_resource_group.example.location}" resource_group_name = "${azurerm_resource_group.example.name}" From 19adfc1ff48d204aadb6bdca83458f18990bc167 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Thu, 24 Oct 2019 16:04:27 +0200 Subject: [PATCH 3/7] updating to include #4697 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e00899101ed..71ea599fe8d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ BUG FIXES: * `azurerm_api_management` - deprecate the `disable_backend_ssl30`, `disable_backend_tls10`, `disable_backend_tls11`, `disable_triple_des_ciphers`, `disable_frontend_ssl30`, `disable_frontend_tls10`, `disable_frontend_tls11` properties as `true` actually meant enable in favour of `enable_backend_ssl30`, `enable_backend_tls10`, `enable_backend_tls11`, `enable_triple_des_ciphers`, `enable_frontend_ssl30`, `enable_frontend_tls10`, `enable_frontend_tls11` [GH-4534] * `azurerm_devspace_controller`: the `host_suffix` field is now read-only due to a change in Azure [GH-4597] * `azurerm_key_vault_certificate` - switches the `emails`, `dns_names `, `upns` of the `subject_alternative_names` property to use `TypeSet` [GH-4645] +* `azurerm_kubernetes_cluster` - fixing a crash when the `service_principal_profile` block was nil [GH-4697] * `azurerm_kubernetes_cluster` - the `log_analytics_workspace_id` property is now optional [GH-4513] * `azurerm_media_services_account` - fixes the `invalid address to set: []string{"tags"}` error [GH-4537] * `azurerm_monitor_activity_log_alert` - fixing support for the category `ServiceHealth` [GH-4646] From 45731d542cc0a8385e9d0e695521e6ccabdcc00a Mon Sep 17 00:00:00 2001 From: Eugene Chuvyrov Date: Thu, 24 Oct 2019 10:02:09 -0700 Subject: [PATCH 4/7] Added Terraform Azure Partner ID (#4663) --- azurerm/internal/common/client_options.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/common/client_options.go b/azurerm/internal/common/client_options.go index fdd8ec05f7d1..4a4feeebc9cd 100644 --- a/azurerm/internal/common/client_options.go +++ b/azurerm/internal/common/client_options.go @@ -63,9 +63,13 @@ func setUserAgent(client *autorest.Client, tfVersion, partnerID string) { client.UserAgent = fmt.Sprintf("%s %s", client.UserAgent, azureAgent) } - if partnerID != "" { - client.UserAgent = fmt.Sprintf("%s pid-%s", client.UserAgent, partnerID) + // only one pid can be interpreted currently + // hence, send partner ID if present, otherrwise send Terraform GUID + if partnerID == "" { + // Microsoft’s Terraform Partner ID is this specific GUID + partnerID = "222c6c49-1b0a-5959-a213-6608f9eb8820" } + client.UserAgent = fmt.Sprintf("%s pid-%s", client.UserAgent, partnerID) log.Printf("[DEBUG] AzureRM Client User Agent: %s\n", client.UserAgent) } From 0ebf584945a2bb10e32ba5901809481b5f100115 Mon Sep 17 00:00:00 2001 From: Rich Haddock Date: Thu, 24 Oct 2019 11:03:18 -0600 Subject: [PATCH 5/7] Update app_service_source_control_token.html.markdown (#4711) Removed apostrophe from "Source Control Token's" It's just "Tokens". --- website/docs/r/app_service_source_control_token.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/app_service_source_control_token.html.markdown b/website/docs/r/app_service_source_control_token.html.markdown index 25245e1af139..9c9e7852a0a9 100644 --- a/website/docs/r/app_service_source_control_token.html.markdown +++ b/website/docs/r/app_service_source_control_token.html.markdown @@ -11,7 +11,7 @@ description: |- Manages an App Service source control token. -~> **NOTE:** Source Control Token's are configured at the subscription level, not on each App Service - as such this can only be configured Subscription-wide +~> **NOTE:** Source Control Tokens are configured at the subscription level, not on each App Service - as such this can only be configured Subscription-wide ## Example Usage From 3d734ad45ee3f0a3c342f857b9c897c4f9027fcf Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Thu, 24 Oct 2019 19:20:50 +0200 Subject: [PATCH 6/7] updating to include #4663 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71ea599fe8d0..162efb245eb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ IMPROVEMENTS: * devspace: updating to API version `2019-04-01` [GH-4597] * frontdoor: updating to use API version `2019-04-01` [GH-4609] * provider: switching to use the Provider SDK from `github.com/hashicorp/terraform-provider-sdk` [GH-4474] +* provider: sending Microsoft's Terraform Partner ID in the user agent if a custom Partner ID isn’t specified [GH-4663] * Data Source: `azurerm_lb_backend_address_pool` - exposing `backend_ip_configurations` [GH-4605] * `azurerm_cosmosdb_mongo_collection` - add support for the `throughput` property [GH-4467] * `azurerm_firewall` - support for `zones` [GH-4670] From da6989377b0f0817b8d87c80370da7dff7d9d227 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Thu, 24 Oct 2019 19:28:16 +0200 Subject: [PATCH 7/7] r/storage_blob: fixing the example (#4713) --- website/docs/r/storage_blob.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/storage_blob.html.markdown b/website/docs/r/storage_blob.html.markdown index 32f36b63e4fd..2d6098224c3f 100644 --- a/website/docs/r/storage_blob.html.markdown +++ b/website/docs/r/storage_blob.html.markdown @@ -38,7 +38,7 @@ resource "azurerm_storage_blob" "test" { resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "blob" + type = "Block" source = "some-local-file.zip" } ```