Changes to support additional azure enviornments (#1142)

* changes to support additional enviornments * additional test and cleanup * Using azure cloud variables
kanisterio · Nov 17, 2021 · d791e8c · d791e8c
1 parent c955037
commit d791e8c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/pkg/blockstorage/azure/client.go b/pkg/blockstorage/azure/client.go
@@ -40,6 +40,7 @@ type Client struct {
 func NewClient(ctx context.Context, config map[string]string) (*Client, error) {
 	var resourceGroup string
 	var subscriptionID string
+	var cloudEnvironment string
 	var baseURI string
 	var ok bool
 	var err error
@@ -62,7 +63,16 @@ func NewClient(ctx context.Context, config map[string]string) (*Client, error) {
 		}
 	}
 
-	authorizer, err := getAuthorizer(azure.PublicCloud, config)
+	if cloudEnvironment, ok = config[blockstorage.AzureCloudEnviornmentID]; !ok || cloudEnvironment == "" {
+		cloudEnvironment = azure.PublicCloud.Name
+	}
+
+	env, err := azure.EnvironmentFromName(cloudEnvironment)
+	if err != nil {
+		return nil, errors.Wrap(err, "Failed to fetch the cloud environment.")
+	}
+
+	authorizer, err := getAuthorizer(env, config)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/blockstorage/azure/client_test.go b/pkg/blockstorage/azure/client_test.go
@@ -41,6 +41,7 @@ func (s *ClientSuite) TestClient(c *C) {
 	config[blockstorage.AzureCientID] = envconfig.GetEnvOrSkip(c, blockstorage.AzureCientID)
 	config[blockstorage.AzureClentSecret] = envconfig.GetEnvOrSkip(c, blockstorage.AzureClentSecret)
 	config[blockstorage.AzureResurceGroup] = envconfig.GetEnvOrSkip(c, blockstorage.AzureResurceGroup)
+	config[blockstorage.AzureCloudEnviornmentID] = envconfig.GetEnvOrSkip(c, blockstorage.AzureCloudEnviornmentID)
 	azCli, err := NewClient(context.Background(), config)
 	c.Assert(err, IsNil)
 

diff --git a/pkg/blockstorage/blockstorage_test.go b/pkg/blockstorage/blockstorage_test.go
@@ -294,6 +294,7 @@ func (s *BlockStorageProviderSuite) getConfig(c *C, region string) map[string]st
 		config[blockstorage.AzureCientID] = envconfig.GetEnvOrSkip(c, blockstorage.AzureCientID)
 		config[blockstorage.AzureClentSecret] = envconfig.GetEnvOrSkip(c, blockstorage.AzureClentSecret)
 		config[blockstorage.AzureResurceGroup] = envconfig.GetEnvOrSkip(c, blockstorage.AzureResurceGroup)
+		config[blockstorage.AzureCloudEnviornmentID] = envconfig.GetEnvOrSkip(c, blockstorage.AzureCloudEnviornmentID)
 		s.args[blockstorage.AzureMigrateStorageAccount] = envconfig.GetEnvOrSkip(c, blockstorage.AzureMigrateStorageAccount)
 		s.args[blockstorage.AzureMigrateStorageKey] = envconfig.GetEnvOrSkip(c, blockstorage.AzureMigrateStorageKey)
 		s.args[blockstorage.AzureMigrateResourceGroup] = envconfig.GetEnvOrSkip(c, blockstorage.AzureMigrateResourceGroup)

diff --git a/pkg/blockstorage/helpers.go b/pkg/blockstorage/helpers.go
@@ -39,6 +39,7 @@ const (
 	AzureMigrateResourceGroup  = "AZURE_MIGRATE_RESOURCE_GROUP"
 	AzureActiveDirEndpoint     = "AZURE_AD_ENDPOINT"
 	AzureActiveDirResourceID   = "AZURE_AD_RESOURCE"
+	AzureCloudEnviornmentID    = "AZURE_CLOUD_ENV_ID"
 )
 
 // SanitizeTags are used to sanitize the tags