kitchen-azurerm 0.2.6 → 0.3.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b24b970ab88760f88f81546dbb8809561f91120e
-  data.tar.gz: 46bbfb0905c418c9b8676bfa7b1d40ef4d9291cf
+  metadata.gz: ec8f20a56864bfe1b156c1de219296fd7d989514
+  data.tar.gz: f1cd4d4df570fed5a7a38a30563d08fd5e0b7fae
 SHA512:
-  metadata.gz: 433f0b5b6a9c5a420dc60c3a4db656ec54030b77a8cc63f0fb6446f6eacb39d1bed0790fca23ba0c4bbfae89f93cdc6db089b69ddd2a034512f8dba49729e6f4
-  data.tar.gz: 24de08d4b408e9ab3380b56b64bdf5b191f577cc79d32d4a4cc7292e9a4c990f10f204cc6d1634d6fa6f39effa2fe743e2f0310e90a51a3cc2d9f48444cdbe36
+  metadata.gz: 558b375c9a445c4ba8000392e48e1eccd09b09c6c9c2c052bf754622d0ea0cbfa1c47bfe6bda34a3c7de3c59ac0e0cb65b0dcfaf7d0806a7506969533c992cdd
+  data.tar.gz: c2089548a61769a3dcaf44c90c7161f5f433cc5acf6a3e2e11e0912206694715de844fb60a13f1a0c15abc30ab1f4278c277d3337633d5c7c2ea4d7010fcf29f

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # kitchen-azurerm Changelog
 
+## [0.3.0] - 2016-02-29
+- Breaking: Linux machines are now created using a temporary sshkey (~/.ssh/id_kitchen) instead of password (@stuartpreston)
+- Real error message shown if credentials are incorrect (@stuartpreston)
+
 ## [0.2.4] - 2016-01-26
 - Support Premium Storage and Boot Diagnostics (@stuartpreston)
 - If deployment fails, show the message from the failing operation (@stuartpreston)

data/README.md

@@ -4,7 +4,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/kitchen-azurerm.svg)](http://badge.fury.io/rb/kitchen-azurerm) [![Build Status](https://travis-ci.org/pendrica/kitchen-azurerm.svg)](https://travis-ci.org/pendrica/kitchen-azurerm)
 
-This version has been tested on Windows, OS/X and Ubuntu. If you encounter a problem on your platform, please raise an issue. 
+This version has been tested on Windows, OS/X and Ubuntu. If you encounter a problem on your platform, please raise an issue.
 
 ## Quick-start
 ### Installation
@@ -16,11 +16,18 @@ Note if you are running the ChefDK you may need to prefix the command with chef,
 
 ### Configuration
 
-For the driver to interact with the Microsoft Azure Resource management REST API, a Service Principal needs to be configured with Owner rights against the specific subscription being targeted.  Using an Organizational (AAD) account and related password is no longer supported.  To create a Service Principal and apply the correct permissions, follow the instructions in the article: [Authenticating a service principal with Azure Resource Manager](https://azure.microsoft.com/en-us/documentation/articles/resource-group-authenticate-service-principal/#authenticate-service-principal-with-password---azure-cli)   
+For the driver to interact with the Microsoft Azure Resource management REST API, a Service Principal needs to be configured with Contributor rights against the specific subscription being targeted.  Using an Organizational (AAD) account and related password is no longer supported.  To create a Service Principal and apply the correct permissions, you will need to [create and authenticate a service principal](https://azure.microsoft.com/en-us/documentation/articles/resource-group-authenticate-service-principal/#authenticate-service-principal-with-password---azure-cli) using the [Azure CLI](https://azure.microsoft.com/en-us/documentation/articles/xplat-cli-install/). Make sure you stay within the section titled 'Authenticate service principal with password - Azure CLI'.
 
-You will essentially need 4 parameters from the above article to configure kitchen-azurerm: **Subscription ID**, **Client ID**, **Client Secret/Password** and **Tenant ID**.  These can be easily obtained using the azure-cli tools (v0.9.8 or higher) on any platform.
+You will also need to ensure you have an active Azure subscription (you can get started [for free](https://azure.microsoft.com/en-us/free/) or use your [MSDN Subscription](https://azure.microsoft.com/en-us/pricing/member-offers/msdn-benefits/)).
 
-Using a text editor, open or create the file ```~/.azure/credentials``` and add the following section, noting there is one section per Subscription ID.  **Make sure you save the file with UTF-8 encoding** 
+You are now ready to configure kitchen-azurerm to use the credentials from the service principal you created above. You will use four elements from the steps in that article:
+
+1. **Subscription ID**: available from the azure portal
+2. **Client ID**: this will be the Application Id from the application in step 2.
+3. **Client Secret/Password**: this will be the password you supplied in the command in step 2.
+4. **Tenant ID**: listed after the command in step 5.
+
+Using a text editor, open or create the file ```~/.azure/credentials``` and add the following section, noting there is one section per Subscription ID.  **Make sure you save the file with UTF-8 encoding**
 
 ```ruby
 [abcd1234-YOUR-SUBSCRIPTION-ID-HERE-abcdef123456]
@@ -41,7 +48,7 @@ Note that the environment variables, if set, take preference over the values in
 
 ### .kitchen.yml example 1 - Linux/Ubuntu
 
-Here's an example ```.kitchen.yml``` file that provisions 3 different types of Ubuntu Server, using Chef Zero as the provisioner and SSH as the transport.
+Here's an example ```.kitchen.yml``` file that provisions 3 different types of Ubuntu Server, using Chef Zero as the provisioner and SSH as the transport. Note that if the key does not exist at the specified location, it will be created.
 
 ```yml
 ---
@@ -53,6 +60,9 @@ driver_config:
   location: 'West Europe'
   machine_size: 'Standard_D1'
 
+transport:
+  ssh_key: ~/.ssh/id_kitchen-azurerm
+
 provisioner:
   name: chef_zero
 

data/lib/kitchen/driver/azurerm.rb

@@ -4,6 +4,8 @@ require 'securerandom'
 require 'azure_mgmt_resources'
 require 'azure_mgmt_network'
 require 'base64'
+require 'sshkey'
+require 'fileutils'
 
 module Kitchen
   module Driver
@@ -80,7 +82,7 @@ module Kitchen
           info "Creating Resource Group: #{state[:azure_resource_group_name]}"
           resource_management_client.resource_groups.create_or_update(state[:azure_resource_group_name], resource_group).value!
         rescue ::MsRestAzure::AzureOperationError => operation_error
-          info operation_error.body['error']
+          info operation_error
           raise operation_error
         end
 
@@ -142,9 +144,40 @@ module Kitchen
           end
           template['resources'] << JSON.parse(custom_script_extension_template(command))
         end
+
+        if instance.transport.name.casecmp('ssh') == 0 && !instance.transport[:ssh_key].nil?
+          info "Adding public key from #{File.expand_path(instance.transport[:ssh_key])}.pub to the deployment."
+          public_key = public_key_for_deployment(File.expand_path(instance.transport[:ssh_key]))
+          template['resources'].select { |h| h['type'] == 'Microsoft.Compute/virtualMachines' }.each do |resource|
+            resource['properties']['osProfile']['linuxConfiguration'] = JSON.parse(custom_linux_configuration(public_key))
+          end
+        end
         template.to_json
       end
 
+      def public_key_for_deployment(private_key_filename)
+        if File.file?(private_key_filename) == false
+          k = SSHKey.generate
+
+          ::FileUtils.mkdir_p(File.dirname(private_key_filename))
+
+          private_key_file = File.new(private_key_filename, 'w')
+          private_key_file.syswrite(k.private_key)
+          private_key_file.chmod(0600)
+          private_key_file.close
+
+          public_key_file = File.new("#{private_key_filename}.pub", 'w')
+          public_key_file.syswrite(k.ssh_public_key)
+          public_key_file.chmod(0600)
+          public_key_file.close
+
+          output = k.ssh_public_key
+        else
+          output = File.read("#{private_key_filename}.pub")
+        end
+        output
+      end
+
       def deployment(parameters)
         template = template_for_transport_name
         deployment = ::Azure::ARM::Resources::Models::Deployment.new
@@ -180,7 +213,7 @@ module Kitchen
         failed_operations = resource_management_client.deployment_operations.list(resource_group, deployment_name).value!
         failed_operations.body.value.each do |val|
           resource_code = val.properties.status_code
-          fail val.properties.status_message.inspect.to_s if resource_code != 'OK'
+          raise val.properties.status_message.inspect.to_s if resource_code != 'OK'
         end
       end
 
@@ -238,6 +271,22 @@ New-NetFirewallRule -DisplayName "Windows Remote Management (HTTP-In)" -Name "Wi
         'copy /y c:\\\\azuredata\\\\customdata.bin c:\\\\azuredata\\\\customdata.ps1 && powershell.exe -ExecutionPolicy Unrestricted -Command \\"start-process powershell.exe -verb runas -argumentlist c:\\\\azuredata\\\\customdata.ps1\\"'
       end
 
+      def custom_linux_configuration(public_key)
+        <<-EOH
+        {
+          "disablePasswordAuthentication": "true",
+          "ssh": {
+            "publicKeys": [
+              {
+                "path": "[concat('/home/',parameters('adminUsername'),'/.ssh/authorized_keys')]",
+                "keyData": "#{public_key}"
+              }
+            ]
+          }
+        }
+        EOH
+      end
+
       def custom_script_extension_template(command)
         <<-EOH
         {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-azurerm
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.1.pre
 platform: ruby
 authors:
 - Stuart Preston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -52,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: sshkey
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -135,9 +149,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8