kitchen-azurerm 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43e31b997eaad24c664c720fd6e499f04021940c
-  data.tar.gz: 3c92979c97988e1d7af0d84111362c501e577b62
+  metadata.gz: 05ef22eeb440f66a0bffd98b1176b0016fd3d05e
+  data.tar.gz: a891f93f0ea8296aace68d6efdbb111aafcc0400
 SHA512:
-  metadata.gz: 1a3a8b0de1fbf6c832c2fa065515552ec17d7042d9a86ebefc9c22ec5d1a653153111ec19b7c4eb71f0a51078d9ea4d6952707b55d76ce19554cf984d42476cd
-  data.tar.gz: 7ac4c11589b995f3d8c3262d5372015a58420c079547559ad0e93261a218d13db8141935ba35e06d61dd1f89d92b4f5ee0471d5c0d6fac1fed69a3259de2ea9e
+  metadata.gz: 19892e32f4c756c90ddd3b7fe9e5dc00cf9ec8e5b722b73ec98006cab9402537a95fd93b8ab868f6ef2d0bcce704dced603e8226b63d6e53e74ef52d64967e88
+  data.tar.gz: 018ce70d5e518dae8759b0a6e5ff6a5daeb77f2d66712e0dca3a0c234b8bd76dfd8f04035ab10a6e707edfa7985ec26fbcc4d4d60d9bb840e863708d07cb0c27

data/lib/kitchen/driver/azurerm.rb

@@ -56,8 +56,8 @@ module Kitchen
         false
       end
 
-      default_config(:azure_management_url) do |_config|
-        'https://management.azure.com'
+      default_config(:azure_environment) do |_config|
+        'Azure'
       end
 
       default_config(:pre_deployment_template) do |_config|
@@ -95,8 +95,10 @@ module Kitchen
           vmName: state[:vm_name]
         }
 
-        credentials = Kitchen::Driver::Credentials.new.azure_credentials_for_subscription(config[:subscription_id])
-        @resource_management_client = ::Azure::ARM::Resources::ResourceManagementClient.new(credentials)
+        credentials = Kitchen::Driver::Credentials.new.azure_credentials_for_subscription(config[:subscription_id], config[:azure_environment])
+        management_endpoint = resource_manager_endpoint_url(config[:azure_environment])
+        info "Azure environment: #{config[:azure_environment]}"
+        @resource_management_client = ::Azure::ARM::Resources::ResourceManagementClient.new(credentials, management_endpoint)
         @resource_management_client.subscription_id = config[:subscription_id]
 
         # Create Resource Group
@@ -136,7 +138,7 @@ module Kitchen
         # Monitor all operations until completion
         follow_deployment_until_end_state(state[:azure_resource_group_name], deployment_name)
 
-        network_management_client = ::Azure::ARM::Network::NetworkManagementClient.new(credentials)
+        network_management_client = ::Azure::ARM::Network::NetworkManagementClient.new(credentials, management_endpoint)
         network_management_client.subscription_id = config[:subscription_id]
 
         if config[:vnet_id] == '' || config[:public_ip]
@@ -161,7 +163,7 @@ module Kitchen
         state[:uuid] = SecureRandom.hex(8) unless existing_state_value?(state, :uuid)
         state[:server_id] = "vm#{state[:uuid]}" unless existing_state_value?(state, :server_id)
         state[:azure_resource_group_name] = azure_resource_group_name unless existing_state_value?(state, :azure_resource_group_name)
-        [:subscription_id, :username, :password, :vm_name, :azure_management_url].each do |config_element|
+        [:subscription_id, :username, :password, :vm_name, :azure_environment].each do |config_element|
           state[config_element] = config[config_element] unless existing_state_value?(state, config_element)
         end
         state.delete(:password) unless instance.transport[:ssh_key].nil?
@@ -305,8 +307,10 @@ module Kitchen
 
       def destroy(state)
         return if state[:server_id].nil?
-        credentials = Kitchen::Driver::Credentials.new.azure_credentials_for_subscription(state[:subscription_id])
-        resource_management_client = ::Azure::ARM::Resources::ResourceManagementClient.new(credentials, state[:azure_management_url])
+        credentials = Kitchen::Driver::Credentials.new.azure_credentials_for_subscription(state[:subscription_id], state[:azure_environment])
+        management_endpoint = resource_manager_endpoint_url(state[:azure_environment])
+        info "Azure environment: #{state[:azure_environment]}"
+        resource_management_client = ::Azure::ARM::Resources::ResourceManagementClient.new(credentials, management_endpoint)
         resource_management_client.subscription_id = state[:subscription_id]
         begin
           info "Destroying Resource Group: #{state[:azure_resource_group_name]}"
@@ -385,6 +389,19 @@ logoff
         data.each { |key, value| render_binding.local_variable_set(key.to_sym, value) }
         ERB.new(template, nil, '-').result(render_binding)
       end
+
+      def resource_manager_endpoint_url(azure_environment)
+        case azure_environment.downcase
+        when 'azureusgovernment'
+          MsRestAzure::AzureEnvironments::AzureUSGovernment.resource_manager_endpoint_url
+        when 'azurechina'
+          MsRestAzure::AzureEnvironments::AzureChina.resource_manager_endpoint_url
+        when 'azuregermancloud'
+          MsRestAzure::AzureEnvironments::AzureGermanCloud.resource_manager_endpoint_url
+        when 'azure'
+          MsRestAzure::AzureEnvironments::Azure.resource_manager_endpoint_url
+        end
+      end
     end
   end
 end

data/lib/kitchen/driver/credentials.rb

@@ -26,14 +26,33 @@ module Kitchen
       #
       # @return [MsRest::TokenCredentials] TokenCredentials object to be passed in with each subsequent request.
       #
-      def azure_credentials_for_subscription(subscription_id)
+      def azure_credentials_for_subscription(subscription_id, azure_environment)
         tenant_id = ENV['AZURE_TENANT_ID'] || @credentials[subscription_id]['tenant_id']
         client_id = ENV['AZURE_CLIENT_ID'] || @credentials[subscription_id]['client_id']
         client_secret = ENV['AZURE_CLIENT_SECRET'] || @credentials[subscription_id]['client_secret']
-        token_provider = ::MsRestAzure::ApplicationTokenProvider.new(tenant_id, client_id, client_secret)
+        token_provider = ::MsRestAzure::ApplicationTokenProvider.new(tenant_id, client_id, client_secret, settings_for_azure_environment(azure_environment))
         ::MsRest::TokenCredentials.new(token_provider)
       end
 
+      #
+      # Retrieves a [MsRestAzure::ActiveDirectoryServiceSettings] object representing the settings for the given cloud.
+      # @param azure_environment [String] The Azure environment to retrieve settings for.
+      #
+      # @return [MsRestAzure::ActiveDirectoryServiceSettings] Settings to be used for subsequent requests
+      #
+      def settings_for_azure_environment(azure_environment)
+        case azure_environment.downcase
+        when 'azureusgovernment'
+          ::MsRestAzure::ActiveDirectoryServiceSettings.get_azure_us_government_settings
+        when 'azurechina'
+          ::MsRestAzure::ActiveDirectoryServiceSettings.get_azure_china_settings
+        when 'azuregermancloud'
+          ::MsRestAzure::ActiveDirectoryServiceSettings.get_azure_germany_settings
+        when 'azure'
+          ::MsRestAzure::ActiveDirectoryServiceSettings.get_azure_settings
+        end
+      end
+
       def self.singleton
         @credentials ||= Credentials.new
       end

data/templates/internal.erb

@@ -196,7 +196,7 @@
                     "osDisk": {
                         "name": "osdisk",
                         "vhd": {
-                            "uri": "[concat('http://',parameters('newStorageAccountName'),'.blob.core.windows.net/',variables('vmStorageAccountContainerName'),'/',variables('OSDiskName'),'.vhd')]"
+                            "uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName')), '2015-06-15').primaryEndpoints.blob, variables('vmStorageAccountContainerName'), '/',variables('OSDiskName'),'.vhd')]"
                         },
                         "caching": "ReadWrite",
                         "createOption": "FromImage"
@@ -212,7 +212,7 @@
                 "diagnosticsProfile": {
                     "bootDiagnostics": {
                         "enabled": "[parameters('bootDiagnosticsEnabled')]",
-                        "storageUri": "[concat('http://',parameters('newStorageAccountName'),'.blob.core.windows.net')]"
+                        "storageUri": "[reference(concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName')), '2015-06-15').primaryEndpoints.blob]"
                     }
                 }
             },

data/templates/public.erb

@@ -215,7 +215,7 @@
                     "osDisk": {
                         "name": "osdisk",
                         "vhd": {
-                            "uri": "[concat('http://',parameters('newStorageAccountName'),'.blob.core.windows.net/',variables('vmStorageAccountContainerName'),'/',variables('OSDiskName'),'.vhd')]"
+                            "uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName')), '2015-06-15').primaryEndpoints.blob, variables('vmStorageAccountContainerName'), '/',variables('OSDiskName'),'.vhd')]"
                         },
                         "caching": "ReadWrite",
                         "createOption": "FromImage"
@@ -231,7 +231,7 @@
                 "diagnosticsProfile": {
                     "bootDiagnostics": {
                         "enabled": "[parameters('bootDiagnosticsEnabled')]",
-                        "storageUri": "[concat('http://',parameters('newStorageAccountName'),'.blob.core.windows.net')]"
+                        "storageUri": "[reference(concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName')), '2015-06-15').primaryEndpoints.blob]"
                     }
                 }
             },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-azurerm
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Stuart Preston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -148,7 +148,7 @@ dependencies:
         version: '0'
 description: Test Kitchen driver for the Microsoft Azure Resource Manager (ARM) API
 email:
-- stuart@pendrica.com
+- stuart@chef.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -160,7 +160,7 @@ files:
 - lib/kitchen/driver/credentials.rb
 - templates/internal.erb
 - templates/public.erb
-homepage: https://github.com/pendrica/kitchen-azurerm
+homepage: https://github.com/test-kitchen/kitchen-azurerm
 licenses:
 - Apache-2.0
 metadata: {}