vagrant-google 2.4.0.rc0 → 2.7.0

data/test/unit/common/config_test.rb

@@ -30,26 +30,30 @@ describe VagrantPlugins::Google::Config do
       end
     end
 
-    its("name")                   { should match "i-[0-9]{10}-[0-9a-f]{4}" }
-    its("image")                  { should be_nil }
-    its("image_family")           { should be_nil }
-    its("image_project_id")       { should be_nil }
-    its("instance_group")         { should be_nil }
-    its("zone")                   { should == "us-central1-f" }
-    its("network")                { should == "default" }
-    its("machine_type")           { should == "n1-standard-1" }
-    its("disk_size")              { should == 10 }
-    its("disk_name")              { should be_nil }
-    its("disk_type")              { should == "pd-standard" }
-    its("instance_ready_timeout") { should == 20 }
-    its("metadata")               { should == {} }
-    its("tags")                   { should == [] }
-    its("labels")                 { should == {} }
-    its("scopes")                 { should == nil }
-    its("additional_disks")       { should == [] }
-    its("preemptible")            { should be_falsey }
-    its("auto_restart")           { should }
-    its("on_host_maintenance")    { should == "MIGRATE" }
+    its("name")                        { should match "i-[0-9]{10}-[0-9a-f]{4}" }
+    its("image")                       { should be_nil }
+    its("image_family")                { should be_nil }
+    its("image_project_id")            { should be_nil }
+    its("instance_group")              { should be_nil }
+    its("zone")                        { should == "us-central1-f" }
+    its("network")                     { should == "default" }
+    its("machine_type")                { should == "n1-standard-1" }
+    its("disk_size")                   { should == 10 }
+    its("disk_name")                   { should be_nil }
+    its("disk_type")                   { should == "pd-standard" }
+    its("instance_ready_timeout")      { should == 20 }
+    its("metadata")                    { should == {} }
+    its("tags")                        { should == [] }
+    its("labels")                      { should == {} }
+    its("scopes")                      { should == nil }
+    its("additional_disks")            { should == [] }
+    its("preemptible")                 { should be_falsey }
+    its("auto_restart")                { should }
+    its("on_host_maintenance")         { should == "MIGRATE" }
+    its("accelerators")                { should == [] }
+    its("enable_secure_boot")          { should be_falsey }
+    its("enable_vtpm")                 { should be_falsey }
+    its("enable_integrity_monitoring") { should be_falsey }
   end
 
   describe "overriding defaults" do
@@ -57,8 +61,28 @@ describe VagrantPlugins::Google::Config do
     # simple boilerplate test, so I cut corners here. It just sets
     # each of these attributes to "foo" in isolation, and reads the value
     # and asserts the proper result comes back out.
-    [:name, :image, :image_family, :image_project_id, :zone, :instance_ready_timeout, :machine_type, :disk_size, :disk_name, :disk_type,
-     :network, :network_project_id, :metadata, :labels, :can_ip_forward, :external_ip, :autodelete_disk].each do |attribute|
+    [
+        :name,
+        :image,
+        :image_family,
+        :image_project_id,
+        :zone,
+        :instance_ready_timeout,
+        :machine_type,
+        :disk_size,
+        :disk_name,
+        :disk_type,
+        :network,
+        :network_project_id,
+        :metadata,
+        :labels,
+        :can_ip_forward,
+        :external_ip,
+        :autodelete_disk,
+        :enable_secure_boot,
+        :enable_vtpm,
+        :enable_integrity_monitoring,
+    ].each do |attribute|
 
       it "should not default #{attribute} if overridden" do
         instance.send("#{attribute}=".to_sym, "foo")
@@ -89,6 +113,14 @@ describe VagrantPlugins::Google::Config do
       errors = instance.validate("foo")["Google Provider"]
       expect(errors).to include(/on_host_maintenance_invalid_on_preemptible/)
     end
+
+    it "should raise error with accelerators and on_host_maintenance is not TERMINATE" do
+      instance.accelerators = [{ :type => "nvidia-tesla-k80" }]
+      instance.on_host_maintenance = "MIGRATE"
+      instance.finalize!
+      errors = instance.validate("foo")["Google Provider"]
+      expect(errors).to include(/on_host_maintenance_invalid_with_accelerators/)
+    end
   end
 
   describe "getting credentials from environment" do
@@ -99,13 +131,11 @@ describe VagrantPlugins::Google::Config do
         end
       end
 
-      its("google_client_email") { should be_nil }
       its("google_json_key_location") { should be_nil }
     end
 
     context "with Google credential environment variables" do
       before :each do
-        allow(ENV).to receive(:[]).with("GOOGLE_CLIENT_EMAIL").and_return("client_id_email")
         allow(ENV).to receive(:[]).with("GOOGLE_JSON_KEY_LOCATION").and_return("/path/to/json/key")
       end
 
@@ -115,7 +145,6 @@ describe VagrantPlugins::Google::Config do
         end
       end
 
-      its("google_client_email") { should == "client_id_email" }
       its("google_json_key_location") { should == "/path/to/json/key" }
     end
   end
@@ -131,6 +160,7 @@ describe VagrantPlugins::Google::Config do
     let(:config_network)         { "foo" }
     let(:can_ip_forward)         { true }
     let(:external_ip)            { "foo" }
+    let(:accelerators)           { [{ :type => "foo" }] }
 
     def set_test_values(instance)
       instance.name              = config_name
@@ -143,6 +173,7 @@ describe VagrantPlugins::Google::Config do
       instance.zone              = config_zone
       instance.can_ip_forward    = can_ip_forward
       instance.external_ip       = external_ip
+      instance.accelerators      = accelerators
     end
 
     it "should raise an exception if not finalized" do
@@ -172,6 +203,7 @@ describe VagrantPlugins::Google::Config do
       its("zone")              { should == config_zone }
       its("can_ip_forward")    { should == can_ip_forward }
       its("external_ip")       { should == external_ip }
+      its("accelerators")      { should == accelerators }
     end
 
     context "with a specific config set" do
@@ -200,6 +232,7 @@ describe VagrantPlugins::Google::Config do
       its("zone")              { should == zone_name }
       its("can_ip_forward")    { should == can_ip_forward }
       its("external_ip")       { should == external_ip }
+      its("accelerators")      { should == accelerators }
     end
 
     describe "inheritance of parent config" do
@@ -234,47 +267,76 @@ describe VagrantPlugins::Google::Config do
     end
 
     describe "merging" do
-      let(:first) { described_class.new }
-      let(:second) { described_class.new }
+      let(:current) { described_class.new }
+      let(:other) { described_class.new }
+
+      subject { current.merge(other) }
 
       it "should merge the metadata" do
-        first.metadata["one"] = "foo"
-        second.metadata["two"] = "bar"
+        current.metadata["one"] = "foo"
+        other.metadata["two"] = "bar"
 
-        third = first.merge(second)
-        expect(third.metadata).to eq({
+        expect(subject.metadata).to eq({
           "one" => "foo",
           "two" => "bar"
         })
       end
 
+      it "should merge the metadata and overwrite older values" do
+        current.metadata = {
+          "one" => "foo",
+          "name" => "current",
+        }
+
+        other.metadata = {
+          "two" => "bar",
+          "name" => "other",
+        }
+
+        expect(subject.metadata).to eq({
+          "one" => "foo",
+          "two" => "bar",
+          "name" => "other",
+        })
+      end
+
       it "should merge the labels" do
-        first.labels["one"] = "one"
-        second.labels["two"] = "two"
+        current.labels["one"] = "one"
+        other.labels["two"] = "two"
 
-        third = first.merge(second)
-        expect(third.labels).to eq({
+        expect(subject.labels).to eq({
           "one" => "one",
           "two" => "two"
         })
       end
+      
+      it "should merge the labels and overwrite older values" do
+        current.labels["one"] = "one"
+        current.labels["name"] = "current"
+        other.labels["two"] = "two"
+        other.labels["name"] = "other"
+
+        expect(subject.labels).to eq({
+          "one" => "one",
+          "two" => "two",
+          "name" => "other",
+        })
+      end
 
       it "should merge the tags" do
-        first.tags = ["foo", "bar"]
-        second.tags = ["biz"]
+        current.tags = ["foo", "bar"]
+        other.tags = ["biz"]
 
-        third = first.merge(second)
-        expect(third.tags).to include("foo")
-        expect(third.tags).to include("bar")
-        expect(third.tags).to include("biz")
+        expect(subject.tags).to include("foo")
+        expect(subject.tags).to include("bar")
+        expect(subject.tags).to include("biz")
       end
 
       it "should merge the additional_disks" do
-        first.additional_disks = [{:one => "one"}]
-        second.additional_disks = [{:two => "two"}]
+        current.additional_disks = [{:one => "one"}]
+        other.additional_disks = [{:two => "two"}]
 
-        third = first.merge(second)
-        expect(third.additional_disks).to contain_exactly(
+        expect(subject.additional_disks).to contain_exactly(
           {:one => "one"}, {:two => "two"}
         )
       end
@@ -297,7 +359,6 @@ describe VagrantPlugins::Google::Config do
 
       before :each do
         # Stub out required env to make sure we produce only errors we're looking for.
-        allow(ENV).to receive(:[]).with("GOOGLE_CLIENT_EMAIL").and_return("client_id_email")
         allow(ENV).to receive(:[]).with("GOOGLE_PROJECT_ID").and_return("my-awesome-project")
         allow(ENV).to receive(:[]).with("GOOGLE_JSON_KEY_LOCATION").and_return("/path/to/json/key")
         allow(ENV).to receive(:[]).with("GOOGLE_SSH_KEY_LOCATION").and_return("/path/to/ssh/key")

data/vagrant-google.gemspec

@@ -28,16 +28,17 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "vagrant-google"
 
-  s.add_runtime_dependency "fog-google", "~> 1.9.1"
+  s.add_runtime_dependency "fog-google", "~> 1.17.0"
 
   # 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)
   s.add_development_dependency "rspec-legacy_formatters"
 
-  s.add_development_dependency "rake", "~> 12.3"
-  s.add_development_dependency "rspec", ">= 3.5.0", "<= 3.6"
+  s.add_development_dependency "rake", ">= 13.0.1"
+  s.add_development_dependency "rspec", ">= 3.10", "< 4.0"
   s.add_development_dependency "rspec-its", "~> 1.2"
-  s.add_development_dependency "rubocop", "~> 0.50"
+  s.add_development_dependency "rubocop", "~> 0.83"
+  s.add_development_dependency "rubocop-performance", "~> 1.5.2"
   s.add_development_dependency "highline"
   s.add_development_dependency "pry"
   s.add_development_dependency "pry-byebug"

data/vagrantfile_examples/Vagrantfile.multiple_machines

@@ -24,7 +24,6 @@
 
 # Customize these global variables
 $GOOGLE_PROJECT_ID = "YOUR_GOOGLE_CLOUD_PROJECT_ID"
-$GOOGLE_CLIENT_EMAIL = "YOUR_SERVICE_ACCOUNT_EMAIL_ADDRESS"
 $GOOGLE_JSON_KEY_LOCATION = "/path/to/your/private-key.json"
 $LOCAL_USER = "mitchellh"
 $LOCAL_SSH_KEY = "~/.ssh/id_rsa"
@@ -54,7 +53,6 @@ Vagrant.configure("2") do |config|
   config.vm.define :z1c do |z1c|
     z1c.vm.provider :google do |google, override|
       google.google_project_id = $GOOGLE_PROJECT_ID
-      google.google_client_email = $GOOGLE_CLIENT_EMAIL
       google.google_json_key_location = $GOOGLE_JSON_KEY_LOCATION
       google.zone = "us-central1-c"
 
@@ -74,7 +72,6 @@ Vagrant.configure("2") do |config|
   config.vm.define :z1f do |z1f|
     z1f.vm.provider :google do |google, override|
       google.google_project_id = $GOOGLE_PROJECT_ID
-      google.google_client_email = $GOOGLE_CLIENT_EMAIL
       google.google_json_key_location = $GOOGLE_JSON_KEY_LOCATION
       google.zone = "us-central1-f"
 

data/vagrantfile_examples/Vagrantfile.provision_single

@@ -20,7 +20,6 @@
 
 # Customize these global variables
 $GOOGLE_PROJECT_ID = "YOUR_GOOGLE_CLOUD_PROJECT_ID"
-$GOOGLE_CLIENT_EMAIL = "YOUR_SERVICE_ACCOUNT_EMAIL_ADDRESS"
 $GOOGLE_JSON_KEY_LOCATION = "/path/to/your/private-key.json"
 $LOCAL_USER = "mitchellh"
 $LOCAL_SSH_KEY = "~/.ssh/id_rsa"
@@ -31,7 +30,6 @@ Vagrant.configure("2") do |config|
 
   config.vm.provider :google do |google, override|
     google.google_project_id = $GOOGLE_PROJECT_ID
-    google.google_client_email = $GOOGLE_CLIENT_EMAIL
     google.google_json_key_location = $GOOGLE_JSON_KEY_LOCATION
 
     # Override provider defaults

data/vagrantfile_examples/Vagrantfile.simple

@@ -19,7 +19,6 @@ Vagrant.configure("2") do |config|
 
   config.vm.provider :google do |google, override|
     google.google_project_id = "YOUR_GOOGLE_CLOUD_PROJECT_ID"
-    google.google_client_email = "YOUR_SERVICE_ACCOUNT_EMAIL_ADDRESS"
     google.google_json_key_location = "/path/to/your/private-key.json"
 
     google.image_family = 'ubuntu-1604-lts'

data/vagrantfile_examples/Vagrantfile.zone_config

@@ -19,7 +19,6 @@ Vagrant.configure("2") do |config|
 
   config.vm.provider :google do |google, override|
     google.google_project_id = "YOUR_GOOGLE_CLOUD_PROJECT_ID"
-    google.google_client_email = "YOUR_SERVICE_ACCOUNT_EMAIL_ADDRESS"
     google.google_json_key_location = "/path/to/your/private-key.json"
 
     override.ssh.username = "mitchellh"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-google
 version: !ruby/object:Gem::Version
-  version: 2.4.0.rc0
+  version: 2.7.0
 platform: ruby
 authors:
 - Eric Johnson
 - Artem Yakimenko
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-23 00:00:00.000000000 Z
+date: 2021-11-20 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.9.1
+        version: 1.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: rspec-legacy_formatters
   requirement: !ruby/object:Gem::Requirement
@@ -43,36 +43,36 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
-    - - "<="
+        version: '3.10'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
-    - - "<="
+        version: '3.10'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -93,14 +93,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: '0.83'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.83'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +165,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
@@ -176,6 +189,7 @@ files:
 - lib/vagrant-google/action/read_ssh_info.rb
 - lib/vagrant-google/action/read_state.rb
 - lib/vagrant-google/action/run_instance.rb
+- lib/vagrant-google/action/setup_winrm_password.rb
 - lib/vagrant-google/action/start_instance.rb
 - lib/vagrant-google/action/stop_instance.rb
 - lib/vagrant-google/action/terminate_instance.rb
@@ -192,6 +206,7 @@ files:
 - tasks/acceptance.rake
 - tasks/boxes.rake
 - tasks/bundler.rake
+- tasks/changelog.rake
 - tasks/lint.rake
 - tasks/test.rake
 - test/acceptance/base.rb
@@ -220,7 +235,7 @@ files:
 homepage: http://www.vagrantup.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -235,9 +250,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: vagrant-google
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Vagrant provider plugin for Google Compute Engine.
 test_files: []