Revert "Update the redisenterprise sdk to 2024-10-01 to update SKU li…

…st (#28280)" This reverts commit 73603ed.
hashicorp · Jan 15, 2025 · bd070d6 · bd070d6
1 parent 185503e
commit bd070d6
Show file tree

Hide file tree

Showing 94 changed files with 271 additions and 29 deletions.
diff --git a/internal/services/redisenterprise/client/client.go b/internal/services/redisenterprise/client/client.go
@@ -6,8 +6,8 @@ package client
 import (
 	"fmt"
 
-	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-10-01/databases"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-10-01/redisenterprise"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/databases"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/redisenterprise"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/common"
 )
 

diff --git a/internal/services/redisenterprise/redis_enterprise_cluster_resource.go b/internal/services/redisenterprise/redis_enterprise_cluster_resource.go
@@ -16,7 +16,7 @@ import (
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/zones"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-10-01/redisenterprise"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/redisenterprise"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/features"

diff --git a/internal/services/redisenterprise/redis_enterprise_cluster_resource_test.go b/internal/services/redisenterprise/redis_enterprise_cluster_resource_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-10-01/redisenterprise"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/redisenterprise"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"

diff --git a/internal/services/redisenterprise/redis_enterprise_database_data_source.go b/internal/services/redisenterprise/redis_enterprise_database_data_source.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-10-01/databases"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-10-01/redisenterprise"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/databases"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/redisenterprise"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"

diff --git a/internal/services/redisenterprise/redis_enterprise_database_resource.go b/internal/services/redisenterprise/redis_enterprise_database_resource.go
@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-10-01/databases"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-10-01/redisenterprise"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/databases"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/redisenterprise"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/redisenterprise/validate"

diff --git a/internal/services/redisenterprise/redis_enterprise_database_resource_test.go b/internal/services/redisenterprise/redis_enterprise_database_resource_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-10-01/databases"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/databases"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"

diff --git a/internal/services/redisenterprise/validate/redis_enterprise_cluster_sku_name.go b/internal/services/redisenterprise/validate/redis_enterprise_cluster_sku_name.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-10-01/redisenterprise"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/redisenterprise"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 )
 

diff --git a/...enterprise/2024-10-01/databases/README.md → ...se/2024-06-01-preview/databases/README.md b/...enterprise/2024-10-01/databases/README.md → ...se/2024-06-01-preview/databases/README.md
diff --git a/...enterprise/2024-10-01/databases/client.go → ...se/2024-06-01-preview/databases/client.go b/...enterprise/2024-10-01/databases/client.go → ...se/2024-06-01-preview/databases/client.go
diff --git a/...erprise/2024-10-01/databases/constants.go → ...2024-06-01-preview/databases/constants.go b/...erprise/2024-10-01/databases/constants.go → ...2024-06-01-preview/databases/constants.go
diff --git a/...prise/2024-10-01/databases/id_database.go → ...24-06-01-preview/databases/id_database.go b/...prise/2024-10-01/databases/id_database.go → ...24-06-01-preview/databases/id_database.go
diff --git a/...024-10-01/databases/id_redisenterprise.go → ...1-preview/databases/id_redisenterprise.go b/...024-10-01/databases/id_redisenterprise.go → ...1-preview/databases/id_redisenterprise.go
diff --git a/...ise/2024-10-01/databases/method_create.go → ...-06-01-preview/databases/method_create.go b/...ise/2024-10-01/databases/method_create.go → ...-06-01-preview/databases/method_create.go
diff --git a/...ise/2024-10-01/databases/method_delete.go → ...-06-01-preview/databases/method_delete.go b/...ise/2024-10-01/databases/method_delete.go → ...-06-01-preview/databases/method_delete.go
diff --git a/...ise/2024-10-01/databases/method_export.go → ...-06-01-preview/databases/method_export.go b/...ise/2024-10-01/databases/method_export.go → ...-06-01-preview/databases/method_export.go
diff --git a/...rise/2024-10-01/databases/method_flush.go → ...4-06-01-preview/databases/method_flush.go b/...rise/2024-10-01/databases/method_flush.go → ...4-06-01-preview/databases/method_flush.go
diff --git a/...ses/method_forcelinktoreplicationgroup.go → ...ses/method_forcelinktoreplicationgroup.go b/...ses/method_forcelinktoreplicationgroup.go → ...ses/method_forcelinktoreplicationgroup.go
diff --git a/...024-10-01/databases/method_forceunlink.go → ...1-preview/databases/method_forceunlink.go b/...024-10-01/databases/method_forceunlink.go → ...1-preview/databases/method_forceunlink.go
diff --git a/...rprise/2024-10-01/databases/method_get.go → ...024-06-01-preview/databases/method_get.go b/...rprise/2024-10-01/databases/method_get.go → ...024-06-01-preview/databases/method_get.go
diff --git a/...ise/2024-10-01/databases/method_import.go → ...-06-01-preview/databases/method_import.go b/...ise/2024-10-01/databases/method_import.go → ...-06-01-preview/databases/method_import.go
diff --git a/...4-10-01/databases/method_listbycluster.go → ...preview/databases/method_listbycluster.go b/...4-10-01/databases/method_listbycluster.go → ...preview/databases/method_listbycluster.go
diff --git a/...e/2024-10-01/databases/method_listkeys.go → ...6-01-preview/databases/method_listkeys.go b/...e/2024-10-01/databases/method_listkeys.go → ...6-01-preview/databases/method_listkeys.go
diff --git a/...4-10-01/databases/method_regeneratekey.go → ...preview/databases/method_regeneratekey.go b/...4-10-01/databases/method_regeneratekey.go → ...preview/databases/method_regeneratekey.go
diff --git a/...ise/2024-10-01/databases/method_update.go → ...-06-01-preview/databases/method_update.go b/...ise/2024-10-01/databases/method_update.go → ...-06-01-preview/databases/method_update.go
diff --git a/...urce-manager/redisenterprise/2024-06-01-preview/databases/method_upgradedbredisversion.go b/...urce-manager/redisenterprise/2024-06-01-preview/databases/method_upgradedbredisversion.go
diff --git a/.../2024-10-01/databases/model_accesskeys.go → ...-01-preview/databases/model_accesskeys.go b/.../2024-10-01/databases/model_accesskeys.go → ...-01-preview/databases/model_accesskeys.go
diff --git a/...se/2024-10-01/databases/model_database.go → ...06-01-preview/databases/model_database.go b/...se/2024-10-01/databases/model_database.go → ...06-01-preview/databases/model_database.go
diff --git a/...-01/databases/model_databaseproperties.go → ...iew/databases/model_databaseproperties.go b/...-01/databases/model_databaseproperties.go → ...iew/databases/model_databaseproperties.go
diff --git a/...model_databasepropertiesgeoreplication.go → ...model_databasepropertiesgeoreplication.go b/...model_databasepropertiesgeoreplication.go → ...model_databasepropertiesgeoreplication.go
diff --git a/...4-10-01/databases/model_databaseupdate.go → ...preview/databases/model_databaseupdate.go b/...4-10-01/databases/model_databaseupdate.go → ...preview/databases/model_databaseupdate.go
diff --git a/...atabases/model_exportclusterparameters.go → ...atabases/model_exportclusterparameters.go b/...atabases/model_exportclusterparameters.go → ...atabases/model_exportclusterparameters.go
diff --git a/...-10-01/databases/model_flushparameters.go → ...review/databases/model_flushparameters.go b/...-10-01/databases/model_flushparameters.go → ...review/databases/model_flushparameters.go
diff --git a/...01/databases/model_forcelinkparameters.go → ...ew/databases/model_forcelinkparameters.go b/...01/databases/model_forcelinkparameters.go → ...ew/databases/model_forcelinkparameters.go
diff --git a/.../databases/model_forceunlinkparameters.go → .../databases/model_forceunlinkparameters.go b/.../databases/model_forceunlinkparameters.go → .../databases/model_forceunlinkparameters.go
diff --git a/...atabases/model_importclusterparameters.go → ...atabases/model_importclusterparameters.go b/...atabases/model_importclusterparameters.go → ...atabases/model_importclusterparameters.go
diff --git a/...4-10-01/databases/model_linkeddatabase.go → ...preview/databases/model_linkeddatabase.go b/...4-10-01/databases/model_linkeddatabase.go → ...preview/databases/model_linkeddatabase.go
diff --git a/...rise/2024-10-01/databases/model_module.go → ...4-06-01-preview/databases/model_module.go b/...rise/2024-10-01/databases/model_module.go → ...4-06-01-preview/databases/model_module.go
diff --git a/...2024-10-01/databases/model_persistence.go → ...01-preview/databases/model_persistence.go b/...2024-10-01/databases/model_persistence.go → ...01-preview/databases/model_persistence.go
diff --git a/...atabases/model_regeneratekeyparameters.go → ...atabases/model_regeneratekeyparameters.go b/...atabases/model_regeneratekeyparameters.go → ...atabases/model_regeneratekeyparameters.go
diff --git a/...rprise/2024-10-01/databases/predicates.go → ...024-06-01-preview/databases/predicates.go b/...rprise/2024-10-01/databases/predicates.go → ...024-06-01-preview/databases/predicates.go
diff --git a/...nterprise/2024-10-01/databases/version.go → ...e/2024-06-01-preview/databases/version.go b/...nterprise/2024-10-01/databases/version.go → ...e/2024-06-01-preview/databases/version.go
diff --git a/...rise/2024-10-01/redisenterprise/README.md → ...4-06-01-preview/redisenterprise/README.md b/...rise/2024-10-01/redisenterprise/README.md → ...4-06-01-preview/redisenterprise/README.md
diff --git a/...rise/2024-10-01/redisenterprise/client.go → ...4-06-01-preview/redisenterprise/client.go b/...rise/2024-10-01/redisenterprise/client.go → ...4-06-01-preview/redisenterprise/client.go
diff --git a/...e/2024-10-01/redisenterprise/constants.go → ...6-01-preview/redisenterprise/constants.go b/...e/2024-10-01/redisenterprise/constants.go → ...6-01-preview/redisenterprise/constants.go
diff --git a/...2024-10-01/redisenterprise/id_database.go → ...01-preview/redisenterprise/id_database.go b/...2024-10-01/redisenterprise/id_database.go → ...01-preview/redisenterprise/id_database.go
diff --git a/...-01/redisenterprise/id_redisenterprise.go → ...iew/redisenterprise/id_redisenterprise.go b/...-01/redisenterprise/id_redisenterprise.go → ...iew/redisenterprise/id_redisenterprise.go
diff --git a/...24-10-01/redisenterprise/method_create.go → ...-preview/redisenterprise/method_create.go b/...24-10-01/redisenterprise/method_create.go → ...-preview/redisenterprise/method_create.go
diff --git a/...redisenterprise/method_databasescreate.go → ...redisenterprise/method_databasescreate.go b/...redisenterprise/method_databasescreate.go → ...redisenterprise/method_databasescreate.go
diff --git a/...redisenterprise/method_databasesdelete.go → ...redisenterprise/method_databasesdelete.go b/...redisenterprise/method_databasesdelete.go → ...redisenterprise/method_databasesdelete.go
diff --git a/...redisenterprise/method_databasesexport.go → ...redisenterprise/method_databasesexport.go b/...redisenterprise/method_databasesexport.go → ...redisenterprise/method_databasesexport.go
diff --git a/.../redisenterprise/method_databasesflush.go → .../redisenterprise/method_databasesflush.go b/.../redisenterprise/method_databasesflush.go → .../redisenterprise/method_databasesflush.go
diff --git a/...d_databasesforcelinktoreplicationgroup.go → ...d_databasesforcelinktoreplicationgroup.go b/...d_databasesforcelinktoreplicationgroup.go → ...d_databasesforcelinktoreplicationgroup.go
diff --git a/...enterprise/method_databasesforceunlink.go → ...enterprise/method_databasesforceunlink.go b/...enterprise/method_databasesforceunlink.go → ...enterprise/method_databasesforceunlink.go
diff --git a/...01/redisenterprise/method_databasesget.go → ...ew/redisenterprise/method_databasesget.go b/...01/redisenterprise/method_databasesget.go → ...ew/redisenterprise/method_databasesget.go
diff --git a/...redisenterprise/method_databasesimport.go → ...redisenterprise/method_databasesimport.go b/...redisenterprise/method_databasesimport.go → ...redisenterprise/method_databasesimport.go
diff --git a/...terprise/method_databaseslistbycluster.go → ...terprise/method_databaseslistbycluster.go b/...terprise/method_databaseslistbycluster.go → ...terprise/method_databaseslistbycluster.go
diff --git a/...disenterprise/method_databaseslistkeys.go → ...disenterprise/method_databaseslistkeys.go b/...disenterprise/method_databaseslistkeys.go → ...disenterprise/method_databaseslistkeys.go
diff --git a/...terprise/method_databasesregeneratekey.go → ...terprise/method_databasesregeneratekey.go b/...terprise/method_databasesregeneratekey.go → ...terprise/method_databasesregeneratekey.go
diff --git a/...redisenterprise/method_databasesupdate.go → ...redisenterprise/method_databasesupdate.go b/...redisenterprise/method_databasesupdate.go → ...redisenterprise/method_databasesupdate.go