terraspace_plugin_azurerm 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3ff4bc13ad8e73d40b985420c107ef791d652bde858092271a239715ec6b824
-  data.tar.gz: cdbc5ddac31c0c4fad5676ea802810fd9982f02a59f3347bf72d4e407f7abec7
+  metadata.gz: 3164712306e20fe0da2192f6e8168e7d19dc773f840f351f351bd3cd0c56fd76
+  data.tar.gz: 4e3a39f1aacad41a0806f5e9c81013119b58f11dc42b2d0ac791f9e0c4e44814
 SHA512:
-  metadata.gz: 878dc0469567622cd0bf3ef0c378ae5ba9962035511110fdb057892873d0d4e67cf0e00c2173cc52904ea9d2a58d7c2062b1bac8673a8dd45c03bb946e220149
-  data.tar.gz: f9f776fc7ad11500b9f29c57a141012b883295f59e25c67d7393d07a6dde2aadaf71f7e2322848bdf67ba5feaebce3553c49a4004632e83f9fc5026b965278bf
+  metadata.gz: 005df536cf5d7b6ed59435e2560bce4924ecc8a0cf4be3a6c2ae294b711c160e435797a62758d476978d3be3914f10336d23c74a681f1b381bc6d820c68dbcae
+  data.tar.gz: 6c3169184cb1b3de048689ab79c9e860c6f9892c5c6ff74eca63db07010d2c6883e8a24d802d6d0d29d4b69d427243631fb66bc990c1e922fdbe9132cd4095cd

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [0.2.3]
+- #4 validate env vars and use older storage client
+
 ## [0.2.2]
 - #3 fix test template
 

data/README.md

@@ -27,7 +27,7 @@ end
 
 By default, this plugin will automatically create the:
 
-* [resource group](Pluginazurerm)
+* [resource group](https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/manage-resource-groups-portal)
 * [storage account](https://docs.microsoft.com/en-us/azure/storage/common/storage-account-create?tabs=azure-portal)
 * [storage container](https://docs.microsoft.com/en-us/cli/azure/storage/container?view=azure-cli-latest#az-storage-container-create)
 
@@ -35,15 +35,17 @@ The settings generally only apply if the resource does not yet exist yet and is
 
 ## Environment Variables
 
-To create the Azure resources like [resource group](Pluginazurerm), [storage account](https://docs.microsoft.com/en-us/azure/storage/common/storage-account-create?tabs=azure-portal), and [storage container](https://docs.microsoft.com/en-us/cli/azure/storage/container?view=azure-cli-latest#az-storage-container-create) these environment variables are required:
+To create the Azure resources like [resource group](https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/manage-resource-groups-portal), [storage account](https://docs.microsoft.com/en-us/azure/storage/common/storage-account-create?tabs=azure-portal), and [storage container](https://docs.microsoft.com/en-us/cli/azure/storage/container?view=azure-cli-latest#az-storage-container-create) these environment variables are required:
 
-    AZURE_CLIENT_ID
-    AZURE_CLIENT_SECRET
+    ARM_CLIENT_ID
+    ARM_CLIENT_SECRET
 
-There's other env variables can also be set, but are generally inferred.
+Other env variables can be optionally set:
 
-    AZURE_TENANT_ID
-    AZURE_SUBSCRIPTION_ID
+    ARM_TENANT_ID
+    ARM_SUBSCRIPTION_ID
+
+When not set, their values are inferred from the [az cli](https://docs.microsoft.com/en-us/cli/azure/) settings. For those interested, this is done with the [boltops-tools/azure_info](https://github.com/boltops-tools/azure_info) library.
 
 ## Contributing
 

data/lib/terraspace_plugin_azurerm/clients/options.rb

@@ -3,21 +3,49 @@ module TerraspacePluginAzurerm::Clients
     extend Memoist
 
     def client_options
-      client_id       = ENV['AZURE_CLIENT_ID']
-      client_secret   = ENV['AZURE_CLIENT_SECRET']
-      subscription_id = ENV['AZURE_SUBSCRIPTION_ID'] || AzureInfo.subscription_id
-      tenant_id       = ENV['AZURE_TENANT_ID'] || AzureInfo.tenant_id
+      o = base_client_options
+      o[:credentials] = credentials
+      o
+    end
+
+    def credentials
+      o = base_client_options
+      provider = MsRestAzure::ApplicationTokenProvider.new(o[:tenant_id], o[:client_id], o[:client_secret])
+      MsRest::TokenCredentials.new(provider)
+    end
 
-      provider = MsRestAzure::ApplicationTokenProvider.new(tenant_id, client_id, client_secret)
-      credentials = MsRest::TokenCredentials.new(provider)
+    def base_client_options
+      # AZURE_* is used by ruby generally.
+      # ARM_* is used by Terraform azurerm provider: https://www.terraform.io/docs/providers/azurerm/index.html
+      # Favor ARM_ because this plugin is designed for Terraspace.
+      client_id       = ENV['ARM_CLIENT_ID'] || ENV['AZURE_CLIENT_ID']
+      client_secret   = ENV['ARM_CLIENT_SECRET'] || ENV['AZURE_CLIENT_SECRET']
+      subscription_id = ENV['ARM_SUBSCRIPTION_ID'] || ENV['AZURE_SUBSCRIPTION_ID'] || AzureInfo.subscription_id
+      tenant_id       = ENV['ARM_TENANT_ID'] || ENV['AZURE_TENANT_ID'] || AzureInfo.tenant_id
 
-      {
+      o = {
         tenant_id: tenant_id,
         client_id: client_id,
         client_secret: client_secret,
         subscription_id: subscription_id,
-        credentials: credentials
       }
+      validate_base_options!(o)
+      o
+    end
+    memoize :base_client_options
+
+    def validate_base_options!(options)
+      vars = []
+      options.each do |k,v|
+        vars << "ARM_#{k}".upcase if v.nil?
+      end
+      return if vars.empty?
+
+      logger.error "ERROR: Required Azure env variables missing. Please set these env variables:".color(:red)
+      vars.each do |var|
+        logger.error "    #{var}"
+      end
+      exit 1
     end
   end
 end

data/lib/terraspace_plugin_azurerm/clients/storage.rb

@@ -6,8 +6,8 @@ module TerraspacePluginAzurerm::Clients
     extend Memoist
 
     # Include SDK modules to ease access to Storage classes.
-    include Azure::Storage::Profiles::Latest::Mgmt
-    include Azure::Storage::Profiles::Latest::Mgmt::Models
+    include Azure::Storage::Mgmt::V2019_06_01
+    include Azure::Storage::Mgmt::V2019_06_01::Models
 
     def storage_accounts
       mgmt.storage_accounts
@@ -19,7 +19,9 @@ module TerraspacePluginAzurerm::Clients
     memoize :blob_containers
 
     def mgmt
-      Client.new(client_options)
+      client = StorageManagementClient.new(credentials)
+      client.subscription_id = client_options[:subscription_id]
+      client
     end
     memoize :mgmt
   end

data/lib/terraspace_plugin_azurerm/version.rb

@@ -1,3 +1,3 @@
 module TerraspacePluginAzurerm
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace_plugin_azurerm
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-20 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure-storage-blob