vagrant-google 1.0.0 → 2.0.0.rc0

data/example_boxes/gce-test/Vagrantfile

@@ -20,5 +20,6 @@ Vagrant.configure("2") do |config|
       override.ssh.username = ENV['GOOGLE_SSH_USER']
       override.ssh.private_key_path = ENV['GOOGLE_SSH_KEY_LOCATION']
     end
+      _google.image_family = "debian-9"
   end
 end

data/lib/vagrant-google/action.rb

@@ -66,7 +66,7 @@ module VagrantPlugins
             end
 
             b2.use Provision
-            b2.use SyncFolders
+            b2.use SyncedFolders
           end
         end
       end
@@ -134,7 +134,7 @@ module VagrantPlugins
               b1.use Call, IsTerminated do |env2, b2|
                 if env2[:result]
                   b2.use Provision
-                  b2.use SyncFolders
+                  b2.use SyncedFolders
                   b2.use WarnNetworks
                   b2.use WarnSshKeys
                   b2.use StartInstance
@@ -145,7 +145,7 @@ module VagrantPlugins
               end
             else
               b1.use Provision
-              b1.use SyncFolders
+              b1.use SyncedFolders
               b1.use WarnNetworks
               b1.use WarnSshKeys
               b1.use RunInstance
@@ -186,7 +186,6 @@ module VagrantPlugins
       autoload :RunInstance, action_root.join("run_instance")
       autoload :StartInstance, action_root.join("start_instance")
       autoload :StopInstance, action_root.join("stop_instance")
-      autoload :SyncFolders, action_root.join("sync_folders")
       autoload :TerminateInstance, action_root.join("terminate_instance")
       autoload :TimedProvision, action_root.join("timed_provision")
       autoload :WarnNetworks, action_root.join("warn_networks")

data/lib/vagrant-google/action/assign_instance_groups.rb

@@ -34,6 +34,8 @@ module VagrantPlugins
           zone_config = env[:machine].provider_config.get_zone_config(zone)
           instance_name = zone_config.name
           instance_group_name = zone_config.instance_group
+          network = zone_config.network
+          subnetwork = zone_config.subnetwork
 
           if instance_group_name
             group = env[:google_compute].instance_groups.get(instance_group_name,
@@ -44,7 +46,9 @@ module VagrantPlugins
               instance_group_config = {
                 name: instance_group_name,
                 zone: zone,
-                description: "Created by Vagrant"
+                description: "Created by Vagrant",
+                network: network,
+                subnetwork: subnetwork,
               }
               env[:google_compute].instance_groups.create(instance_group_config)
             end
@@ -52,17 +56,17 @@ module VagrantPlugins
             # Add the machine to instance group
             env[:ui].info(I18n.t("vagrant_google.instance_group_add"))
 
-            response = env[:google_compute].instance_groups.add_instance(
-              group: instance_group_name,
-              zone: zone,
-              instance: instance_name
+            # Fixup with add_instance_group_instance after adding to fog
+            # See https://github.com/fog/fog-google/issues/308
+            response = env[:google_compute].add_instance_group_instances(
+              instance_group_name,
+              zone,
+              [instance_name]
             )
-            unless response.body["status"] == "DONE"
-              operation = env[:google_compute].operations.get(
-                operation.body["name"], zone
-              )
+            unless response.status == "DONE"
+              operation = env[:google_compute].operations.get(response.name, zone)
               env[:ui].info(I18n.t("vagrant_google.waiting_for_operation",
-                                   name: operation.body["name"]))
+                                   name: operation.name))
               operation.wait_for { ready? }
             end
           end

data/lib/vagrant-google/action/connect_google.rb

@@ -35,11 +35,8 @@ module VagrantPlugins
             :google_project      => provider_config.google_project_id,
             :google_client_email => provider_config.google_client_email
           }
-          if provider_config.google_json_key_location.nil?
-            fog_config[:google_key_location] = provider_config.google_key_location
-          else
-            fog_config[:google_json_key_location] = provider_config.google_json_key_location
-          end
+
+          fog_config[:google_json_key_location] = find_key(provider_config.google_json_key_location, env)
 
           @logger.info("Connecting to Google...")
           env[:google_compute] = Fog::Compute.new(fog_config)
@@ -47,6 +44,15 @@ module VagrantPlugins
           @app.call(env)
           @logger.info("...Connected!")
         end
+
+        # If the key is not found, try expanding from root location (see #159)
+        def find_key(location, env)
+           if File.file?(File.expand_path(location))
+             return File.expand_path(location)
+           else
+             return File.expand_path(location, env[:root_path])
+           end
+        end
       end
     end
   end

data/lib/vagrant-google/action/read_ssh_info.rb

@@ -47,13 +47,13 @@ module VagrantPlugins
 
           # Default to use public ip address
           ssh_info = {
-            :host => server.public_ip_address,
+            :host => server.public_ip_addresses[0],
             :port => 22
           }
 
           if use_private_ip then
             ssh_info = {
-              :host => server.private_ip_address,
+              :host => server.private_ip_addresses[0],
               :port => 22
             }
           end

data/lib/vagrant-google/action/read_state.rb

@@ -43,7 +43,7 @@ module VagrantPlugins
             @logger.info(e.message)
             server = nil
           end
-          if server.nil? || [:"shutting-down", :terminated].include?(server.state.to_sym)
+          if server.nil? || [:"shutting-down", :terminated].include?(server.status.to_sym)
             # The machine can't be found
             @logger.info("Machine '#{zone}:#{machine.id}' not found or terminated, assuming it got destroyed.")
             machine.id = nil
@@ -51,7 +51,7 @@ module VagrantPlugins
           end
 
           # Return the state
-          return server.state.to_sym
+          return server.status.to_sym
         end
       end
     end

data/lib/vagrant-google/action/run_instance.rb

@@ -43,6 +43,7 @@ module VagrantPlugins
           # Get the configs
           zone_config         = env[:machine].provider_config.get_zone_config(zone)
           image               = zone_config.image
+          image_family        = zone_config.image_family
           instance_group      = zone_config.instance_group
           name                = zone_config.name
           machine_type        = zone_config.machine_type
@@ -52,6 +53,7 @@ module VagrantPlugins
           network             = zone_config.network
           subnetwork          = zone_config.subnetwork
           metadata            = zone_config.metadata
+          labels              = zone_config.labels
           tags                = zone_config.tags
           can_ip_forward      = zone_config.can_ip_forward
           use_private_ip      = zone_config.use_private_ip
@@ -61,21 +63,25 @@ module VagrantPlugins
           on_host_maintenance = zone_config.on_host_maintenance
           autodelete_disk     = zone_config.autodelete_disk
           service_accounts    = zone_config.service_accounts
+          project_id          = zone_config.google_project_id
 
           # Launch!
           env[:ui].info(I18n.t("vagrant_google.launching_instance"))
           env[:ui].info(" -- Name:            #{name}")
+          env[:ui].info(" -- Project:         #{project_id}")
           env[:ui].info(" -- Type:            #{machine_type}")
           env[:ui].info(" -- Disk type:       #{disk_type}")
           env[:ui].info(" -- Disk size:       #{disk_size} GB")
           env[:ui].info(" -- Disk name:       #{disk_name}")
           env[:ui].info(" -- Image:           #{image}")
+          env[:ui].info(" -- Image family:    #{image_family}")
           env[:ui].info(" -- Instance Group:  #{instance_group}")
           env[:ui].info(" -- Zone:            #{zone}") if zone
           env[:ui].info(" -- Network:         #{network}") if network
           env[:ui].info(" -- Subnetwork:      #{subnetwork}") if subnetwork
           env[:ui].info(" -- Metadata:        '#{metadata}'")
-          env[:ui].info(" -- Tags:            '#{tags}'")
+          env[:ui].info(" -- Labels:          '#{labels}'")
+          env[:ui].info(" -- Network tags:    '#{tags}'")
           env[:ui].info(" -- IP Forward:      #{can_ip_forward}")
           env[:ui].info(" -- Use private IP:  #{use_private_ip}")
           env[:ui].info(" -- External IP:     #{external_ip}")
@@ -84,6 +90,36 @@ module VagrantPlugins
           env[:ui].info(" -- On Maintenance:  #{on_host_maintenance}")
           env[:ui].info(" -- Autodelete Disk: #{autodelete_disk}")
           env[:ui].info(" -- Scopes:          #{service_accounts}")
+
+          # Munge image configs
+          image = env[:google_compute].images.get(image).self_link
+
+          # If image_family is set, get the latest image image from the family.
+          unless image_family.nil?
+            image = env[:google_compute].images.get_from_family(image_family).self_link
+          end
+
+          # Munge network configs
+          if network != 'default'
+            network = "projects/#{project_id}/global/networks/#{network}"
+            subnetwork  = "projects/#{project_id}/regions/#{zone.split('-')[0..1].join('-')}/subnetworks/#{subnetwork}"
+          else
+            network = "global/networks/default"
+          end
+
+          if external_ip == false
+            # No external IP
+            network_interfaces = [ { :network => network, :subnetwork => subnetwork } ]
+          else
+            network_interfaces = [ { :network => network, :subnetwork => subnetwork, :access_configs => [{:name => 'External NAT', :type => 'ONE_TO_ONE_NAT'}]} ]
+          end
+
+          # Munge scheduling configs
+          scheduling = { :automatic_restart => auto_restart, :on_host_maintenance => on_host_maintenance, :preemptible => preemptible}
+
+          # Munge service_accounts / scopes config
+          service_accounts = [ { :scopes => service_accounts } ]
+
           begin
             request_start_time = Time.now.to_i
 
@@ -96,24 +132,24 @@ module VagrantPlugins
             if disk_name.nil?
               # no disk_name... disk_name defaults to instance name
               disk = env[:google_compute].disks.create(
-                  name: name,
-                  size_gb: disk_size,
-                  type: disk_type,
-                  zone_name: zone,
-                  source_image: image
+                name: name,
+                size_gb: disk_size,
+                type: disk_type,
+                zone_name: zone,
+                source_image: image
               )
-              disk_created_by_vagrant = true
               disk.wait_for { disk.ready? }
+              disk_created_by_vagrant = true
             else
               disk = env[:google_compute].disks.get(disk_name, zone)
               if disk.nil?
                 # disk not found... create it with name
                 disk = env[:google_compute].disks.create(
-                    name: disk_name,
-                    size_gb: disk_size,
-                    type: disk_type,
-                    zone_name: zone,
-                    source_image: image
+                  name: disk_name,
+                  size_gb: disk_size,
+                  type: disk_type,
+                  zone_name: zone,
+                  source_image: image
                 )
                 disk.wait_for { disk.ready? }
                 disk_created_by_vagrant = true
@@ -122,22 +158,20 @@ module VagrantPlugins
 
             defaults = {
               :name                => name,
-              :zone_name           => zone,
+              :zone                => zone,
               :machine_type        => machine_type,
               :disk_size           => disk_size,
               :disk_type           => disk_type,
               :image               => image,
-              :network             => network,
-              :subnetwork          => subnetwork,
-              :metadata            => metadata,
-              :tags                => tags,
+              :network_interfaces  => network_interfaces,
+              :metadata            => { :items => metadata.each.map { |k, v| {:key => k.to_s, :value => v.to_s} } },
+              :labels              => labels,
+              :tags                => { :items => tags },
               :can_ip_forward      => can_ip_forward,
               :use_private_ip      => use_private_ip,
               :external_ip         => external_ip,
-              :preemptible         => preemptible,
-              :auto_restart        => auto_restart,
-              :on_host_maintenance => on_host_maintenance,
               :disks               => [disk.get_as_boot_disk(true, autodelete_disk)],
+              :scheduling          => scheduling,
               :service_accounts    => service_accounts
             }
             server = env[:google_compute].servers.create(defaults)
@@ -176,7 +210,7 @@ module VagrantPlugins
               end
             end
             @logger.info("Time for SSH ready: #{env[:metrics]["instance_ssh_time"]}")
-            env[:ui].info(I18n.t("vagrant_google.ready_ssh"))
+            env[:ui].info(I18n.t("vagrant_google.ready_ssh")) unless env[:interrupted]
           end
 
           # Terminate the instance if we were interrupted
@@ -205,7 +239,7 @@ module VagrantPlugins
         def get_disk_type(env, disk_type, zone)
           begin
             # TODO(temikus): Outsource parsing logic to fog-google
-            disk_type = env[:google_compute].get_disk_type(disk_type, zone).body["selfLink"]
+            disk_type = env[:google_compute].get_disk_type(disk_type, zone).self_link
           rescue Fog::Errors::NotFound
             raise Errors::DiskTypeError,
                   :disktype => disk_type

data/lib/vagrant-google/action/stop_instance.rb

@@ -18,10 +18,8 @@ require 'vagrant-google/util/timer'
 module VagrantPlugins
   module Google
     module Action
-
       # This stops the running instance.
       class StopInstance
-
         include Vagrant::Util::Retryable
 
         def initialize(app, env)

data/lib/vagrant-google/action/terminate_instance.rb

@@ -28,6 +28,8 @@ module VagrantPlugins
 
           # Destroy the server and remove the tracking ID
           # destroy() is called with 'false' to disable asynchronous execution.
+          # TODO: Add "override_async" option for faster test
+          # TODO: Look at fog logic for possibly making sync faster
           env[:ui].info(I18n.t("vagrant_google.terminating"))
           server.destroy(false) unless server.nil?
           env[:machine].id = nil

data/lib/vagrant-google/config.rb

@@ -22,11 +22,6 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :google_client_email
 
-      # The path to the Service Account private key
-      #
-      # @return [String]
-      attr_accessor :google_key_location
-
       # The path to the Service Account json-formatted private key
       #
       # @return [String]
@@ -42,6 +37,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :image
 
+      # The image family of the instance to use.
+      #
+      # @return [String]
+      attr_accessor :image_family
+
       # The instance group name to put the instance in.
       #
       # @return [String]
@@ -92,6 +92,11 @@ module VagrantPlugins
       # @return [Array]
       attr_accessor :tags
 
+      # Labels to apply to the instance
+      #
+      # @return [Hash<String, String>]
+      attr_accessor :labels
+
       # whether to enable ip forwarding
       #
       # @return Boolean
@@ -152,10 +157,10 @@ module VagrantPlugins
 
       def initialize(zone_specific=false)
         @google_client_email = UNSET_VALUE
-        @google_key_location = UNSET_VALUE
         @google_json_key_location = UNSET_VALUE
         @google_project_id   = UNSET_VALUE
         @image               = UNSET_VALUE
+        @image_family        = UNSET_VALUE
         @instance_group      = UNSET_VALUE
         @machine_type        = UNSET_VALUE
         @disk_size           = UNSET_VALUE
@@ -166,6 +171,7 @@ module VagrantPlugins
         @network             = UNSET_VALUE
         @subnetwork          = UNSET_VALUE
         @tags                = []
+        @labels              = {}
         @can_ip_forward      = UNSET_VALUE
         @external_ip         = UNSET_VALUE
         @use_private_ip      = UNSET_VALUE
@@ -190,7 +196,7 @@ module VagrantPlugins
       # image and machine type name for zones. Example:
       #
       #     google.zone_config "us-central1-f" do |zone|
-      #       zone.image = "debian-7-wheezy-v20150127"
+      #       zone.image = "ubuntu-1604-xenial-v20180306"
       #       zone.machine_type = "n1-standard-4"
       #     end
       #
@@ -216,11 +222,6 @@ module VagrantPlugins
         @__zone_config[zone] << block if block_given?
       end
 
-      def expand_path(path, root_path)
-        return path if not path
-        return Pathname.new(path).expand_path(root_path)
-      end
-
       #-------------------------------------------------------------------
       # Internal methods.
       #-------------------------------------------------------------------
@@ -255,12 +256,14 @@ module VagrantPlugins
         # Try to get access keys from standard Google environment variables; they
         # will default to nil if the environment variables are not present.
         @google_client_email = ENV['GOOGLE_CLIENT_EMAIL'] if @google_client_email == UNSET_VALUE
-        @google_key_location = ENV['GOOGLE_KEY_LOCATION'] if @google_key_location == UNSET_VALUE
         @google_json_key_location = ENV['GOOGLE_JSON_KEY_LOCATION'] if @google_json_key_location == UNSET_VALUE
         @google_project_id = ENV['GOOGLE_PROJECT_ID'] if @google_project_id == UNSET_VALUE
 
-        # Image must be nil, since we can't default that
-        @image = "debian-8-jessie-v20160511" if @image == UNSET_VALUE
+        # Default image is nil
+        @image = nil if @image == UNSET_VALUE
+
+        # Default image family is nil
+        @image_family = nil if @image_family == UNSET_VALUE
 
         # Default instance group name is nil
         @instance_group = nil if @instance_group == UNSET_VALUE
@@ -352,20 +355,16 @@ module VagrantPlugins
         if @zone
           config = get_zone_config(@zone)
 
-          config.google_key_location = expand_path(config.google_key_location, machine.env.root_path)
-          config.google_json_key_location = expand_path(config.google_json_key_location, machine.env.root_path)
-
+          # TODO: Check why provider-level settings are validated in the zone config
           errors << I18n.t("vagrant_google.config.google_project_id_required") if \
             config.google_project_id.nil?
           errors << I18n.t("vagrant_google.config.google_client_email_required") if \
             config.google_client_email.nil?
-          errors << I18n.t("vagrant_google.config.google_duplicate_key_location") if \
-            !config.google_key_location.nil? and !config.google_json_key_location.nil?
           errors << I18n.t("vagrant_google.config.google_key_location_required") if \
-            config.google_key_location.nil? and config.google_json_key_location.nil?
+            config.google_json_key_location.nil?
           errors << I18n.t("vagrant_google.config.private_key_missing") unless \
-            File.exist?(config.google_key_location.to_s) or \
-            File.exist?(config.google_json_key_location.to_s)
+            File.exist?(File.expand_path(config.google_json_key_location.to_s)) or
+            File.exist?(File.expand_path(config.google_json_key_location.to_s, machine.env.root_path))
 
           if config.preemptible
             errors << I18n.t("vagrant_google.config.auto_restart_invalid_on_preemptible") if \
@@ -373,9 +372,14 @@ module VagrantPlugins
             errors << I18n.t("vagrant_google.config.on_host_maintenance_invalid_on_preemptible") unless \
              config.on_host_maintenance == "TERMINATE"
           end
+
+          if config.image_family
+            errors << I18n.t("vagrant_google.config.image_and_image_family_set") if \
+             config.image
+          end
         end
 
-        errors << I18n.t("vagrant_google.config.image_required") if config.image.nil?
+        errors << I18n.t("vagrant_google.config.image_required") if config.image.nil? && config.image_family.nil?
         errors << I18n.t("vagrant_google.config.name_required") if @name.nil?
 
         { "Google Provider" => errors }