vagrant-azure 1.0.5 → 1.1.0

data/lib/vagrant-azure/errors.rb

@@ -1,27 +1,28 @@
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-
-module VagrantPlugins
-  module WinAzure
-    module Errors
-      class WinAzureError < Vagrant::Errors::VagrantError
-        error_namespace("vagrant_azure.errors")
-      end
-
-      class WinRMNotReady < WinAzureError
-        error_key(:win_rm_not_ready)
-      end
-
-      class ServerNotCreated < WinAzureError
-        error_key(:server_not_created)
-      end
-
-      class CreateVMFailure < WinAzureError
-        error_key(:create_vm_failure)
-      end
-
-    end
-  end
-end
+#-------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved.  Licensed under the Apache License, Version 2.0.
+# See License.txt in the project root for license information.
+#--------------------------------------------------------------------------
+
+module VagrantPlugins
+  module WinAzure
+    module Errors
+      class WinAzureError < Vagrant::Errors::VagrantError
+        error_namespace("vagrant_azure.errors")
+      end
+
+      class WinRMNotReady < WinAzureError
+        error_key(:win_rm_not_ready)
+      end
+
+      class ServerNotCreated < WinAzureError
+        error_key(:server_not_created)
+      end
+
+      class CreateVMFailure < WinAzureError
+        error_key(:create_vm_failure)
+      end
+
+    end
+  end
+end

data/lib/vagrant-azure/monkey_patch/azure.rb

@@ -0,0 +1,46 @@
+
+require 'azure'
+
+# Patch azure-ruby-sdk to enable vhds to be created every millisecond as opposed to every minute...
+Azure::VirtualMachineManagement::Serialization.module_eval do
+  def self.role_to_xml(params, options)
+    builder = Nokogiri::XML::Builder.new do |xml|
+      xml.PersistentVMRole(
+        'xmlns' => 'http://schemas.microsoft.com/windowsazure',
+        'xmlns:i' => 'http://www.w3.org/2001/XMLSchema-instance'
+      ) do
+        xml.RoleName { xml.text params[:vm_name] }
+        xml.OsVersion('i:nil' => 'true')
+        xml.RoleType 'PersistentVMRole'
+
+        xml.ConfigurationSets do
+          provisioning_configuration_to_xml(xml, params, options)
+          xml.ConfigurationSet('i:type' => 'NetworkConfigurationSet') do
+            xml.ConfigurationSetType 'NetworkConfiguration'
+            xml.InputEndpoints do
+              default_endpoints_to_xml(xml, options)
+              tcp_endpoints_to_xml(
+                xml,
+                options[:tcp_endpoints],
+                options[:existing_ports]
+              ) if options[:tcp_endpoints]
+            end
+            if options[:virtual_network_name] && options[:subnet_name]
+              xml.SubnetNames do
+                xml.SubnetName options[:subnet_name]
+              end
+            end
+          end
+        end
+        xml.AvailabilitySetName options[:availability_set_name]
+        xml.Label Base64.encode64(params[:vm_name]).strip
+        xml.OSVirtualHardDisk do
+          xml.MediaLink 'http://' + options[:storage_account_name] + '.blob.core.windows.net/vhds/' + (Time.now.strftime('disk_%Y_%m_%d_%H_%M_%S_%L')) + '.vhd'
+          xml.SourceImageName params[:image]
+        end
+        xml.RoleSize options[:vm_size]
+      end
+    end
+    builder.doc
+  end
+end

data/lib/vagrant-azure/monkey_patch/winrm.rb

@@ -0,0 +1,77 @@
+# patch no_ssl_peer_validation for ssl based winrm
+
+WinRM::HTTP::HttpTransport.class_eval do
+
+  # provide a patch for no peer verification.
+  # the patch exists upstream, but vagrant depends on an older version of winrm
+  def no_ssl_peer_verification!
+    @httpcli.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+  end
+end
+
+WinRM::HTTP::HttpSSL.class_eval do
+
+  # provide a constructor that offers the ability to disable peer verification
+  def initialize(endpoint, user, pass, ca_trust_path = nil, opts)
+    super(endpoint)
+    @httpcli.set_auth(endpoint, user, pass)
+    @httpcli.ssl_config.set_trust_ca(ca_trust_path) unless ca_trust_path.nil?
+    no_sspi_auth! if opts[:disable_sspi]
+    basic_auth_only! if opts[:basic_auth_only]
+    no_ssl_peer_verification! if opts[:no_ssl_peer_verification]
+  end
+end
+
+
+VagrantPlugins::CommunicatorWinRM::WinRMShell.class_eval do
+  EXCEPTIONS = class_variable_get(:@@exceptions_to_retry_on)
+
+  protected
+
+  # patch the timeout being raised from openssl that is not handled properly
+  def execute_shell_with_retry(command, shell, &block)
+    retryable(:tries => @max_tries, :on => EXCEPTIONS, :sleep => 10) do
+      @logger.debug("#{shell} executing:\n#{command}")
+      begin
+        output = session.send(shell, command) do |out, err|
+          block.call(:stdout, out) if block_given? && out
+          block.call(:stderr, err) if block_given? && err
+        end
+      rescue Exception => ex
+        raise Timeout::Error if ex.message =~ /execution expired/ # received not friendly timeout, raise a more friendly error
+        raise # didn't include execution expired, so raise for retryable to handle
+      end
+      @logger.debug("Output: #{output.inspect}")
+      return output
+    end
+  end
+
+  # create a new session using ssl rather than kerberos or plaintext
+  def new_session
+    @logger.info("Attempting to connect to WinRM (patched)...")
+    @logger.info("  - Host: #{@host}")
+    @logger.info("  - Port: #{@port}")
+    @logger.info("  - Username: #{@username}")
+
+    client = ::WinRM::WinRMWebService.new(endpoint, :ssl, endpoint_options)
+    client.set_timeout(@timeout_in_seconds)
+    client.toggle_nori_type_casting(:off) #we don't want coersion of types
+    client
+  end
+
+  # override the internal http endpoint
+  def endpoint
+    "https://#{@host}:#{@port}/wsman"
+  end
+
+  # don't verify azure self signed certs and don't try to use sspi
+  def endpoint_options
+    {user: @username,
+     pass: @password,
+     host: @host,
+     port: @port,
+     operation_timeout: @timeout_in_seconds,
+     no_ssl_peer_verification: true,
+     disable_sspi: true}
+  end
+end

data/lib/vagrant-azure/plugin.rb

@@ -1,91 +1,102 @@
-#--------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-begin
-  require 'vagrant'
-rescue LoadError
-  raise 'The Vagrant Azure plugin must be run within Vagrant.'
-end
-
-# This is a sanity check to make sure no one is attempting to install this into
-# an early Vagrant version.
-if Vagrant::VERSION < '1.2.0'
-  raise 'The Vagrant Azure plugin is only compatible with Vagrant 1.2+'
-end
-
-module VagrantPlugins
-  module WinAzure
-    class Plugin < Vagrant.plugin('2')
-      name 'azure'
-      description <<-DESC
-      This plugin installs a provider that allows Vagrant to manage
-      machines in Windows Azure.
-      DESC
-
-      config(:azure, :provider) do
-        require_relative 'config'
-        Config
-      end
-
-      provider(:azure, parallel: true) do
-        # Setup logging and i18n
-        setup_logging
-        setup_i18n
-
-        # Return the provider
-        require_relative 'provider'
-        Provider
-      end
-
-      command 'rdp' do
-        require_relative 'command/rdp/command'
-        Command
-      end
-
-      def self.setup_i18n
-        I18n.load_path << File.expand_path(
-          'locales/en.yml',
-          WinAzure.source_root
-        )
-        I18n.load_path << File.expand_path(
-          'templates/locales/en.yml',
-          Vagrant.source_root
-        )
-        I18n.load_path << File.expand_path(
-          'templates/locales/providers_hyperv.yml',
-          Vagrant.source_root
-        )
-        I18n.reload!
-      end
-
-      def self.setup_logging
-        require 'log4r'
-
-        level = nil
-        begin
-          level = Log4r.const_get(ENV['VAGRANT_LOG'].upcase)
-        rescue NameError
-          # This means that the logging constant wasn't found,
-          # which is fine. We just keep `level` as `nil`. But
-          # we tell the user.
-          level = nil
-        end
-
-        # Some constants, such as "true" resolve to booleans, so the
-        # above error checking doesn't catch it. This will check to make
-        # sure that the log level is an integer, as Log4r requires.
-        level = nil if !level.is_a?(Integer)
-
-        # Set the logging level on all "vagrant" namespaced logs as long as
-        # we have a valid level
-        if level
-          logger = Log4r::Logger.new("vagrant_azure")
-          logger.outputters = Log4r::Outputter.stderr
-          logger.level = level
-          logger = nil
-        end
-      end
-    end
-  end
-end
+#--------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved.  Licensed under the Apache License, Version 2.0.
+# See License.txt in the project root for license information.
+#--------------------------------------------------------------------------
+begin
+  require 'vagrant'
+rescue LoadError
+  raise 'The Vagrant Azure plugin must be run within Vagrant.'
+end
+
+# This is a sanity check to make sure no one is attempting to install this into
+# an early Vagrant version.
+if Vagrant::VERSION < '1.6.0'
+  raise 'The Vagrant Azure plugin is only compatible with Vagrant 1.6+'
+end
+
+module VagrantPlugins
+  module WinAzure
+    class Plugin < Vagrant.plugin('2')
+      name 'azure'
+      description <<-DESC
+      This plugin installs a provider that allows Vagrant to manage
+      machines in Windows Azure.
+      DESC
+
+      config(:azure, :provider) do
+        require_relative 'config'
+        Config
+      end
+
+      provider(:azure, parallel: true) do
+        # Setup logging and i18n
+        setup_logging
+        setup_i18n
+
+        # Return the provider
+        require_relative 'provider'
+        Provider
+      end
+
+      provider_capability(:azure, :winrm_info) do
+        require_relative 'capabilities/winrm'
+        VagrantPlugins::WinAzure::Cap::WinRM
+      end
+
+      command 'powershell' do
+        require_relative 'command/powershell'
+        VagrantPlugins::WinAzure::Command::PowerShell
+      end
+
+      command 'rdp' do
+        require_relative 'command/rdp'
+        VagrantPlugins::WinAzure::Command::RDP
+      end
+
+      def self.setup_i18n
+        I18n.load_path << File.expand_path(
+          'locales/en.yml',
+          WinAzure.source_root
+        )
+        I18n.load_path << File.expand_path(
+          'templates/locales/en.yml',
+          Vagrant.source_root
+        )
+        I18n.load_path << File.expand_path(
+          'templates/locales/providers_hyperv.yml',
+          Vagrant.source_root
+        )
+        I18n.reload!
+      end
+
+      def self.setup_logging
+        require 'log4r'
+
+        level = nil
+        begin
+          level = Log4r.const_get(ENV['VAGRANT_LOG'].upcase)
+        rescue NameError
+          # This means that the logging constant wasn't found,
+          # which is fine. We just keep `level` as `nil`. But
+          # we tell the user.
+          level = nil
+        end
+
+        # Some constants, such as "true" resolve to booleans, so the
+        # above error checking doesn't catch it. This will check to make
+        # sure that the log level is an integer, as Log4r requires.
+        level = nil if !level.is_a?(Integer)
+
+        # Set the logging level on all "vagrant" namespaced logs as long as
+        # we have a valid level
+        if level
+          logger = Log4r::Logger.new("vagrant_azure")
+          logger.outputters = Log4r::Outputter.stderr
+          logger.level = level
+          logger = nil
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-azure/provider.rb

@@ -1,70 +1,74 @@
-#--------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-require 'log4r'
-require 'vagrant'
-
-module VagrantPlugins
-  module WinAzure
-    class Provider < Vagrant.plugin('2', :provider)
-      attr_reader :driver
-
-      def initialize(machine)
-        @machine = machine
-
-        # Load the driver
-        machine_id_changed
-      end
-
-      def action(name)
-        # Attempt to get the action method from the Action class if it
-        # exists, otherwise return nil to show that we don't support the
-        # given action.
-        action_method = "action_#{name}"
-        return Action.send(action_method) if Action.respond_to?(action_method)
-        nil
-      end
-
-      def machine_id_changed
-        @driver = Driver.new(@machine)
-      end
-
-      def ssh_info
-        # Run a custom action called "read_ssh_info" which does what it
-        # says and puts the resulting SSH info into the `:machine_ssh_info`
-        # key in the environment.
-        env = @machine.action('read_ssh_info')
-        env[:machine_ssh_info]
-      end
-
-      def rdp_info
-        env = @machine.action('read_rdp_info')
-        env[:machine_ssh_info]
-      end
-
-      def winrm_info
-        env = @machine.action('read_winrm_info')
-        env[:machine_ssh_info]
-      end
-
-      def state
-        # Run a custom action we define called "read_state" which does what it
-        # says. It puts the state in the `:machine_state_id` key in the env
-        env = @machine.action('read_state')
-        state_id = env[:machine_state_id]
-
-        short = "Machine's current state is #{state_id}"
-        long = ""
-
-        # Return the MachineState object
-        Vagrant::MachineState.new(state_id, short, long)
-      end
-
-      def to_s
-        id = @machine.id.nil? ? 'new' : @machine.id
-        "Azure (#{id})"
-      end
-    end
-  end
-end
+#--------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved.  Licensed under the Apache License, Version 2.0.
+# See License.txt in the project root for license information.
+#--------------------------------------------------------------------------
+require 'log4r'
+require 'vagrant'
+
+module VagrantPlugins
+  module WinAzure
+    class Provider < Vagrant.plugin('2', :provider)
+      attr_reader :driver
+
+      def initialize(machine)
+        @machine = machine
+
+        # Load the driver
+        machine_id_changed
+
+        @machine.config.winrm.password = @machine.provider_config.vm_password || @machine.provider_config.vm_user
+        @machine.config.winrm.username = @machine.provider_config.vm_user
+      end
+
+      def action(name)
+        # Attempt to get the action method from the Action class if it
+        # exists, otherwise return nil to show that we don't support the
+        # given action.
+        action_method = "action_#{name}"
+        return Action.send(action_method) if Action.respond_to?(action_method)
+        nil
+      end
+
+      def machine_id_changed
+        @driver = Driver.new(@machine)
+      end
+
+      def ssh_info
+        # Run a custom action called "read_ssh_info" which does what it
+        # says and puts the resulting SSH info into the `:machine_ssh_info`
+        # key in the environment.
+        env = @machine.action('read_ssh_info')
+        env[:machine_ssh_info]
+      end
+
+      def rdp_info
+        env = @machine.action('read_rdp_info')
+        env[:machine_ssh_info]
+      end
+
+      def winrm_info
+        env = @machine.action('read_winrm_info')
+        env[:machine_winrm_info]
+      end
+
+      def state
+        # Run a custom action we define called "read_state" which does what it
+        # says. It puts the state in the `:machine_state_id` key in the env
+        env = @machine.action('read_state')
+        state_id = env[:machine_state_id]
+
+        short = "Machine's current state is #{state_id}"
+        long = ""
+
+        # Return the MachineState object
+        Vagrant::MachineState.new(state_id, short, long)
+      end
+
+      def to_s
+        id = @machine.id.nil? ? 'new' : @machine.id
+        "Azure (#{id})"
+      end
+    end
+  end
+end