merging hashicorp#11626

* Upgrade to latest version of databox * Updated SKUs and Documentation
gro1m · May 26, 2021 · 538f43f · 538f43f
1 parent f273e24
commit 538f43f
Show file tree

Hide file tree

Showing 35 changed files with 5,625 additions and 1,463 deletions.
diff --git a/azurerm/internal/services/databoxedge/client/client.go b/azurerm/internal/services/databoxedge/client/client.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/Azure/azure-sdk-for-go/services/databoxedge/mgmt/2019-08-01/databoxedge"
+	"github.com/Azure/azure-sdk-for-go/services/databoxedge/mgmt/2020-12-01/databoxedge"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
 )
 

diff --git a/azurerm/internal/services/databoxedge/databox_edge_device_resource.go b/azurerm/internal/services/databoxedge/databox_edge_device_resource.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/databoxedge/mgmt/2019-08-01/databoxedge"
+	"github.com/Azure/azure-sdk-for-go/services/databoxedge/mgmt/2020-12-01/databoxedge"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"

diff --git a/azurerm/internal/services/databoxedge/databox_edge_device_resource_test.go b/azurerm/internal/services/databoxedge/databox_edge_device_resource_test.go
@@ -135,7 +135,7 @@ resource "azurerm_databox_edge_device" "test" {
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
 
-  sku_name = "Edge-Standard"
+  sku_name = "EdgeP_Base-Standard"
 }
 `, r.template(data), data.RandomString)
 }
@@ -149,7 +149,7 @@ resource "azurerm_databox_edge_device" "import" {
   resource_group_name = azurerm_databox_edge_device.test.resource_group_name
   location            = azurerm_databox_edge_device.test.location
 
-  sku_name = "Edge-Standard"
+  sku_name = "EdgeP_Base-Standard"
 }
 `, r.basic(data))
 }
@@ -163,7 +163,7 @@ resource "azurerm_databox_edge_device" "test" {
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
 
-  sku_name = "Edge-Standard"
+  sku_name = "EdgeP_Base-Standard"
 
   tags = {
     ENV = "Test"

diff --git a/azurerm/internal/services/databoxedge/databox_edge_order_resource.go b/azurerm/internal/services/databoxedge/databox_edge_order_resource.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/databoxedge/mgmt/2019-08-01/databoxedge"
+	"github.com/Azure/azure-sdk-for-go/services/databoxedge/mgmt/2020-12-01/databoxedge"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"

diff --git a/azurerm/internal/services/databoxedge/databox_edge_order_resource_test.go b/azurerm/internal/services/databoxedge/databox_edge_order_resource_test.go
@@ -98,7 +98,7 @@ resource "azurerm_databox_edge_device" "test" {
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
 
-  sku_name = "Edge-Standard"
+  sku_name = "EdgeP_Base-Standard"
 }
 `, data.RandomInteger, "eastus", data.RandomString)
 }

diff --git a/azurerm/internal/services/databoxedge/parse/databox_edge_device_sku.go b/azurerm/internal/services/databoxedge/parse/databox_edge_device_sku.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/Azure/azure-sdk-for-go/services/databoxedge/mgmt/2019-08-01/databoxedge"
+	"github.com/Azure/azure-sdk-for-go/services/databoxedge/mgmt/2020-12-01/databoxedge"
 )
 
 // DataboxEdgeDeviceSku type

diff --git a/azurerm/internal/services/databoxedge/validate/databox_edge_device_sku_name.go b/azurerm/internal/services/databoxedge/validate/databox_edge_device_sku_name.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/Azure/azure-sdk-for-go/services/databoxedge/mgmt/2019-08-01/databoxedge"
+	"github.com/Azure/azure-sdk-for-go/services/databoxedge/mgmt/2020-12-01/databoxedge"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 )
 
@@ -53,7 +53,21 @@ func DataboxEdgeDeviceSkuName(v interface{}, k string) (warnings []string, error
 func getValidSkus() []string {
 	return []string{
 		string(databoxedge.Gateway),
-		string(databoxedge.Edge),
+		// notified that the Edge SKU has been deprecated per the
+		// service team as via a communication on Thursday, March 11, 2021
+		// and been replaced by the below new SKUs: EdgePBase is the new Edge SKU
+		string(databoxedge.EdgeMRMini),
+		string(databoxedge.EdgePBase),
+		string(databoxedge.EdgePHigh),
+		string(databoxedge.EdgePRBase),
+		string(databoxedge.EdgePRBaseUPS),
+		string(databoxedge.GPU),
+		string(databoxedge.RCALarge),
+		string(databoxedge.RCASmall),
+		string(databoxedge.RDC),
+		string(databoxedge.TCALarge),
+		string(databoxedge.TCASmall),
+		string(databoxedge.TDC),
 		string(databoxedge.TEA1Node),
 		string(databoxedge.TEA1NodeUPS),
 		string(databoxedge.TEA1NodeHeater),

diff --git a/...ithub.com/Azure/azure-sdk-for-go/services/databoxedge/mgmt/2019-08-01/databoxedge/skus.go b/...ithub.com/Azure/azure-sdk-for-go/services/databoxedge/mgmt/2019-08-01/databoxedge/skus.go
diff --git a/.../mgmt/2019-08-01/databoxedge/CHANGELOG.md → .../mgmt/2020-12-01/databoxedge/CHANGELOG.md b/.../mgmt/2019-08-01/databoxedge/CHANGELOG.md → .../mgmt/2020-12-01/databoxedge/CHANGELOG.md
diff --git a/...ge/mgmt/2019-08-01/databoxedge/_meta.json → ...ge/mgmt/2020-12-01/databoxedge/_meta.json b/...ge/mgmt/2019-08-01/databoxedge/_meta.json → ...ge/mgmt/2020-12-01/databoxedge/_meta.json