vagrant-google 0.1.5 → 0.2.0.rc1

data/test/acceptance/provider/scopes_spec.rb

@@ -0,0 +1,29 @@
+# This tests that account scopes can be configured correctly
+# Additionally, this verifies that the 'scopes' method alias is
+# available and gcloud GCE aliases can be used.
+# (see lib/fog/google/models/compute/server.rb in fog-google)
+shared_examples 'provider/scopes' do |provider, options|
+  if !options[:box]
+    raise ArgumentError,
+          "box option must be specified for provider: #{provider}"
+  end
+
+  include_context 'acceptance'
+
+  before do
+    environment.skeleton('scopes')
+    assert_execute('vagrant', 'box', 'add', 'basic', options[:box])
+    assert_execute('vagrant', 'up', "--provider=#{provider}")
+  end
+
+  after do
+    assert_execute('vagrant', 'destroy', '--force')
+  end
+
+  it 'should bring up machine with scope definitions' do
+    status("Test: machine is running after up")
+    result = execute("vagrant", "ssh", "-c", "echo foo")
+    expect(result).to exit_with(0)
+    expect(result.stdout).to match(/foo\n$/)
+  end
+end

data/test/acceptance/skeletons/multi_instance/Vagrantfile

@@ -0,0 +1,29 @@
+Vagrant.configure("2") do |config|
+  config.vm.box = "basic"
+
+  config.vm.define :z1a do |z1a|
+    z1a.vm.provider :google do |google, override|
+      google.zone = "europe-west1-c"
+
+      google.zone_config "europe-west1-c" do |z1a_zone|
+        z1a_zone.name = "vagrant-testing-acceptance-multi-z1a"
+        z1a_zone.image = "debian-7-wheezy-v20150603"
+        z1a_zone.machine_type = "n1-standard-1"
+        z1a_zone.zone = "europe-west1-c"
+      end
+    end
+  end
+
+  config.vm.define :z1b do |z1b|
+    z1b.vm.provider :google do |google, override|
+      google.zone = "europe-west1-d"
+
+      google.zone_config "europe-west1-d" do |z1b_zone|
+        z1b_zone.name = "vagrant-testing-acceptance-multi-z1b"
+        z1b_zone.image = "debian-7-wheezy-v20150603"
+        z1b_zone.machine_type = "n1-standard-2"
+        z1b_zone.zone = "europe-west1-d"
+      end
+    end
+  end
+end

data/test/acceptance/skeletons/preemptible/Vagrantfile

@@ -0,0 +1,17 @@
+Vagrant.configure("2") do |config|
+  config.vm.box = "basic"
+
+  config.vm.provider :google do |google, override|
+
+    google.zone = "europe-west1-d"
+
+    google.zone_config "europe-west1-d" do |zone1d|
+      zone1d.name = "vagrant-testing-preemptible"
+      zone1d.image = "debian-7-wheezy-v20150603"
+      zone1d.zone = "europe-west1-d"
+      zone1d.preemptible = true
+      zone1d.auto_restart = false
+      zone1d.on_host_maintenance = "TERMINATE"
+    end
+  end
+end

data/test/acceptance/skeletons/scopes/Vagrantfile

@@ -0,0 +1,18 @@
+Vagrant.configure("2") do |config|
+  config.vm.box = "basic"
+
+  config.vm.provider :google do |google, override|
+
+    google.zone = "europe-west1-d"
+
+    google.zone_config "europe-west1-d" do |zone1d|
+      zone1d.name = "vagrant-testing-acceptance-scopes"
+      zone1d.scopes = ['sql-admin',
+                       'bigquery',
+                       'https://www.googleapis.com/auth/compute'
+                      ]
+      zone1d.image = "debian-7-wheezy-v20150603"
+      zone1d.zone = "europe-west1-d"
+    end
+  end
+end

data/test/unit/base.rb

@@ -7,7 +7,7 @@ require "vagrant"
 require "vagrant-google"
 
 # Add the test directory to the load path
-$:.unshift File.expand_path("../../", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../../", __FILE__)
 
 # Do not buffer output
 $stdout.sync = true

data/test/unit/common/config_test.rb

@@ -29,19 +29,22 @@ describe VagrantPlugins::Google::Config do
         o.finalize!
       end
     end
-    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-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("name")                   { should match "i-[0-9]{10}-[0-9a-f]{4}" }
+    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 == [] }
+    its("metadata")               { should == {} }
+    its("tags")                   { should == [] }
+    its("service_accounts")       { should == nil }
+    its("preemptible")            { should be_false }
+    its("auto_restart")           { should }
+    its("on_host_maintenance")    { should == "MIGRATE" }
   end
 
   describe "overriding defaults" do
@@ -50,7 +53,7 @@ describe VagrantPlugins::Google::Config do
     # 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, :disk_name, :disk_type,
-      :network, :metadata, :can_ip_forward, :external_ip, :autodelete_disk].each do |attribute|
+     :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")
@@ -58,6 +61,24 @@ describe VagrantPlugins::Google::Config do
         instance.send(attribute).should == "foo"
       end
     end
+
+    it "should raise error when preemptible and auto_restart is true" do
+      instance.preemptible = true
+      instance.auto_restart = true
+      expected_error = "en.vagrant_google.config.auto_restart_invalid_on_preemptible"
+      instance.finalize!
+      errors = instance.validate("foo")["Google Provider"]
+      errors.inject(false) { |a, e| a or e.include?(expected_error) }.should == true
+    end
+
+    it "should raise error when preemptible and on_host_maintenance is not TERMINATE" do
+      instance.preemptible = true
+      instance.on_host_maintenance = "MIGRATE"
+      expected_error = "en.vagrant_google.config.on_host_maintenance_invalid_on_preemptible"
+      instance.finalize!
+      errors = instance.validate("foo")["Google Provider"]
+      errors.inject(false) { |a, e| a or e.include?(expected_error) }.should == true
+    end
   end
 
   describe "getting credentials from environment" do
@@ -244,5 +265,33 @@ describe VagrantPlugins::Google::Config do
         }
       end
     end
+
+    describe "zone_preemptible" do
+      let(:zone) { "hashi-zone" }
+      subject do
+        instance.zone = zone
+        instance.zone_config zone do |config|
+          config.preemptible = true
+          config.auto_restart = true
+          config.on_host_maintenance = "MIGRATE"
+        end
+
+        instance.tap do |o|
+          o.finalize!
+        end
+      end
+
+      it "should fail auto_restart validation" do
+        expected_error = "en.vagrant_google.config.auto_restart_invalid_on_preemptible"
+        errors = subject.validate("foo")["Google Provider"]
+        errors.inject(false) { |a, e| a or e.include?(expected_error) }.should == true
+      end
+
+      it "should fail on_host_maintenance validation" do
+        expected_error = "en.vagrant_google.config.on_host_maintenance_invalid_on_preemptible"
+        errors = subject.validate("foo")["Google Provider"]
+        errors.inject(false) { |a, e| a or e.include?(expected_error) }.should == true
+      end
+    end
   end
 end

data/vagrant-google.gemspec

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-$:.unshift File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 require "vagrant-google/version"
 
 Gem::Specification.new do |s|
@@ -28,14 +28,15 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "vagrant-google"
 
-  s.add_runtime_dependency "fog", "1.29"
+  s.add_runtime_dependency "fog-google", "~> 0.0.7"
   s.add_runtime_dependency "google-api-client"
   #s.add_runtime_dependency "pry"
-  #s.add_runtime_dependency "pry-nav"
+  #s.add_runtime_dependency "pry-byebug"
   #s.add_runtime_dependency "rb-readline"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 2.14.0"
+  s.add_development_dependency "rubocop", "0.31.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

@@ -5,6 +5,6 @@ Vagrant::Spec::Acceptance.configure do |c|
   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"]
+             box: "https://github.com/mitchellh/vagrant-google/raw/master/google-test.box",
+             contexts: ["provider-context/google"]
 end

data/vagrantfile_examples/Vagrantfile.multiple_machines

@@ -0,0 +1,93 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Usage:
+#  1) Launch both instances and then destroy both
+#     $ vagrant up --provider=google
+#     $ vagrant destroy
+#  2) Launch one instance 'z1c' and then destory the same
+#     $ vagrant up z1c --provider=google
+#     $ vagrant destroy z1c
+
+# 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"
+
+# Example Debian provistion script
+$PROVISION_DEBIAN = <<SCRIPT
+uname=$(uname -a)
+ver=$(cat /etc/debian_version)
+echo "== BEGIN: vagrant provisioning on '${uname}'"
+echo "== DEBIAN VERSION: ${ver}"
+echo "== UPDATING Debian repositories and packages"
+/usr/bin/apt-get update -y -qq > /dev/null 2>&1
+/usr/bin/apt-get upgrade -y -qq > /dev/null 2>&1
+extip=$(curl -s http://bot.whatismyipaddress.com)
+echo "== EXTERNAL IP: ${extip}"
+echo "== APPENDING /etc/motd"
+d=$(date +%r)
+echo "# ${d}" >> /etc/motd
+echo "== cat /etc/motd"
+cat /etc/motd
+SCRIPT
+
+Vagrant.configure("2") do |config|
+  config.vm.box = "gce"
+  config.vm.provision :shell, :inline => $PROVISION_DEBIAN
+
+  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"
+
+      override.ssh.username = $LOCAL_USER
+      override.ssh.private_key_path = $LOCAL_SSH_KEY
+
+      google.zone_config "us-central1-c" do |z1c_zone|
+        z1c_zone.name = "z1c"
+        z1c_zone.image = "debian-7-wheezy-v20150603"
+        z1c_zone.machine_type = "n1-standard-1"
+        z1c_zone.zone = "us-central1-c"
+        z1c_zone.metadata = {"zone" => "US Central 1c"}
+      end
+    end
+  end
+
+  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"
+
+      override.ssh.username = $LOCAL_USER
+      override.ssh.private_key_path = $LOCAL_SSH_KEY
+
+      google.zone_config "us-central1-f" do |z1f_zone|
+        z1f_zone.name = "z1f"
+        z1f_zone.image = "debian-7-wheezy-v20150603"
+        z1f_zone.machine_type = "n1-standard-2"
+        z1f_zone.zone = "us-central1-f"
+        z1f_zone.metadata = {"zone" => "US Central 1f"}
+      end
+    end
+  end
+end

data/vagrantfile_examples/Vagrantfile.provision_single

@@ -0,0 +1,48 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Usage:
+#   $ vagrant up --provider=google
+#   $ vagrant destroy
+
+# 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"
+
+Vagrant.configure("2") do |config|
+
+  config.vm.box = "gce"
+
+  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
+    google.name = "testing-vagrant"
+    google.image = "debian-7-wheezy-v20150603"
+    google.machine_type = "n1-standard-1"
+    google.zone = "us-central1-f"
+    google.metadata = {'custom' => 'metadata', 'testing' => 'foobarbaz'}
+    google.tags = ['vagrantbox', 'dev']
+
+    override.ssh.username = $LOCAL_USER
+    override.ssh.private_key_path = $LOCAL_SSH_KEY
+  end
+end

data/vagrantfile_examples/Vagrantfile.simple

@@ -0,0 +1,29 @@
+# -*- mde: ruby -*-
+# vi: set ft=ruby :
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Vagrant.configure("2") do |config|
+  config.vm.box = "gce"
+
+  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"
+    override.ssh.private_key_path = "~/.ssh/id_rsa"
+  end
+
+end

data/vagrantfile_examples/Vagrantfile.zone_config

@@ -0,0 +1,40 @@
+# -*- mde: ruby -*-
+# vi: set ft=ruby :
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Vagrant.configure("2") do |config|
+  config.vm.box = "gce"
+
+  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"
+    override.ssh.private_key_path = "~/.ssh/id_rsa"
+
+    # Make sure to set this to trigger the zone_config
+    google.zone = "us-central1-f"
+
+    google.zone_config "us-central1-f" do |zone1a|
+        zone1a.name = "testing-vagrant"
+        zone1a.image = "debian-7-wheezy-v20150603"
+        zone1a.machine_type = "n1-standard-4"
+        zone1a.zone = "us-central1-f"
+        zone1a.scopes = ['bigquery', 'monitoring', 'https://www.googleapis.com/auth/compute']
+        zone1a.metadata = {'custom' => 'metadata', 'testing' => 'foobarbaz'}
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-google
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0.rc1
 platform: ruby
 authors:
 - Eric Johnson
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: fog-google
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.29'
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.29'
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +67,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.31.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.31.0
 description: Enables Vagrant to manage Google Compute Engine instances.
 email: vagrant-google@google.com
 executables: []
@@ -79,7 +93,9 @@ files:
 - README.md
 - Rakefile
 - example_boxes/README.md
+- example_boxes/gce-test/Vagrantfile
 - example_boxes/gce-test/metadata.json
+- example_boxes/gce/Vagrantfile
 - example_boxes/gce/metadata.json
 - google-test.box
 - google.box
@@ -87,13 +103,15 @@ files:
 - lib/vagrant-google/action.rb
 - lib/vagrant-google/action/connect_google.rb
 - lib/vagrant-google/action/is_created.rb
+- lib/vagrant-google/action/is_terminated.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/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/start_instance.rb
+- lib/vagrant-google/action/stop_instance.rb
 - lib/vagrant-google/action/terminate_instance.rb
 - lib/vagrant-google/action/timed_provision.rb
 - lib/vagrant-google/action/warn_networks.rb
@@ -106,14 +124,27 @@ files:
 - locales/en.yml
 - tasks/acceptance.rake
 - tasks/bundler.rake
+- tasks/lint.rake
 - tasks/test.rake
 - test/acceptance/base.rb
+- test/acceptance/provider/multi_instance_spec.rb
+- test/acceptance/provider/preemptible_spec.rb
+- test/acceptance/provider/scopes_spec.rb
 - test/acceptance/shared/context_google.rb
+- test/acceptance/skeletons/multi_instance/Vagrantfile
+- test/acceptance/skeletons/preemptible/Vagrantfile
+- test/acceptance/skeletons/scopes/Vagrantfile
 - test/unit/base.rb
 - test/unit/common/config_test.rb
 - vagrant-google.gemspec
 - vagrant-spec.config.rb
+- vagrantfile_examples/Vagrantfile.multiple_machines
+- vagrantfile_examples/Vagrantfile.provision_single
+- vagrantfile_examples/Vagrantfile.simple
+- vagrantfile_examples/Vagrantfile.zone_config
 - .gitignore
+- .rubocop.yml
+- .rubocop_todo.yml
 - .ruby-version
 homepage: http://www.vagrantup.com
 licenses: []