Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TeamCity] azurerm_databox_edge_* - Upgrade to latest version of databox and fix test cases #11626

Merged
merged 2 commits into from
May 8, 2021
Merged

[TeamCity] azurerm_databox_edge_* - Upgrade to latest version of databox and fix test cases #11626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea3880f
Upgrade to latest version of databox
WodansSon May 8, 2021
0806880
Updated SKUs and Documentation
WodansSon May 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azurerm/internal/services/databoxedge/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/databoxedge/databox_edge_device_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions azurerm/internal/services/databoxedge/databox_edge_device_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -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))
}
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/databoxedge/databox_edge_order_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/databoxedge/databox_edge_order_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/databoxedge/parse/databox_edge_device_sku.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 16 additions & 2 deletions azurerm/internal/services/databoxedge/validate/databox_edge_device_sku_name.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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),
Expand Down
107 changes: 0 additions & 107 deletions ...ithub.com/Azure/azure-sdk-for-go/services/databoxedge/mgmt/2019-08-01/databoxedge/skus.go
View file
Open in desktop

This file was deleted.

0 .../mgmt/2019-08-01/databoxedge/CHANGELOG.md → .../mgmt/2020-12-01/databoxedge/CHANGELOG.md
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ge/mgmt/2019-08-01/databoxedge/_meta.json → ...ge/mgmt/2020-12-01/databoxedge/_meta.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading