vagrant-google 0.1.4 → 0.1.5.rc1

data/lib/vagrant-google/version.rb

@@ -13,6 +13,6 @@
 # limitations under the License.
 module VagrantPlugins
   module Google
-    VERSION = "0.1.4"
+    VERSION = "0.1.5.rc1"
   end
 end

data/locales/en.yml

@@ -4,17 +4,15 @@ en:
       The machine is already created.
     launching_instance: |-
       Launching an instance with the following settings...
-    launch_vpc_warning: |-
-      Warning! You're launching this instance into a VPC without an
-      elastic IP. Please verify you're properly connected to a VPN so
-      you can access this machine, otherwise Vagrant will not be able
-      to SSH into it.
     not_created: |-
       Instance is not created. Please run `vagrant up` first.
     ready: |-
       Machine is booted and ready for use!
     ready_ssh: |-
       Machine is ready for SSH access!
+    rsync_not_found_warning: |-
+      Warning! Folder sync disabled because the rsync binary is missing.
+      Make sure rsync is installed and the binary can be found in the PATH.
     rsync_folder: |-
       Rsyncing folder: %{hostpath} => %{guestpath}
     terminating: |-
@@ -30,12 +28,12 @@ en:
     will_not_destroy: |-
       The instance '%{name}' will not be destroyed, since the confirmation
       was declined.
-
+#-------------------------------------------------------------------------------
+# Translations for config validation errors
+#-------------------------------------------------------------------------------
     config:
       google_client_email_required: |-
         A Google Service Account client email is required via "google_client_email"
-      machine_required: |-
-        An MACHINE_TYPE must be configured via "machine"
       private_key_missing: |-
         The specified private key for Google could not be found
       zone_required: |-
@@ -43,10 +41,18 @@ en:
       name_required: |-
         An instance name must be specified via "name"
       google_key_location_required: |-
-        A private key pathname is required via "google_key_location"
+        A private key pathname is required via:
+         "google_json_key_location" (for JSON keys)
+         or
+         "google_key_location" (for P12 keys)
+      google_duplicate_key_location: |-
+        Both "google_json_key_location" and "google_key_location" are specified.
+        Config must specify only one key location.
       google_project_id_required: |-
         A Google Cloud Project ID is required via "google_project_id"
-
+#-------------------------------------------------------------------------------
+# Translations for exception classes
+#-------------------------------------------------------------------------------
     errors:
       fog_error: |-
         There was an error talking to Google. The error message is shown
@@ -65,7 +71,15 @@ en:
         Host path: %{hostpath}
         Guest path: %{guestpath}
         Error: %{stderr}
-
+      external_ip_error: |-
+        Specified external IP address is invalid or already in use.
+        IP address requested: %{externalip}
+      disk_type_error: |-
+        Specified disk type is not available in the region selected.
+        Disk type requested: %{disktype}
+#-------------------------------------------------------------------------------
+# Translations for machine states
+#-------------------------------------------------------------------------------
     states:
       short_not_created: |-
         not created

data/tasks/acceptance.rake

@@ -0,0 +1,38 @@
+namespace :acceptance do
+
+  desc "shows components that can be tested separately"
+  task :components do
+    exec("bundle exec vagrant-spec components")
+  end
+
+  desc "runs acceptance tests using vagrant-spec"
+  task :run do
+
+    puts "NOTE: For acceptance tests to be functional, correct ssh key needs to be added to GCE metadata."
+
+    if !ENV["GOOGLE_JSON_KEY_LOCATION"] && !ENV["GOOGLE_KEY_LOCATION"]
+      abort ("Environment variables GOOGLE_JSON_KEY_LOCATION or GOOGLE_KEY_LOCATION are not set. Aborting.")
+    end
+
+    if !ENV["GOOGLE_PROJECT_ID"]
+      abort ("Environment variable GOOGLE_PROJECT_ID is not set. Aborting.")
+    end
+
+    if !ENV["GOOGLE_CLIENT_EMAIL"]
+      abort ("Environment variable GOOGLE_CLIENT_EMAIL is not set. Aborting.")
+    end
+
+    if !ENV["GOOGLE_SSH_USER"]
+      puts "WARNING: GOOGLE_SSH_USER variable is not set. Will try to start tests using insecure Vagrant private key."
+    end
+
+    components = %w(
+      provisioner/shell
+    ).map{ |s| "provider/google/#{s}" }
+
+    command = "bundle exec vagrant-spec test --components=#{components.join(" ")}"
+    puts command
+    puts
+    exec(command)
+  end
+end

data/tasks/bundler.rake

@@ -0,0 +1,3 @@
+# This installs the tasks that help with gem creation and
+# publishing.
+Bundler::GemHelper.install_tasks

data/tasks/test.rake

@@ -0,0 +1,8 @@
+require 'rake/testtask'
+require 'rspec/core/rake_task'
+
+namespace :test do
+  RSpec::Core::RakeTask.new(:unit) do |t|
+    t.pattern = "test/unit/**/*_test.rb"
+  end
+end

data/test/acceptance/base.rb

@@ -0,0 +1,2 @@
+require "vagrant-spec/acceptance"
+require_relative "shared/context_google"

data/test/acceptance/shared/context_google.rb

@@ -0,0 +1,3 @@
+shared_context "provider-context/google" do
+
+end

data/test/unit/base.rb

@@ -0,0 +1,19 @@
+require "rubygems"
+require "rspec/autorun"
+
+# Require Vagrant itself so we can reference the proper
+# classes to test.
+require "vagrant"
+require "vagrant-google"
+
+# Add the test directory to the load path
+$:.unshift File.expand_path("../../", __FILE__)
+
+# Do not buffer output
+$stdout.sync = true
+$stderr.sync = true
+
+# Configure RSpec
+RSpec.configure do |c|
+  c.formatter = :progress
+end

data/{spec/vagrant-google/config_spec.rb → test/unit/common/config_test.rb}

@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+require File.expand_path("../../base", __FILE__)
+
 require "vagrant-google/config"
 
 describe VagrantPlugins::Google::Config do
@@ -30,11 +32,13 @@ describe VagrantPlugins::Google::Config do
     t = Time.now
 
     its("name")              { should == "i-#{t.year}#{t.month.to_s.rjust(2,'0')}#{t.day.to_s.rjust(2,'0')}#{t.hour.to_s.rjust(2,'0')}" }
-    its("image")             { should == "debian-7-wheezy-v20140926" }
+    its("image")             { should == "debian-7-wheezy-v20150127" }
     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 == [] }
@@ -45,8 +49,8 @@ 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, :zone, :instance_ready_timeout, :machine_type, :disk_size,
-      :network, :metadata].each do |attribute|
+    [:name, :image, :zone, :instance_ready_timeout, :machine_type, :disk_size, :disk_name, :disk_type,
+      :network, :metadata, :can_ip_forward, :external_ip, :autodelete_disk].each do |attribute|
 
       it "should not default #{attribute} if overridden" do
         instance.send("#{attribute}=".to_sym, "foo")
@@ -66,12 +70,14 @@ describe VagrantPlugins::Google::Config do
 
       its("google_client_email") { should be_nil }
       its("google_key_location") { should be_nil }
+      its("google_json_key_location") { should be_nil }
     end
 
     context "with Google credential environment variables" do
       before :each do
         ENV.stub(:[]).with("GOOGLE_CLIENT_EMAIL").and_return("client_id_email")
         ENV.stub(:[]).with("GOOGLE_KEY_LOCATION").and_return("/path/to/key")
+        ENV.stub(:[]).with("GOOGLE_JSON_KEY_LOCATION").and_return("/path/to/json/key")
       end
 
       subject do
@@ -82,6 +88,31 @@ describe VagrantPlugins::Google::Config do
 
       its("google_client_email") { should == "client_id_email" }
       its("google_key_location") { should == "/path/to/key" }
+      its("google_json_key_location") { should == "/path/to/json/key" }
+    end
+
+    context "With both Google credential environment variables" do
+      before :each do
+        ENV.stub(:[]).with("GOOGLE_CLIENT_EMAIL").and_return("client_id_email")
+        ENV.stub(:[]).with("GOOGLE_KEY_LOCATION").and_return("/path/to/key")
+        ENV.stub(:[]).with("GOOGLE_JSON_KEY_LOCATION").and_return("/path/to/json/key")
+      end
+
+      it "Should return duplicate key location errors" do
+        instance.finalize!
+        expect(instance.validate("foo")["Google Provider"][1]).to include("en.vagrant_google.config.google_duplicate_key_location")
+      end
+    end
+
+    context "With none of the Google credential environment variables set" do
+      before :each do
+        ENV.stub(:[]).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
 
@@ -89,9 +120,13 @@ describe VagrantPlugins::Google::Config do
     let(:config_image)           { "foo" }
     let(:config_machine_type)    { "foo" }
     let(:config_disk_size)       { 99 }
+    let(:config_disk_name)       { "foo" }
+    let(:config_disk_type)       { "foo" }
     let(:config_name)            { "foo" }
     let(:config_zone)            { "foo" }
     let(:config_network)         { "foo" }
+    let(:can_ip_forward)         { true }
+    let(:external_ip)            { "foo" }
 
     def set_test_values(instance)
       instance.name              = config_name
@@ -99,7 +134,11 @@ describe VagrantPlugins::Google::Config do
       instance.image             = config_image
       instance.machine_type      = config_machine_type
       instance.disk_size         = config_disk_size
+      instance.disk_name         = config_disk_name
+      instance.disk_type         = config_disk_type
       instance.zone              = config_zone
+      instance.can_ip_forward    = can_ip_forward
+      instance.external_ip       = external_ip
     end
 
     it "should raise an exception if not finalized" do
@@ -123,8 +162,12 @@ describe VagrantPlugins::Google::Config do
       its("image")             { should == config_image }
       its("machine_type")      { should == config_machine_type }
       its("disk_size")         { should == config_disk_size }
+      its("disk_name")         { should == config_disk_name }
+      its("disk_type")         { should == config_disk_type }
       its("network")           { should == config_network }
       its("zone")              { should == config_zone }
+      its("can_ip_forward")    { should == can_ip_forward }
+      its("external_ip")       { should == external_ip }
     end
 
     context "with a specific config set" do
@@ -147,8 +190,12 @@ describe VagrantPlugins::Google::Config do
       its("image")             { should == config_image }
       its("machine_type")      { should == config_machine_type }
       its("disk_size")         { should == config_disk_size }
+      its("disk_name")         { should == config_disk_name }
+      its("disk_type")         { should == config_disk_type }
       its("network")           { should == config_network }
       its("zone")              { should == zone_name }
+      its("can_ip_forward")    { should == can_ip_forward }
+      its("external_ip")       { should == external_ip }
     end
 
     describe "inheritance of parent config" do

data/vagrant-google.gemspec

@@ -1,11 +1,11 @@
 # Copyright 2013 Google Inc. All Rights Reserved.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.name          = "vagrant-google"
   s.version       = VagrantPlugins::Google::VERSION
   s.platform      = Gem::Platform::RUBY
-  s.authors       = "Eric Johnson"
-  s.email         = "erjohnso@google.com"
+  s.authors       = ["Eric Johnson", "Artem Yakimenko"]
+  s.email         = "vagrant-google@google.com"
   s.homepage      = "http://www.vagrantup.com"
   s.summary       = "Vagrant provider plugin for Google Compute Engine."
   s.description   = "Enables Vagrant to manage Google Compute Engine instances."
@@ -28,16 +28,14 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "vagrant-google"
 
-  s.add_runtime_dependency "fog", "~> 1.22"
+  s.add_runtime_dependency "fog", "1.29"
   s.add_runtime_dependency "google-api-client"
   #s.add_runtime_dependency "pry"
   #s.add_runtime_dependency "pry-nav"
   #s.add_runtime_dependency "rb-readline"
 
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec-core", "~> 2.12.2"
-  s.add_development_dependency "rspec-expectations", "~> 2.12.1"
-  s.add_development_dependency "rspec-mocks", "~> 2.12.1"
+  s.add_development_dependency "rspec", "~> 2.14.0"
 
   # The following block of code determines the files that should be included
   # in the gem. It does this by reading all the files in the directory where

data/vagrant-spec.config.rb

@@ -0,0 +1,10 @@
+require_relative "test/acceptance/base"
+
+Vagrant::Spec::Acceptance.configure do |c|
+  c.component_paths << File.expand_path("../test/acceptance", __FILE__)
+  c.skeleton_paths << File.expand_path("../test/acceptance/skeletons", __FILE__)
+
+  c.provider "google",
+    box: "https://github.com/mitchellh/vagrant-google/raw/master/google-test.box",
+    contexts: ["provider-context/google"]
+end

metadata

@@ -1,173 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-google
 version: !ruby/object:Gem::Version
-  version: 0.1.4
-  prerelease: 
+  version: 0.1.5.rc1
 platform: ruby
 authors:
 - Eric Johnson
+- Artem Yakimenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '1.29'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '1.29'
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-core
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.2
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.1
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 2.14.0
 description: Enables Vagrant to manage Google Compute Engine instances.
-email: erjohnso@google.com
+email: vagrant-google@google.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Rakefile
-- README.md
-- vagrant-google.gemspec
-- locales/en.yml
 - CHANGELOG.md
-- LICENSE
-- CONTRIB.md
 - Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- example_boxes/README.md
+- example_boxes/gce-test/metadata.json
+- example_boxes/gce/metadata.json
+- google-test.box
+- google.box
+- lib/vagrant-google.rb
 - lib/vagrant-google/action.rb
-- lib/vagrant-google/action/run_instance.rb
-- lib/vagrant-google/action/timed_provision.rb
-- lib/vagrant-google/action/terminate_instance.rb
-- lib/vagrant-google/action/read_ssh_info.rb
-- lib/vagrant-google/action/message_not_created.rb
 - lib/vagrant-google/action/connect_google.rb
 - lib/vagrant-google/action/is_created.rb
+- lib/vagrant-google/action/message_already_created.rb
+- lib/vagrant-google/action/message_not_created.rb
 - lib/vagrant-google/action/message_will_not_destroy.rb
-- lib/vagrant-google/action/warn_networks.rb
+- 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/sync_folders.rb
-- lib/vagrant-google/action/message_already_created.rb
+- lib/vagrant-google/action/terminate_instance.rb
+- lib/vagrant-google/action/timed_provision.rb
+- lib/vagrant-google/action/warn_networks.rb
 - lib/vagrant-google/config.rb
+- lib/vagrant-google/errors.rb
 - lib/vagrant-google/plugin.rb
-- lib/vagrant-google/version.rb
 - lib/vagrant-google/provider.rb
-- lib/vagrant-google/errors.rb
 - lib/vagrant-google/util/timer.rb
-- lib/vagrant-google.rb
-- example_box/README.md
-- example_box/metadata.json
-- google.box
-- spec/vagrant-google/config_spec.rb
+- lib/vagrant-google/version.rb
+- locales/en.yml
+- tasks/acceptance.rake
+- tasks/bundler.rake
+- tasks/test.rake
+- test/acceptance/base.rb
+- test/acceptance/shared/context_google.rb
+- test/unit/base.rb
+- test/unit/common/config_test.rb
+- vagrant-google.gemspec
+- vagrant-spec.config.rb
 - .gitignore
+- .ruby-version
 homepage: http://www.vagrantup.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-google
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Vagrant provider plugin for Google Compute Engine.
 test_files: []

data/CONTRIB.md

@@ -1,64 +0,0 @@
-# How to become a contributor and submit your own code
-
-## Contributor License Agreements
-
-We'd love to accept your sample apps and patches! Before we can take them, we
-have to jump a couple of legal hurdles.
-
-Please fill out either the individual or corporate Contributor License Agreement
-(CLA).
-
-  * If you are an individual writing original source code and you're sure you
-    own the intellectual property, then you'll need to sign an [individual CLA]
-    (https://developers.google.com/open-source/cla/individual).
-  * If you work for a company that wants to allow you to contribute your work,
-    then you'll need to sign a [corporate CLA]
-    (https://developers.google.com/open-source/cla/corporate).
-
-Follow either of the two links above to access the appropriate CLA and
-instructions for how to sign and return it. Once we receive it, we'll be able to
-accept your pull requests.
-
-## Contributing A Patch
-
-1. Submit an issue describing your proposed change to the repo in question.
-1. The repo owner will respond to your issue promptly.
-1. If your proposed change is accepted, and you haven't already done so, sign a
-   Contributor License Agreement (see details above).
-1. Fork the desired repo, develop and test your code changes.
-1. Ensure that your code adheres to the existing style in the sample to which
-   you are contributing. Refer to the
-   [Google Cloud Platform Samples Style Guide]
-   (https://github.com/GoogleCloudPlatform/Template/wiki/style.html) for the
-   recommended coding standards for this organization.
-1. Ensure that your code has an appropriate set of unit tests which all pass.
-1. Submit a pull request.
-
-## Contributing A New Sample App
-
-1. Submit an issue to the GoogleCloudPlatform/Template repo describing your
-   proposed sample app.
-1. The Template repo owner will respond to your enhancement issue promptly.
-   Instructional value is the top priority when evaluating new app proposals for
-   this collection of repos.
-1. If your proposal is accepted, and you haven't already done so, sign a
-   Contributor License Agreement (see details above).
-1. Create your own repo for your app following this naming convention:
-    * {product}-{app-name}-{language}
-    * products: appengine, compute, storage, bigquery, prediction, cloudsql
-    * example:  appengine-guestbook-python
-    * For multi-product apps, concatenate the primary products, like this:
-      compute-appengine-demo-suite-python.
-    * For multi-language apps, concatenate the primary languages like this:
-      appengine-sockets-python-java-go.
-
-1. Clone the README.md, CONTRIB.md and LICENSE files from the
-   GoogleCloudPlatform/Template repo.
-1. Ensure that your code adheres to the existing style in the sample to which
-   you are contributing. Refer to the
-   [Google Cloud Platform Samples Style Guide]
-   (https://github.com/GoogleCloudPlatform/Template/wiki/style.html) for the
-   recommended coding standards for this organization.
-1. Ensure that your code has an appropriate set of unit tests which all pass.
-1. Submit a request to fork your repo in GoogleCloudPlatform organizationt via
-   your proposal issue.