vagrant-azure 1.3.0 → 2.0.0.pre1

data/lib/vagrant-azure/plugin.rb

@@ -1,8 +1,6 @@
-#--------------------------------------------------------------------------
-# 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.
-#--------------------------------------------------------------------------
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License in the project root for license information.
 begin
   require 'vagrant'
 rescue LoadError
@@ -16,12 +14,12 @@ if Vagrant::VERSION < '1.6.0'
 end
 
 module VagrantPlugins
-  module WinAzure
+  module Azure
     class Plugin < Vagrant.plugin('2')
-      name 'azure'
+      name 'Azure'
       description <<-DESC
       This plugin installs a provider that allows Vagrant to manage
-      machines in Windows Azure.
+      machines in Microsoft Azure.
       DESC
 
       config(:azure, :provider) do
@@ -33,38 +31,16 @@ module VagrantPlugins
         # Setup logging and i18n
         setup_logging
         setup_i18n
-        apply_patches
 
         # 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.apply_patches
-        lib_path = Pathname.new(File.expand_path('../../vagrant-azure', __FILE__))
-        Vagrant.plugin('2').manager.communicators[:winrm]
-        require lib_path.join('monkey_patch/winrm')
-      end
-
       def self.setup_i18n
         I18n.load_path << File.expand_path(
           'locales/en.yml',
-          WinAzure.source_root
+          Azure.source_root
         )
         I18n.load_path << File.expand_path(
           'templates/locales/en.yml',
@@ -98,7 +74,7 @@ module VagrantPlugins
         # 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 = Log4r::Logger.new('vagrant_azure')
           logger.outputters = Log4r::Outputter.stderr
           logger.level = level
           logger = nil

data/lib/vagrant-azure/provider.rb

@@ -1,24 +1,15 @@
-#--------------------------------------------------------------------------
-# 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.
-#--------------------------------------------------------------------------
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License in the project root for license information.
 require 'log4r'
 require 'vagrant'
 
 module VagrantPlugins
-  module WinAzure
+  module Azure
     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)
@@ -30,10 +21,6 @@ module VagrantPlugins
         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`
@@ -42,24 +29,15 @@ module VagrantPlugins
         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 = ""
+        # Get the short and long description
+        short = I18n.t("vagrant_azure.states.short_#{state_id}")
+        long  = I18n.t("vagrant_azure.states.long_#{state_id}")
 
         # Return the MachineState object
         Vagrant::MachineState.new(state_id, short, long)

data/lib/vagrant-azure/services/azure_resource_manager.rb

@@ -0,0 +1,80 @@
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License in the project root for license information.
+
+require 'azure_mgmt_resources'
+require 'azure_mgmt_compute'
+require 'azure_mgmt_network'
+require 'azure_mgmt_storage'
+
+module VagrantPlugins
+  module Azure
+    module Services
+      class AzureResourceManager
+
+        TENANT_ID_NAME = 'AZURE_TENANT_ID'
+        CLIENT_ID_NAME = 'AZURE_CLIENT_ID'
+        CLIENT_SECRET_NAME = 'AZURE_CLIENT_SECRET'
+
+        # AzureResourceManager provides access to the Azure Resource Manager APIs
+        # @param [MsRest::TokenProvider] token_provider object used to procure an authentication token from Azure Active
+        #   Directory
+        # @param [String] subscription_id
+        # @param [String] base_url
+        def initialize(token_provider, subscription_id, base_url = nil)
+          @token_provider = if token_provider.nil? || !token_provider.is_a?(MsRest::TokenProvider)
+                              if ENV[TENANT_ID_NAME].nil? || ENV[CLIENT_ID_NAME].nil? || ENV[CLIENT_SECRET_NAME].nil?
+                                raise ArgumentError "Either set #{TENANT_ID_NAME}, #{CLIENT_ID_NAME} or #{CLIENT_SECRET_NAME} in your environment, or pass in a MsRest::TokenProvider"
+                              else
+                                MsRestAzure::ApplicationTokenProvider.new(
+                                    ENV[TENANT_ID_NAME],
+                                    ENV[CLIENT_ID_NAME],
+                                    ENV[CLIENT_SECRET_NAME])
+                              end
+                            else
+                              token_provider
+                            end
+          @credential = MsRest::TokenCredentials.new(token_provider)
+          @base_url = base_url
+          @subscription_id = subscription_id
+        end
+
+        # Azure Resource Manager Compute API Client
+        # @return [Azure::ARM::Compute::ComputeManagementClient]
+        def compute
+          build(::Azure::ARM::Compute::ComputeManagementClient)
+        end
+
+        # Azure Resource Manager Generic Resource API Client
+        # @return [Azure::ARM::Resources::ResourceManagementClient]
+        def resources
+          build(::Azure::ARM::Resources::ResourceManagementClient)
+        end
+
+        # Azure Resource Manager Network API Client
+        # @return [Azure::ARM::Network::NetworkManagementClient]
+        def network
+          build(::Azure::ARM::Network::NetworkManagementClient)
+        end
+
+        # Azure Resource Manager Storage API Client
+        # @return [Azure::ARM::Storage::StorageManagementClient]
+        def storage
+          build(::Azure::ARM::Storage::StorageManagementClient)
+        end
+
+        private
+
+        def build(clazz)
+          instance = clazz.new(*client_params)
+          instance.subscription_id = @subscription_id
+          instance
+        end
+
+        def client_params
+          [@credential, @base_url].reject{ |i| i.nil? }
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-azure/util/machine_id_helper.rb

@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module Azure
+    module Util
+      module MachineIdHelper
+        def parse_machine_id(id)
+          parts = id.split(':')
+          {
+              group: parts[0],
+              name: parts[1],
+              location: parts[2]
+          }
+        end
+
+        def serialize_machine_id(resource_group, vm_name, location)
+          [resource_group, vm_name, location].join(':')
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-azure/util/timer.rb

@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module Azure
+    module Util
+      class Timer
+        def self.time
+          start_time = Time.now.to_f
+          yield
+          end_time = Time.now.to_f
+
+          end_time - start_time
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-azure/util/vm_await.rb

@@ -0,0 +1,36 @@
+module VagrantPlugins
+  module Azure
+    module Util
+      module VMAwait
+
+        def await_true(env)
+          config = env[:machine].provider_config
+          parsed = parse_machine_id(env[:machine].id)
+          azure = env[:azure_arm_service]
+          tries = config.instance_ready_timeout / 2
+          count = 0
+          task = Concurrent::TimerTask.new(execution_interval: config.instance_check_interval ) do
+            task.shutdown if env[:interrupted]
+
+            if count > tries
+              task.shutdown
+              false
+            end
+
+            count += 1
+            vm = azure.compute.virtual_machines.get(parsed[:group], parsed[:name], 'instanceView').value!.body
+            if yield(vm)
+              task.shutdown
+              true
+            end
+          end
+
+          task.execute
+          task.wait_for_termination
+          task
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-azure/util/vm_status_translator.rb

@@ -0,0 +1,59 @@
+module VagrantPlugins
+  module Azure
+    module Util
+      module VMStatusTranslator
+
+        PROVISIONING_STATES = [:provisioned, :deleting]
+        POWER_STATES = [:running, :starting, :deallocating, :deallocated]
+
+        def vm_status_to_state(status)
+          code = status.code
+          case
+            when code == 'ProvisioningState/succeeded'
+              :provisioned
+            when code == 'ProvisioningState/deleting'
+              :deleting
+            when code == 'PowerState/running'
+              :running
+            when code == 'PowerState/stopping'
+              :stopping
+            when code == 'PowerState/stopped'
+              :stopped
+            when code == 'PowerState/starting'
+              :starting
+            when code == 'PowerState/deallocating'
+              :deallocating
+            when code == 'PowerState/deallocated'
+              :deallocated
+            else
+              :unknown
+          end
+        end
+
+        def power_state(statuses)
+          vm_status_to_state(statuses.select{ |s| s.code.match(/PowerState/) }.last)
+        end
+
+        def running?(statuses)
+          statuses.any?{ |s| vm_status_to_state(s) == :running }
+        end
+
+        def built?(statuses)
+          statuses.any?{ |s| vm_status_to_state(s) == :provisioned }
+        end
+
+        def stopped?(statuses)
+          statuses.any?{ |s| vm_status_to_state(s) == :stopped }
+        end
+
+        def stopping?(statuses)
+          statuses.any?{ |s| vm_status_to_state(s) == :stopping }
+        end
+
+        def tearing_down?(statuses)
+          statuses.any?{ |s| vm_status_to_state(s) == :deleting }
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-azure/version.rb

@@ -1,11 +1,9 @@
-#--------------------------------------------------------------------------
-# 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.
-#--------------------------------------------------------------------------
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License in the project root for license information.
 
 module VagrantPlugins
-  module WinAzure
-    VERSION = '1.3.0'
+  module Azure
+    VERSION = '2.0.0.pre1'
   end
 end

data/lib/vagrant-azure.rb

@@ -1,19 +1,14 @@
-#--------------------------------------------------------------------------
-# 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.
-#--------------------------------------------------------------------------
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License in the project root for license information.
 require 'pathname'
 require 'vagrant-azure/plugin'
 
 module VagrantPlugins
-  module WinAzure
+  module Azure
     lib_path = Pathname.new(File.expand_path('../vagrant-azure', __FILE__))
     autoload :Action, lib_path.join('action')
     autoload :Errors, lib_path.join('errors')
-    autoload :Driver, lib_path.join('driver')
-
-    CLOUD_SERVICE_SEMAPHORE = Mutex.new
 
     # This returns the path to the source of this plugin.
     #

data/locales/en.yml

@@ -1,5 +1,7 @@
 en:
   vagrant_azure:
+    launching_instance: |-
+      Launching an instance with the following settings...
     not_created: |-
       The machine does not exist. Please run `vagrant up` first.
     will_not_destroy: |-
@@ -7,13 +9,25 @@ en:
     already_status: |-
       The machine is already %{status}.
     stopping: |-
-      Stopping '%{vm_name}' in '%{cloud_service_name}'
+      Stopping '%{name}' in '%{group}'
+    terminating: |-
+      Terminating '%{name}'
+    terminated: |-
+      Terminated '%{name}'
     rdp_not_ready: |-
       RDP not ready
-    vm_started: |-
+    starting: |-
+      VM '%{name}' is starting
+    started: |-
       VM '%{name}' has been started
-    vm_stopped: |-
+    stopping: |-
+      VM '%{name}' is stopping
+    stopped: |-
       VM '%{name}' has been stopped
+    restarting: |-
+      VM '%{name}' is restarting
+    restarted: |-
+      VM '%{name}' has been restarted
     copy_folder: |-
       Copying folder: %{hostpath} ==>
       %{guestpath}
@@ -35,3 +49,60 @@ en:
         Server not created. Error is: %{message}
       create_vm_failure: |-
         There was some error in creating the VM.
+      failed_starting: |-
+        Failed to start VM '%{name}'!!
+      failed_stopping: |-
+        Failed to stopping VM '%{name}'!!
+    subscription_id:
+      required: |-
+        You must provide an Azure Subscription Id either through ENV['AZURE_SUBSCRIPTION_ID'] or via Vagrantfile.
+    mgmt_endpoint:
+      required: |-
+        You must provide a non-nil Azure Management Endpoint either through ENV['AZURE_MANAGEMENT_ENDPOINT'] or via Vagrantfile.
+    auth:
+      required: |-
+        You must provide Azure Active Directory Tenant ID, Application Client ID and Application Client Secret via ENV or Vagrantfile.
+    states:
+      short_not_created: |-
+        not created
+      long_not_created: |-
+        The Azure instance is not created. Run `vagrant up` to create it.
+      short_stopped: |-
+        stopped
+      long_stopped: |-
+        The Azure instance is stopped. Run `vagrant up` to start it.
+      short_stopping: |-
+        stopping
+      long_stopping: |-
+        The Azure instance is stopping. Wait until is completely stopped to
+        run `vagrant up` and start it.
+      short_pending: |-
+        pending
+      long_pending: |-
+        The Azure instance is pending a start (i.e. this is a transition state).
+      short_running: |-
+        running
+      long_running: |-
+        The Azure instance is running. To stop this machine, you can run
+        `vagrant halt`. To destroy the machine, you can run `vagrant destroy`.
+      short_pending: |-
+        pending
+      long_pending: |-
+        The Azure instance is still being initialized. To destroy this machine,
+        you can run `vagrant destroy`.
+    waiting_for_ssh: |-
+      Waiting for SSH to become available...
+    ready: |-
+      Machine is booted and ready for use!
+    public_key_path_private_key: |-
+      We expect the public key to be added to the Azure VM to be located at the
+      same place as the config.ssh.private_key_path + '.pub'. We couldn't find
+      any public keys for these private key paths:
+    private_key_not_specified: |-
+      Please specify a secure key to use with config.ssh.private_key_path
+      (see: https://www.vagrantup.com/docs/vagrantfile/ssh_settings.html).
+      If not, you publicly accessible Azure VM will be extremely insecure.
+    waiting_for_ready: |-
+      Waiting for instance to become "ready"...
+    waiting_for_stop: |-
+      Waiting for instance to become "stopped"...

data/spec/spec_helper.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License in the project root for license information.
+require 'vagrant-azure'
+
+if ENV['COVERAGE'] || ENV['CI'] || ENV['TRAVIS']
+  require 'simplecov'
+  require 'coveralls'
+
+  if ENV['TRAVIS']
+    SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+        SimpleCov::Formatter::HTMLFormatter,
+        Coveralls::SimpleCov::Formatter
+    ]
+  else
+    SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
+  end
+
+  SimpleCov.start do
+    project_name 'vagrant-azure'
+    add_filter '/build-tests/'
+    add_filter '/coverage/'
+    add_filter '/locales/'
+    add_filter '/templates/'
+    add_filter '/doc/'
+    add_filter '/example_box/'
+    add_filter '/pkg/'
+    add_filter '/spec/'
+    add_filter '/tasks/'
+    add_filter '/yard-template/'
+    add_filter '/yardoc/'
+  end
+end
+
+# import all the support files
+Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require File.expand_path(f) }
+
+RSpec.configure do |config|
+  config.order = 'random'
+end

data/spec/vagrant-azure/config_spec.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License in the project root for license information.
+
+require 'vagrant'
+require 'vagrant-azure/config'
+
+module VagrantPlugins
+  module Azure
+    describe Config do
+
+      it 'should config' do
+
+      end
+
+    end
+  end
+end

data/spec/vagrant-azure/services/azure_resource_manager_spec.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License in the project root for license information.
+
+require 'vagrant-azure/services/azure_resource_manager'
+
+module VagrantPlugins
+  module Azure
+    module Services
+      describe AzureResourceManager do
+
+        it 'should be hello world' do
+
+        end
+
+      end
+    end
+  end
+end