Merge pull request #2572 from terraform-providers/dep/sdk-24

Update azure-go-sdk to v24.0.0 and autorest to v11.2.0
hashicorp · Jan 8, 2019 · 5ef2b53 · 5ef2b53
2 parents c1e3839 + 9c7fae4
commit 5ef2b53
Show file tree

Hide file tree

Showing 1,162 changed files with 198,003 additions and 35,804 deletions.
diff --git a/.github/ISSUE_TEMPLATE/Bug_Report.md b/.github/ISSUE_TEMPLATE/Bug_Report.md
@@ -34,7 +34,7 @@ If you are running into one of these scenarios, we recommend opening an issue in
 
 <!--- Please list the affected resources and data sources. --->
 
-* azurerm_XXXXX
+* `azurerm_XXXXX`
 
 ### Terraform Configuration Files
 

diff --git a/azurerm/config.go b/azurerm/config.go
@@ -45,7 +45,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/preview/msi/mgmt/2015-08-31-preview/msi"
 	"github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights"
 	"github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement"
-	"github.com/Azure/azure-sdk-for-go/services/preview/resources/mgmt/2018-03-01-preview/management"
+	"github.com/Azure/azure-sdk-for-go/services/preview/resources/mgmt/2018-03-01-preview/managementgroups"
 	"github.com/Azure/azure-sdk-for-go/services/preview/security/mgmt/2017-08-01-preview/security"
 	"github.com/Azure/azure-sdk-for-go/services/preview/signalr/mgmt/2018-03-01-preview/signalr"
 	"github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql"

diff --git a/azurerm/data_source_management_group.go b/azurerm/data_source_management_group.go
@@ -3,7 +3,7 @@ package azurerm
 import (
 	"fmt"
 
-	"github.com/Azure/azure-sdk-for-go/services/preview/resources/mgmt/2018-03-01-preview/management"
+	"github.com/Azure/azure-sdk-for-go/services/preview/resources/mgmt/2018-03-01-preview/managementgroups"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )

diff --git a/azurerm/resource_arm_cognitive_account.go b/azurerm/resource_arm_cognitive_account.go
@@ -76,17 +76,7 @@ func resourceArmCognitiveAccount() *schema.Resource {
 							Type:     schema.TypeString,
 							Required: true,
 							ValidateFunc: validation.StringInSlice([]string{
-								string(cognitiveservices.F0),
-								string(cognitiveservices.S0),
-								string(cognitiveservices.S1),
-								string(cognitiveservices.S2),
-								string(cognitiveservices.S3),
-								string(cognitiveservices.S4),
-								string(cognitiveservices.S5),
-								string(cognitiveservices.S6),
-								string(cognitiveservices.P0),
-								string(cognitiveservices.P1),
-								string(cognitiveservices.P2),
+								"F0", "S0", "S1", "S2", "S3", "S4", "S5", "S6", "P0", "P1", "P2",
 							}, false),
 						},
 
@@ -139,7 +129,7 @@ func resourceArmCognitiveAccountCreate(d *schema.ResourceData, meta interface{})
 	sku := expandCognitiveAccountSku(d)
 
 	properties := cognitiveservices.AccountCreateParameters{
-		Kind:       cognitiveservices.Kind(kind),
+		Kind:       utils.String(kind),
 		Location:   utils.String(location),
 		Sku:        sku,
 		Properties: &cognitiveServicesPropertiesStruct{},
@@ -258,7 +248,7 @@ func expandCognitiveAccountSku(d *schema.ResourceData) *cognitiveservices.Sku {
 	sku := skus[0].(map[string]interface{})
 
 	return &cognitiveservices.Sku{
-		Name: cognitiveservices.SkuName(sku["name"].(string)),
+		Name: utils.String(sku["name"].(string)),
 		Tier: cognitiveservices.SkuTier(sku["tier"].(string)),
 	}
 }
@@ -268,10 +258,13 @@ func flattenCognitiveAccountSku(input *cognitiveservices.Sku) []interface{} {
 		return []interface{}{}
 	}
 
-	return []interface{}{
-		map[string]interface{}{
-			"name": string(input.Name),
-			"tier": string(input.Tier),
-		},
+	m := map[string]interface{}{
+		"tier": string(input.Tier),
+	}
+
+	if v := input.Name; v != nil {
+		m["name"] = *v
 	}
+
+	return []interface{}{m}
 }
diff --git a/azurerm/resource_arm_express_route_circuit.go b/azurerm/resource_arm_express_route_circuit.go
@@ -64,7 +64,6 @@ func resourceArmExpressRouteCircuit() *schema.Resource {
 							Required: true,
 							ValidateFunc: validation.StringInSlice([]string{
 								string(network.Standard),
-								string(network.Premium),
 							}, true),
 							DiffSuppressFunc: ignoreCaseDiffSuppressFunc,
 						},

diff --git a/azurerm/resource_arm_firewall_network_rule_collection.go b/azurerm/resource_arm_firewall_network_rule_collection.go
@@ -95,7 +95,7 @@ func resourceArmFirewallNetworkRuleCollection() *schema.Resource {
 								Type: schema.TypeString,
 								ValidateFunc: validation.StringInSlice([]string{
 									string(network.Any),
-									"ICMP", // TODO(metacpp): update it after v22.0.
+									string(network.ICMP),
 									string(network.TCP),
 									string(network.UDP),
 								}, false),

diff --git a/azurerm/resource_arm_management_group.go b/azurerm/resource_arm_management_group.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/Azure/azure-sdk-for-go/services/preview/resources/mgmt/2018-03-01-preview/management"
+	"github.com/Azure/azure-sdk-for-go/services/preview/resources/mgmt/2018-03-01-preview/managementgroups"
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response"

diff --git a/vendor/contrib.go.opencensus.io/exporter/ocagent/CONTRIBUTING.md b/vendor/contrib.go.opencensus.io/exporter/ocagent/CONTRIBUTING.md
diff --git a/vendor/contrib.go.opencensus.io/exporter/ocagent/LICENSE b/vendor/contrib.go.opencensus.io/exporter/ocagent/LICENSE
diff --git a/vendor/contrib.go.opencensus.io/exporter/ocagent/README.md b/vendor/contrib.go.opencensus.io/exporter/ocagent/README.md