kitchen-digitalocean 0.9.8 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c1846159e0b976e60d1ee6b5897b1f8d39fb1979
-  data.tar.gz: f258dccf780f743b4af512e01d62239654925313
+SHA256:
+  metadata.gz: fb074d3b982863bc5ec0b2950a45ac3e19c7e5fbba56d694362081da07ed0bae
+  data.tar.gz: 2c65727319c97d2d0fe643d79589694ba617cd87d0fbbe2d65be37f1205f55e1
 SHA512:
-  metadata.gz: 94d95d68e71298fd71a85bac08e0205a08b37a6d64c88a9f481f6f47ac40c662e02535bd8e31f7cba718ab7019d19de8f49c92d715a0c340cd600d785de63b9a
-  data.tar.gz: 59f260bcee25ff2b39114a1a447ffd160228f4dc436e3b9f53a6e16a02a7c63584c3f035f392a64587c85901889f4dd873bd32e4c4eb0e98a7fcb6d561f19a73
+  metadata.gz: f246bc48cdaea1097a81719fb2596dac1db44e59590e74f449e61864f9b7bf5ac8c61cc1af6f5570e7658e5e01b31ea132c32dbcf64741c74cb4d83892662b7e
+  data.tar.gz: a0c0ffbf04dd73e75957e041cdba63403c717fd6fd86866ca78dd79c51af157ed88d1ba7690c37b7ca930eda27597de326a39e50b08b498fb96fe0c2d92c1d8b

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+# 0.10.0 / 2018-06-13
+
+* Bump droplet_kit to latest 2.3 series release
+* Rubocop fixes
+* [@tolland] [PR #59] Add tags attribute to the driver config
+* [@tolland] [PR #58] Add firewalls attribute to driver config
+* [@tolland] [PR #57] Update image slugs for ubuntu 17, 18, fedora 27, 28
+
+# 0.9.8 / 2017-09-09
+
+* After the 0.9.7 release I noticed the nyc2 datacenter we were defaulting to no longer exists, now defaulting to nyc1.
+
+# 0.9.7 / 2017-09-09
+
+* Update slug abbrevations
+* Bump a few testing tools in the gemspec file
+* Fix some rubocop warnings
+* Fix tests
+
+
 # 0.9.6 / 2017-07-27
 
 * [@martinisoft] Bump droplet_kit to latest 2.0 series release

data/README.md

@@ -1,6 +1,6 @@
-[![Gem Version](https://badge.fury.io/rb/kitchen-digitalocean.svg)](http://badge.fury.io/rb/kitchen-digitalocean) 
-[![Build Status](https://travis-ci.org/test-kitchen/kitchen-digitalocean.png?branch=master)](https://travis-ci.org/test-kitchen/kitchen-digitalocean) 
-[![Code Climate](https://codeclimate.com/github/test-kitchen/kitchen-digitalocean.png)](https://codeclimate.com/github/test-kitchen/kitchen-digitalocean) 
+[![Gem Version](https://badge.fury.io/rb/kitchen-digitalocean.svg)](http://badge.fury.io/rb/kitchen-digitalocean)
+[![Build Status](https://travis-ci.org/test-kitchen/kitchen-digitalocean.png?branch=master)](https://travis-ci.org/test-kitchen/kitchen-digitalocean)
+[![Code Climate](https://codeclimate.com/github/test-kitchen/kitchen-digitalocean.png)](https://codeclimate.com/github/test-kitchen/kitchen-digitalocean)
 [![Coverage Status](https://coveralls.io/repos/test-kitchen/kitchen-digitalocean/badge.svg?branch=master)](https://coveralls.io/r/test-kitchen/kitchen-digitalocean?branch=master)
 [![Dependency Status](https://gemnasium.com/test-kitchen/kitchen-digitalocean.svg)](https://gemnasium.com/test-kitchen/kitchen-digitalocean)
 
@@ -15,7 +15,7 @@ awesome work on an [Rackspace driver](https://github.com/RoboticCheese/kitchen-r
 
 From this version forward the driver uses [API V2](https://developers.digitalocean.com/) only.
 Use of image_id, flavor_id, and region_id have been replaced with image, size, and region.
-You can now use slugs instead of relying on the old data.json to translate IDs. 
+You can now use slugs instead of relying on the old data.json to translate IDs.
 Please refer to the examples below, and the API documentation for more information.
 
 # Requirements
@@ -116,17 +116,17 @@ coreos-stable
 oreos-beta
 coreos-alpha
 debian-7
-ebian-8
+debian-8
 debian-9
-fedora-24
-fedora-25
-fedora-26
+fedora-27
+fedora-28
 reebsd-11.1
 freebsd-11.0
 freebsd-10.3
 ubuntu-14
 ubuntu-16
 ubuntu-17
+ubuntu-18
 ```
 
 # Regions
@@ -145,6 +145,45 @@ sfo2    San Francisco 2
 blr1    Bangalore 1
 ```
 
+
+# Tags
+
+To add tags to the droplet, provide the tags attribute
+
+```ruby
+driver:
+  tags:
+    - test-kitchen
+    - this-is-a-tag
+```
+
+
+# Firewall
+
+To create the droplet with firewalls, provide a pre-existing firewall ID as a
+string or list of string
+
+```ruby
+driver:
+  firewalls:
+    - 7a489167-a3d5-4d93-9f4a-371bd02ea8a3
+    - 624c1408-f101-4b59-af64-99c7f7560f7a
+```
+or
+```ruby
+driver:
+  firewalls: 624c1408-f101-4b59-af64-99c7f7560f7a
+```
+
+Note that your `firewalls` must be the numeric ids of your firewall. To get the 
+numeric ID, use something like to following command to get them from the digital 
+ocean API:
+
+```bash
+curl -X GET https://api.digitalocean.com/v2/firewalls -H "Authorization: Bearer $DIGITALOCEAN_ACCESS_TOKEN"
+```
+
+
 # Development
 
 * Source hosted at [GitHub](https://github.com/test-kitchen/kitchen-digitalocean)

data/kitchen-digitalocean.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'test-kitchen', '~> 1.17'
-  spec.add_dependency 'droplet_kit', '~> 2.2'
+  spec.add_dependency 'droplet_kit', '~> 2.3'
 
   spec.add_development_dependency 'bundler', '~> 1.0'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rubocop', '~> 0.49'
+  spec.add_development_dependency 'rubocop', '~> 0.57'
   spec.add_development_dependency 'cane', '~> 2.6'
   spec.add_development_dependency 'countloc', '~> 0.4'
   spec.add_development_dependency 'rspec', '~> 3.6'

data/lib/kitchen/driver/digitalocean.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 #
 # Author:: Greg Fitzgerald (<greg@gregf.org>)
 #
@@ -39,6 +37,8 @@ module Kitchen
       default_config :private_networking, true
       default_config :ipv6, false
       default_config :user_data, nil
+      default_config :tags, nil
+      default_config :firewalls, nil
 
       default_config :digitalocean_access_token do
         ENV['DIGITALOCEAN_ACCESS_TOKEN']
@@ -63,13 +63,36 @@ module Kitchen
           droplet = client.droplets.find(id: state[:server_id])
 
           break if droplet && droplet.networks[:v4] &&
-            droplet.networks[:v4].any? { |n| n[:type] == 'public' }
+                   droplet.networks[:v4].any? { |n| n[:type] == 'public' }
         end
         droplet ||= client.droplets.find(id: state[:server_id])
 
         state[:hostname] = droplet.networks[:v4]
                                   .find { |n| n[:type] == 'public' }['ip_address']
 
+        if config[:firewalls]
+          debug('trying to add the firewall by id')
+          fw_ids = if config[:firewalls].is_a?(String)
+                     config[:firewalls].split(/\s+|,\s+|,+/)
+                   elsif config[:firewalls].is_a?(Array)
+                     config[:firewalls]
+                   else
+                     warn('firewalls attribute is not string/array, ignoring')
+                     []
+                   end
+          debug("firewall : #{fw_ids.inspect.to_yaml}")
+          fw_ids.each do |fw_id|
+            firewall = client.firewalls.find(id: fw_id)
+            if firewall
+              client.firewalls
+                    .add_droplets([droplet.id], id: firewall.id)
+              debug("firewall added: #{firewall.id}")
+            else
+              warn("firewalls id: '#{fw_id}' was not found in api, ignoring")
+            end
+          end
+        end
+
         wait_for_sshd(state[:hostname]); print "(ssh ready)\n"
         debug("digitalocean:create #{state[:hostname]}")
       end
@@ -142,7 +165,12 @@ module Kitchen
           ssh_keys: config[:ssh_key_ids].to_s.split(/, ?/),
           private_networking: config[:private_networking],
           ipv6: config[:ipv6],
-          user_data: config[:user_data]
+          user_data: config[:user_data],
+          tags: if config[:tags].is_a?(String)
+                  config[:tags].split(/\s+|,\s+|,+/)
+                else
+                  config[:tags]
+                end
         )
 
         resp = client.droplets.create(droplet)
@@ -164,6 +192,8 @@ module Kitchen
         debug("digitalocean:private_networking #{config[:private_networking]}")
         debug("digitalocean:ipv6 #{config[:ipv6]}")
         debug("digitalocean:user_data #{config[:user_data]}")
+        debug("digitalocean:tags #{config[:tags]}")
+        debug("digitalocean:firewalls #{config[:firewalls]}")
       end
 
       def debug_client_config
@@ -180,15 +210,15 @@ module Kitchen
           'debian-7'     => 'debian-7-x64',
           'debian-8'     => 'debian-8-x64',
           'debian-9'     => 'debian-9-x64',
-          'fedora-24'      => 'fedora-24-x64',
-          'fedora-25'      => 'fedora-25-x64',
-          'fedora-26'      => 'fedora-26-x64',
+          'fedora-27'      => 'fedora-27-x64',
+          'fedora-28'      => 'fedora-28-x64',
           'freebsd-11.1'   => 'freebsd-11-1-x64-zfs',
           'freebsd-11.0'   => 'freebsd-11-0-x64-zfs',
           'freebsd-10.3'   => 'freebsd-10-3-x64-zfs',
           'ubuntu-14'   => 'ubuntu-14-04-x64',
           'ubuntu-16'   => 'ubuntu-16-04-x64',
-          'ubuntu-17'   => 'ubuntu-17-04-x64'
+          'ubuntu-17'   => 'ubuntu-17-10-x64',
+          'ubuntu-18'   => 'ubuntu-18-04-x64'
         }
       end
     end

data/lib/kitchen/driver/digitalocean_version.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 #
 # Author:: Greg Fitzgerald (<greg@gregf.org>)
 #
@@ -20,7 +18,7 @@
 module Kitchen
   module Driver
     # Version string for Digital Ocean Kitchen driver
-    DIGITALOCEAN_VERSION = '0.9.8'.freeze
+    DIGITALOCEAN_VERSION = '0.10.0'.freeze
   end
 end
 

data/spec/kitchen/driver/digitalocean_spec.rb

@@ -89,7 +89,7 @@ describe Kitchen::Driver::Digitalocean do
       let(:platform_name) { 'ubuntu-17' }
 
       it 'matches the correct image slug' do
-        expect(driver[:image]).to eq('ubuntu-17-04-x64')
+        expect(driver[:image]).to eq('ubuntu-17-10-x64')
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.10.0
 platform: ruby
 authors:
 - Greg Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-09 00:00:00.000000000 Z
+date: 2018-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.57'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.57'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Digital Ocean