vagrant-azure 1.0.5 → 1.1.0

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

@@ -0,0 +1,12 @@
+module VagrantPlugins
+  module WinAzure
+    module Cap
+      class WinRM
+        def self.winrm_info(machine)
+          env = machine.action('read_winrm_info')
+          env[:machine_winrm_info]
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-azure/command/powershell.rb

@@ -0,0 +1,43 @@
+module VagrantPlugins
+  module WinAzure
+    module Command
+      class PowerShell < Vagrant.plugin('2', :command)
+        def self.synopsis
+          'execute PowerShell command or script on remote machine'
+        end
+
+        def execute
+          options = {}
+
+          opts = OptionParser.new do |o|
+            o.banner = 'Usage: vagrant powershell [machine] -[c|s] [command|script file]'
+            o.separator ''
+            o.separator 'Options:'
+            o.separator ''
+
+            o.on('-c', '--command COMMAND', 'Execute a PowerShell command directly') do |c|
+              options[:command] = c
+            end
+
+            o.on('-s', '--script SCRIPT_FILE', 'Execute a PowerShell script directly') do |s|
+              raise Vagrant::Errors::CLIInvalidOptions, :help => "File #{s} can't be found. Does it exist?" unless File.exists?(s)
+              options[:command] = File.read(s)
+            end
+          end
+
+          argv = parse_options(opts)
+          if options.empty?
+            raise Vagrant::Errors::CLIInvalidOptions, :help => opts.help.chomp
+          end
+
+          with_target_vms(argv, single_target: true) do |vm|
+            @logger.debug("Executing single command on remote machine: #{options[:command]}")
+
+            vm.action(:powershell_run, powershell_command: options[:command])
+          end
+          0
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-azure/command/rdp.rb

@@ -0,0 +1,24 @@
+#--------------------------------------------------------------------------
+# 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 Command
+      class RDP < Vagrant.plugin('2', :command)
+        def self.synopsis
+          'opens an RDP session for a vagrant machine'
+        end
+
+        def execute
+          with_target_vms do |vm|
+            vm.action(:rdp)
+          end
+
+          0
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-azure/config.rb

@@ -1,147 +1,158 @@
-#--------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-require 'vagrant'
-require 'azure'
-
-module VagrantPlugins
-  module WinAzure
-    class Config < Vagrant.plugin('2', :config)
-      attr_accessor :mgmt_certificate
-      attr_accessor :mgmt_endpoint
-      attr_accessor :subscription_id
-      attr_accessor :storage_acct_name
-      attr_accessor :storage_access_key
-
-      attr_accessor :vm_name
-      attr_accessor :vm_user
-      attr_accessor :vm_password
-      attr_accessor :vm_image
-      attr_accessor :vm_location
-      attr_accessor :vm_affinity_group
-
-      attr_accessor :cloud_service_name
-      attr_accessor :deployment_name
-      attr_accessor :tcp_endpoints
-      attr_accessor :ssh_private_key_file
-      attr_accessor :ssh_certificate_file
-      attr_accessor :ssh_port
-      attr_accessor :vm_size
-      attr_accessor :winrm_transport
-      attr_accessor :winrm_http_port
-      attr_accessor :winrm_https_port
-      attr_accessor :availability_set_name
-
-      attr_accessor :state_read_timeout
-
-      def initialize
-        @storage_acct_name = UNSET_VALUE
-        @storage_access_key = UNSET_VALUE
-        @mgmt_certificate = UNSET_VALUE
-        @mgmt_endpoint = UNSET_VALUE
-        @subscription_id = UNSET_VALUE
-
-        @vm_name = UNSET_VALUE
-        @vm_user = UNSET_VALUE
-        @vm_password = UNSET_VALUE
-        @vm_image = UNSET_VALUE
-        @vm_location = UNSET_VALUE
-        @vm_affinity_group = UNSET_VALUE
-
-        @cloud_service_name = UNSET_VALUE
-        @deployment_name = UNSET_VALUE
-        @tcp_endpoints = UNSET_VALUE
-        @ssh_private_key_file = UNSET_VALUE
-        @ssh_certificate_file = UNSET_VALUE
-        @ssh_port = UNSET_VALUE
-        @vm_size = UNSET_VALUE
-        @winrm_transport = UNSET_VALUE
-        @winrm_http_port = UNSET_VALUE
-        @winrm_https_port = UNSET_VALUE
-        @availability_set_name = UNSET_VALUE
-        @state_read_timeout = UNSET_VALUE
-      end
-
-      def finalize!
-        @storage_acct_name = ENV["AZURE_STORAGE_ACCOUNT"] if \
-          @storage_acct_name == UNSET_VALUE
-        @storage_access_key = ENV["AZURE_STORAGE_ACCESS_KEY"] if \
-          @storage_access_key == UNSET_VALUE
-        @mgmt_certificate = ENV["AZURE_MANAGEMENT_CERTIFICATE"] if \
-          @mgmt_certificate == UNSET_VALUE
-        @mgmt_endpoint = ENV["AZURE_MANAGEMENT_ENDPOINT"] if \
-          @mgmt_endpoint == UNSET_VALUE
-        @subscription_id = ENV["AZURE_SUBSCRIPTION_ID"] if \
-          @subscription_id == UNSET_VALUE
-
-        @vm_name = nil if @vm_name == UNSET_VALUE
-        @vm_user = 'vagrant' if @vm_user == UNSET_VALUE
-        @vm_password = nil if @vm_password == UNSET_VALUE
-        @vm_image = nil if @vm_image == UNSET_VALUE
-        @vm_location = nil if @vm_location == UNSET_VALUE
-        @vm_affinity_group = nil if @vm_affinity_group == UNSET_VALUE
-
-        @cloud_service_name = nil if @cloud_service_name == UNSET_VALUE
-        @deployment_name = nil if @deployment_name == UNSET_VALUE
-        @tcp_endpoints = nil if @tcp_endpoints == UNSET_VALUE
-        @ssh_private_key_file = nil if @ssh_private_key_file == UNSET_VALUE
-        @ssh_certificate_file = nil if @ssh_certificate_file == UNSET_VALUE
-        @ssh_port = nil if @ssh_port == UNSET_VALUE
-        @vm_size = nil if @vm_size == UNSET_VALUE
-        @winrm_transport = nil if @winrm_transport == UNSET_VALUE
-        @winrm_http_port = nil if @winrm_http_port == UNSET_VALUE
-        @winrm_https_port = nil if @winrm_https_port == UNSET_VALUE
-        @availability_set_name = nil if @availability_set_name == UNSET_VALUE
-
-        @state_read_timeout = 360 if @state_read_timeout == UNSET_VALUE
-
-        # This done due to a bug in Ruby SDK - it doesn't generate a storage
-        # account name if add_role = true
-        if @storage_acct_name.nil? || @storage_acct_name.empty?
-          @storage_acct_name = Azure::Core::Utility.random_string(
-            "#{@vm_name}storage"
-          ).gsub(/[^0-9a-z ]/i, '').downcase[0..23]
-        end
-
-        if @cloud_service_name.nil? || @cloud_service_name.empty?
-          @cloud_service_name = Azure::Core::Utility.random_string(
-            "#{@vm_name}-service-"
-          )
-        end
-      end
-
-      def merge(other)
-        super.tap do |result|
-          result.mgmt_certificate = other.mgmt_certificate || \
-            self.mgmt_certificate
-          result.mgmt_endpoint = other.mgmt_endpoint || \
-            self.mgmt_endpoint
-          result.subscription_id = other.subscription_id || \
-            self.subscription_id
-          result.storage_acct_name = other.storage_acct_name || \
-            self.storage_acct_name
-          result.storage_access_key = other.storage_access_key || \
-            self.storage_access_key
-        end
-      end
-
-      def validate(machine)
-        errors = _detected_errors
-
-        # Azure connection properties related validation.
-        errors << "vagrant_azure.subscription_id.required" if \
-          @subscription_id.nil?
-        errors << "vagrant_azure.mgmt_certificate.required" if \
-          @mgmt_certificate.nil?
-        errors << "vagrant_azure.mgmt_endpoint.required" if \
-          @mgmt_endpoint.nil?
-
-        # Azure Virtual Machine related validation
-        errors << "vagrant_azure.vm_name.required" if @vm_name.nil?
-
-        { "Windows Azure Provider" => errors }
-      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 'vagrant'
+require 'azure'
+
+module VagrantPlugins
+  module WinAzure
+    class Config < Vagrant.plugin('2', :config)
+      attr_accessor :mgmt_certificate
+      attr_accessor :mgmt_endpoint
+      attr_accessor :subscription_id
+      attr_accessor :storage_acct_name
+      attr_accessor :storage_access_key
+
+      attr_accessor :vm_name
+      attr_accessor :vm_user
+      attr_accessor :vm_password
+      attr_accessor :vm_image
+      attr_accessor :vm_location
+      attr_accessor :vm_affinity_group
+
+      attr_accessor :cloud_service_name
+      attr_accessor :deployment_name
+      attr_accessor :tcp_endpoints
+
+      # ssh_private_key and ssh_certificate_file is overly specific and probably should be deprecated in favor of
+      # private_key_file and certificate_file as they are in Azure ruby sdk.
+      # This is here to not break compatibility with previous versions.
+      attr_accessor :private_key_file
+      alias :ssh_private_key_file :private_key_file
+      alias :ssh_private_key_file= :private_key_file=
+
+      attr_accessor :certificate_file
+      alias :ssh_certificate_file :certificate_file
+      alias :ssh_certificate_file= :certificate_file=
+
+      attr_accessor :ssh_port
+      attr_accessor :vm_size
+      attr_accessor :winrm_transport
+      attr_accessor :winrm_http_port
+      attr_accessor :winrm_https_port
+      attr_accessor :availability_set_name
+
+      attr_accessor :state_read_timeout
+
+      def initialize
+        @storage_acct_name = UNSET_VALUE
+        @storage_access_key = UNSET_VALUE
+        @mgmt_certificate = UNSET_VALUE
+        @mgmt_endpoint = UNSET_VALUE
+        @subscription_id = UNSET_VALUE
+
+        @vm_name = UNSET_VALUE
+        @vm_user = UNSET_VALUE
+        @vm_password = UNSET_VALUE
+        @vm_image = UNSET_VALUE
+        @vm_location = UNSET_VALUE
+        @vm_affinity_group = UNSET_VALUE
+
+        @cloud_service_name = UNSET_VALUE
+        @deployment_name = UNSET_VALUE
+        @tcp_endpoints = UNSET_VALUE
+        @private_key_file = UNSET_VALUE
+        @certificate_file = UNSET_VALUE
+        @ssh_port = UNSET_VALUE
+        @vm_size = UNSET_VALUE
+        @winrm_transport = UNSET_VALUE
+        @winrm_http_port = UNSET_VALUE
+        @winrm_https_port = UNSET_VALUE
+        @availability_set_name = UNSET_VALUE
+        @state_read_timeout = UNSET_VALUE
+      end
+
+      def finalize!
+        @storage_acct_name = ENV["AZURE_STORAGE_ACCOUNT"] if \
+          @storage_acct_name == UNSET_VALUE
+        @storage_access_key = ENV["AZURE_STORAGE_ACCESS_KEY"] if \
+          @storage_access_key == UNSET_VALUE
+        @mgmt_certificate = ENV["AZURE_MANAGEMENT_CERTIFICATE"] if \
+          @mgmt_certificate == UNSET_VALUE
+        @mgmt_endpoint = ENV["AZURE_MANAGEMENT_ENDPOINT"] if \
+          @mgmt_endpoint == UNSET_VALUE
+        @subscription_id = ENV["AZURE_SUBSCRIPTION_ID"] if \
+          @subscription_id == UNSET_VALUE
+
+        @vm_name = nil if @vm_name == UNSET_VALUE
+        @vm_user = 'vagrant' if @vm_user == UNSET_VALUE
+        @vm_password = nil if @vm_password == UNSET_VALUE
+        @vm_image = nil if @vm_image == UNSET_VALUE
+        @vm_location = nil if @vm_location == UNSET_VALUE
+        @vm_affinity_group = nil if @vm_affinity_group == UNSET_VALUE
+
+        @cloud_service_name = nil if @cloud_service_name == UNSET_VALUE
+        @deployment_name = nil if @deployment_name == UNSET_VALUE
+        @tcp_endpoints = nil if @tcp_endpoints == UNSET_VALUE
+        @private_key_file = nil if @private_key_file == UNSET_VALUE
+        @certificate_file = nil if @certificate_file == UNSET_VALUE
+        @ssh_port = nil if @ssh_port == UNSET_VALUE
+        @vm_size = nil if @vm_size == UNSET_VALUE
+        @winrm_transport = nil if @winrm_transport == UNSET_VALUE
+        @winrm_http_port = nil if @winrm_http_port == UNSET_VALUE
+        @winrm_https_port = nil if @winrm_https_port == UNSET_VALUE
+        @availability_set_name = nil if @availability_set_name == UNSET_VALUE
+
+        @state_read_timeout = nil if @state_read_timeout == UNSET_VALUE
+
+        # This done due to a bug in Ruby SDK - it doesn't generate a storage
+        # account name if add_role = true
+        if @storage_acct_name.nil? || @storage_acct_name.empty?
+          @storage_acct_name = Azure::Core::Utility.random_string(
+            "#{@vm_name}storage"
+          ).gsub(/[^0-9a-z ]/i, '').downcase[0..23]
+        end
+
+        if @cloud_service_name.nil? || @cloud_service_name.empty?
+          @cloud_service_name = Azure::Core::Utility.random_string(
+            "#{@vm_name}-service-"
+          )
+        end
+      end
+
+      def merge(other)
+        super.tap do |result|
+          result.mgmt_certificate = other.mgmt_certificate || \
+            self.mgmt_certificate
+          result.mgmt_endpoint = other.mgmt_endpoint || \
+            self.mgmt_endpoint
+          result.subscription_id = other.subscription_id || \
+            self.subscription_id
+          result.storage_acct_name = other.storage_acct_name || \
+            self.storage_acct_name
+          result.storage_access_key = other.storage_access_key || \
+            self.storage_access_key
+        end
+      end
+
+      def validate(machine)
+        errors = _detected_errors
+
+        # Azure connection properties related validation.
+        errors << "vagrant_azure.subscription_id.required" if \
+          @subscription_id.nil?
+        errors << "vagrant_azure.mgmt_certificate.required" if \
+          @mgmt_certificate.nil?
+        errors << "vagrant_azure.mgmt_endpoint.required" if \
+          @mgmt_endpoint.nil?
+
+        # Azure Virtual Machine related validation
+        errors << "vagrant_azure.vm_name.required" if @vm_name.nil?
+
+        { "Windows Azure Provider" => errors }
+      end
+    end
+  end
+end

data/lib/vagrant-azure/driver.rb

@@ -1,84 +1,48 @@
-#---------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-require 'json'
-require "#{Vagrant::source_root}/plugins/providers/hyperv/driver"
-
-module VagrantPlugins
-  module WinAzure
-    class Driver < VagrantPlugins::HyperV::Driver
-      def initialize(machine)
-        @id = machine.id
-        @machine = machine
-      end
-
-      def ssh_info
-        @ssh_info ||= @machine.provider.winrm_info
-        @ssh_info[:username] ||= @machine.config.ssh.username
-        @ssh_info[:password] ||= @machine.config.ssh.password
-        @ssh_info
-      end
-
-      def remote_credentials
-        @remote_credentials ||= {
-          guest_ip: ssh_info[:host],
-          guest_port: ssh_info[:port],
-          username: ssh_info[:username],
-          password: ssh_info[:password]
-        }
-      end
-
-      def run_remote_ps(command, &block)
-        options = remote_credentials.merge(command: command)
-        script_path = local_script_path('run_in_remote.ps1')
-
-        ps_options = []
-
-        options.each do |key, value|
-          ps_options << "-#{key}"
-          ps_options << "'#{value}'"
-        end
-
-        ps_options << '-ErrorAction' << 'Stop'
-        opts = { notify: [:stdout, :stderr, :stdin] }
-        Vagrant::Util::PowerShell.execute(
-          script_path,
-          *ps_options,
-          **opts,
-          &block
-        )
-      end
-
-      def upload(from, to)
-        options = {
-          host_path: windows_path(from),
-          guest_path: windows_path(to)
-        }.merge(remote_credentials)
-
-        script_path = local_script_path('upload_file.ps1')
-        execute(script_path, options)
-      end
-
-      def check_winrm
-        script_path = local_script_path('check_winrm.ps1')
-        execute(script_path, remote_credentials)
-      end
-
-      protected
-
-      def local_script_path(path)
-        lib_path = Pathname.new(File.expand_path('../scripts', __FILE__))
-        windows_path(lib_path.join(path).to_s)
-      end
-
-      def windows_path(path)
-        if path
-          path = path.gsub('/', "\\")
-          path = "c:#{path}" if path =~ /^\\/
-        end
-        path
-      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 'json'
+require "#{Vagrant::source_root}/plugins/providers/hyperv/driver"
+
+module VagrantPlugins
+  module WinAzure
+    class Driver < VagrantPlugins::HyperV::Driver
+      def initialize(machine)
+        @id = machine.id
+        @machine = machine
+      end
+
+      def ssh_info
+        @ssh_info ||= @machine.provider.winrm_info
+        @ssh_info[:username] ||= @machine.config.ssh.username
+        @ssh_info[:password] ||= @machine.config.ssh.password
+        @ssh_info
+      end
+
+      def remote_credentials
+        @remote_credentials ||= {
+          guest_ip: ssh_info[:host],
+          guest_port: ssh_info[:port],
+          username: ssh_info[:username],
+          password: ssh_info[:password]
+        }
+      end
+
+      def run_remote_ps(command, &block)
+        @machine.communicate.execute(command) do |*args|
+          block.call(args) unless block.nil?
+        end
+      end
+
+      def upload(from, to)
+        @machine.communicate.upload(from, to)
+      end
+
+      def check_winrm
+        @machine.communicate.ready?
+      end
+    end
+  end
+end