Including #21250

* Initial Check-in... * Fix lint errors... * Add validation and refactor code base... * Fix lint error... * Remove unused meta... * Remove code changes...
hashicorp · Apr 5, 2023 · 6595652 · 6595652
1 parent 04499e3
commit 6595652
Show file tree

Hide file tree

Showing 70 changed files with 1,951 additions and 31 deletions.
diff --git a/internal/services/search/client/client.go b/internal/services/search/client/client.go
@@ -1,10 +1,10 @@
 package client
 
 import (
-	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2020-03-13/adminkeys"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2020-03-13/querykeys"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2020-03-13/services"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2020-08-01/sharedprivatelinkresources"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/adminkeys"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/querykeys"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/services"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/sharedprivatelinkresources"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/common"
 )
 

diff --git a/internal/services/search/search_service_data_source.go b/internal/services/search/search_service_data_source.go
@@ -7,9 +7,9 @@ import (
 	"github.com/hashicorp/go-azure-helpers/lang/response"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/identity"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2020-03-13/adminkeys"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2020-03-13/querykeys"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2020-03-13/services"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/adminkeys"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/querykeys"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/services"
 	"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/search/search_service_resource.go b/internal/services/search/search_service_resource.go
@@ -10,9 +10,9 @@ import (
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/identity"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2020-03-13/adminkeys"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2020-03-13/querykeys"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2020-03-13/services"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/adminkeys"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/querykeys"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/services"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/validate"
@@ -168,7 +168,7 @@ func resourceSearchServiceCreateUpdate(d *pluginsdk.ResourceData, meta interface
 
 	skuName := services.SkuName(d.Get("sku").(string))
 	properties := services.SearchService{
-		Location: utils.String(location),
+		Location: location,
 		Sku: &services.Sku{
 			Name: &skuName,
 		},
@@ -226,7 +226,7 @@ func resourceSearchServiceRead(d *pluginsdk.ResourceData, meta interface{}) erro
 	d.Set("resource_group_name", id.ResourceGroupName)
 
 	if model := resp.Model; model != nil {
-		d.Set("location", location.NormalizeNilable(model.Location))
+		d.Set("location", location.Normalize(model.Location))
 
 		skuName := ""
 		if sku := model.Sku; sku != nil && sku.Name != nil {

diff --git a/internal/services/search/search_service_resource_test.go b/internal/services/search/search_service_resource_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2020-03-13/services"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/services"
 	"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/search/search_shared_private_link_service_resource.go b/internal/services/search/search_shared_private_link_service_resource.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2020-03-13/services"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2020-08-01/sharedprivatelinkresources"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/services"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/sharedprivatelinkresources"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
 	networkValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/network/validate"

diff --git a/internal/services/search/search_shared_private_link_service_resource_test.go b/internal/services/search/search_shared_private_link_service_resource_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2020-08-01/sharedprivatelinkresources"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/sharedprivatelinkresources"
 	"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/...ger/search/2020-03-13/adminkeys/README.md → ...ger/search/2022-09-01/adminkeys/README.md b/...ger/search/2020-03-13/adminkeys/README.md → ...ger/search/2022-09-01/adminkeys/README.md
diff --git a/...ger/search/2020-03-13/adminkeys/client.go → ...ger/search/2022-09-01/adminkeys/client.go b/...ger/search/2020-03-13/adminkeys/client.go → ...ger/search/2022-09-01/adminkeys/client.go
diff --git a/.../search/2020-03-13/adminkeys/constants.go → .../search/2022-09-01/adminkeys/constants.go b/.../search/2020-03-13/adminkeys/constants.go → .../search/2022-09-01/adminkeys/constants.go
diff --git a/...search/2020-03-13/adminkeys/id_keykind.go → ...search/2022-09-01/adminkeys/id_keykind.go b/...search/2020-03-13/adminkeys/id_keykind.go → ...search/2022-09-01/adminkeys/id_keykind.go
diff --git a/.../2020-03-13/adminkeys/id_searchservice.go → .../2022-09-01/adminkeys/id_searchservice.go b/.../2020-03-13/adminkeys/id_searchservice.go → .../2022-09-01/adminkeys/id_searchservice.go
diff --git a/...20-03-13/adminkeys/method_get_autorest.go → ...22-09-01/adminkeys/method_get_autorest.go b/...20-03-13/adminkeys/method_get_autorest.go → ...22-09-01/adminkeys/method_get_autorest.go
diff --git a/...3/adminkeys/method_regenerate_autorest.go → ...1/adminkeys/method_regenerate_autorest.go b/...3/adminkeys/method_regenerate_autorest.go → ...1/adminkeys/method_regenerate_autorest.go
diff --git a/...0-03-13/adminkeys/model_adminkeyresult.go → ...2-09-01/adminkeys/model_adminkeyresult.go b/...0-03-13/adminkeys/model_adminkeyresult.go → ...2-09-01/adminkeys/model_adminkeyresult.go
diff --git a/...er/search/2020-03-13/adminkeys/version.go → ...er/search/2022-09-01/adminkeys/version.go b/...er/search/2020-03-13/adminkeys/version.go → ...er/search/2022-09-01/adminkeys/version.go
diff --git a/...ger/search/2020-03-13/querykeys/README.md → ...ger/search/2022-09-01/querykeys/README.md b/...ger/search/2020-03-13/querykeys/README.md → ...ger/search/2022-09-01/querykeys/README.md
diff --git a/...ger/search/2020-03-13/querykeys/client.go → ...ger/search/2022-09-01/querykeys/client.go b/...ger/search/2020-03-13/querykeys/client.go → ...ger/search/2022-09-01/querykeys/client.go
diff --git a/...2020-03-13/querykeys/id_createquerykey.go → ...2022-09-01/querykeys/id_createquerykey.go b/...2020-03-13/querykeys/id_createquerykey.go → ...2022-09-01/querykeys/id_createquerykey.go
diff --git a/...2020-03-13/querykeys/id_deletequerykey.go → ...2022-09-01/querykeys/id_deletequerykey.go b/...2020-03-13/querykeys/id_deletequerykey.go → ...2022-09-01/querykeys/id_deletequerykey.go
diff --git a/.../2020-03-13/querykeys/id_searchservice.go → .../2022-09-01/querykeys/id_searchservice.go b/.../2020-03-13/querykeys/id_searchservice.go → .../2022-09-01/querykeys/id_searchservice.go
diff --git a/...03-13/querykeys/method_create_autorest.go → ...09-01/querykeys/method_create_autorest.go b/...03-13/querykeys/method_create_autorest.go → ...09-01/querykeys/method_create_autorest.go
diff --git a/...03-13/querykeys/method_delete_autorest.go → ...09-01/querykeys/method_delete_autorest.go b/...03-13/querykeys/method_delete_autorest.go → ...09-01/querykeys/method_delete_autorest.go
diff --git a/...ys/method_listbysearchservice_autorest.go → ...ys/method_listbysearchservice_autorest.go b/...ys/method_listbysearchservice_autorest.go → ...ys/method_listbysearchservice_autorest.go
diff --git a/...ch/2020-03-13/querykeys/model_querykey.go → ...ch/2022-09-01/querykeys/model_querykey.go b/...ch/2020-03-13/querykeys/model_querykey.go → ...ch/2022-09-01/querykeys/model_querykey.go
diff --git a/...search/2020-03-13/querykeys/predicates.go → ...search/2022-09-01/querykeys/predicates.go b/...search/2020-03-13/querykeys/predicates.go → ...search/2022-09-01/querykeys/predicates.go
diff --git a/...er/search/2020-03-13/querykeys/version.go → ...er/search/2022-09-01/querykeys/version.go b/...er/search/2020-03-13/querykeys/version.go → ...er/search/2022-09-01/querykeys/version.go
diff --git a/...om/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/services/README.md b/...om/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/services/README.md
diff --git a/...r/github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/services/client.go b/...r/github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/services/client.go