kitchen-azurerm 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0d97c69c8005f27101cab45195a8c8680f9eddc7
-  data.tar.gz: f6a7a95a41e0adb5aa64d82a316c843f92a552b4
+SHA256:
+  metadata.gz: b74bca4d62cfed46b2324573d6a855ae063b77904f3a9bfb9c4daefd4f292ab9
+  data.tar.gz: 8e634aef438292cbca56180e73938a756a0f480e6c0189ec03d9958c4e82db76
 SHA512:
-  metadata.gz: 1cccf2149ccd7c0b8f9a8ff08ff37e3a9afa366a14e5918f0662c051a4b2b07eb1aa2b6598b0b9e669f3f9ec0674ff432d6cc8a0ccc9ae85458af8de9905a0b0
-  data.tar.gz: ea9e44ce8f8547ab702eab588620b75c7a5bb2fe6338a966c62c74690d56e3b827487106d02601bf8d567c206111481184321bdf4c26d76ee21bae2df5967bc7
+  metadata.gz: 169c9351866ec61413c0d0466a427598b8678d7a728a764712d48474814ac7f7e21d8650d58dac8a7494134e293485d06cfd5886a494ca299bb5e2c871703017
+  data.tar.gz: 322cdbfebcffa928f6ae37912cdc82038160f2252e451688ec27d3fca548bd17eba7385082827b77f2311956dfdd537335f57ffa9bb6a89002d6b9b668429312

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # kitchen-azurerm Changelog
 
+## [0.14.1] - 2018-05-10
+- Support for soverign clouds with latest Azure SDK for Ruby, fixes [#79](https://github.com/test-kitchen/kitchen-azurerm/issues/79)
+- Raise error when subscription_id is not available, fixes [#74](https://github.com/test-kitchen/kitchen-azurerm/issues/74)
+
 ## [0.14.0] - 2018-04-10
 - Update Azure SDK to latest version, upgrade to latest build tools
 

data/README.md

@@ -56,8 +56,6 @@ Here's an example ```.kitchen.yml``` file that provisions an Ubuntu Server, usin
 ---
 driver:
   name: azurerm
-
-driver_config:
   subscription_id: '4801fa9d-YOUR-GUID-HERE-b265ff49ce21'
   location: 'West Europe'
   machine_size: 'Standard_D1'
@@ -70,7 +68,7 @@ provisioner:
 
 platforms:
   - name: ubuntu-14.04
-    driver_config:
+    driver:
       image_urn: Canonical:UbuntuServer:14.04.4-LTS:latest
       vm_name: trusty-vm
       vm_tags:
@@ -99,8 +97,6 @@ Here's a further example ```.kitchen.yml``` file that will provision a Windows S
 ---
 driver:
   name: azurerm
-
-driver_config:
   subscription_id: '4801fa9d-YOUR-GUID-HERE-b265ff49ce21'
   location: 'West Europe'
   machine_size: 'Standard_D1'
@@ -110,7 +106,7 @@ provisioner:
 
 platforms:
   - name: windows2012-r2
-    driver_config:
+    driver:
       image_urn: MicrosoftWindowsServer:WindowsServer:2012-R2-Datacenter:latest
     transport:
       name: winrm
@@ -133,8 +129,6 @@ These resources will be created in the same Azure Resource Group as the VM under
 ---
 driver:
   name: azurerm
-
-driver_config:
   subscription_id: '4801fa9d-YOUR-GUID-HERE-b265ff49ce21'
   location: 'West Europe'
   machine_size: 'Standard_D1'
@@ -150,7 +144,7 @@ provisioner:
 
 platforms:
   - name: ubuntu-1404
-    driver_config:
+    driver:
       image_urn: Canonical:UbuntuServer:14.04.4-LTS:latest
 
 suites:
@@ -199,7 +193,7 @@ Example predeploy.json:
 
 ### .kitchen.yml example 4 - deploy VM to existing virtual network/subnet (use for ExpressRoute/VPN scenarios)
 
-The following example introduces the ```vnet_id``` and ```subnet_id``` properties under driver_config in the configuration file.  This can be applied at the top level, or per platform.
+The following example introduces the ```vnet_id``` and ```subnet_id``` properties under "driver" in the configuration file.  This can be applied at the top level, or per platform.
 You can use this capability to create the VM on an existing virtual network and subnet created in a different resource group.
 
 In this case, the public IP address is not used unless ```public_ip``` is set to ```true```
@@ -209,8 +203,6 @@ In this case, the public IP address is not used unless ```public_ip``` is set to
 ---
 driver:
   name: azurerm
-
-driver_config:
   subscription_id: '4801fa9d-YOUR-GUID-HERE-b265ff49ce21'
   location: 'West Europe'
   machine_size: 'Standard_D1'
@@ -223,7 +215,7 @@ provisioner:
 
 platforms:
   - name: ubuntu-1404
-    driver_config:
+    driver:
       image_urn: Canonical:UbuntuServer:14.04.4-LTS:latest
       vnet_id: /subscriptions/b6e7eee9-YOUR-GUID-HERE-03ab624df016/resourceGroups/pendrica-infrastructure/providers/Microsoft.Network/virtualNetworks/pendrica-arm-vnet
       subnet_id: subnet-10.1.0
@@ -245,8 +237,6 @@ Note: The image must be available first. On deletion the disk and everything is
 ---
 driver:
   name: azurerm
-
-driver_config:
   subscription_id: '4801fa9d-YOUR-GUID-HERE-b265ff49ce21'
   location: 'West Europe'
   machine_size: 'Standard_D1'
@@ -259,7 +249,7 @@ provisioner:
 
 platforms:
   - name: ubuntu-1404
-    driver_config:
+    driver:
       image_id: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/RESGROUP/providers/Microsoft.Compute/images/IMAGENAME
       vnet_id: /subscriptions/b6e7eee9-YOUR-GUID-HERE-03ab624df016/resourceGroups/pendrica-infrastructure/providers/Microsoft.Network/virtualNetworks/pendrica-arm-vnet
       subnet_id: subnet-10.1.0
@@ -290,8 +280,6 @@ This example will:
 ---
 driver:
   name: azurerm
-
-driver_config:
   subscription_id: '4801fa9d-YOUR-GUID-HERE-b265ff49ce21'
   location: 'West Europe'
   machine_size: 'Standard_D1'
@@ -304,7 +292,7 @@ provisioner:
 
 platforms:
   - name: ubuntu-1404
-    driver_config:
+    driver:
       image_url: https://yourstorageaccount.blob.core.windows.net/system/Microsoft.Compute/Images/images/Cent7_P4-osDisk.170dd1b7-7dc3-4496-b248-f47c49f63965.vhd
       existing_storage_account_blob_url: https://yourstorageaccount.blob.core.windows.net
       os_type: linux
@@ -330,8 +318,6 @@ Note: Custom data can be custom data or a file to custom data. Please also note
 ---
 driver:
   name: azurerm
-
-driver_config:
   subscription_id: '4801fa9d-YOUR-GUID-HERE-b265ff49ce21'
   location: 'West Europe'
   machine_size: 'Standard_D1'
@@ -344,7 +330,7 @@ provisioner:
 
 platforms:
   - name: ubuntu-1404
-    driver_config:
+    driver:
       image_url: https://yourstorageaccount.blob.core.windows.net/system/Microsoft.Compute/Images/images/Cent7_P4-osDisk.170dd1b7-7dc3-4496-b248-f47c49f63965.vhd
       existing_storage_account_blob_url: https://yourstorageaccount.blob.core.windows.net
       os_type: linux
@@ -377,8 +363,6 @@ Note the availability of a `format_data_disks` option (default: `false`).  When
 ---
 driver:
   name: azurerm
-
-driver_config:
   subscription_id: '4801fa9d-YOUR-GUID-HERE-b265ff49ce21'
   location: 'West Europe'
   machine_size: 'Standard_F2s'
@@ -388,7 +372,7 @@ provisioner:
 
 platforms:
 - name: windows2016-noformat
-  driver_config:
+  driver:
     image_urn: MicrosoftWindowsServer:WindowsServer:2016-Datacenter:latest
     data_disks:
       - lun: 0
@@ -418,8 +402,6 @@ Note that the ```use_managed_disks``` option should be set to false until suppor
 ---
 driver:
   name: azurerm
-
-driver_config:
   subscription_id: 'abcdabcd-YOUR-GUID-HERE-abcdabcdabcd'
   azure_environment: 'AzureUSGovernment'
   location: 'US Gov Iowa'
@@ -434,7 +416,7 @@ verifier:
 
 platforms:
 - name: ubuntu1604
-  driver_config:
+  driver:
     image_urn: Canonical:UbuntuServer:16.04-LTS:latest
   transport:
     ssh_key: ~/.ssh/id_kitchen-azurerm
@@ -480,7 +462,7 @@ info:    vm image list command OK
 ```
 
 ### Additional parameters:
-- Note that the ```driver_config``` section also takes a ```username``` and ```password``` parameter, the defaults if these are not specified are "azure" and "P2ssw0rd" respectively.
+- Note that the ```driver``` section also takes a ```username``` and ```password``` parameter, the defaults if these are not specified are "azure" and "P2ssw0rd" respectively.
 - The ```storage_account_type``` parameter defaults to 'Standard_LRS' and allows you to switch to premium storage (e.g. 'Premium_LRS')
 - The ```enable_boot_diagnostics``` parameter defaults to 'true' and allows you to switch off boot diagnostics in case you are using premium storage.
 - The optional ```vm_tags``` parameter allows you to define key:value pairs to tag VMs with on creation.

data/lib/kitchen/driver/azurerm.rb

@@ -148,6 +148,10 @@ module Kitchen
           vmName: state[:vm_name]
         }
 
+        if config[:subscription_id].to_s == ''
+          raise 'A subscription_id config value was not detected and kitchen-azurerm cannot continue. Please check your .kitchen.yml configuration. Exiting.'
+        end
+
         if config[:custom_data].to_s != ''
           deployment_parameters['customData'] = prepared_custom_data
         end

data/lib/kitchen/driver/credentials.rb

@@ -33,22 +33,24 @@ module Kitchen
         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, settings_for_azure_environment(azure_environment))
+        token_provider = ::MsRestAzure::ApplicationTokenProvider.new(tenant_id, client_id, client_secret, ad_settings_for_azure_environment(azure_environment))
         options = { tenant_id: tenant_id,
                     client_id: client_id,
                     client_secret: client_secret,
                     subscription_id: subscription_id,
-                    credentials: ::MsRest::TokenCredentials.new(token_provider) }
+                    credentials: ::MsRest::TokenCredentials.new(token_provider),
+                    active_directory_settings: ad_settings_for_azure_environment(azure_environment),
+                    base_url: endpoint_settings_for_azure_environment(azure_environment).resource_manager_endpoint_url }
         options
       end
 
       #
-      # Retrieves a [MsRestAzure::ActiveDirectoryServiceSettings] object representing the settings for the given cloud.
+      # Retrieves a [MsRestAzure::ActiveDirectoryServiceSettings] object representing the AD 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)
+      def ad_settings_for_azure_environment(azure_environment)
         case azure_environment.downcase
         when 'azureusgovernment'
           ::MsRestAzure::ActiveDirectoryServiceSettings.get_azure_us_government_settings
@@ -61,6 +63,25 @@ module Kitchen
         end
       end
 
+      #
+      # Retrieves a [MsRestAzure::AzureEnvironment] object representing endpoint settings for the given cloud.
+      # @param azure_environment [String] The Azure environment to retrieve settings for.
+      #
+      # @return [MsRestAzure::AzureEnvironment] Settings to be used for subsequent requests
+      #
+      def endpoint_settings_for_azure_environment(azure_environment)
+        case azure_environment.downcase
+        when 'azureusgovernment'
+          ::MsRestAzure::AzureEnvironments::AzureUSGovernment
+        when 'azurechina'
+          ::MsRestAzure::AzureEnvironments::AzureChinaCloud
+        when 'azuregermancloud'
+          ::MsRestAzure::AzureEnvironments::AzureGermanCloud
+        when 'azure'
+          ::MsRestAzure::AzureEnvironments::AzureCloud
+        end
+      end
+
       def self.singleton
         @credentials ||= Credentials.new
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-azurerm
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Stuart Preston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_network
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Test Kitchen driver for Azure Resource Manager.