Merge pull request #213 from mavin/allow-without-explicit-service-account

feat: Allow without explicit service account

Author: Temikus

lib/vagrant-google/action/connect_google.rb

@@ -26,23 +26,31 @@ def initialize(app, env)
           @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
 
           # Build fog config
           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)

lib/vagrant-google/config.rb

@@ -421,13 +421,12 @@ def validate(machine)
           # 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 \

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: |-

test/unit/common/config_test.rb

@@ -118,17 +118,6 @@
       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

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)