kitchen-google 1.5.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e19b3e4c95bfbeedf09b290ba0cc45536c523bc8791ecb345642181ab2e607d
-  data.tar.gz: 7913bc02ccdc1d606ba87df8b7960f4556674b13f1469d68611bb882e59a5889
+  metadata.gz: 3c5874afc2f62cd96ad13e7fe9d6c06df8fcfbde871fb4acf7e79c67a487b8db
+  data.tar.gz: 8bcd73921c384133d9713f826f8c7339b8af9f94931c150e7d568139f628d3ab
 SHA512:
-  metadata.gz: cbbd3baa2e01527513f4deb906d5312551e90f82ac38a259f7baaf733d03267b885c5d4941da98cd456f553d2713ef7f4518c5e51aa6a7866dd2fb4b79399fb3
-  data.tar.gz: dbac982910773161e264b04b5df4e2a4367eb838bfda77819ecd57c0c31f59f9660e1825520dbe9beb8d6824b104a5438eee0db5a12060a9481537d29096f1b0
+  metadata.gz: 0b1fec07ef7d37baeee30da6147060777cd22fcf64079d2359b971f0c539d60122b6489f2e8b9af54b07a2b4843c4e3be1faa4effddd81f55700650fc8c93dd1
+  data.tar.gz: 25dbb7779b0a5a00f1425561cf053da466876012697d9108abe4a857c8d953abb0733e25d9867d6e1bc2347d827e0d73898b154bc9a11f28e31e18620162a3d1

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-# Change Log
+## [v2.0.0](https://github.com/test-kitchen/kitchen-google/tree/v2.0.0)
+
+[Full Changelog](https://github.com/test-kitchen/kitchen-google/compare/v1.5.0...v2.0.0)
+
+ * #59: Add support for GCE instance labels
+ * Require Ruby 2.3 or later
+ * Reduced the number of files we ship in the Gem to reduce install size
+ * Resolve minor Chefstyle warnings
+ * Simplify and loosen dev deps
 
 ## [v1.5.0](https://github.com/test-kitchen/kitchen-google/tree/v1.5.0)
 

data/lib/kitchen/driver/gce.rb

@@ -51,7 +51,7 @@ module Kitchen
         "useraccounts-ro"    => "cloud.useraccounts.readonly",
         "useraccounts-rw"    => "cloud.useraccounts",
         "userinfo-email"     => "userinfo.email",
-      }
+      }.freeze
 
       kitchen_driver_api_version 2
       plugin_version Kitchen::Driver::GCE_VERSION
@@ -81,6 +81,7 @@ module Kitchen
       default_config :wait_time, 600
       default_config :refresh_rate, 2
       default_config :metadata, {}
+      default_config :labels, {}
 
       DISK_NAME_REGEX = /(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?)/
 
@@ -167,7 +168,7 @@ module Kitchen
               autodelete_disk: config.fetch(:autodelete_disk, disk_default_config[:autodelete_disk]),
               disk_size: config.fetch(:disk_size, disk_default_config[:disk_size]),
               disk_type: config.fetch(:disk_type, disk_default_config[:disk_type]),
-            }
+            },
           }
           raise "Disk type #{config[:disks][:disk1][:disk_type]} is not valid" unless valid_disk_type?(config[:disks][:disk1][:disk_type])
         elsif new_disk_configuration_present?
@@ -410,6 +411,7 @@ module Kitchen
         inst_obj.scheduling         = instance_scheduling
         inst_obj.service_accounts   = instance_service_accounts unless instance_service_accounts.nil?
         inst_obj.tags               = instance_tags
+        inst_obj.labels             = instance_labels
 
         inst_obj
       end
@@ -552,6 +554,10 @@ module Kitchen
         end
       end
 
+      def instance_labels
+        config[:labels]
+      end
+
       def env_user
         ENV["USER"] || "unknown"
       end

data/lib/kitchen/driver/gce_version.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright (c) 2015-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +18,6 @@
 
 module Kitchen
   module Driver
-    GCE_VERSION = "1.5.0".freeze
+    GCE_VERSION = "2.0.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-google
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Andrew Leonard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2018-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gcewinpass
@@ -83,20 +83,6 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.5'
-- !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,7 +96,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -145,23 +131,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE
-- README.md
-- Rakefile
-- kitchen-google.gemspec
 - lib/kitchen/driver/gce.rb
 - lib/kitchen/driver/gce_version.rb
-- spec/kitchen/driver/gce_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/test-kitchen/kitchen-google
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -171,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.gitignore

@@ -1,5 +0,0 @@
-*~
-*#
-.ruby-version
-*.gem
-Gemfile.lock

data/.rubocop.yml

@@ -1 +0,0 @@
-inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -1,11 +0,0 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-09-20 08:00:47 -0700 using RuboCop version 0.26.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
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 102

data/.travis.yml

@@ -1,11 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-branches:
-  only:
-  - master
-rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-  - ruby-head

data/Gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-# Specify dependencies in gemspec:
-gemspec
-
-gem "chefstyle", git: "https://github.com/chef/chefstyle"

data/README.md

@@ -1,446 +0,0 @@
-# Kitchen::Gce - A Test Kitchen Driver for Google Compute Engine
-
-[![Build Status](https://travis-ci.org/test-kitchen/kitchen-google.png?branch=master)](https://travis-ci.org/test-kitchen/kitchen-google)
-[![Code Climate](https://codeclimate.com/github/test-kitchen/kitchen-google.png)](https://codeclimate.com/github/test-kitchen/kitchen-google)
-
-This is a [Test Kitchen](https://github.com/opscode/test-kitchen/)
-driver for Google Compute Engine.  While similar to EC2 and other IaaS
-providers, GCE has a couple of advantages for Chef cookbook testing:
-
-* (Subjectively) faster instance launch times; and
-* Sub-hour billing.
-
-## Requirements
-
-### Ruby Version
-
-Ruby 2.0 or greater.
-
-### Google Cloud Platform (GCP) Project
-A [Google Cloud Platform](https://cloud.google.com) account is
-required.  If you do not already have an appropriate "project" in
-which to run your test-kitchen instances, create one, noting the
-"project id".
-
-### Authentication and Authorization
-
-The [underlying API](https://github.com/google/google-api-ruby-client) this plugin uses relies on the
-[Google Auth Library](https://github.com/google/google-auth-library-ruby) to handle authentication to the
-Google Cloud API. The auth library expects that there is a JSON credentials file located at:
-
-`~/.config/gcloud/application_default_credentials.json`
-
-The easiest way to create this is to download and install the [Google Cloud SDK](https://cloud.google.com/sdk/) and run the
-`gcloud auth application-default login` command which will create the credentials file for you.
-
-If you already have a file you'd like to use that is in a different location, set the
-`GOOGLE_APPLICATION_CREDENTIALS` environment variable with the full path to that file.
-
-### SSH Keys
-
-#### Project Level Keys
-
-In order to bootstrap Linux nodes, you will first need to ensure your SSH
-keys are set up correctly. Ensure your SSH public key is properly entered
-into your project's Metadata tab in the GCP Console. GCE will add your key
-to the appropriate user's `~/.ssh/authorized_keys` file when Chef first
-connects to perform the bootstrap process.
-
- * If you don't have one, create a key using `ssh-keygen`
- * Log in to the GCP console, select your project, go to Compute Engine, and go to the Metadata tab.
- * Select the "SSH Keys" tab.
- * Add a new item, and paste in your public key.
-    * Note: to change the username automatically detected for the key, prefix your key with the username
-      you plan to use to connect to a new instance. For example, if you plan to connect
-      as "chefuser", your key should look like: `chefuser:ssh-rsa AAAAB3N...`
- * Click "Save".
-
-Alternatively, the Google Cloud SDK (a.k.a. `gcloud`) will create a SSH key
-for you when you create and access your first instance:
-
- 1. Create a small test instance:
-    `gcloud compute instances create instance1 --zone us-central1-f --image-family=debian-8 --image-project=debian-cloud --machine-type g1-small`
- 1. Ensure your SSH keys allow access to the new instance
-    `gcloud compute ssh instance1 --zone us-central1-f`
- 1. Log out and delete the instance
-    `gcloud compute instances delete instance1 --zone us-central1-f`
-
-You will now have a local SSH keypair, `~/.ssh/google_compute_engine[.pub]` that
-will be used for connecting to your GCE Linux instances for this local username
-when you use the `gcloud compute ssh` command. You can tell Test Kitchen to use
-this key by adding it to the transport section of your .kitchen.yml:
-
-```yaml
-transport:
-  ssh_key:
-    - ~/.ssh/google_compute_engine
-```
-
-You can find [more information on configuring SSH keys](https://cloud.google.com/compute/docs/instances/adding-removing-ssh-keys) in
-the Google Compute Engine documentation.
-
-#### Instance Level Keys
-
-It is possible to [add keys](https://cloud.google.com/compute/docs/storing-retrieving-metadata#default)
-that are not included in the project's metadata to an instance. Do this by
-listing additional keys in custom metadata (see below for more about [setting
-metadata](#metadata)).
-
-For example, given a workspace that has environment variables set for `USER`
-(the username to connect as) and `SSH_KEY` (the path to the private key to use):
-
-```yaml
-driver:
-  name: gce
-  ...
-  metadata:
-    ssh-keys: <%= ENV['USER'] + ':' + IO.binread("#{ENV['SSH_KEY']}.pub").rstrip! %>
-
-transport:
-  username: <%= ENV['USER'] %>
-  ssh_key: <%= ENV['SSH_KEY'] %>
-```
-
-## Installation
-
-Install the gem with:
-
-```sh
-gem install kitchen-google
-```
-
-Or, even better, if you're using the ChefDK:
-
-```sh
-chef gem install kitchen-google
-```
-
-If you're using Bundler, simply add it to your Gemfile:
-
-```ruby
-gem "kitchen-google", "~> 1.0"
-```
-
-... and then run `bundle install`.
-
-
-## Configuration
-
-### `project`
-
-**Required**. The project ID of the GCP project into which Test Kitchen
-instances will be launched. This can be found on the "Manage All Projects"
-screen, found under the "Select a Project" drop-down at the top of the
-GCP console.
-
-Note that this parameter requires the "Project ID", not the "Project Name."
-
-Example: "funky-penguin-12345"
-
-### `image_project`
-
-The project ID of the GCP project to search for the configured image or image
-family. This must be specified to find either public images or your own images
-that exist in another project.
-
-Example: "ubuntu-os-cloud"
-
-### `image_family`
-
-The family of the image to initialize your boot disk from, the latest
-non-deprecated image will be used.
-
-Note that this parameter will be ignored if `image_name` is also specified.
-
-Example: "ubuntu-1604-lts"
-
-### `image_name`
-
-The name of the disk image to use as the source image for the boot disk.
-
-Example: `centos-7-v20170124`
-
-This parameter will override `image_family` if they are both specified.
-
-If `image_project` is not specified, only the GCP project specified in `project`
-will be searched.
-
-### `zone`
-
-**Required if `region` is left blank.** The name of the GCE zone in which to
-launch your instances.
-
-Example: `us-east1-b`
-
-### `region`
-
-**Required if zone is left blank.** The name of the region in which to
-launch your instances. A zone in the region will be randomly selected.
-
-Example: `us-central1`
-
-This parameter will be ignored if `zone` is specified.
-
-### `inst_name`
-
-**Optional** Name to give to instance. If given, must be under 63 characters
-in length. Any character that is not alphanumeric or a hyphen will be converted
-to a hyphen. Unlike EC2's "Name" tag, this is used as an instance identifier and
-must be unique.  By default, a unique name will be auto-generated; note that
-auto-generated names must be used if there is more than one test suite.  Default:
-`tk-<suite>-<platform>-<UUID>`
-
-### `auto_migrate`
-
-Boolean specifying whether or not to automatically migrate the instance
-to a host in the event of host maintenance. Default: `false`
-
-### `email`
-
-**Required for Windows instances.** The email address of the
-currently-logged-in GCP user.
-
-While the credentials file specified in the Authentication and Authorization
-section is used for all API interactions, the email address is required when
-performing the necessary password reset prior to bootstrapping the instance.
-
-### `machine_type`
-
-GCE instance type (size) to launch; default: `n1-standard-1`
-
-### `network`
-
-GCE network that instance will be attached to; default: `default`
-
-### `network_project`
-
-GCE project which network belongs to; default is same as `project`
-
-### `subnet`
-
-GCE subnetwork that instance will be attached to. Only applies to custom networks.
-
-### `subnet_project`
-
-GCE project which subnet belongs to. Only applies when `subnet` is used; default is same as `project`
-
-### `preemptible`
-
-If set to `true`, GCE instance will be brought up as a  [preemptible](https://cloud.google.com/compute/docs/instances/preemptible) virtual machine,
-that runs at a much lower price than normal instances. However, Compute
-Engine might terminate (preempt) these instances if it requires access
-to those resources for other tasks; default: `false`
-
-### `service_account_name`
-
-The name of the service account to use when enabling account scopes. This
-is usually an email-formatted service account name created via the "Permissions"
-tab of the GCP console.
-
-This is ignored unless you specify any `service_account_scopes`.
-
-Default: "default"
-
-### `service_account_scopes`
-
-An array of scopes to add to the instance, used to grant additional permissions
-within GCP.
-
-The scopes can either be a full URL (i.e. `https://www.googleapis.com/auth/devstorage.read_write`),
-the short-name (i.e. `devstorage.read_write`), or a gcloud alias (i.e. `storage-rw`).
-
-See the output of `gcloud compute instances create --help` for a full list of scopes.
-
-### `tags`
-
-Array of tags to associate with instance; default: `[]`
-
-### `use_private_ip`
-
-Boolean indicating whether or not to connect to the instance using its
-private IP address. If `true`, kitchen-google will also not provision
-a public IP for this instance. Default: `false`
-
-### `wait_time`
-
-Amount of time, in seconds, to wait for any API interactions. Default: 600
-
-### `refresh_rate`
-
-Amount of time, in seconds, to refresh the status of an API interaction. Default: 2
-
-### `metadata`
-
-Allows custom instance metadata to be set.
-The following metadata is set by default if no metadata configuration is provided:
-Default:
-
-
-    "created-by"            => "test-kitchen",
-    "test-kitchen-instance" => <instance.name>,
-    "test-kitchen-user"     => <env_user>,
-
-### Disk configuration
-
-NOTE: In order to support multiple disks in this driver, the disk configuration has been reworked. However, old .kitchen-files will keep working and simply be adapted automatically. 
-
-```yaml
-driver:
-  disks:
-    disk0:
-      autodelete_disk: false
-    disk1:
-      disk_size: 30
-    disk2:
-      disk_size: 50
-```
-
-In the above example the `disk0` would be automatically be used as the bootdisk (/dev/sda), `disk1` would be mounted as /dev/sdb and be 30 gigabytes in size. `disk2` would be mounted as /dev/sdc and 50 gigabytes in size. Any of these disks could be the bootdisk (see below), but since none is specified, disk0 is automatically elected. Note that if `disk1` would be set as bootdisk using `boot: true` it will be mounted as /dev/sda.
-
-#### `boot`
-
-Specifies wether or not a disk should be used as the boot disk for the instance. By default the first disk will be used as boot disk.
-
-#### `autodelete_disk` - deprecated as standalone option
-
-Boolean specifying whether or not to automatically delete boot disk
-for test instance.  Default: `true`
-
-*This option is deprecated as a standlone configuration, but can be applied on a per disk level.*
-
-NOTE: If you set this to false, once Test Kitchen destroys your instance,
-the boot disk used will remain in your project. You will need to manually delete it to
-avoid consuming unused resources by either using the `gcloud compute disks delete`
-command in the GCP SDK or by using `knife google disk delete` from
-[knife-google](https://github.com/chef/knife-google).
-
-#### `disk_size` - deprecated as standalone option
-
-Size, in gigabytes, of boot disk.  Default: `10`.
-
-*This option is deprecated as a standlone configuration, but can be applied on a per disk level.*
-
-Some images, such as windows images, have a larger source image size
-and require the disk_size to be the same size or larger than the source.
-An error message will be displayed to you indicating this requirement
-if necessary.
-
-#### `disk_type` - deprecated as standalone option
-
-Type of the disk. Default: `pd-standard`.
-
-*This option is deprecated as a standlone configuration, but can be applied on a per disk level.*
-
-Valid disk types:
-
- - `pd-standard`: Attached magnetic hard drive
- - `pd-ssd`: Attached SSD
- - `local-ssd`: [Local scratch SSD](https://cloud.google.com/compute/docs/disks/#localssds). NOTE: You cannot specify their size. They always are 375 GB!
-
-### Transport Settings
-
-Beginning with Test Kitchen 1.4, settings related to the transport (i.e. how to connect
-to the instance) have been moved to the `transport` section of the config, such as the
-username, password, SSH key path, etc.
-
-Therefore, you will need to update the transport section with the username configured
-for the SSH Key you imported into your project metadata as described in the "SSH Keys"
-section above.  For example, if you are connecting as the "chefuser", your .kitchen.yml
-might have a section like this:
-
-```yaml
-transport:
-  username: chefuser
-```
-
-Additionally, if you do not wish to use the standard default SSH key (`~/.ssh/id_rsa`),
-you can set the `ssh_key` parameter in the `transport` section of your .kitchen.yml.
-For example, if you want to use the SSH key auto-generated by the GCP SDK:
-
-```yaml
-transport:
-  ssh_key:
-    - ~/.ssh/google_compute_engine
-```
-
-## Example .kitchen.yml
-
-```yaml
----
-driver:
-  name: gce
-  project: mycompany-test
-  zone: us-east1-c
-  email: me@mycompany.com
-  tags:
-    - devteam
-    - test-kitchen
-  service_account_scopes:
-    - devstorage.read_write
-    - userinfo.email
-
-provisioner:
-  name: chef_zero
-
-transport:
-  username: chefuser
-
-platforms:
-  - name: centos-7
-    driver:
-      image_project: centos-cloud
-      image_name: centos-7-v20170124
-      metadata:
-        application: centos
-        release: a
-        version: 7
-  - name: ubuntu-16.04
-    driver:
-      image_project: ubuntu-os-cloud
-      image_family: ubuntu-1604-lts
-      metadata:
-        application: ubuntu
-        release: a
-        version: 1604
-  - name: windows
-    driver:
-      image_project: windows-cloud
-      image_name: windows-server-2012-r2-dc-v20170117
-      disk_size: 50
-      metadata:
-        application: windows
-        release: a
-        version: cloud
-
-suites:
-  - name: default
-    run_list:
-      - recipe[gcetest::default]
-    attributes:
-```
-
-## Development
-
-Source is hosted on [GitHub](https://github.com/test-kitchen/kitchen-google).
-
-* Pull requests are welcome, using topic branches if possible:
-
-1. Fork the repo.
-2. Create a feature branch, commit changes to it and push them.
-3. Submit a pull request.
-
-* Report issues or submit feature requests on [GitHub](https://github.com/test-kitchen/kitchen-google/issues)
-
-## Author, Acknowledgements, Etc.
-
-Created and maintained by [Andrew Leonard](http://andyleonard.com)
-([andy@hurricane-ridge.com](mailto:andy@hurricane-ridge.com)).
-
-The initial release drew heavily on the
-[kitchen-ec2](https://github.com/opscode/kitchen-ec2/) gem for both
-inspiration and implementation details.  Any bugs, however, are solely
-the author's own doing.
-
-## License
-
-Licensed under Apache 2.0.