vagrant-google 2.2.1 → 2.3.0.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff7fc355aac3b30b66f83ee7dc0032c64060a0dc
-  data.tar.gz: aa90cafdd81a4815b3b4f9676827bb7e2403fb16
+  metadata.gz: '08471e3d05bc8414569638e5fdc304ee522d743f'
+  data.tar.gz: a91555ed68b59ce5e1b84d1bab7b681ebb1ce890
 SHA512:
-  metadata.gz: 3bb5325a938bdf66b431ef25490c90948fc81e0a873e09b4eb862a46cfcfec78d5685077d5dbe83c58b724e8482ceb0b95e0b3d2db4c64f0eebd22084eb44da7
-  data.tar.gz: dd90bd55eb16fcd40645a55ca306542586e4e581a1989123f639db5a3715498d9ea35822f6b66e2fc7c9cdb0491c5890687800dfdb07b2c8c373f81bf3ea649f
+  metadata.gz: 91a2d9310f63eb4eb3755d5a7d7d68c19bfc1975b5ba77521bbebcfc87089f07bf7f790e5f474c390bae626324fa7b7fde3c1e85eef8432f5e31f6efae6f6331
+  data.tar.gz: 1f666a0801fc61431bbe3c970483a5b09672de88441d5671631ef4f988a67db9bfbe145900d636bd2488a5bfee4df73e0844b9f4cc2c31cc3abfb0023210e4f1

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 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.3.0 (February 2019)
+
+### User-facing
+
+- \#210 Allow adding additional disks to the instances. [whynick1]
+
+### Development
+
+- \#211 Rspec-its is now explicitly required for unit tests. [temikus]
+
 ## 2.2.1 (October 2018)
 
 ### User-facing

data/README.md

@@ -1,8 +1,6 @@
 # Vagrant Google Compute Engine (GCE) Provider
 
-
-[![Gem Version](https://badge.fury.io/rb/vagrant-google.png)][gem]
-[![Dependency Status](https://gemnasium.com/mitchellh/vagrant-google.png)][gemnasium]
+[![Gem Version](https://badge.fury.io/rb/vagrant-google.svg)](https://badge.fury.io/rb/vagrant-google)
 
 [gem]: https://rubygems.org/gems/vagrant-google
 [gemnasium]: https://gemnasium.com/mitchellh/vagrant-google
@@ -210,6 +208,20 @@ will pull the most recent CentOS 7 image. For more info, refer to
   utility aliases, for example:
   `['storage-full', 'bigquery', 'https://www.googleapis.com/auth/compute']`.
 * `service_account` - The IAM service account email to use for the instance.
+* `additional_disks` - An array of additional disk configurations. `disk_size` is default to `10`GB; 
+  `disk_name` is default to `name` + "-additional-disk-#{index}"; `disk_type` is default to `pd-standard`; 
+  `autodelete_disk` is default to `true`. Here is an example of configuration.
+```ruby
+  [{
+   :image_family => "google-image-family",
+   :image => nil,
+   :image_project_id => "google-project-id",
+   :disk_size => 20,
+   :disk_name => "google-additional-disk-0",
+   :disk_type => "pd-standard",
+   :autodelete_disk => true
+  }]
+```
 
 These can be set like typical provider-specific configuration:
 

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

@@ -67,6 +67,7 @@ module VagrantPlugins
           service_account_scopes = zone_config.scopes
           service_account        = zone_config.service_account
           project_id             = zone_config.google_project_id
+          additional_disks       = zone_config.additional_disks
 
           # Launch!
           env[:ui].info(I18n.t("vagrant_google.launching_instance"))
@@ -96,6 +97,7 @@ module VagrantPlugins
           env[:ui].info(" -- Autodelete Disk: #{autodelete_disk}")
           env[:ui].info(" -- Scopes:          #{service_account_scopes}") if service_account_scopes
           env[:ui].info(" -- Service Account: #{service_account}") if service_account
+          env[:ui].info(" -- Additional Disks:#{additional_disks}")
 
           # Munge image config
           if image_family
@@ -127,7 +129,7 @@ module VagrantPlugins
 
           begin
             request_start_time = Time.now.to_i
-
+            disk = nil
             # Check if specified external ip is available
             external_ip = get_external_ip(env, external_ip) if external_ip
             # Check if disk type is available in the zone and set the proper resource link
@@ -161,6 +163,83 @@ module VagrantPlugins
               end
             end
 
+            # Add boot disk to the instance
+            disks = [disk.get_as_boot_disk(true, autodelete_disk)]
+
+            # Configure additional disks
+            additional_disks.each_with_index do |disk_config, index|
+              additional_disk = nil
+
+              # Get additional disk image
+              # Create a blank disk if neither image nor additional_disk_image is provided
+              additional_disk_image = nil
+              if disk_config[:image_family]
+                additional_disk_image = env[:google_compute].images.get_from_family(disk_config[:image_family], disk_config[:image_project_id]).self_link
+              elsif disk_config[:image]
+                additional_disk_image = env[:google_compute].images.get(disk_config[:image], disk_config[:image_project_id]).self_link
+              end
+
+              # Get additional disk size
+              additional_disk_size = nil
+              if disk_config[:disk_size].nil?
+                # Default disk size is 10 GB
+                additional_disk_size = 10
+              else
+                additional_disk_size = disk_config[:disk_size]
+              end
+
+              # Get additional disk type
+              additional_disk_type = nil
+              if disk_config[:disk_type].nil?
+                # Default disk type is pd-standard
+                additional_disk_type = get_disk_type(env, "pd-standard", zone)
+              else
+                additional_disk_type = get_disk_type(env, disk_config[:disk_type], zone)
+              end
+
+              # Get additional disk auto delete
+              additional_disk_auto_delete = nil
+              if disk_config[:disk_type].nil?
+                # Default auto delete to true
+                additional_disk_auto_delete = true
+              else
+                additional_disk_auto_delete = disk_config[:autodelete_disk]
+              end
+
+              # Get additional disk name
+              additional_disk_name = nil
+              if disk_config[:disk_name].nil?
+                # no disk_name... disk_name defaults to instance (name + "-additional-disk-#{index}"
+                additional_disk_name = name + "-additional-disk-#{index}"
+                additional_disk = env[:google_compute].disks.create(
+                  name: additional_disk_name,
+                  size_gb: additional_disk_size,
+                  type: additional_disk_type,
+                  zone_name: zone,
+                  source_image: additional_disk_image
+                )
+              else
+                # additional_disk_name set in disk_config
+                additional_disk_name = disk_config[:disk_name]
+
+                additional_disk = env[:google_compute].disks.get(additional_disk_name, zone)
+                if additional_disk.nil?
+                  # disk not found... create it with name
+                  additional_disk = env[:google_compute].disks.create(
+                    name: additional_disk_name,
+                    size_gb: additional_disk_size,
+                    type: additional_disk_type,
+                    zone_name: zone,
+                    source_image: additional_disk_image
+                  )
+                  additional_disk.wait_for { additional_disk.ready? }
+                end
+              end
+
+              # Add additional disk to the instance
+              disks.push(additional_disk.attached_disk_obj(boot:false, writable:true, auto_delete:additional_disk_auto_delete))
+            end
+
             defaults = {
               :name                => name,
               :zone                => zone,
@@ -175,7 +254,7 @@ module VagrantPlugins
               :can_ip_forward      => can_ip_forward,
               :use_private_ip      => use_private_ip,
               :external_ip         => external_ip,
-              :disks               => [disk.get_as_boot_disk(true, autodelete_disk)],
+              :disks               => disks,
               :scheduling          => scheduling,
               :service_accounts    => service_accounts
             }
@@ -185,7 +264,9 @@ module VagrantPlugins
             # TODO: Cleanup the Fog catch-all once Fog implements better exceptions
             # There is a chance Google has failed to create an instance, so we need
             # to clean up the created disk.
-            cleanup_disk(disk.name, env) if disk && disk_created_by_vagrant
+            disks.each do |disk|
+                cleanup_disk(disk.name, env) if disk && disk_created_by_vagrant
+            end
             raise Errors::FogError, :message => e.message
           end
 

data/lib/vagrant-google/config.rb

@@ -173,6 +173,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :service_account
 
+      # The configuration for additional disks.
+      #
+      # @return [Array<Hash>]
+      attr_accessor :additional_disks
+
       def initialize(zone_specific=false)
         @google_client_email = UNSET_VALUE
         @google_json_key_location = UNSET_VALUE
@@ -204,6 +209,7 @@ module VagrantPlugins
         @scopes              = UNSET_VALUE
         @service_accounts    = UNSET_VALUE
         @service_account     = UNSET_VALUE
+        @additional_disks    = []
 
         # Internal state (prefix with __ so they aren't automatically
         # merged)

data/lib/vagrant-google/version.rb

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

data/test/unit/base.rb

@@ -1,4 +1,5 @@
 require "rubygems"
+require "rspec/its"
 
 # Set vagrant env to avoid "Encoded files can't be read" error.
 ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"] = File.expand_path("../../../", __FILE__)

data/test/unit/common/config_test.rb

@@ -46,6 +46,7 @@ describe VagrantPlugins::Google::Config do
     its("tags")                   { should == [] }
     its("labels")                 { should == {} }
     its("scopes")                 { should == nil }
+    its("additional_disks")       { should == [] }
     its("preemptible")            { should be_falsey }
     its("auto_restart")           { should }
     its("on_host_maintenance")    { should == "MIGRATE" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-google
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0.rc0
 platform: ruby
 authors:
 - Eric Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-06 00:00:00.000000000 Z
+date: 2019-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-google