fix for config validation on custom images

Author: devigned

Gemfile

@@ -2,18 +2,17 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License in the project root for license information.
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
-group :development do
+group :development, :test do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
-  gem 'bundler', '~>1.10.5'
+  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", tag: "v1.9.2"
 end
 
 group :plugins do
-  gem 'vagrant-azure', path: '.'
+  gem "vagrant-azure", path: "."
 end

lib/vagrant-azure/config.rb

@@ -252,7 +252,7 @@ def validate(machine)
         errors = _detected_errors
 
         errors << I18n.t("vagrant_azure.custom_image_os_error") if !@vm_vhd_uri.nil? && (@vm_operating_system.nil? || @vm_vhd_storage_account_id.nil?)
-        errors << I18n.t("vagrant_azure.vhd_and_managed_image_error") if !@vm_vhd_uri.nil? && !@vm_managed
+        errors << I18n.t("vagrant_azure.vhd_and_managed_image_error") if !@vm_vhd_uri.nil? && !@vm_managed_image_id.nil?
         errors << I18n.t("vagrant_azure.manage_image_id_format_error") if !@vm_managed_image_id.nil? && !valid_image_id?(@vm_managed_image_id)
         # Azure connection properties related validation.
         errors << I18n.t('vagrant_azure.subscription_id.required') if @subscription_id.nil?

lib/vagrant-azure/version.rb

@@ -4,6 +4,6 @@
 
 module VagrantPlugins
   module Azure
-    VERSION = '2.0.0.pre7'.freeze
+    VERSION = '2.0.0.pre8'.freeze
   end
 end

templates/arm/deployment.json.erb

@@ -96,13 +96,13 @@
   },
   "resources": [
     <% if vhd_uri %>
-    <%= VagrantPlugins::Azure::Util::TemplateRenderer.render("arm/resources/import_disk.json", {
-      name: "[variables('managedOSDiskName')]",
-      account_type: "[parameters('storageAccountType')]",
-      os_type: "#{operating_system}",
-      source_uri: "#{vhd_uri}",
-      account_id: "#{vhd_stor_acct_id}"
-    }) + "," %>
+      <%= VagrantPlugins::Azure::Util::TemplateRenderer.render("arm/resources/import_disk.json", {
+        name: "[variables('managedOSDiskName')]",
+        account_type: "[parameters('storageAccountType')]",
+        os_type: "#{operating_system}",
+        source_uri: "#{vhd_uri}",
+        account_id: "#{vhd_stor_acct_id}"
+      }) + "," %>
     <% end %>
     <%= VagrantPlugins::Azure::Util::TemplateRenderer.render("arm/resources/network_security_group.json", self) + "," %>
     <%= VagrantPlugins::Azure::Util::TemplateRenderer.render("arm/resources/public_ip_address.json", self) + "," %>
@@ -113,32 +113,33 @@
     <% end %>
 
     <% if vhd_uri && operating_system == "Linux" %>
-    <%= VagrantPlugins::Azure::Util::TemplateRenderer.render("arm/resources/linux_reset_root_ext.json",
-                                                            {
-                                                              name: "[concat(parameters('vmName'), '/linuxResetUserExt')]",
-                                                              depends_on: ["[concat('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"],
-                                                              ssh_key: "[parameters('sshKeyData')]",
-                                                              username: "[parameters('adminUserName')]"
-                                                            }) + ", "
-                                                            %>
+      <%= VagrantPlugins::Azure::Util::TemplateRenderer.render("arm/resources/linux_reset_root_ext.json",
+                                                              {
+                                                                name: "[concat(parameters('vmName'), '/linuxResetUserExt')]",
+                                                                depends_on: ["[concat('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"],
+                                                                ssh_key: "[parameters('sshKeyData')]",
+                                                                username: "[parameters('adminUserName')]"
+                                                              }) + ", "
+                                                              %>
     <% end %>
 
     <% if vhd_uri && operating_system == "Windows" %>
-    <%= VagrantPlugins::Azure::Util::TemplateRenderer.render("arm/resources/windows_reset_access_ext.json",
-                                                            {
-                                                              name: "[concat(parameters('vmName'), '/windowsResetUserExt')]",
-                                                              depends_on: ["[concat('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"],
-                                                              password: "[parameters('adminPassword')]",
-                                                              username: "[parameters('adminUserName')]"
-                                                            }) + ", "
-                                                            %>
+      <%= VagrantPlugins::Azure::Util::TemplateRenderer.render("arm/resources/windows_reset_access_ext.json",
+                                                              {
+                                                                name: "[concat(parameters('vmName'), '/windowsResetUserExt')]",
+                                                                depends_on: ["[concat('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"],
+                                                                password: "[parameters('adminPassword')]",
+                                                                username: "[parameters('adminUserName')]"
+                                                              }) + ", "
+                                                              %>
     <% end %>
 
     <%
       vm_dependencies = ["[concat('Microsoft.Network/networkInterfaces/', variables('nicName'))]"]
       if availability_set_name
         vm_dependencies.push("[resourceId('Microsoft.Compute/availabilitySets', '#{availability_set_name}')")
       end
+
       if vhd_uri
         vm_dependencies.push("[resourceId('Microsoft.Compute/disks', variables('managedOSDiskName'))]")
       end

templates/arm/resources/linux_reset_root_ext.json.erb

@@ -9,7 +9,7 @@
   "properties": {
     "publisher": "Microsoft.OSTCExtensions",
     "type": "VMAccessForLinux",
-    "typeHandlerVersion": "1.*",
+    "typeHandlerVersion": "1.4",
     "autoUpgradeMinorVersion": true,
     "protectedSettings": {
       "ssh_key": "<%= ssh_key %>",

vagrant-azure.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'haikunator',            '~>1.1'
   s.add_runtime_dependency 'highline',              '~>1.7'
 
-  s.add_development_dependency 'bundler',           '~>1.9'
+  s.add_development_dependency 'bundler',           '~>1.10.5'
   s.add_development_dependency 'rake',              '~>11.1'
   s.add_development_dependency 'rspec',             '~>3.4'
   s.add_development_dependency 'simplecov',         '~>0.11'