diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a0ba291..244fb1c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,10 +10,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up Ruby 2.6 + - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7.4 + ruby-version: '3.4' - name: Unit tests run: | diff --git a/lib/vagrant-google/action/run_instance.rb b/lib/vagrant-google/action/run_instance.rb index d837c10..cb805ad 100644 --- a/lib/vagrant-google/action/run_instance.rb +++ b/lib/vagrant-google/action/run_instance.rb @@ -24,8 +24,8 @@ class RunInstance # rubocop:disable Metrics/ClassLength include Vagrant::Util::Retryable FOG_ERRORS = [ - Fog::Compute::Google::NotFound, - Fog::Compute::Google::Error, + Fog::Google::Compute::NotFound, + Fog::Google::Compute::Error, Fog::Errors::Error ].freeze diff --git a/lib/vagrant-google/action/start_instance.rb b/lib/vagrant-google/action/start_instance.rb index 1d30aec..e3b91e9 100644 --- a/lib/vagrant-google/action/start_instance.rb +++ b/lib/vagrant-google/action/start_instance.rb @@ -58,7 +58,7 @@ def call(env) timeout: env[:machine].provider_config.instance_ready_timeout end end - rescue Fog::Compute::Google::Error => e + rescue Fog::Google::Compute::Error => e raise Errors::FogError, :message => e.message end diff --git a/lib/vagrant-google/version.rb b/lib/vagrant-google/version.rb index 065f2cc..9211705 100644 --- a/lib/vagrant-google/version.rb +++ b/lib/vagrant-google/version.rb @@ -13,6 +13,6 @@ # limitations under the License. module VagrantPlugins module Google - VERSION = "2.7.0".freeze + VERSION = "2.8.0".freeze end end diff --git a/test/unit/common/config_test.rb b/test/unit/common/config_test.rb index 9072a9a..97f995a 100644 --- a/test/unit/common/config_test.rb +++ b/test/unit/common/config_test.rb @@ -54,6 +54,7 @@ its("enable_secure_boot") { should be_falsey } its("enable_vtpm") { should be_falsey } its("enable_integrity_monitoring") { should be_falsey } + its("resource_policies") { should == [] } end describe "overriding defaults" do diff --git a/vagrant-google.gemspec b/vagrant-google.gemspec index 43282f2..78281d9 100644 --- a/vagrant-google.gemspec +++ b/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.17.0" + s.add_runtime_dependency "fog-google", "~> 1.25.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)