vagrant-google 1.0.0 → 2.0.0.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbafcc7662aa102b358b192a4ad78e23db634023
-  data.tar.gz: 7b7399389eb95da30e47c6066e92a1f06c81c339
+  metadata.gz: 3de3e5c8c3002f1dfb3b01ce2a07aa96ee9c904b
+  data.tar.gz: d1ae149feea9e3c24529cb3cf9455cffa57b6792
 SHA512:
-  metadata.gz: c370bc290216a655eb520ea9d736f2e3797d11111f506d4a3ae8432013af7c8c4d75324943aaa6e0147e255ad3e5acc825257b880354711e2d5664b9819f2686
-  data.tar.gz: c736f6cc8a6939d3ff5ff51e6c912e405609ac745d433f65b90e253f50185849b10e25fd055e86262a9947eb227fa239b094d5f6a522a0b867b5c0af2036c765
+  metadata.gz: da3d11aa820d64a4fc4ed216ed29452f17700a75ea1acd27af6c8596935c649c13463b17e2dbc53a13dd703f1fb2dafa1767918c380fd352c0d8d5ce7ebe5738
+  data.tar.gz: 886634d649fe59215e9da565df5d6ea1cfc8c47bcf00e7f7178d59582416bac71937eb74e436071b6eae61c7e7c9b8348572f587d0bd84b8b2bf315a84233025

data/.gitignore

@@ -9,10 +9,11 @@ pkg/*
 tags
 Gemfile.lock
 /vagrant-google/*
+vendor/*
 
 # Vagrant
 .vagrant
 /Vagrantfile*
 
 # Intellij projects folder
-.idea
+.idea

data/.rubocop.yml

@@ -9,3 +9,9 @@ AllCops:
 
 Style/EmptyLinesAroundBlockBody:
   Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+
+Style/IfUnlessModifier:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,13 +1,65 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-03-25 19:11:49 +0100 using RuboCop version 0.38.0.
+# on 2017-10-29 18:43:35 +1100 using RuboCop version 0.51.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: SupportedStyles, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_braces
+Layout/IndentHash:
+  EnforcedStyle: consistent
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: Width, IgnoredPatterns.
+Layout/IndentationWidth:
+  Exclude:
+    - 'lib/vagrant-google/action/connect_google.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/LeadingCommentSpace:
+  Exclude:
+    - 'lib/vagrant-google/action/sync_folders.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/SpaceAfterComma:
+  Exclude:
+    - 'test/unit/common/config_test.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: SupportedStyles.
+# SupportedStyles: space, no_space
+Layout/SpaceAroundEqualsInParameterDefault:
+  EnforcedStyle: no_space
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, SupportedStylesForEmptyBraces.
+# SupportedStyles: space, no_space
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceBeforeBlockBraces:
+  Exclude:
+    - 'lib/vagrant-google/action/sync_folders.rb'
+    - 'tasks/acceptance.rake'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces, SpaceBeforeBlockParameters.
+# SupportedStyles: space, no_space
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideBlockBraces:
+  Exclude:
+    - 'lib/vagrant-google/action/sync_folders.rb'
+
 # Offense count: 2
-Lint/LiteralInCondition:
+Lint/LiteralAsCondition:
   Exclude:
     - 'lib/vagrant-google/action/run_instance.rb'
     - 'lib/vagrant-google/action/start_instance.rb'
@@ -24,7 +76,7 @@ Lint/RescueException:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: IgnoreEmptyBlocks.
+# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
 Lint/UnusedBlockArgument:
   Exclude:
     - 'lib/vagrant-google/action/sync_folders.rb'
@@ -40,16 +92,21 @@ Lint/UselessAssignment:
   Exclude:
     - 'lib/vagrant-google/plugin.rb'
 
-# Offense count: 11
+# Offense count: 12
 Metrics/AbcSize:
-  Max: 54
+  Max: 59
+
+# Offense count: 7
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 224
 
 # Offense count: 4
 Metrics/CyclomaticComplexity:
-  Max: 16
+  Max: 19
 
-# Offense count: 71
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# Offense count: 84
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 131
@@ -57,18 +114,26 @@ Metrics/LineLength:
 # Offense count: 15
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 35
+  Max: 43
 
 # Offense count: 3
 Metrics/PerceivedComplexity:
-  Max: 16
+  Max: 19
 
 # Offense count: 1
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Exclude:
     - 'test/unit/common/config_test.rb'
 
-# Offense count: 8
+# Offense count: 2
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Exclude:
+    - 'lib/vagrant-google.rb'
+    - 'vagrant-spec.config.rb'
+
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: always, conditionals
@@ -76,8 +141,23 @@ Style/AndOr:
   Exclude:
     - 'example_boxes/gce-test/Vagrantfile'
     - 'lib/vagrant-google/config.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: braces, no_braces, context_dependent
+Style/BracesAroundHashParameters:
+  Exclude:
     - 'test/unit/common/config_test.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly, IncludeTernaryExpressions.
+# SupportedStyles: assign_to_condition, assign_inside_condition
+Style/ConditionalAssignment:
+  Exclude:
+    - 'lib/vagrant-google/config.rb'
+
 # Offense count: 18
 Style/Documentation:
   Exclude:
@@ -96,64 +176,36 @@ Style/Documentation:
     - 'lib/vagrant-google/provider.rb'
     - 'lib/vagrant-google/util/timer.rb'
 
-# Offense count: 1
+# Offense count: 49
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: leading, trailing
-Style/DotPosition:
+# SupportedStyles: when_needed, always, never
+Style/FrozenStringLiteralComment:
   Enabled: false
 
-# Offense count: 9
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: empty_lines, no_empty_lines
-Style/EmptyLinesAroundBlockBody:
-  Exclude:
-
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: empty_lines, no_empty_lines
-Style/EmptyLinesAroundClassBody:
-  Exclude:
-    - 'lib/vagrant-google/action/stop_instance.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: empty_lines, no_empty_lines
-Style/EmptyLinesAroundModuleBody:
-  Exclude:
-    - 'lib/vagrant-google/action/stop_instance.rb'
-
-# Offense count: 2
-# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts.
-Style/FileName:
-  Exclude:
-    - 'lib/vagrant-google.rb'
-    - 'vagrant-spec.config.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: consistent, special_for_inner_method_call, special_for_inner_method_call_in_parentheses
-Style/FirstParameterIndentation:
-  Exclude:
-    - 'lib/vagrant-google/action/run_instance.rb'
-
-# Offense count: 1
+# Offense count: 4
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
+    - 'lib/vagrant-google/action/connect_google.rb'
     - 'lib/vagrant-google/action/run_instance.rb'
+    - 'lib/vagrant-google/plugin.rb'
 
-# Offense count: 40
+# Offense count: 45
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues.
-# SupportedStyles: ruby19, ruby19_no_mixed_keys, hash_rockets
+# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
 Style/HashSyntax:
-  Enabled: false
+  Exclude:
+    - 'lib/vagrant-google/action/connect_google.rb'
+    - 'lib/vagrant-google/action/read_ssh_info.rb'
+    - 'lib/vagrant-google/action/run_instance.rb'
+    - 'lib/vagrant-google/action/start_instance.rb'
+    - 'lib/vagrant-google/action/stop_instance.rb'
+    - 'lib/vagrant-google/action/sync_folders.rb'
+    - 'tasks/acceptance.rake'
+    - 'tasks/boxes.rake'
+    - 'test/unit/common/config_test.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -164,9 +216,9 @@ Style/InfiniteLoop:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-Style/LeadingCommentSpace:
+Style/MultilineIfThen:
   Exclude:
-    - 'lib/vagrant-google/action/sync_folders.rb'
+    - 'lib/vagrant-google/action/read_ssh_info.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -182,17 +234,25 @@ Style/NilComparison:
   Exclude:
     - 'test/unit/common/config_test.rb'
 
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    - 'tasks/acceptance.rake'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/PerlBackrefs:
   Exclude:
     - 'lib/vagrant-google/action/sync_folders.rb'
 
-# Offense count: 2
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: AllowMultipleReturnValues.
 Style/RedundantReturn:
   Exclude:
+    - 'lib/vagrant-google/action/connect_google.rb'
     - 'lib/vagrant-google/action/read_ssh_info.rb'
     - 'lib/vagrant-google/action/read_state.rb'
 
@@ -212,49 +272,34 @@ Style/RegexpLiteral:
 
 # Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles.
-# SupportedStyles: space, no_space
-Style/SpaceAroundEqualsInParameterDefault:
-  EnforcedStyle: no_space
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: space, no_space
-Style/SpaceBeforeBlockBraces:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/SpaceBeforeComma:
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil.
+Style/SafeNavigation:
   Exclude:
-    - 'Gemfile'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
-# SupportedStyles: space, no_space
-Style/SpaceInsideBlockBraces:
-  Enabled: false
-
-# Offense count: 392
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiterals:
-  Enabled: false
+    - 'lib/vagrant-google/action/run_instance.rb'
+    - 'lib/vagrant-google/action/terminate_instance.rb'
 
-# Offense count: 7
+# Offense count: 8
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiteralsInInterpolation:
-  Enabled: false
+  Exclude:
+    - 'lib/vagrant-google/action/run_instance.rb'
+    - 'lib/vagrant-google/action/start_instance.rb'
+    - 'lib/vagrant-google/config.rb'
+    - 'tasks/acceptance.rake'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: MinSize, SupportedStyles.
+# SupportedStyles: percent, brackets
+Style/SymbolArray:
+  EnforcedStyle: brackets
 
 # Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoredMethods.
-# IgnoredMethods: respond_to
+# IgnoredMethods: respond_to, define_method
 Style/SymbolProc:
   Exclude:
     - 'test/unit/common/config_test.rb'

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+# 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) 
+  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 
+    specified at runtime
+  * Rsync behavior now consistent with Vagrant's default, removed old rsync code
+
+# 1.0.0 (July 2017)
+# 0.2.5 (October 2016)
+# 0.2.4 (April 2016)
+# 0.2.3 (January 2016)
+
 # 0.2.2 (October 2015)
 
 * Cleanup instance and disks on backend failures [p0deje]

data/README.md

@@ -18,7 +18,8 @@ The maintainers for this plugin are @temikus(primary), @erjohnso(backup).
 * Boot Google Compute Engine instances.
 * SSH into the instances.
 * Provision the instances with any built-in Vagrant provisioner.
-* Minimal synced folder support via `rsync`.
+* Synced folder support via Vagrant's 
+[rsync action](https://www.vagrantup.com/docs/synced-folders/rsync.html).
 * Define zone-specific configurations so Vagrant can manage machines in
   multiple zones.
 
@@ -88,7 +89,9 @@ Vagrant.configure("2") do |config|
     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'
+    
     override.ssh.username = "USERNAME"
     override.ssh.private_key_path = "~/.ssh/id_rsa"
     #override.ssh.private_key_path = "~/.ssh/google_compute_engine"
@@ -99,10 +102,11 @@ end
 
 And then run `vagrant up --provider=google`.
 
-This will start a Debian 8 (Jessie) instance in the `us-central1-f` zone,
-with an `n1-standard-1` machine, and the `"default"` network within your
-project. And assuming your SSH information (see below) was filled in properly
-within your Vagrantfile, SSH and provisioning will work as well.
+This will start a latest version of Ubuntu 16.04 LTS instance in the 
+`us-central1-f` zone, with an `n1-standard-1` machine, and the `"default"` 
+network within your project. And assuming your SSH information (see below) was 
+filled in properly within your Vagrantfile, SSH and provisioning will work as 
+well.
 
 Note that normally a lot of this boilerplate is encoded within the box file,
 but the box file used for the quick start, the "google" box, has no
@@ -165,15 +169,15 @@ 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_key_location` - The location of the P12 private key file matching your
-  Service Account.  
-  (Can also be configured with `GOOGLE_KEY_LOCATION` 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.)
 * `google_project_id` - The Project ID for your Google Cloud Platform account.  
   (Can also be configured with `GOOGLE_PROJECT_ID` environment variable.)
 * `image` - The image name to use when booting your instance.
+* `image_family` - Specify an "image family" to pull the latest image from. For example: `centos-7` 
+will pull the most recent CentOS 7 image. For more info, refer to 
+[Google Image documentation](https://cloud.google.com/compute/docs/images#image_families).
 * `instance_group` - Unmanaged instance group to add the machine to. If one
   doesn't exist it will be created.
 * `instance_ready_timeout` - The number of seconds to wait for the instance
@@ -182,6 +186,7 @@ This provider exposes quite a few provider-specific configuration options:
 * `disk_size` - The disk size in GB.  The default is 10.
 * `disk_name` - The disk name to use.  If the disk exists, it will be reused, otherwise created.
 * `disk_type` - Whether to use Standard disk or SSD disk. Use either `pd-ssd` or `pd-standard`.
+* `autodelete_disk` - Boolean whether to delete the disk when the instance is deleted or not. Default is true.
 * `metadata` - Custom key/value pairs of metadata to add to the instance.
 * `name` - The name of your instance.  The default is "i-yyyymmddhh-randomsd",
   e.g. 10/08/2015 13:15:15 is "i-2015081013-15637fda".
@@ -189,13 +194,14 @@ This provider exposes quite a few provider-specific configuration options:
  "default".
 * `subnetwork` - The name of the subnetwork to use for the instance.
 * `tags` - An array of tags to apply to this instance.
+* `labels` - Custom key/value pairs of labels to add to the instance.
 * `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.
 * `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.
-* `on_host_maintenance` - What to do on host maintenance. Default is "MIGRATE".
+* `on_host_maintenance` - What to do on host maintenance. Can be set to `MIGRATE` or `TERMINATE` Default is `MIGRATE`.
 * `service_accounts` or `scopes` - An array of OAuth2 account scopes for
   services that the instance will have access to. Those can be both full API
   scopes, just endpoint aliases (the part after `...auth/`), and `gcloud`
@@ -236,7 +242,7 @@ Vagrant.configure("2") do |config|
 
     google.zone_config "us-central1-f" do |zone1f|
         zone1f.name = "testing-vagrant"
-        zone1f.image = "debian-8-jessie-v20160923"
+        zone1f.image = "debian-8-jessie-v20180307"
         zone1f.machine_type = "n1-standard-4"
         zone1f.zone = "us-central1-f"
         zone1f.metadata = {'custom' => 'metadata', 'testing' => 'foobarbaz'}
@@ -262,13 +268,9 @@ emit a warning, but will otherwise boot the GCE machine.
 
 ## Synced Folders
 
-There is minimal support for synced folders. Upon `vagrant up`,
-`vagrant reload`, and `vagrant provision`, the Google provider will use
-`rsync` (if available) to uni-directionally sync the folder to the remote
-machine over SSH.
-
-This is good enough for all built-in Vagrant provisioners (`shell`, `chef`, and
-`puppet`) to work!
+Since plugin version 2.0, this is implemented via built-in `SyncedFolders` action.
+See Vagrant's [rsync action](https://www.vagrantup.com/docs/synced-folders/rsync.html) 
+documentation for more info.
 
 ## Development