Merge pull request #2005 from andyzhangx/cleanup-go-autorest

cleanup: remove unused getCloudEnvironment func

Author: andyzhangx

go.mod

@@ -14,7 +14,6 @@ require (
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.0
 	github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.3.1
 	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2
-	github.com/Azure/go-autorest/autorest v0.11.30
 	github.com/container-storage-interface/spec v1.11.0
 	github.com/go-ini/ini v1.67.0
 	github.com/golang/protobuf v1.5.4
@@ -59,6 +58,7 @@ require (
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v1.3.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1 // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
+	github.com/Azure/go-autorest/autorest v0.11.30 // indirect
 	github.com/Azure/go-autorest/autorest/adal v0.9.24 // indirect
 	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
 	github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect

pkg/blob/azure.go

@@ -25,7 +25,6 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
 	network "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v6"
 	"github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets"
-	azure2 "github.com/Azure/go-autorest/autorest/azure"
 	"golang.org/x/net/context"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
@@ -280,21 +279,6 @@ func (d *Driver) getStorageEndPointSuffix() string {
 	return d.cloud.Environment.StorageEndpointSuffix
 }
 
-func (d *Driver) getCloudEnvironment() azure2.Environment {
-	if d.cloud == nil || d.cloud.Environment == nil {
-		return azure2.PublicCloud
-	}
-	return azure2.Environment{
-		Name:                       d.cloud.Environment.Name,
-		ServiceManagementEndpoint:  d.cloud.Environment.ServiceManagementEndpoint,
-		ResourceManagerEndpoint:    d.cloud.Environment.ResourceManagerEndpoint,
-		ActiveDirectoryEndpoint:    d.cloud.Environment.ActiveDirectoryEndpoint,
-		StorageEndpointSuffix:      d.cloud.Environment.StorageEndpointSuffix,
-		ContainerRegistryDNSSuffix: d.cloud.Environment.ContainerRegistryDNSSuffix,
-		TokenAudience:              d.cloud.Environment.TokenAudience,
-	}
-}
-
 // getBackOff returns a backoff object based on the config
 func getBackOff(config azureconfig.Config) wait.Backoff {
 	steps := config.CloudProviderBackoffRetries

pkg/blob/azure_test.go

@@ -28,7 +28,6 @@ import (
 	"time"
 
 	network "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v6"
-	"github.com/Azure/go-autorest/autorest/azure"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/mock/gomock"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -420,40 +419,6 @@ func TestGetStorageEndPointSuffix(t *testing.T) {
 	}
 }
 
-func TestGetCloudEnvironment(t *testing.T) {
-	d := NewFakeDriver()
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	tests := []struct {
-		name        string
-		cloud       *storage.AccountRepo
-		expectedEnv azure.Environment
-	}{
-		{
-			name:        "nil cloud",
-			cloud:       nil,
-			expectedEnv: azure.PublicCloud,
-		},
-		{
-			name: "cloud with environment",
-			cloud: &storage.AccountRepo{
-				Environment: &azclient.Environment{
-					Name: "AzureChinaCloud",
-				},
-			},
-			expectedEnv: azure.ChinaCloud,
-		},
-	}
-
-	for _, test := range tests {
-		d.cloud = test.cloud
-		env := d.getCloudEnvironment()
-		assert.Equal(t, test.expectedEnv.Name, env.Name, test.name)
-	}
-}
-
 func TestGetBackOff(t *testing.T) {
 	tests := []struct {
 		desc     string