vagrant-google 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56ca12d434139b7c86e68282058c5872e718446c
-  data.tar.gz: 3cf842f432128fa82f916c958ad77760b16b1a33
+  metadata.gz: ed6ee3d8610c741c80fb0a023922309c396ba06f
+  data.tar.gz: e5110f3de87fad8d872150e38e371f560e65993c
 SHA512:
-  metadata.gz: 3257faaf10a31cdc944453f7be6829f865ea2081fc1f19a90ce6d91b6eaa62ba615da7da928c18e6aeba3d6b3e94073e16074580ccccb121943cece918d84d93
-  data.tar.gz: a626190d8436b24c132458a9ad3459782da8ed8e38033a314eeaffcfc86112f8c64208ac90c101b84b851a29572cb32a54afd3b6bc092c4fa9c18108486acdec
+  metadata.gz: caa68543e38fa5432182179df747283e5182fd303edca1dae9f1c3581805182c4d46711d438a13c2d68e090774b10eae95e544ad181e9d29e793d448dcb8e17d
+  data.tar.gz: 4c8e2dac09fa2c02ee3dba1f9cc9e74ca4c89488d85221e6d682ebb5044711f303c5031eff61c2e74506c2316d7bbfbbfebbe797758a78ba75ea9e6a3f36b94f

data/.gitignore

@@ -17,3 +17,6 @@ vendor/*
 
 # Intellij projects folder
 .idea
+
+# Env
+setenv_*.sh

data/CHANGELOG.md

@@ -2,6 +2,28 @@
 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.5.0 (September 2019)
+
+### User-facing
+
+#### Added
+- \#222 Added internal IP support [andrewh1978]
+
+#### Deprecated
+
+- \#220 Deprecated google_client_email parameter, as it's no longer needed or
+  supported by fog-google [temikus]
+
+### Development
+
+#### Added
+
+- \#223 Set up unit test GitHub Action worflow [temikus]
+
+#### Fixed
+
+- \#225 Locked the vagrant dep to 2.2.4 due to bundler issues on 2.2.5 [temikus]
+
 ## 2.4.0 (April 2019)
 
 ### User-facing
@@ -11,7 +33,7 @@ The format is loosely based on [Keep a Changelog](http://keepachangelog.com/en/1
 
 #### 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 
+- \#215 Allow tags,labels and additional_disks to be merged with multiple
   configs [mavin]
 
 ### Development
@@ -33,14 +55,14 @@ The format is loosely based on [Keep a Changelog](http://keepachangelog.com/en/1
 
 ### User-facing
 
-- \#206 Fix image selection logic - Plugin no longer traces back with 
+- \#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 
+  - fog-google version to 1.8.1
+  - vagrant & vagrant-spec are now pointing to new upstream Hashicorp org repos
 
 ## 2.2.0 (June 2018)
 
@@ -59,13 +81,13 @@ platforms.
 ## 2.0.0 (March 2018)
 
 * Update to use fog-google gem v1
-* Add new configuration option `labels` for setting [labels](https://cloud.google.com/compute/docs/labeling-resources) 
+* Add new configuration option `labels` for setting [labels](https://cloud.google.com/compute/docs/labeling-resources)
   on GCE instances
 * Fix disk cleanup issue causing the disk to be marked as created before insertion
 * Test environment fixups to avoid 'Encoded files can't be read outside of the Vagrant installer.'
 * Breaking changes:
   * Drop support for configuration option `google_key_location`(GCP P12 key)
-  * `image` parameter no longer defaults to an arbitrary image and must be 
+  * `image` parameter no longer defaults to an arbitrary image and must be
     specified at runtime
   * Rsync behavior now consistent with Vagrant's default, removed old rsync code
 

data/Gemfile

@@ -23,6 +23,9 @@ 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/hashicorp/vagrant.git"
+
+  # TODO(temikus): remove to 2.2.4 tag lock when
+  # https://github.com/hashicorp/vagrant/pull/10945 is resolved
+  gem 'vagrant', git: "https://github.com/hashicorp/vagrant.git", :tag => 'v2.2.4'
   gem 'vagrant-spec', git: "https://github.com/hashicorp/vagrant-spec.git"
 end

data/README.md

@@ -85,7 +85,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'
@@ -165,8 +164,6 @@ configuration for this provider.
 
 This provider exposes quite a few provider-specific configuration options:
 
-* `google_client_email` - The Client Email address for your Service Account.  
-  (Can also be configured with `GOOGLE_CLIENT_EMAIL` environment variable.)
 * `google_json_key_location` - The location of the JSON private key file matching your
   Service Account.  
   (Can also be configured with `GOOGLE_JSON_KEY_LOCATION` environment variable.)
@@ -198,6 +195,7 @@ will pull the most recent CentOS 7 image. For more info, refer to
 * `zone` - The zone name where the instance will be created.
 * `can_ip_forward` - Boolean whether to enable IP Forwarding.
 * `external_ip` - The external IP address to use (supports names). Set to `false` to not assign an external address.
+* `network_ip` - The internal IP address to use. Default is to use next available address.
 * `use_private_ip` - Boolean whether to use private IP for SSH/provisioning. Default is false.
 * `preemptible` - Boolean whether to enable preemptibility. Default is false.
 * `auto_restart` - Boolean whether to enable auto_restart. Default is true.
@@ -231,7 +229,6 @@ Vagrant.configure("2") do |config|
 
   config.vm.provider :google do |google|
     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"
   end
 end
@@ -249,7 +246,6 @@ Vagrant.configure("2") do |config|
 
   config.vm.provider :google do |google|
     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"
 
     # Make sure to set this to trigger the zone_config
@@ -320,7 +316,6 @@ Before you start acceptance tests, you'll need to set the authentication
 shell variables accordingly:
 
 ```sh
-export GOOGLE_CLIENT_EMAIL="your-google_service_account_email@developer.gserviceaccount.com"
 export GOOGLE_PROJECT_ID="your-google-cloud-project-id"
 export GOOGLE_JSON_KEY_LOCATION="/full/path/to/your/private-key.json"
 

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

@@ -36,18 +36,10 @@ module VagrantPlugins
             :google_project      => provider_config.google_project_id,
           }
 
-          unless provider_config.google_client_email.nil?
-            fog_config[:google_client_email] = provider_config.google_client_email
-          end
-
           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)

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

@@ -60,6 +60,7 @@ module VagrantPlugins
           can_ip_forward         = zone_config.can_ip_forward
           use_private_ip         = zone_config.use_private_ip
           external_ip            = zone_config.external_ip
+          network_ip             = zone_config.network_ip
           preemptible            = zone_config.preemptible
           auto_restart           = zone_config.auto_restart
           on_host_maintenance    = zone_config.on_host_maintenance
@@ -91,6 +92,7 @@ module VagrantPlugins
           env[:ui].info(" -- IP Forward:      #{can_ip_forward}")
           env[:ui].info(" -- Use private IP:  #{use_private_ip}")
           env[:ui].info(" -- External IP:     #{external_ip}")
+          env[:ui].info(" -- Network IP:      #{network_ip}")
           env[:ui].info(" -- Preemptible:     #{preemptible}")
           env[:ui].info(" -- Auto Restart:    #{auto_restart}")
           env[:ui].info(" -- On Maintenance:  #{on_host_maintenance}")
@@ -254,6 +256,7 @@ module VagrantPlugins
               :can_ip_forward      => can_ip_forward,
               :use_private_ip      => use_private_ip,
               :external_ip         => external_ip,
+              :network_ip          => network_ip,
               :disks               => disks,
               :scheduling          => scheduling,
               :service_accounts    => service_accounts

data/lib/vagrant-google/config.rb

@@ -17,11 +17,6 @@ require "securerandom"
 module VagrantPlugins
   module Google
     class Config < Vagrant.plugin("2", :config) # rubocop:disable Metrics/ClassLength
-      # The Service Account Client ID Email address
-      #
-      # @return [String]
-      attr_accessor :google_client_email
-
       # The path to the Service Account json-formatted private key
       #
       # @return [String]
@@ -117,6 +112,11 @@ module VagrantPlugins
       # @return String
       attr_accessor :external_ip
 
+      # The network IP Address to use
+      #
+      # @return String
+      attr_accessor :network_ip
+
       # Use private ip address
       #
       # @return Boolean
@@ -179,7 +179,6 @@ module VagrantPlugins
       attr_accessor :additional_disks
 
       def initialize(zone_specific=false)
-        @google_client_email = UNSET_VALUE
         @google_json_key_location = UNSET_VALUE
         @google_project_id   = UNSET_VALUE
         @image               = UNSET_VALUE
@@ -199,6 +198,7 @@ module VagrantPlugins
         @labels              = {}
         @can_ip_forward      = UNSET_VALUE
         @external_ip         = UNSET_VALUE
+        @network_ip          = UNSET_VALUE
         @use_private_ip      = UNSET_VALUE
         @autodelete_disk     = UNSET_VALUE
         @preemptible         = UNSET_VALUE
@@ -295,7 +295,6 @@ module VagrantPlugins
       def finalize! # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         # Try to get access keys from standard Google environment variables; they
         # will default to nil if the environment variables are not present.
-        @google_client_email = ENV['GOOGLE_CLIENT_EMAIL'] if @google_client_email == UNSET_VALUE
         @google_json_key_location = ENV['GOOGLE_JSON_KEY_LOCATION'] if @google_json_key_location == UNSET_VALUE
         @google_project_id = ENV['GOOGLE_PROJECT_ID'] if @google_project_id == UNSET_VALUE
 
@@ -356,6 +355,9 @@ module VagrantPlugins
         # external_ip defaults to nil
         @external_ip = nil if @external_ip == UNSET_VALUE
 
+        # network_ip defaults to nil
+        @network_ip = nil if @network_ip == UNSET_VALUE
+
         # use_private_ip defaults to false
         @use_private_ip = false if @use_private_ip == UNSET_VALUE
 

data/lib/vagrant-google/version.rb

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

data/tasks/acceptance.rake

@@ -37,10 +37,6 @@ namespace :acceptance do
       abort "Environment variable GOOGLE_PROJECT_ID is not set. Aborting."
     end
 
-    unless ENV["GOOGLE_CLIENT_EMAIL"]
-      abort "Environment variable GOOGLE_CLIENT_EMAIL is not set. Aborting."
-    end
-
     unless ENV["GOOGLE_SSH_USER"]
       yellow "WARNING: GOOGLE_SSH_USER variable is not set. Will try to start tests using insecure Vagrant private key."
     end
@@ -70,7 +66,6 @@ namespace :acceptance do
       image_family
       synced_folder/rsync
       provisioner/shell
-      provisioner/chef-solo
     ).map{ |s| "provider/google/#{s}" }
 
     command = "vagrant-spec test --components=#{components.join(" ")}"

data/test/unit/common/config_test.rb

@@ -99,13 +99,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 +113,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
@@ -297,7 +294,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/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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-google
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Eric Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-05 00:00:00.000000000 Z
+date: 2019-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-google