deps: update maps to 2021-02-01, add G2 SKU

azurerm/internal/services/maps/client/client.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/Azure/azure-sdk-for-go/services/maps/mgmt/2018-05-01/maps"
+	"github.com/Azure/azure-sdk-for-go/services/maps/mgmt/2021-02-01/maps"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
 )
 

azurerm/internal/services/maps/maps_account_data_source.go

@@ -82,7 +82,7 @@ func dataSourceMapsAccountRead(d *schema.ResourceData, meta interface{}) error {
 		d.Set("sku_name", sku.Name)
 	}
 	if props := resp.Properties; props != nil {
-		d.Set("x_ms_client_id", props.XMsClientID)
+		d.Set("x_ms_client_id", props.UniqueID)
 	}
 
 	keysResp, err := client.ListKeys(ctx, resourceGroup, name)

azurerm/internal/services/maps/maps_account_resource.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/maps/mgmt/2018-05-01/maps"
+	"github.com/Azure/azure-sdk-for-go/services/maps/mgmt/2021-02-01/maps"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
@@ -53,8 +53,9 @@ func resourceMapsAccount() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 				ValidateFunc: validation.StringInSlice([]string{
-					"S0",
-					"S1",
+					string(maps.NameS0),
+					string(maps.NameS1),
+					string(maps.NameG2),
 				}, false),
 			},
 
@@ -105,10 +106,10 @@ func resourceMapsAccountCreateUpdate(d *schema.ResourceData, meta interface{}) e
 		}
 	}
 
-	parameters := maps.AccountCreateParameters{
+	parameters := maps.Account{
 		Location: utils.String("global"),
 		Sku: &maps.Sku{
-			Name: &sku,
+			Name: maps.Name(sku),
 		},
 		Tags: tags.Expand(t),
 	}
@@ -157,7 +158,7 @@ func resourceMapsAccountRead(d *schema.ResourceData, meta interface{}) error {
 		d.Set("sku_name", sku.Name)
 	}
 	if props := resp.Properties; props != nil {
-		d.Set("x_ms_client_id", props.XMsClientID)
+		d.Set("x_ms_client_id", props.UniqueID)
 	}
 
 	keysResp, err := client.ListKeys(ctx, id.ResourceGroup, id.Name)

azurerm/internal/services/maps/maps_account_resource_test.go

@@ -42,7 +42,7 @@ func TestAccMapsAccount_sku(t *testing.T) {
 
 	data.ResourceTest(t, r, []resource.TestStep{
 		{
-			Config: r.sku(data),
+			Config: r.sku(data, "S1"),
 			Check: resource.ComposeTestCheckFunc(
 				check.That(data.ResourceName).Key("name").Exists(),
 				check.That(data.ResourceName).Key("x_ms_client_id").Exists(),
@@ -55,6 +55,25 @@ func TestAccMapsAccount_sku(t *testing.T) {
 	})
 }
 
+func TestAccMapsAccount_skuG2(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_maps_account", "test")
+	r := MapsAccountResource{}
+
+	data.ResourceTest(t, r, []resource.TestStep{
+		{
+			Config: r.sku(data, "G2"),
+			Check: resource.ComposeTestCheckFunc(
+				check.That(data.ResourceName).Key("name").Exists(),
+				check.That(data.ResourceName).Key("x_ms_client_id").Exists(),
+				check.That(data.ResourceName).Key("primary_access_key").Exists(),
+				check.That(data.ResourceName).Key("secondary_access_key").Exists(),
+				check.That(data.ResourceName).Key("sku_name").HasValue("G2"),
+			),
+		},
+		data.ImportStep(),
+	})
+}
+
 func TestAccMapsAccount_tags(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_maps_account", "test")
 	r := MapsAccountResource{}
@@ -113,7 +132,7 @@ resource "azurerm_maps_account" "test" {
 `, data.RandomInteger, data.Locations.Primary, data.RandomInteger)
 }
 
-func (MapsAccountResource) sku(data acceptance.TestData) string {
+func (MapsAccountResource) sku(data acceptance.TestData, sku string) string {
 	return fmt.Sprintf(`
 provider "azurerm" {
   features {}
@@ -127,9 +146,9 @@ resource "azurerm_resource_group" "test" {
 resource "azurerm_maps_account" "test" {
   name                = "accMapsAccount-%d"
   resource_group_name = azurerm_resource_group.test.name
-  sku_name            = "S1"
+  sku_name            = "%s"
 }
-`, data.RandomInteger, data.Locations.Primary, data.RandomInteger)
+`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, sku)
 }
 
 func (MapsAccountResource) tags(data acceptance.TestData) string {