Revert "Upgrade Postgresql API version from `2023-06-01-preview/2022-…

…12-01` to `2024-08-01`" (#28467) This reverts commit 8fe05cc.
hashicorp · Jan 9, 2025 · f1c5f20 · f1c5f20
1 parent 538b4f5
commit f1c5f20
Show file tree

Hide file tree

Showing 97 changed files with 42 additions and 2,144 deletions.
diff --git a/internal/services/postgres/client/client.go b/internal/services/postgres/client/client.go
@@ -17,11 +17,11 @@ import (
 	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2020-01-01/serverkeys"
 	flexibleserverconfigurations "github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2021-06-01/configurations"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2021-06-01/serverrestart"
-	flexibleserveradministrators "github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/administrators"
-	flexibleserverdatabases "github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/databases"
-	flexibleserverfirewallrules "github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/firewallrules"
-	flexibleservers "github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/servers"
-	flexibleservervirtualendpoints "github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/virtualendpoints"
+	flexibleserveradministrators "github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2022-12-01/administrators"
+	flexibleserverdatabases "github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2022-12-01/databases"
+	flexibleserverfirewallrules "github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2022-12-01/firewallrules"
+	flexibleservers "github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2023-06-01-preview/servers"
+	flexibleservervirtualendpoints "github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2023-06-01-preview/virtualendpoints"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/common"
 )
 

diff --git a/internal/services/postgres/postgresql_flexible_server_aad_administrator_resource.go b/internal/services/postgres/postgresql_flexible_server_aad_administrator_resource.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
 	"github.com/hashicorp/go-azure-helpers/lang/response"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/administrators"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2022-12-01/administrators"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/locks"

diff --git a/internal/services/postgres/postgresql_flexible_server_aad_administrator_resource_test.go b/internal/services/postgres/postgresql_flexible_server_aad_administrator_resource_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/administrators"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2022-12-01/administrators"
 	"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/postgres/postgresql_flexible_server_data_source.go b/internal/services/postgres/postgresql_flexible_server_data_source.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/servers"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2023-06-01-preview/servers"
 	"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/postgres/postgresql_flexible_server_database_resource.go b/internal/services/postgres/postgresql_flexible_server_database_resource.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/databases"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2022-12-01/databases"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/locks"

diff --git a/internal/services/postgres/postgresql_flexible_server_database_resource_test.go b/internal/services/postgres/postgresql_flexible_server_database_resource_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/databases"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2022-12-01/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/postgres/postgresql_flexible_server_firewall_rule_resource.go b/internal/services/postgres/postgresql_flexible_server_firewall_rule_resource.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/firewallrules"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2022-12-01/firewallrules"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/locks"

diff --git a/internal/services/postgres/postgresql_flexible_server_firewall_rule_resource_test.go b/internal/services/postgres/postgresql_flexible_server_firewall_rule_resource_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/firewallrules"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2022-12-01/firewallrules"
 	"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/postgres/postgresql_flexible_server_resource.go b/internal/services/postgres/postgresql_flexible_server_resource.go
@@ -19,7 +19,7 @@ import (
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2021-06-01/serverrestart"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/servers"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2023-06-01-preview/servers"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/privatedns/2020-06-01/privatezones"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"

diff --git a/internal/services/postgres/postgresql_flexible_server_resource_test.go b/internal/services/postgres/postgresql_flexible_server_resource_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/servers"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2023-06-01-preview/servers"
 	"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/postgres/postgresql_flexible_server_virtual_endpoint_resource.go b/internal/services/postgres/postgresql_flexible_server_virtual_endpoint_resource.go
@@ -12,8 +12,8 @@ import (
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
 	"github.com/hashicorp/go-azure-helpers/lang/response"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/commonids"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/servers"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/virtualendpoints"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2023-06-01-preview/servers"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2023-06-01-preview/virtualendpoints"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/locks"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"

diff --git a/internal/services/postgres/postgresql_flexible_server_virtual_endpoint_resource_test.go b/internal/services/postgres/postgresql_flexible_server_virtual_endpoint_resource_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/virtualendpoints"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2023-06-01-preview/virtualendpoints"
 	"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/postgres/validate/flexible_server_storage_tier.go b/internal/services/postgres/validate/flexible_server_storage_tier.go
@@ -4,7 +4,7 @@
 package validate
 
 import (
-	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/servers"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2023-06-01-preview/servers"
 )
 
 type StorageTiers struct {

diff --git a/...resql/2024-08-01/administrators/README.md → ...resql/2022-12-01/administrators/README.md b/...resql/2024-08-01/administrators/README.md → ...resql/2022-12-01/administrators/README.md
diff --git a/...resql/2024-08-01/administrators/client.go → ...resql/2022-12-01/administrators/client.go b/...resql/2024-08-01/administrators/client.go → ...resql/2022-12-01/administrators/client.go
diff --git a/...ql/2024-08-01/administrators/constants.go → ...ql/2022-12-01/administrators/constants.go b/...ql/2024-08-01/administrators/constants.go → ...ql/2022-12-01/administrators/constants.go
diff --git a/...-08-01/administrators/id_administrator.go → ...-12-01/administrators/id_administrator.go b/...-08-01/administrators/id_administrator.go → ...-12-01/administrators/id_administrator.go
diff --git a/...08-01/administrators/id_flexibleserver.go → ...12-01/administrators/id_flexibleserver.go b/...08-01/administrators/id_flexibleserver.go → ...12-01/administrators/id_flexibleserver.go
diff --git a/...024-08-01/administrators/method_create.go → ...022-12-01/administrators/method_create.go b/...024-08-01/administrators/method_create.go → ...022-12-01/administrators/method_create.go
diff --git a/...024-08-01/administrators/method_delete.go → ...022-12-01/administrators/method_delete.go b/...024-08-01/administrators/method_delete.go → ...022-12-01/administrators/method_delete.go
diff --git a/...l/2024-08-01/administrators/method_get.go → ...l/2022-12-01/administrators/method_get.go b/...l/2024-08-01/administrators/method_get.go → ...l/2022-12-01/administrators/method_get.go
diff --git a/...-01/administrators/method_listbyserver.go → ...-01/administrators/method_listbyserver.go b/...-01/administrators/method_listbyserver.go → ...-01/administrators/method_listbyserver.go
diff --git a/...ors/model_activedirectoryadministrator.go → ...ors/model_activedirectoryadministrator.go b/...ors/model_activedirectoryadministrator.go → ...ors/model_activedirectoryadministrator.go
diff --git a/.../model_activedirectoryadministratoradd.go → .../model_activedirectoryadministratoradd.go b/.../model_activedirectoryadministratoradd.go → .../model_activedirectoryadministratoradd.go
diff --git a/...strators/model_administratorproperties.go → ...strators/model_administratorproperties.go b/...strators/model_administratorproperties.go → ...strators/model_administratorproperties.go
diff --git a/...rs/model_administratorpropertiesforadd.go → ...rs/model_administratorpropertiesforadd.go b/...rs/model_administratorpropertiesforadd.go → ...rs/model_administratorpropertiesforadd.go
diff --git a/...l/2024-08-01/administrators/predicates.go → ...l/2022-12-01/administrators/predicates.go b/...l/2024-08-01/administrators/predicates.go → ...l/2022-12-01/administrators/predicates.go
diff --git a/...esql/2024-08-01/administrators/version.go → ...esql/2022-12-01/administrators/version.go b/...esql/2024-08-01/administrators/version.go → ...esql/2022-12-01/administrators/version.go
diff --git a/...postgresql/2024-08-01/databases/README.md → ...postgresql/2022-12-01/databases/README.md b/...postgresql/2024-08-01/databases/README.md → ...postgresql/2022-12-01/databases/README.md
diff --git a/...postgresql/2024-08-01/databases/client.go → ...postgresql/2022-12-01/databases/client.go b/...postgresql/2024-08-01/databases/client.go → ...postgresql/2022-12-01/databases/client.go
diff --git a/...resql/2024-08-01/databases/id_database.go → ...resql/2022-12-01/databases/id_database.go b/...resql/2024-08-01/databases/id_database.go → ...resql/2022-12-01/databases/id_database.go
diff --git a/...2024-08-01/databases/id_flexibleserver.go → ...2022-12-01/databases/id_flexibleserver.go b/...2024-08-01/databases/id_flexibleserver.go → ...2022-12-01/databases/id_flexibleserver.go
diff --git a/...sql/2024-08-01/databases/method_create.go → ...sql/2022-12-01/databases/method_create.go b/...sql/2024-08-01/databases/method_create.go → ...sql/2022-12-01/databases/method_create.go
diff --git a/...sql/2024-08-01/databases/method_delete.go → ...sql/2022-12-01/databases/method_delete.go b/...sql/2024-08-01/databases/method_delete.go → ...sql/2022-12-01/databases/method_delete.go
diff --git a/...gresql/2024-08-01/databases/method_get.go → ...gresql/2022-12-01/databases/method_get.go b/...gresql/2024-08-01/databases/method_get.go → ...gresql/2022-12-01/databases/method_get.go
diff --git a/...24-08-01/databases/method_listbyserver.go → ...22-12-01/databases/method_listbyserver.go b/...24-08-01/databases/method_listbyserver.go → ...22-12-01/databases/method_listbyserver.go
diff --git a/...ql/2024-08-01/databases/model_database.go → ...ql/2022-12-01/databases/model_database.go b/...ql/2024-08-01/databases/model_database.go → ...ql/2022-12-01/databases/model_database.go
diff --git a/...-01/databases/model_databaseproperties.go → ...-01/databases/model_databaseproperties.go b/...-01/databases/model_databaseproperties.go → ...-01/databases/model_databaseproperties.go
diff --git a/...gresql/2024-08-01/databases/predicates.go → ...gresql/2022-12-01/databases/predicates.go b/...gresql/2024-08-01/databases/predicates.go → ...gresql/2022-12-01/databases/predicates.go
diff --git a/...ostgresql/2024-08-01/databases/version.go → ...ostgresql/2022-12-01/databases/version.go b/...ostgresql/2024-08-01/databases/version.go → ...ostgresql/2022-12-01/databases/version.go
diff --git a/...gresql/2024-08-01/firewallrules/README.md → ...gresql/2022-12-01/firewallrules/README.md b/...gresql/2024-08-01/firewallrules/README.md → ...gresql/2022-12-01/firewallrules/README.md
diff --git a/...gresql/2024-08-01/firewallrules/client.go → ...gresql/2022-12-01/firewallrules/client.go b/...gresql/2024-08-01/firewallrules/client.go → ...gresql/2022-12-01/firewallrules/client.go
diff --git a/...24-08-01/firewallrules/id_firewallrule.go → ...22-12-01/firewallrules/id_firewallrule.go b/...24-08-01/firewallrules/id_firewallrule.go → ...22-12-01/firewallrules/id_firewallrule.go
diff --git a/...-08-01/firewallrules/id_flexibleserver.go → ...-12-01/firewallrules/id_flexibleserver.go b/...-08-01/firewallrules/id_flexibleserver.go → ...-12-01/firewallrules/id_flexibleserver.go
diff --git a/...01/firewallrules/method_createorupdate.go → ...01/firewallrules/method_createorupdate.go b/...01/firewallrules/method_createorupdate.go → ...01/firewallrules/method_createorupdate.go
diff --git a/...2024-08-01/firewallrules/method_delete.go → ...2022-12-01/firewallrules/method_delete.go b/...2024-08-01/firewallrules/method_delete.go → ...2022-12-01/firewallrules/method_delete.go
diff --git a/...ql/2024-08-01/firewallrules/method_get.go → ...ql/2022-12-01/firewallrules/method_get.go b/...ql/2024-08-01/firewallrules/method_get.go → ...ql/2022-12-01/firewallrules/method_get.go
diff --git a/...8-01/firewallrules/method_listbyserver.go → ...2-01/firewallrules/method_listbyserver.go b/...8-01/firewallrules/method_listbyserver.go → ...2-01/firewallrules/method_listbyserver.go
diff --git a/...08-01/firewallrules/model_firewallrule.go → ...12-01/firewallrules/model_firewallrule.go b/...08-01/firewallrules/model_firewallrule.go → ...12-01/firewallrules/model_firewallrule.go
diff --git a/...wallrules/model_firewallruleproperties.go → ...wallrules/model_firewallruleproperties.go b/...wallrules/model_firewallruleproperties.go → ...wallrules/model_firewallruleproperties.go
diff --git a/...ql/2024-08-01/firewallrules/predicates.go → ...ql/2022-12-01/firewallrules/predicates.go b/...ql/2024-08-01/firewallrules/predicates.go → ...ql/2022-12-01/firewallrules/predicates.go
diff --git a/...resql/2024-08-01/firewallrules/version.go → ...resql/2022-12-01/firewallrules/version.go b/...resql/2024-08-01/firewallrules/version.go → ...resql/2022-12-01/firewallrules/version.go
diff --git a/...sql/2024-08-01/virtualendpoints/README.md → ...-06-01-preview/virtualendpoints/README.md b/...sql/2024-08-01/virtualendpoints/README.md → ...-06-01-preview/virtualendpoints/README.md
diff --git a/...sql/2024-08-01/virtualendpoints/client.go → ...-06-01-preview/virtualendpoints/client.go b/...sql/2024-08-01/virtualendpoints/client.go → ...-06-01-preview/virtualendpoints/client.go
diff --git a/.../2024-08-01/virtualendpoints/constants.go → ...-01-preview/virtualendpoints/constants.go b/.../2024-08-01/virtualendpoints/constants.go → ...-01-preview/virtualendpoints/constants.go
diff --git a/...-01/virtualendpoints/id_flexibleserver.go → ...iew/virtualendpoints/id_flexibleserver.go b/...-01/virtualendpoints/id_flexibleserver.go → ...iew/virtualendpoints/id_flexibleserver.go
diff --git a/...01/virtualendpoints/id_virtualendpoint.go → ...ew/virtualendpoints/id_virtualendpoint.go b/...01/virtualendpoints/id_virtualendpoint.go → ...ew/virtualendpoints/id_virtualendpoint.go
diff --git a/...4-08-01/virtualendpoints/method_create.go → ...preview/virtualendpoints/method_create.go b/...4-08-01/virtualendpoints/method_create.go → ...preview/virtualendpoints/method_create.go
diff --git a/...4-08-01/virtualendpoints/method_delete.go → ...preview/virtualendpoints/method_delete.go b/...4-08-01/virtualendpoints/method_delete.go → ...preview/virtualendpoints/method_delete.go
diff --git a/...2024-08-01/virtualendpoints/method_get.go → ...01-preview/virtualendpoints/method_get.go b/...2024-08-01/virtualendpoints/method_get.go → ...01-preview/virtualendpoints/method_get.go
diff --git a/...1/virtualendpoints/method_listbyserver.go → ...w/virtualendpoints/method_listbyserver.go b/...1/virtualendpoints/method_listbyserver.go → ...w/virtualendpoints/method_listbyserver.go
diff --git a/...4-08-01/virtualendpoints/method_update.go → ...preview/virtualendpoints/method_update.go b/...4-08-01/virtualendpoints/method_update.go → ...preview/virtualendpoints/method_update.go
diff --git a/...ndpoints/model_virtualendpointresource.go → ...ndpoints/model_virtualendpointresource.go b/...ndpoints/model_virtualendpointresource.go → ...ndpoints/model_virtualendpointresource.go
diff --git a/.../model_virtualendpointresourceforpatch.go → .../model_virtualendpointresourceforpatch.go b/.../model_virtualendpointresourceforpatch.go → .../model_virtualendpointresourceforpatch.go
diff --git a/...odel_virtualendpointresourceproperties.go → ...odel_virtualendpointresourceproperties.go b/...odel_virtualendpointresourceproperties.go → ...odel_virtualendpointresourceproperties.go
diff --git a/...2024-08-01/virtualendpoints/predicates.go → ...01-preview/virtualendpoints/predicates.go b/...2024-08-01/virtualendpoints/predicates.go → ...01-preview/virtualendpoints/predicates.go
diff --git a/...ql/2024-08-01/virtualendpoints/version.go → ...06-01-preview/virtualendpoints/version.go b/...ql/2024-08-01/virtualendpoints/version.go → ...06-01-preview/virtualendpoints/version.go
diff --git a/...hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/servers/README.md b/...hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/servers/README.md
diff --git a/...ithub.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/servers/client.go b/...ithub.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/servers/client.go