vagrant-google 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97ed22f3b15a2264048780aee27f556253b4fc95
-  data.tar.gz: d25da1e3ffc2df3f7426a3e12925aa4bc712906c
+  metadata.gz: ff7fc355aac3b30b66f83ee7dc0032c64060a0dc
+  data.tar.gz: aa90cafdd81a4815b3b4f9676827bb7e2403fb16
 SHA512:
-  metadata.gz: d93c86649f29f86245324f17397ab4b312ca62f23636473f389b58842708e75b9375a641e940caadd9634ccf5e3f1e48dd3b63853df6e599120d947b1d6e7a56
-  data.tar.gz: edc17341aeee905871bc2af62c4f0cbc1a19da2835742e1ce104ba8e92717b98c763d6a1b6c3757dd7fb3ab674bd9228830b7e9840ade27c86bf5535969b06d9
+  metadata.gz: 3bb5325a938bdf66b431ef25490c90948fc81e0a873e09b4eb862a46cfcfec78d5685077d5dbe83c58b724e8482ceb0b95e0b3d2db4c64f0eebd22084eb44da7
+  data.tar.gz: dd90bd55eb16fcd40645a55ca306542586e4e581a1989123f639db5a3715498d9ea35822f6b66e2fc7c9cdb0491c5890687800dfdb07b2c8c373f81bf3ea649f

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 All notable changes to this project will be documented in this file.
 The format is loosely based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 2.2.1 (October 2018)
+
+### User-facing
+
+- \#206 Fix image selection logic - Plugin no longer traces back with 
+  `image_family` config option. [temikus]
+
+### Development
+
+- \#206 Bumped dependencies. [temikus]
+  - fog-google version to 1.8.1 
+  - vagrant & vagrant-spec are now pointing to new upstream Hashicorp org repos 
+
 ## 2.2.0 (June 2018)
 
 #### Fixed

data/Gemfile

@@ -23,6 +23,6 @@ group :development 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 'vagrant-spec', git: "https://github.com/mitchellh/vagrant-spec.git"
+  gem 'vagrant', git: "https://github.com/hashicorp/vagrant.git"
+  gem 'vagrant-spec', git: "https://github.com/hashicorp/vagrant-spec.git"
 end

data/README.md

@@ -245,7 +245,7 @@ Vagrant.configure("2") do |config|
 
     google.zone_config "us-central1-f" do |zone1f|
         zone1f.name = "testing-vagrant"
-        zone1f.image = "debian-8-jessie-v20180307"
+        zone1f.image = "debian-9-stretch-v20180611"
         zone1f.machine_type = "n1-standard-4"
         zone1f.zone = "us-central1-f"
         zone1f.metadata = {'custom' => 'metadata', 'testing' => 'foobarbaz'}

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

@@ -97,12 +97,11 @@ module VagrantPlugins
           env[:ui].info(" -- Scopes:          #{service_account_scopes}") if service_account_scopes
           env[:ui].info(" -- Service Account: #{service_account}") if service_account
 
-          # Munge image configs
-          image = env[:google_compute].images.get(image, image_project_id).self_link
-
-          # If image_family is set, get the latest image image from the family.
-          unless image_family.nil?
+          # Munge image config
+          if image_family
             image = env[:google_compute].images.get_from_family(image_family, image_project_id).self_link
+          else
+            image = env[:google_compute].images.get(image, image_project_id).self_link
           end
 
           # Munge network configs

data/lib/vagrant-google/version.rb

@@ -13,6 +13,6 @@
 # limitations under the License.
 module VagrantPlugins
   module Google
-    VERSION = "2.2.0".freeze
+    VERSION = "2.2.1".freeze
   end
 end

data/vagrant-google.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "vagrant-google"
 
-  s.add_runtime_dependency "fog-google", "~> 1.4"
+  s.add_runtime_dependency "fog-google", "~> 1.8.1"
 
   # This is a restriction to avoid errors on `failure_message_for_should`
   # TODO: revise after vagrant_spec goes past >0.0.1 (at master@e623a56)

data/vagrantfile_examples/Vagrantfile.multiple_machines

@@ -63,7 +63,7 @@ Vagrant.configure("2") do |config|
 
       google.zone_config "us-central1-c" do |z1c_zone|
         z1c_zone.name = "z1c"
-        z1c_zone.image = "debian-8-jessie-v20160923"
+        z1c_zone.image = "debian-9-stretch-v20180611"
         z1c_zone.machine_type = "n1-standard-1"
         z1c_zone.zone = "us-central1-c"
         z1c_zone.metadata = {"zone" => "US Central 1c"}
@@ -83,7 +83,7 @@ Vagrant.configure("2") do |config|
 
       google.zone_config "us-central1-f" do |z1f_zone|
         z1f_zone.name = "z1f"
-        z1f_zone.image = "debian-8-jessie-v20160923"
+        z1f_zone.image = "debian-9-stretch-v20180611"
         z1f_zone.machine_type = "n1-standard-2"
         z1f_zone.zone = "us-central1-f"
         z1f_zone.metadata = {"zone" => "US Central 1f"}

data/vagrantfile_examples/Vagrantfile.provision_single

@@ -36,7 +36,7 @@ Vagrant.configure("2") do |config|
 
     # Override provider defaults
     google.name = "testing-vagrant"
-    google.image = "debian-8-jessie-v20160923"
+    google.image = "debian-9-stretch-v20180611"
     google.machine_type = "n1-standard-1"
     google.zone = "us-central1-f"
     google.metadata = {'custom' => 'metadata', 'testing' => 'foobarbaz'}

data/vagrantfile_examples/Vagrantfile.zone_config

@@ -30,7 +30,7 @@ Vagrant.configure("2") do |config|
 
     google.zone_config "us-central1-f" do |zone1a|
         zone1a.name = "testing-vagrant"
-        zone1a.image = "debian-8-jessie-v20160923"
+        zone1a.image = "debian-9-stretch-v20180611"
         zone1a.machine_type = "n1-standard-4"
         zone1a.zone = "us-central1-f"
         zone1a.scopes = ['bigquery', 'monitoring', 'https://www.googleapis.com/auth/compute']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-google
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Eric Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2018-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-google
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: rspec-legacy_formatters
   requirement: !ruby/object:Gem::Requirement