chef-provisioning-azure 0.2.1 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26141bfd34a60cbcca1f67c7ad5e812a680460a2
-  data.tar.gz: 83399cb5d0df2d81245787aaf2815b61dcd9a5c0
+  metadata.gz: ea6f8fc59f775e2ca0dbca8498954dfdad8dab5a
+  data.tar.gz: 8d3d5954e16f150c15396d05b20c04e82b541224
 SHA512:
-  metadata.gz: 563c5947d6cf351e69ef06591dba95d8d0b1ade40ad438a1347b9c228f8950096a57c526a8d08466a2bc245b8ec912e994e0694b9f2a46ec48bccf1303ea89ed
-  data.tar.gz: 1ac137365d67e200a3bee5a4594e78d855adb5085997e0bff8fbbf2414f746cdd01f5218ba86dbeef5fde2e911b3df4707250bd9ea8cf431c40917636ed46eef
+  metadata.gz: 6e4facf681246035a6aa86fcf36307601610435efe26d4fea7c3dfb2927832cef1b58952d548b14cff719b2d10873ab681522b295e64ad1c023b3ba75fd49a09
+  data.tar.gz: 02636ab1ff97415cade4db45f5dbc8700e137b25de192e97bd0f53c57b76f6e9535454a666052c88f9a2f8381617e782899772e61c55ae2bc7a6e125555b40e4

data/README.md

@@ -1,39 +1,108 @@
-[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/opscode/chef-provisioning?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/chef/chef-provisioning?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 # chef-provisioning-azure
 
-Implementation of an Azure driver that relies on the Azure SDK. 
-
+This is an implementation of an Microsoft Azure driver for [chef-provisioning](/chef/chef-provisioning) that relies on [azure-sdk-for-ruby](https://github.com/stuartpreston/stuartpreston-azure-sdk-for-ruby) and the Azure Service Management API.
 
 ## What does it do?
 
 It can provision and converge a host on Azure with a recipe like the following:
 
+### Linux
+
 ```ruby
 require 'chef/provisioning/azure_driver'
 with_driver 'azure'
 
 machine_options = {
     :bootstrap_options => {
-      :cloud_service_name => 'chefprovisioning',
-      :storage_account_name => 'chefprovisioning',
-      #:vm_size => "A7"
-      :location => 'West US'
+      :cloud_service_name => 'chefprovisioning', #required
+      :storage_account_name => 'chefprovisioning', #required
+      :vm_size => "Standard_D1", #required
+      :location => 'West US', #required
+      :tcp_endpoints => '80:80' #optional
     },
-    #:image_id => 'foobar'
+    :image_id => 'b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-14_04_1-LTS-amd64-server-20140927-en-us-30GB', #required
     # Until SSH keys are supported (soon)
-    :password => "chefm3t4l\\m/"
+    :password => "chefm3t4l\\m/" #required
 }
 
 machine 'toad' do
   machine_options machine_options
 end
 ```
- 
-That's it. No images, nothing else. Do not expect much just yet. Currently you have to specify the 
-password you want the initial user to have in your recipe. No, this will not be for very long. 
 
-### Setting your credentials
+### Windows
+
+The following example creates a Windows Server 2012 R2 VM from the public OS image gallery, then the uses the public WinRM/s port to bootstrap the server.
+
+```ruby
+require 'chef/provisioning/azure_driver'
+with_driver 'azure'
+
+machine_options = {
+    :bootstrap_options => {
+      :vm_user => 'localadmin', #required if Windows
+      :cloud_service_name => 'chefprovisioning', #required
+      :storage_account_name => 'chefprovisioning', #required
+      :vm_size => 'Standard_D1', #optional
+      :location => 'West US', #optional
+      :tcp_endpoints => '3389:3389', #optional
+      :winrm_transport => { #optional
+        'https' => { #required (valid values: 'http', 'https')
+          :disable_sspi => false, #optional, (default: false)
+          :basic_auth_only => false, #optional, (default: false)
+          :no_ssl_peer_verification => true #optional, (default: false)
+        }
+      }
+    },
+    :password => 'P2ssw0rd', #required
+    :image_id => 'a699494373c04fc0bc8f2bb1389d6106__Windows-Server-2012-R2-201502.01-en.us-127GB.vhd' #required
+}
+
+machine 'toad' do
+  machine_options machine_options
+end
+```
+
+## Supported Features
+ * Automatic creation and teardown of Cloud Services
+ * Public (OS) images and captured User (VM) images
+ * Up to date (March 2015) VM sizes including 'D', 'DS', 'G', A10/A11 sizes.
+ * Custom TCP/UDP endpoints per VM role
+ * Linux VMs, SSH external bootstrap via cloud service endpoint
+ * Windows VMs, WinRM bootstrap via cloud service endpoint
+
+## Currently untested/Known issues
+ * Load-balanced sets
+ * Availability sets/Fault domains
+ * Cloud Service autoscaling
+ * Endpoint monitoring
+ * Additional disk volumes
+ * Affinity groups
+ * Direct server return IP addresses
+ * Reserved/Static IP addresses
+ * Virtual network allocation
+ * Bootstrap via internal (private) addresses
+ * Non-IaaS Azure services (e.g CDN/TrafficManager, Service Bus, Azure SQL Database, Media Services, Redis Cache)
+
+Currently you have to specify the password you want the initial user to have in your recipe. No, this will not be for very long.
+
+## Getting started
+
+The gem is installed into Chef's default Ruby via RubyGems:
+
+```
+chef gem install chef-provisioning-azure
+```
+
+### Setting your credentials (v0.3 and above)
+
+ * If you have previously connected to your Azure subscription using the [azure-cli](http://azure.microsoft.com/en-us/documentation/articles/virtual-machines-command-line-tools/) tools and imported your publishsettings, **you do not need to do anything else** the driver will read your profile information and certificates from ~/.azure/azureProfile.json
+ * Alternatively, we support any of the methods listed in [configuration](docs/configuration.md) to set the driver up with access to your subscription
+ * Note that the use of ~/.azure/config to configure the driver is **no longer supported**.
+
+### Setting your credentials (v0.2.1 and below)
 
 Put the right values in ~/.azure/config so that it looks like the following:
 
@@ -45,7 +114,7 @@ subscription_id = "YOUR_SUBSCRIPTION_ID"
 
 If you need to generate a certificate for Azure on OSX / Linux you can do it with the following:
 
-```shell 
+```shell
 openssl req \
   -x509 -nodes -days 365 \
   -newkey rsa:1024 -keyout azure.pem -out azure.pem

data/lib/chef/provisioning/azure_driver/driver.rb

@@ -2,14 +2,16 @@ require 'chef/mixin/shell_out'
 require 'chef/provisioning/driver'
 require 'chef/provisioning/convergence_strategy/install_cached'
 require 'chef/provisioning/convergence_strategy/install_sh'
+require 'chef/provisioning/convergence_strategy/install_msi'
 require 'chef/provisioning/convergence_strategy/no_converge'
 require 'chef/provisioning/transport/ssh'
+require 'chef/provisioning/transport/winrm'
 require 'chef/provisioning/machine/windows_machine'
 require 'chef/provisioning/machine/unix_machine'
 require 'chef/provisioning/machine_spec'
 
 require 'chef/provisioning/azure_driver/version'
-require 'chef/provisioning/azure_driver/credentials'
+require 'chef/provisioning/azure_driver/subscriptions'
 
 require 'yaml'
 require 'azure'
@@ -24,31 +26,46 @@ module AzureDriver
     # Construct an AzureDriver object from a URL - used to parse existing URL
     # data to hydrate a driver object.
     # URL scheme:
-    # azure:account_id:region
+    # azure:subscription_id
     # @return [AzureDriver] A chef-provisioning Azure driver object for the given URL
     def self.from_url(driver_url, config)
       Driver.new(driver_url, config)
     end
 
+    def self.canonicalize_url(driver_url, config)
+      scheme, account_id = driver_url.split(':', 2)
+      if account_id.nil? || account_id.empty?
+        subscription = Subscriptions.default_subscription(config)
+        if !subscription
+          raise "Driver #{driver_url} did not specify a subscription ID, and no default subscription was found.  Have you downloaded the Azure CLI and used `azure account download` and `azure account import` to set up Azure?  Alternately, you can set azure_subscriptions to [ { subscription_id: '...', management_credentials: ... }] in your Chef configuration."
+        end
+        config = Cheffish::MergedConfig.new({ azure_subscriptions: subscription }, config)
+      end
+      if subscription
+        [ "#{scheme}:#{subscription[:subscription_id]}", config ]
+      else
+        [ driver_url, config]
+      end
+    end
+
     def initialize(driver_url, config)
       super
-      # TODO: load a specific one if requested by driver config
-      credentials = azure_credentials.default
-      default_endpoint = 'https://management.core.windows.net'
+      scheme, subscription_id = driver_url.split(':', 2)
+      @subscription = Subscriptions.get_subscription(config, subscription_id)
+      if !subscription
+        raise "Driver #{driver_url} has a subscription ID, but the system has no credentials configured for it!  If you have access to this subscription, you can use `azure account download` and `azure account import` in the Azure CLI to get the credentials, or set azure_subscriptions to [ { subscription_id: '...', management_credentials: ... }] in your Chef configuration."
+      end
+
+      # TODO make this instantiable so we can have multiple drivers ......
       Azure.configure do |azure|
         # Configure these 3 properties to use Storage
-        azure.management_certificate = credentials[:management_certificate]
-        azure.subscription_id        = credentials[:subscription_id]
-        azure.management_endpoint    = credentials[:management_endpoint] || default_endpoint
+        azure.management_certificate = subscription[:management_certificate]
+        azure.subscription_id        = subscription[:subscription_id]
+        azure.management_endpoint    = subscription[:management_endpoint]
       end
     end
 
-    # Take a URL and split it into the appropriate parts of [URL, config]
-    # @return [String, Hash] A 2-element array of [URL, config]
-    def self.canonicalize_url(driver_url, config)
-      url = driver_url.split(':')[0]
-      ["azure:#{url}", config]
-    end
+    attr_reader :subscription
 
     # -- Machine methods --
 
@@ -83,39 +100,33 @@ module AzureDriver
       image_id = machine_options[:image_id] || default_image_for_location(location)
 
       Chef::Log.debug "Azure bootstrap options: #{bootstrap_options.inspect}"
-      
-      # If the cloud service exists already, need to add a role to it - otherwise create virtual machine (including cloud service)
-      cloud_service = azure_cloud_service_service.get_cloud_service(bootstrap_options[:cloud_service_name])
 
-      if cloud_service
-        action_handler.report_progress "Cloud Service #{bootstrap_options[:cloud_service_name]} already exists, adding role."
-        params = {
+      params = {
           vm_name: machine_spec.name,
-          vm_user: default_ssh_username,
+          vm_user: bootstrap_options[:vm_user] || default_ssh_username,
           image: image_id,
           # This is only until SSH keys are added
           password: machine_options[:password],
+          location: location,
           cloud_service_name: bootstrap_options[:cloud_service_name]
-        }
+      }
 
+      # If the cloud service exists already, need to add a role to it - otherwise create virtual machine (including cloud service)
+      cloud_service = azure_cloud_service_service.get_cloud_service(bootstrap_options[:cloud_service_name])
+      existing_deployment = azure_vm_service.list_virtual_machines(bootstrap_options[:cloud_service_name]).any?
+
+      if cloud_service and existing_deployment
+        action_handler.report_progress "Cloud Service #{bootstrap_options[:cloud_service_name]} already exists, adding role."
         action_handler.report_progress "Creating #{machine_spec.name} with image #{image_id} in #{bootstrap_options[:cloud_service_name]}..."
         vm = azure_vm_service.add_role(params, bootstrap_options)
       else
-        params = {
-          vm_name: machine_spec.name,
-          vm_user: default_ssh_username,
-          image: image_id,
-          # This is only until SSH keys are added
-          password: machine_options[:password],
-          location: location
-        }
-
         action_handler.report_progress "Creating #{machine_spec.name} with image #{image_id} in #{location}..."
         vm = azure_vm_service.create_virtual_machine(params, bootstrap_options)
       end
 
       machine_spec.location['vm_name'] = vm.vm_name
-      action_handler.report_progress "Created #{vm.vm_name} in #{location}..."      
+      machine_spec.location['is_windows'] = (true if vm.os_type == 'Windows') || false
+      action_handler.report_progress "Created #{vm.vm_name} in #{location}..."
     end
 
     # (see Chef::Provisioning::Driver#ready_machine)
@@ -196,23 +207,11 @@ module AzureDriver
     end
 
     def transport_for(machine_spec, machine_options, vm)
-      # TODO winrm
-      create_ssh_transport(machine_spec, machine_options, vm)
-    end
-
-    def azure_credentials
-      # Grab the list of possible credentials
-      @azure_credentials ||= if driver_options[:azure_credentials]
-                               driver_options[:azure_credentials]
-                             else
-                               credentials = Credentials.new
-                               if driver_options[:azure_config_file]
-                                 credentials.load_ini(driver_options.delete(:azure_config_file))
-                               else
-                                 credentials.load_default
-                               end
-                               credentials
-                             end
+      if machine_spec.location['is_windows']
+        create_winrm_transport(machine_spec, machine_options, vm)
+      else
+        create_ssh_transport(machine_spec, machine_options, vm)
+      end
     end
 
     def default_image_for_location(location)
@@ -234,7 +233,7 @@ module AzureDriver
       remote_host = tcp_endpoint[:vip]
 
       # TODO: not this... replace with SSH key ASAP, only for getting this thing going...
-      ssh_options = { 
+      ssh_options = {
         password: machine_options[:password],
         port: tcp_endpoint[:public_port] # use public port from Cloud Service endpoint
       }
@@ -250,6 +249,50 @@ module AzureDriver
       Chef::Provisioning::Transport::SSH.new(remote_host, username, ssh_options, options, config)
     end
 
+    def create_winrm_transport(machine_spec, machine_options, instance)
+      winrm_transport_options = machine_options[:bootstrap_options][:winrm_transport]
+      shared_winrm_options = {
+          :user => machine_options[:vm_user] || 'localadmin',
+          :pass => machine_options[:password] # TODO: Replace with encryption
+      }
+
+      if(winrm_transport_options['https'])
+        tcp_endpoint = instance.tcp_endpoints.select { |tcp| tcp[:name] == 'PowerShell' }.first
+        remote_host = tcp_endpoint[:vip]
+        port = tcp_endpoint[:public_port] || default_winrm_https_port
+        endpoint = "https://#{remote_host}:#{port}/wsman"
+        type = :ssl
+        winrm_options = {
+          :disable_sspi => winrm_transport_options['https'][:disable_sspi] || false, # default to Negotiate
+          :basic_auth_only => winrm_transport_options['https'][:basic_auth_only] || false, # disallow Basic auth by default
+          :no_ssl_peer_verification => winrm_transport_options['https'][:no_ssl_peer_verification] || false #disallow MITM potential by default
+        }
+      end
+
+      if(winrm_transport_options['http'])
+        tcp_endpoint = instance.tcp_endpoints.select { |tcp| tcp[:name] == 'WinRm-Http' }.first
+        remote_host = tcp_endpoint[:vip]
+        port = tcp_endpoint[:public_port] || default_winrm_http_port
+        endpoint = "http://#{remote_host}:#{port}/wsman"
+        type = :plaintext
+        winrm_options = {
+          :disable_sspi => winrm_transport_options['http']['disable_sspi'] || false, # default to Negotiate
+          :basic_auth_only => winrm_transport_options['http']['basic_auth_only'] || false # disallow Basic auth by default
+        }
+      end
+
+      merged_winrm_options = winrm_options.merge(shared_winrm_options)
+      Chef::Provisioning::Transport::WinRM.new("#{endpoint}", type, merged_winrm_options, {})
+    end
+
+    def default_winrm_http_port
+      5985
+    end
+
+    def default_winrm_https_port
+      5986
+    end
+
     def convergence_strategy_for(machine_spec, machine_options)
       convergence_options = machine_options[:convergence_options]
       # Defaults

data/lib/chef/provisioning/azure_driver/subscriptions.rb

@@ -0,0 +1,222 @@
+require 'inifile'
+require 'json'
+require 'nokogiri'
+
+class Chef
+module Provisioning
+module AzureDriver
+module Subscriptions
+
+  #
+  # Get the subscription with the given subscription_id or subscription_name
+  #
+  # Returns `nil` if nothing found.
+  #
+  def self.get_subscription(config, subscription_id_or_name)
+    subscription_count = 0
+    subscription = all_subscriptions(config).select do |s|
+      subscription_count += 1
+      s[:subscription_id]   == subscription_id_or_name ||
+      s[:subscription_name] == subscription_id_or_name
+    end.first
+    if !subscription
+      Chef::Log.info("Subscription #{subscription_id_or_name} not found out of #{subscription_count} subscriptions read.")
+    end
+    subscription
+  end
+
+  #
+  # Get the default subscription for the given config.
+  #
+  # The default subscription is either the first .azureProfile subscription with isDefault: true
+  #
+  def self.default_subscription(config)
+    first_subscription = nil
+    all_subscriptions(config).each do |subscription|
+      if subscription[:is_default]
+        Chef::Log.info("Picked default subscription: #{subscription[:subscription_name]} (#{subscription[:subscription_id]}) from #{subscription[:source]}")
+        return subscription
+      end
+
+      first_subscription ||= subscription;
+    end
+    if first_subscription
+      Chef::Log.info("Picked first subscription found as default: #{first_subscription[:subscription_name]} (#{first_subscription[:subscription_id]}) from #{first_subscription[:source]}")
+    else
+      Chef::Log.info("No subscriptions found.")
+    end
+    first_subscription
+  end
+
+  #
+  # We search for subscription in the order specified by Chef::Config.azure_subscriptions,
+  # which includes:
+  #
+  # Key                           | Description
+  # ------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------
+  # `subscription_id`             | The GUID of the subscription.
+  # `subscription_name`           | The name of the subscription.
+  # `management_certificate`      | The path to the actual credentials, a proc, or an IO object (optional; if this is not set, the keychain will be searched).
+  # `management_endpoint`         | The management endpoint URL (optional; if not set, the default Azure endpoint will be used).
+  # `is_default`                  | If `true`, this should be considered the default subscription.
+  # `publishsettings`             | The path/glob to one or more `.publishsettings` formatted files, an IO object, or a hash with one or more { type: <path|io> } keys, where type=:pem, :pdx or :cert.
+  # `azure_profile`               | The path/glob to one or more `azureProfile.json` formatted files, an IO object, or a Hash representing the parsed data.
+  # `allow_missing_file`          | If `true`, provisioning will skip the publishsettings or azure_profile if it does not exist; otherwise it will raise an error on missing file.  Defaults to `false`.
+  #
+  def self.all_subscriptions(config)
+    Enumerator.new do |y|
+      subscriptions = config[:azure_subscriptions]
+      subscriptions ||= default_subscriptions(config)
+      subscriptions = [ subscriptions ].flatten
+
+      subscriptions.each do |subscription_spec|
+        allow_missing_file = subscription_spec[:allow_missing_file]
+        if subscription_spec[:subscription_id]
+          subscription = {
+            management_endpoint: default_management_endpoint(config),
+            source:              "Chef configuration"
+          }
+          y.yield subscription.merge(subscription_spec)
+        end
+        if subscription_spec[:publishsettings]
+          load_publishsettings_subscriptions(config, subscription_spec[:publishsettings], allow_missing_file) do |subscription|
+            y.yield subscription.merge(subscription_spec)
+          end
+        end
+        if subscription_spec[:azure_profile]
+          load_azure_profile_subscriptions(config, subscription_spec[:azure_profile], allow_missing_file) do |subscription|
+            y.yield subscription.merge(subscription_spec)
+          end
+        end
+      end
+    end
+  end
+
+  def self.load_publishsettings_subscriptions(config, data, allow_missing_file, filename=nil, &block)
+    case data
+    when String
+      found = false
+      Dir.glob(data) do |filename|
+        found = true
+        Chef::Log.info("Reading publishsettings file #{filename}")
+        File.open(filename) do |f|
+          load_publishsettings_subscriptions(config, f, allow_missing_file, filename, &block)
+        end
+      end
+      if !found
+        if allow_missing_file
+          Chef::Log.info("Skipping missing publishsettings file #{data}.")
+        else
+          raise "Missing publishsettings file #{data}!"
+        end
+      end
+
+    when IO
+      xml = Nokogiri::XML(data)
+
+      # Parse publishsettings content
+      xml.xpath("//PublishData/PublishProfile/Subscription").each do |subscription|
+        Chef::Log.debug("- Read subscription #{subscription['Name']} (#{subscription['Id']})")
+        result = {
+          subscription_id:        subscription['Id'],
+          subscription_name:      subscription['Name'],
+          management_endpoint:    subscription['ServiceManagementUrl'] || default_management_endpoint(config),
+          source:                 "publishsettings #{filename ? "file #{filename}" : " IO object"}"
+        }
+        result[:publishsettings] = filename if filename
+        if subscription['ManagementCertificate']
+          result[:management_certificate] = {
+            type: :pdx,
+            data: subscription['ManagementCertificate']
+          }
+        end
+        yield result
+      end
+    else
+      raise "Unexpected value #{data.inspect} for publishsettings!"
+    end
+  end
+
+  def self.load_azure_profile_subscriptions(config, data, allow_missing_file, filename=nil, &block)
+    case data
+    when String
+      found = false
+      Dir.glob(data) do |filename|
+        found = true
+        Chef::Log.info("Reading azure profile file #{filename}")
+        File.open(filename) do |f|
+          load_azure_profile_subscriptions(config, f, allow_missing_file, filename, &block)
+        end
+      end
+      if !found
+        if allow_missing_file
+          Chef::Log.info("Skipping missing azure profile file #{data}.")
+        else
+          raise "Missing azure profile file #{data}!"
+        end
+      end
+
+    when IO
+      profile = JSON.parse(data.read, create_additions: false)
+      if profile["subscriptions"]
+        profile["subscriptions"].each do |subscription|
+          Chef::Log.debug("- Read#{subscription['isDefault'] ? " default" : ""} subscription #{subscription['name']} (#{subscription['id']})")
+
+          result = {
+            subscription_id:     subscription['id'],
+            subscription_name:   subscription['name'],
+            management_endpoint: subscription['managementEndpointUrl'] || default_management_endpoint(config),
+            source:                 "azure profile #{filename ? "file #{filename}" : " IO object"}"
+          }
+          subscription[:azure_profile] = filename
+          if subscription['isDefault']
+            result[:is_default] = true
+          end
+          if subscription['managementCertificate'] && subscription['managementCertificate']['key']
+            # Concatenate the key and cert to one .pem so the SDK will be OK with it
+            result[:management_certificate] = {
+              type: :pem,
+              data: "#{subscription['managementCertificate']['key']}#{subscription['managementCertificate']['cert']}",
+            }
+          end
+          yield result
+        end
+      else
+        Chef::Log.warn("Azure profile #{filename ? "file #{filename}" : data} has no subscriptions")
+      end
+
+    else
+      raise "Unexpected value #{data.inspect} for azure_profile!"
+    end
+  end
+
+  def self.default_subscriptions(config)
+    default_azure_profile = self.default_azure_profile(config)
+    azure_publish_settings_file = Chef::Config.knife[:azure_publish_settings_file] if Chef::Config.knife
+    Chef::Log.info("No Chef::Config[:driver_options][:subscriptions] found, reading environment variables AZURE_SUBSCRIPTION_ID, AZURE_MANAGEMENT_CERTIFICATE, and AZURE_MANAGEMENT_ENDPOINT,#{azure_publish_settings_file ? " then #{azure_publish_settings_file}," : ""} and then reading #{default_azure_profile}")
+    result = []
+    result << {
+      subscription_id:        ENV["AZURE_SUBSCRIPTION_ID"],
+      management_certificate: ENV["AZURE_MANAGEMENT_CERTIFICATE"],
+      management_endpoint:    ENV["AZURE_MANAGEMENT_ENDPOINT"],
+      source:                 "environment variables"
+    }
+    result << { publishsettings: azure_publish_settings_file } if azure_publish_settings_file
+    result << {
+      azure_profile: default_azure_profile,
+      allow_missing_file: true
+    }
+    result
+  end
+
+  def self.default_management_endpoint(config)
+    'https://management.core.windows.net'
+  end
+
+  def self.default_azure_profile(config)
+    File.join(config[:home_dir] || File.expand_path("~"), ".azure", "azureProfile.json")
+  end
+end
+end
+end
+end

data/lib/chef/provisioning/azure_driver/version.rb

@@ -2,7 +2,7 @@
 class Chef
 module Provisioning
 module AzureDriver
-  VERSION = '0.2.1'
+  VERSION = '0.3'
 end
 end
 end

metadata

@@ -1,100 +1,101 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-azure
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: '0.3'
 platform: ruby
 authors:
 - John Ewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chef-provisioning
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: azure
+  name: stuartpreston-azure-sdk-for-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.9
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Provisioner for creating Azure things in Chef Provisioning.
+description: This is a driver that works with chef-provisioning thatallows Chef Provisioning
+  to manage objects in Microsoft Azure.
 email: jewart@getchef.com
 executables: []
 extensions: []
@@ -102,20 +103,21 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- Rakefile
 - LICENSE
 - README.md
-- Rakefile
-- lib/chef/provisioning/azure_driver.rb
 - lib/chef/provisioning/azure_driver/bootstrap_options.rb
 - lib/chef/provisioning/azure_driver/constants.rb
-- lib/chef/provisioning/azure_driver/credentials.rb
 - lib/chef/provisioning/azure_driver/driver.rb
 - lib/chef/provisioning/azure_driver/machine_options.rb
 - lib/chef/provisioning/azure_driver/resources.rb
+- lib/chef/provisioning/azure_driver/subscriptions.rb
 - lib/chef/provisioning/azure_driver/version.rb
+- lib/chef/provisioning/azure_driver.rb
 - lib/chef/provisioning/driver_init/azure.rb
-homepage: https://github.com/opscode/chef-provisioning-azure
-licenses: []
+homepage: https://github.com/chef/chef-provisioning-azure
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -123,19 +125,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: Provisioner for creating Azure things in Chef Provisioning.
+summary: Provisioner for creating Microsoft Azure resources using Chef Provisioning.
 test_files: []
-has_rdoc: 

data/lib/chef/provisioning/azure_driver/credentials.rb

@@ -1,73 +0,0 @@
-require 'inifile'
-
-class Chef
-module Provisioning
-module AzureDriver
-  # Reads in a credentials file from a config file and presents them
-  class Credentials
-    CONFIG_PATH = "#{ENV['HOME']}/.azure/config"
-
-    def initialize
-      @credentials = {}
-      load_default
-    end
-
-    include Enumerable
-
-    def default
-      if @credentials.size == 0
-        fail "No credentials loaded! Do you have a #{CONFIG_PATH}?"
-      end
-      default_key = ENV['AZURE_DEFAULT_PROFILE'] || 'default'
-      @credentials[default_key] || @credentials.first[1]
-    end
-
-    def keys
-      @credentials.keys
-    end
-
-    def [](name)
-      @credentials[name]
-    end
-
-    def each(&block)
-      @credentials.each(&block)
-    end
-
-    def load_ini(credentials_ini_file)
-      inifile = IniFile.load(File.expand_path(credentials_ini_file))
-      if inifile
-        inifile.each_section do |section|
-          if section =~ /^\s*profile\s+(.+)$/ || section =~ /^\s*(default)\s*/
-            profile_name = $1.strip
-            profile = inifile[section].inject({}) do |result, pair|
-              result[pair[0].to_sym] = pair[1]
-              result
-            end
-            profile[:name] = profile_name
-            @credentials[profile_name] = profile
-          end
-        end
-      else
-        # Get it to throw an error
-        File.open(File.expand_path(credentials_ini_file)) do
-        end
-      end
-    end
-
-    def load_default
-      config_file = ENV['AZURE_CONFIG_FILE'] || File.expand_path(CONFIG_PATH)
-      load_ini(config_file) if File.file?(config_file)
-    end
-
-    def self.method_missing(name, *args, &block)
-      singleton.send(name, *args, &block)
-    end
-
-    def self.singleton
-      @azure_credentials ||= Credentials.new
-    end
-  end
-end
-end
-end