vagrant-google 2.3.0 → 2.4.0.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 423e476d85cc8eea275803c91756edbea6fde8d9
-  data.tar.gz: f26dfbc44b3c589be27daea9c5282ef8416c4f79
+  metadata.gz: 537db391735594007a72b2a4af1a464f90ac943e
+  data.tar.gz: 5235acd34a609e6e348cfd732fd1ed9d5c89ef8b
 SHA512:
-  metadata.gz: 30d460f79c71e704e1af3896cb1542b7070cf66b07dbbe51f3e4bea176cf79467efd716a4c2ab62f297914452df49254419481ef69850e92c8b36b9c5143c0bd
-  data.tar.gz: 2705e1779125fd1a0b5d64b8a455fed349b4721c34a821f84a9efaa99d5c4f656d24386c0838454cedde645d0474c6c2d4a5ab6c07de3837d1ec99a5a5d56a10
+  metadata.gz: 9415a9c4f8a8fa50c6f648750d925c75cac489d618840dc1ba05ff4330d3707a23275835c5566bb135b01ea44d2249fae577a42d721aebd7c42961734cb7b63c
+  data.tar.gz: 79a35f14f4a8886037fb28b0485b3ec04bc3e4222b300c401f07766403b3a9d64df3b0c524f87b56806f7795d83d1e39af20aca13019f651c044f4fb3a15c26e

data/CHANGELOG.md

@@ -2,6 +2,23 @@
 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.4.0 (April 2019)
+
+### User-facing
+
+#### Added
+- \#213 Implemented Application Default Credentials authentication [mavin]
+
+#### Fixed
+- \#214 Set a default zone only if `default` network is used [mavin]
+- \#215 Allow tags,labels and additional_disks to be merged with multiple 
+  configs [mavin]
+
+### Development
+
+- \#213 Bumped dependencies [mavin]
+   - fog-google version to 1.9.0
+
 ## 2.3.0 (February 2019)
 
 ### User-facing

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

@@ -26,6 +26,7 @@ module VagrantPlugins
           @logger = Log4r::Logger.new("vagrant_google::action::connect_google")
         end
 
+        # Initialize Fog::Compute and add it to the environment
         def call(env)
           provider_config = env[:machine].provider_config
 
@@ -33,16 +34,23 @@ module VagrantPlugins
           fog_config = {
             :provider            => :google,
             :google_project      => provider_config.google_project_id,
-            :google_client_email => provider_config.google_client_email
           }
 
-          fog_config[:google_json_key_location] = find_key(provider_config.google_json_key_location, env)
+          unless provider_config.google_client_email.nil?
+            fog_config[:google_client_email] = provider_config.google_client_email
+          end
 
-          @logger.info("Connecting to Google...")
-          env[:google_compute] = Fog::Compute.new(fog_config)
+          unless provider_config.google_json_key_location.nil?
+            fog_config[:google_json_key_location] = find_key(provider_config.google_json_key_location, env)
+          end
+
+          if provider_config.google_client_email.nil? and provider_config.google_json_key_location.nil?
+            fog_config[:google_application_default] = true
+          end
 
+          @logger.info("Creating Google API client and adding to Vagrant environment")
+          env[:google_compute] = Fog::Compute.new(fog_config)
           @app.call(env)
-          @logger.info("...Connected!")
         end
 
         # If the key is not found, try expanding from root location (see #159)

data/lib/vagrant-google/config.rb

@@ -152,8 +152,8 @@ module VagrantPlugins
       # @return [Int]
       attr_accessor :instance_ready_timeout
 
-      # The zone to launch the instance into. If nil, it will
-      # use the default us-central1-f.
+      # The zone to launch the instance into.
+      # If nil and the "default" network is set use the default us-central1-f.
       #
       # @return [String]
       attr_accessor :zone
@@ -277,6 +277,18 @@ module VagrantPlugins
           # Merge in the metadata
           result.metadata.merge!(self.metadata)
           result.metadata.merge!(other.metadata)
+
+          # Merge in the labels
+          result.labels.merge!(self.labels)
+          result.labels.merge!(other.labels)
+
+          # Merge in the tags
+          result.tags |= self.tags
+          result.tags |= other.tags
+
+          # Merge in the additional disks
+          result.additional_disks |= self.additional_disks
+          result.additional_disks |= other.additional_disks
         end
       end
 
@@ -317,6 +329,7 @@ module VagrantPlugins
           t = Time.now
           @name = "i-#{t.strftime("%Y%m%d%H")}-" + SecureRandom.hex(4)
         end
+
         # Network defaults to 'default'
         @network = "default" if @network == UNSET_VALUE
 
@@ -326,8 +339,13 @@ module VagrantPlugins
         # Subnetwork defaults to nil
         @subnetwork = nil if @subnetwork == UNSET_VALUE
 
-        # Default zone is us-central1-f.
-        @zone = "us-central1-f" if @zone == UNSET_VALUE
+        # Default zone is us-central1-f if using the default network
+        if @zone == UNSET_VALUE
+          @zone = nil
+          if @network == "default"
+            @zone = "us-central1-f"
+          end
+        end
 
         # autodelete_disk defaults to true
         @autodelete_disk = true if @autodelete_disk == UNSET_VALUE
@@ -403,13 +421,12 @@ module VagrantPlugins
           # 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_key_location_required") if \
-            config.google_json_key_location.nil?
-          errors << I18n.t("vagrant_google.config.private_key_missing") unless \
-            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.google_json_key_location
+            errors << I18n.t("vagrant_google.config.private_key_missing") unless \
+              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))
+          end
 
           if config.preemptible
             errors << I18n.t("vagrant_google.config.auto_restart_invalid_on_preemptible") if \
@@ -422,10 +439,10 @@ module VagrantPlugins
             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? && config.image_family.nil?
-        errors << I18n.t("vagrant_google.config.name_required") if @name.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?
+        end
 
         if @service_accounts
           machine.env.ui.warn(I18n.t("vagrant_google.config.service_accounts_deprecaated"))

data/lib/vagrant-google/version.rb

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

data/locales/en.yml

@@ -52,9 +52,6 @@ en:
 # Translations for config validation errors
 #-------------------------------------------------------------------------------
     config:
-      google_client_email_required: |-
-        A Google Service Account client email is required via
-        "google_client_email".
       private_key_missing: |-
         Private key for Google could not be found in the specified location.
       zone_required: |-
@@ -63,9 +60,6 @@ en:
         An instance name must be specified via "name" option.
       image_required: |-
         An image must be specified via "image" or "image_family" option.
-      google_key_location_required: |-
-        A private key pathname is required via:
-         "google_json_key_location" (for JSON keys)
       google_project_id_required: |-
         A Google Cloud Project ID is required via "google_project_id".
       auto_restart_invalid_on_preemptible: |-

data/test/unit/common/config_test.rb

@@ -67,6 +67,13 @@ describe VagrantPlugins::Google::Config do
       end
     end
 
+    it "should raise error when network is not default and zone is not overriden" do
+      instance.network = "not-default"
+      instance.finalize!
+      errors = instance.validate("foo")["Google Provider"]
+      expect(errors).to include(/zone_required/)
+    end
+
     it "should raise error when preemptible and auto_restart is true" do
       instance.preemptible = true
       instance.auto_restart = true
@@ -111,17 +118,6 @@ describe VagrantPlugins::Google::Config do
       its("google_client_email") { should == "client_id_email" }
       its("google_json_key_location") { should == "/path/to/json/key" }
     end
-
-    context "With none of the Google credential environment variables set" do
-      before :each do
-        allow(ENV).to receive(:[]).with("GOOGLE_CLIENT_EMAIL").and_return("client_id_email")
-      end
-
-      it "Should return no key set errors" do
-        instance.finalize!
-        expect(instance.validate("foo")["Google Provider"][1]).to include("en.vagrant_google.config.google_key_location_required")
-      end
-    end
   end
 
   describe "zone config" do
@@ -251,6 +247,37 @@ describe VagrantPlugins::Google::Config do
           "two" => "bar"
         })
       end
+
+      it "should merge the labels" do
+        first.labels["one"] = "one"
+        second.labels["two"] = "two"
+
+        third = first.merge(second)
+        expect(third.labels).to eq({
+          "one" => "one",
+          "two" => "two"
+        })
+      end
+
+      it "should merge the tags" do
+        first.tags = ["foo", "bar"]
+        second.tags = ["biz"]
+
+        third = first.merge(second)
+        expect(third.tags).to include("foo")
+        expect(third.tags).to include("bar")
+        expect(third.tags).to include("biz")
+      end
+
+      it "should merge the additional_disks" do
+        first.additional_disks = [{:one => "one"}]
+        second.additional_disks = [{:two => "two"}]
+
+        third = first.merge(second)
+        expect(third.additional_disks).to contain_exactly(
+          {:one => "one"}, {:two => "two"}
+        )
+      end
     end
 
     describe "zone_preemptible" do

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.8.1"
+  s.add_runtime_dependency "fog-google", "~> 1.9.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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-google
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0.rc0
 platform: ruby
 authors:
 - Eric Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-04-23 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.8.1
+        version: 1.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: rspec-legacy_formatters
   requirement: !ruby/object:Gem::Requirement