vagrant-azure 1.3.0 → 2.0.0.pre1

data/templates/arm/deployment.json.erb

@@ -0,0 +1,264 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "adminUserName": {
+      "type": "string",
+      "defaultValue": "vagrant",
+      "metadata": {
+        "description": "User name for the Virtual Machine."
+      }
+    },
+    <% if operating_system == 'Windows' %>
+    "adminPassword": {
+      "type": "string",
+      "metadata": {
+        "description": "Password for the Virtual Machine (only used on Windows)"
+      }
+    },
+    <% end %>
+    "sshKeyData": {
+      "type": "string",
+      "metadata": {
+        "description": "SSH rsa public key file as a string."
+      }
+    },
+    "dnsLabelPrefix": {
+      "type": "string",
+      "metadata": {
+        "description": "Unique DNS Name for the Public IP used to access the Virtual Machine."
+      }
+    },
+    "vmSize": {
+      "type": "string",
+      "defaultValue": "Standard_D1",
+      "metadata": {
+        "description": "Size of the VM"
+      }
+    },
+    "vmName": {
+      "type": "string",
+      "metadata": {
+        "description": "Name of the VM"
+      }
+    },
+    "imagePublisher": {
+      "type": "string",
+      "defaultValue": "canonical",
+      "metadata": {
+        "description": "Name of the image publisher"
+      }
+    },
+    "imageOffer": {
+      "type": "string",
+      "defaultValue": "ubuntuserver",
+      "metadata": {
+        "description": "Name of the image offer"
+      }
+    },
+    "imageSku": {
+      "type": "string",
+      "defaultValue": "16.04.0-DAILY-LTS",
+      "metadata": {
+        "description": "Name of the image sku"
+      }
+    },
+    "imageVersion": {
+      "type": "string",
+      "defaultValue": "latest",
+      "metadata": {
+        "description": "Name of the image sku"
+      }
+    },
+    "subnetName": {
+      "type": "string",
+      "defaultValue": "vagrant-subnet",
+      "metadata": {
+        "description": "Name of the subnet"
+      }
+    },
+    "virtualNetworkName": {
+      "type": "string",
+      "defaultValue": "vagrantVNET",
+      "metadata": {
+        "description": "Name of the virtual network"
+      }
+    }
+  },
+  "variables": {
+    "storageAccountName": "[concat(uniquestring(resourceGroup().id), 'vagrant')]",
+    "location": "[resourceGroup().location]",
+    "osDiskName": "osDisk1",
+    "addressPrefix": "10.0.0.0/16",
+    "subnetPrefix": "10.0.0.0/24",
+    "vmStorageAccountContainerName": "vagrant-vhds",
+    "nicName": "[concat(parameters('vmName'), '-vagrantNIC')]",
+    "publicIPAddressName": "[concat(parameters('vmName'), '-vagrantPublicIP')]",
+    "publicIPAddressType": "Dynamic",
+    "storageAccountType": "Standard_LRS",
+    "networkSecurityGroupName": "[concat(parameters('vmName'), '-vagrantNSG')]",
+    "sshKeyPath": "[concat('/home/',parameters('adminUsername'),'/.ssh/authorized_keys')]",
+    "vnetID": "[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworkName'))]",
+    "subnetRef": "[concat(variables('vnetID'),'/subnets/',parameters('subnetName'))]",
+    "apiVersion": "2015-06-15"
+  },
+  "resources": [
+    {
+      "type": "Microsoft.Storage/storageAccounts",
+      "name": "[variables('storageAccountName')]",
+      "apiVersion": "[variables('apiVersion')]",
+      "location": "[variables('location')]",
+      "properties": {
+        "accountType": "[variables('storageAccountType')]"
+      }
+    },
+    {
+      "apiVersion": "[variables('apiVersion')]",
+      "type": "Microsoft.Network/networkSecurityGroups",
+      "name": "[variables('networkSecurityGroupName')]",
+      "location": "[variables('location')]",
+      "properties": {
+        "securityRules": [
+          {
+            "name": "ssh_rule",
+            "properties": {
+              "description": "Locks inbound down to ssh default port 22.",
+              "protocol": "Tcp",
+              "sourcePortRange": "*",
+              "destinationPortRange": "22",
+              "sourceAddressPrefix": "*",
+              "destinationAddressPrefix": "*",
+              "access": "Allow",
+              "priority": 123,
+              "direction": "Inbound"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "apiVersion": "[variables('apiVersion')]",
+      "type": "Microsoft.Network/publicIPAddresses",
+      "name": "[variables('publicIPAddressName')]",
+      "location": "[variables('location')]",
+      "properties": {
+        "publicIPAllocationMethod": "[variables('publicIPAddressType')]",
+        "dnsSettings": {
+          "domainNameLabel": "[parameters('dnsLabelPrefix')]"
+        }
+      }
+    },
+    {
+      "apiVersion": "[variables('apiVersion')]",
+      "type": "Microsoft.Network/virtualNetworks",
+      "name": "[parameters('virtualNetworkName')]",
+      "location": "[variables('location')]",
+      "dependsOn": [
+        "[concat('Microsoft.Network/networkSecurityGroups/', variables('networkSecurityGroupName'))]"
+      ],
+      "properties": {
+        "addressSpace": {
+          "addressPrefixes": [
+            "[variables('addressPrefix')]"
+          ]
+        },
+        "subnets": [
+          {
+            "name": "[parameters('subnetName')]",
+            "properties": {
+              "addressPrefix": "[variables('subnetPrefix')]",
+              "networkSecurityGroup": {
+                "id": "[resourceId('Microsoft.Network/networkSecurityGroups', variables('networkSecurityGroupName'))]"
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "apiVersion": "[variables('apiVersion')]",
+      "type": "Microsoft.Network/networkInterfaces",
+      "name": "[variables('nicName')]",
+      "location": "[variables('location')]",
+      "dependsOn": [
+        "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIPAddressName'))]",
+        "[concat('Microsoft.Network/virtualNetworks/', parameters('virtualNetworkName'))]"
+      ],
+      "properties": {
+        "ipConfigurations": [
+          {
+            "name": "ipconfig1",
+            "properties": {
+              "privateIPAllocationMethod": "Dynamic",
+              "publicIPAddress": {
+                "id": "[resourceId('Microsoft.Network/publicIPAddresses', variables('publicIPAddressName'))]"
+              },
+              "subnet": {
+                "id": "[variables('subnetRef')]"
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "apiVersion": "[variables('apiVersion')]",
+      "type": "Microsoft.Compute/virtualMachines",
+      "name": "[parameters('vmName')]",
+      "location": "[variables('location')]",
+      "dependsOn": [
+        "[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]",
+        "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'))]"
+      ],
+      "properties": {
+        "hardwareProfile": {
+          "vmSize": "[parameters('vmSize')]"
+        },
+        "osProfile": {
+          "computerName": "[parameters('vmName')]",
+          "adminUsername": "[parameters('adminUsername')]",
+          "linuxConfiguration": {
+            "disablePasswordAuthentication": "true",
+            "ssh": {
+              "publicKeys": [
+                {
+                  "path": "[variables('sshKeyPath')]",
+                  "keyData": "[parameters('sshKeyData')]"
+                }
+              ]
+            }
+          }
+        },
+        "storageProfile": {
+          "imageReference": {
+            "publisher": "[parameters('imagePublisher')]",
+            "offer": "[parameters('imageOffer')]",
+            "sku": "[parameters('imageSku')]",
+            "version": "latest"
+          },
+          "osDisk": {
+            "name": "osdisk",
+            "vhd": {
+              "uri": "[concat('http://',variables('storageAccountName'),'.blob.core.windows.net/',variables('vmStorageAccountContainerName'),'/', variables('osDiskName'),'.vhd')]"
+            },
+            "caching": "ReadWrite",
+            "createOption": "FromImage"
+          }
+        },
+        "networkProfile": {
+          "networkInterfaces": [
+            {
+              "id": "[resourceId('Microsoft.Network/networkInterfaces', variables('nicName'))]"
+            }
+          ]
+        },
+        "diagnosticsProfile": {
+          "bootDiagnostics": {
+            "enabled": "true",
+            "storageUri": "[concat('http://',variables('storageAccountName'),'.blob.core.windows.net')]"
+          }
+        }
+      }
+    }
+  ]
+}

data/vagrant-azure.gemspec

@@ -1,27 +1,32 @@
-# coding: utf-8
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License in the project root for license information.
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'vagrant-azure/version'
 
 Gem::Specification.new do |s|
   s.name          = 'vagrant-azure'
-  s.version       = VagrantPlugins::WinAzure::VERSION
-  s.authors       = %w(MSOpenTech Azure)
-  s.description   = 'Enable Vagrant to manage machines in Azure.'
-  s.summary       = 'Enable Vagrant to manage Windows and Linux machines in Azure.'
-  s.homepage      = 'https://github.com/MSOpenTech/vagrant-azure'
-  s.license       = 'Apache 2.0'
+  s.version       = VagrantPlugins::Azure::VERSION
+  s.authors       = %w(Azure)
+  s.description   = 'Enable Vagrant to manage machines in Microsoft Azure.'
+  s.summary       = 'Enable Vagrant to manage Windows and Linux machines in Microsoft Azure.'
+  s.homepage      = 'https://github.com/azure/vagrant-azure'
+  s.license       = 'MIT'
   s.require_paths = ['lib']
   s.files         = `git ls-files`.split("\n")
   s.bindir        = 'bin'
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
 
-  s.add_runtime_dependency 'azure',       '0.7.0'
-  s.add_runtime_dependency 'httpclient',  '2.4.0'
+  s.add_runtime_dependency 'azure_mgmt_resources',  '~>0.2.1'
+  s.add_runtime_dependency 'azure_mgmt_compute',    '~>0.2.1'
+  s.add_runtime_dependency 'azure_mgmt_network',    '~>0.2.1'
+  s.add_runtime_dependency 'azure_mgmt_storage',    '~>0.2.1'
+  s.add_runtime_dependency 'haikunator',            '~>1.1'
 
-  s.add_development_dependency 'bundler', '~> 1.3'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'minitest-reporters'
-  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'bundler',           '~>1.9'
+  s.add_development_dependency 'rake',              '~>11.1'
+  s.add_development_dependency 'rspec',             '~>3.4'
+  s.add_development_dependency 'simplecov',         '~>0.11.2'
+  s.add_development_dependency 'coveralls',         '~>0.8'
 end

metadata

@@ -1,121 +1,163 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-azure
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0.pre1
 platform: ruby
 authors:
-- MSOpenTech
 - Azure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: azure
+  name: azure_mgmt_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: azure_mgmt_compute
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: azure_mgmt_network
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: azure_mgmt_storage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: haikunator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.2
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Enable Vagrant to manage machines in Azure.
+        version: '0.8'
+description: Enable Vagrant to manage machines in Microsoft Azure.
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -128,36 +170,39 @@ files:
 - lib/vagrant-azure.rb
 - lib/vagrant-azure/action.rb
 - lib/vagrant-azure/action/connect_azure.rb
-- lib/vagrant-azure/action/os_type.rb
-- lib/vagrant-azure/action/powershell_run.rb
-- lib/vagrant-azure/action/rdp.rb
+- lib/vagrant-azure/action/is_created.rb
+- lib/vagrant-azure/action/is_stopped.rb
+- lib/vagrant-azure/action/message_already_created.rb
+- lib/vagrant-azure/action/message_not_created.rb
+- lib/vagrant-azure/action/message_will_not_destroy.rb
 - lib/vagrant-azure/action/read_ssh_info.rb
 - lib/vagrant-azure/action/read_state.rb
-- lib/vagrant-azure/action/read_winrm_info.rb
 - lib/vagrant-azure/action/restart_vm.rb
 - lib/vagrant-azure/action/run_instance.rb
 - lib/vagrant-azure/action/start_instance.rb
 - lib/vagrant-azure/action/stop_instance.rb
-- lib/vagrant-azure/action/sync_folders.rb
 - lib/vagrant-azure/action/terminate_instance.rb
-- lib/vagrant-azure/action/vagrant_azure_service.rb
 - lib/vagrant-azure/action/wait_for_state.rb
-- lib/vagrant-azure/capabilities/winrm.rb
-- lib/vagrant-azure/command/powershell.rb
-- lib/vagrant-azure/command/rdp.rb
 - lib/vagrant-azure/config.rb
-- lib/vagrant-azure/driver.rb
 - lib/vagrant-azure/errors.rb
-- lib/vagrant-azure/monkey_patch/winrm.rb
 - lib/vagrant-azure/plugin.rb
 - lib/vagrant-azure/provider.rb
+- lib/vagrant-azure/services/azure_resource_manager.rb
+- lib/vagrant-azure/util/machine_id_helper.rb
+- lib/vagrant-azure/util/timer.rb
+- lib/vagrant-azure/util/vm_await.rb
+- lib/vagrant-azure/util/vm_status_translator.rb
 - lib/vagrant-azure/version.rb
 - locales/en.yml
+- spec/spec_helper.rb
+- spec/vagrant-azure/config_spec.rb
+- spec/vagrant-azure/services/azure_resource_manager_spec.rb
+- templates/arm/deployment.json.erb
 - templates/provisioners/chef-solo/solo.erb
 - vagrant-azure.gemspec
-homepage: https://github.com/MSOpenTech/vagrant-azure
+homepage: https://github.com/azure/vagrant-azure
 licenses:
-- Apache 2.0
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -170,13 +215,13 @@ 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.6
 signing_key: 
 specification_version: 4
-summary: Enable Vagrant to manage Windows and Linux machines in Azure.
+summary: Enable Vagrant to manage Windows and Linux machines in Microsoft Azure.
 test_files: []

data/lib/vagrant-azure/action/os_type.rb

@@ -1,34 +0,0 @@
-#--------------------------------------------------------------------------
-# 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'
-
-module VagrantPlugins
-  module WinAzure
-    module Action
-      class OSType
-        def initialize(app, env)
-          @app = app
-          @logger = Log4r::Logger.new('vagrant_azure::action::os_type')
-        end
-
-        def call(env)
-
-          unless env[:machine].config.vm.guest
-            env[:ui].info 'Determining OS Type By Image'
-            guest_os_type = env[:azure_vm_service].send(:get_image, env[:machine].provider_config.vm_image).os_type
-            env[:machine].config.vm.guest = guest_os_type && guest_os_type.downcase.to_sym
-            if env[:machine].config.vm.guest == :windows && env[:machine].config.vm.communicator.nil?
-              env[:machine].config.vm.communicator = :winrm
-            end
-            env[:ui].info "OS Type is #{guest_os_type}"
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-azure/action/powershell_run.rb

@@ -1,28 +0,0 @@
-module VagrantPlugins
-  module WinAzure
-    module Action
-      class PowerShellRun
-        def initialize(app, env)
-          @app = app
-          @logger = Log4r::Logger.new('vagrant_azure::action::powershell_run_command')
-        end
-
-        def call(env)
-
-          if env[:machine].communicate.ready?
-            env[:machine].ui.detail("PowerShell Executing: #{env[:powershell_command]}")
-            env[:powershell_command_exit_status] = env[:machine].communicate.execute(env[:powershell_command]) do |type, stream|
-              if type == :stdout
-                env[:machine].ui.success(stream) unless (stream || '').chomp.empty?
-              else
-                env[:machine].ui.error(stream) unless (stream || '').chomp.empty?
-              end
-            end
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end