Merge pull request #17471 from hashicorp/refactor/storage-to-go-azure…

…-sdk storage: refactoring `objectreplicationpolicy` to use `hashicorp/go-azure-sdk`
hashicorp · Jul 11, 2022 · 72b050d · 72b050d
2 parents 64d1ecc + 01fb21d
commit 72b050d
Show file tree

Hide file tree

Showing 23 changed files with 157 additions and 637 deletions.
diff --git a/internal/services/storage/client/client.go b/internal/services/storage/client/client.go
@@ -7,9 +7,9 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-04-01/storage"
 	"github.com/Azure/azure-sdk-for-go/services/storagesync/mgmt/2020-03-01/storagesync"
 	"github.com/Azure/go-autorest/autorest"
-	az "github.com/Azure/go-autorest/autorest/azure"
+	"github.com/Azure/go-autorest/autorest/azure"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/storage/2021-04-01/objectreplicationpolicies"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/common"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/storage/sdk/2021-04-01/objectreplicationpolicies"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/storage/shim"
 	"github.com/tombuildsstuff/giovanni/storage/2019-12-12/blob/accounts"
 	"github.com/tombuildsstuff/giovanni/storage/2019-12-12/blob/blobs"
@@ -33,7 +33,7 @@ type Client struct {
 	BlobInventoryPoliciesClient *storage.BlobInventoryPoliciesClient
 	CloudEndpointsClient        *storagesync.CloudEndpointsClient
 	EncryptionScopesClient      *storage.EncryptionScopesClient
-	Environment                 az.Environment
+	Environment                 azure.Environment
 	FileServicesClient          *storage.FileServicesClient
 	ObjectReplicationClient     *objectreplicationpolicies.ObjectReplicationPoliciesClient
 	SyncServiceClient           *storagesync.ServicesClient

diff --git a/internal/services/storage/parse/object_replication.go b/internal/services/storage/parse/object_replication.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/storage/sdk/2021-04-01/objectreplicationpolicies"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/storage/2021-04-01/objectreplicationpolicies"
 )
 
 // This is manual for concat two ids are not supported in auto-generation

diff --git a/internal/services/storage/parse/object_replication_test.go b/internal/services/storage/parse/object_replication_test.go
@@ -5,8 +5,8 @@ package parse
 import (
 	"testing"
 
+	"github.com/hashicorp/go-azure-sdk/resource-manager/storage/2021-04-01/objectreplicationpolicies"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/resourceid"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/storage/sdk/2021-04-01/objectreplicationpolicies"
 )
 
 var _ resourceid.Formatter = ObjectReplicationId{}

diff --git a/...ces/storage/sdk/2021-04-01/objectreplicationpolicies/id_objectreplicationpolicies_test.go b/...ces/storage/sdk/2021-04-01/objectreplicationpolicies/id_objectreplicationpolicies_test.go