kitchen-digitalocean 0.10.7 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fce6edc2a0bff67201d4a3db40ca1d786416028c164f099b5c1da82f16712c7b
-  data.tar.gz: 6d35e47885940bd14e7ffcc57cf7bdfc07dcbb418ca92b9fa2bee5e2bc3a1770
+  metadata.gz: 57b24c201f1bc0b22c851d8d7ed316c6658af9a5eae401cc5656ed2de97e632e
+  data.tar.gz: 9ae18f394de58c969b81db50ed82fcf187be07a4419a490a228da7899a5da66c
 SHA512:
-  metadata.gz: 93e92da4e01c434468719368da2e8a971d8bf82c5688350e485cb14bdc57bd95907fb10fa72cd9e70eda8eb0336e5e40f4163b7813d23cb86af95941f12ce1ea
-  data.tar.gz: 4e0424a83db5049abcb667ecb3cfabd46f948b9c23f41396bc2e995fdac5c8706ea2e75fd8307716de5889cc87151accda5118f199c12973914b091bcb84976b
+  metadata.gz: 2ab3ba2374832a91f659e881b2096a77045010a14c9eb571dcff691afe680bfb3044eab8156a148c2d1e1a08dc357d1bbd5980d008257c5b585cbffb0138df7f
+  data.tar.gz: faacfdc85d589fbe10e617558c8cbe8df7cbd49dd942fa51d032237f24ffe941af5738eee01b66992d782bf94122466b395c675bdd75f60a5cd2db088b5c0e07

data/lib/kitchen/driver/digitalocean.rb

@@ -17,12 +17,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'benchmark'
-require 'droplet_kit'
-require 'kitchen'
-require 'etc'
-require 'socket'
-require 'json'
+require "benchmark" unless defined?(Benchmark)
+require "droplet_kit" unless defined?(DropletKit)
+require "kitchen"
+require "etc" unless defined?(Etc)
+require "socket" unless defined?(Socket)
+require "json" unless defined?(JSON)
+autoload :YAML, "yaml"
 
 module Kitchen
   module Driver
@@ -30,9 +31,9 @@ module Kitchen
     #
     # @author Greg Fitzgerald <greg@gregf.org>
     class Digitalocean < Kitchen::Driver::SSHBase
-      default_config :username, 'root'
-      default_config :port, '22'
-      default_config :size, '1gb'
+      default_config :username, "root"
+      default_config :port, "22"
+      default_config :size, "s-1vcpu-1gb"
       default_config :monitoring, false
       default_config(:image, &:default_image)
       default_config(:server_name, &:default_name)
@@ -41,40 +42,35 @@ module Kitchen
       default_config :user_data, nil
       default_config :tags, nil
       default_config :firewalls, nil
+      default_config :vpcs, nil
 
       default_config :region do
-        ENV['DIGITALOCEAN_REGION'] || 'nyc1'
+        ENV["DIGITALOCEAN_REGION"] || "nyc1"
       end
 
       default_config :digitalocean_access_token do
-        ENV['DIGITALOCEAN_ACCESS_TOKEN']
+        ENV["DIGITALOCEAN_ACCESS_TOKEN"]
       end
 
       default_config :ssh_key_ids do
-        ENV['DIGITALOCEAN_SSH_KEY_IDS'] || ENV['SSH_KEY_IDS']
+        ENV["DIGITALOCEAN_SSH_KEY_IDS"] || ENV["SSH_KEY_IDS"]
       end
 
       required_config :digitalocean_access_token
       required_config :ssh_key_ids
 
       PLATFORM_SLUG_MAP = {
-        'centos-6' => 'centos-6-x64',
-        'centos-7' => 'centos-7-x64',
-        'centos-8' => 'centos-8-x64',
-        'coreos-stable' => 'coreos-stable',
-        'coreos-beta' => 'coreos-beta',
-        'coreos-alpha' => 'coreos-alpha',
-        'debian-9' => 'debian-9-x64',
-        'debian-10' => 'debian-10-x64',
-        'fedora-30' => 'fedora-30-x64',
-        'fedora-31' => 'fedora-31-x64',
-        'fedora-32' => 'fedora-32-x64',
-        'freebsd-11' => 'freebsd-11-x64-zfs',
-        'freebsd-12' => 'freebsd-12-x64-zfs',
-        'ubuntu-16' => 'ubuntu-16-04-x64',
-        'ubuntu-18' => 'ubuntu-18-04-x64',
-        'ubuntu-19' => 'ubuntu-19-10-x64',
-        'ubuntu-20' => 'ubuntu-20-04-x64'
+        "centos-7" => "centos-7-x64",
+        "centos-8" => "centos-8-x64",
+        "debian-9" => "debian-9-x64",
+        "debian-10" => "debian-10-x64",
+        "fedora-32" => "fedora-32-x64",
+        "fedora-33" => "fedora-33-x64",
+        "freebsd-11" => "freebsd-11-x64-zfs",
+        "freebsd-12" => "freebsd-12-x64-zfs",
+        "ubuntu-16" => "ubuntu-16-04-x64",
+        "ubuntu-18" => "ubuntu-18-04-x64",
+        "ubuntu-20" => "ubuntu-20-04-x64",
       }.freeze
 
       def create(state)
@@ -89,29 +85,29 @@ 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']
+          .find { |n| n[:type] == "public" }["ip_address"]
 
         if config[:firewalls]
-          debug('trying to add the firewall by id')
+          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')
+                     warn("firewalls attribute is not string/array, ignoring")
                      []
                    end
-          debug("firewall : #{fw_ids.inspect.to_yaml}")
+          debug("firewall : #{YAML.dump(fw_ids.inspect)}")
           fw_ids.each do |fw_id|
             firewall = client.firewalls.find(id: fw_id)
             if firewall
               client.firewalls
-                    .add_droplets([droplet.id], id: firewall.id)
+                .add_droplets([droplet.id], id: firewall.id)
               debug("firewall added: #{firewall.id}")
             else
               warn("firewalls id: '#{fw_id}' was not found in api, ignoring")
@@ -133,7 +129,7 @@ module Kitchen
 
           break unless droplet
 
-          if droplet.status != 'new'
+          if droplet.status != "new"
             client.droplets.delete(id: state[:server_id])
             break
           end
@@ -166,11 +162,11 @@ module Kitchen
       # Total:        63
       def default_name
         [
-          instance.name.gsub(/\W/, '')[0..14],
-          (Etc.getlogin || 'nologin').gsub(/\W/, '')[0..14],
-          Socket.gethostname.gsub(/\W/, '')[0..22],
-          Array.new(7) { rand(36).to_s(36) }.join
-        ].join('-').tr('_', '-')
+          instance.name.gsub(/\W/, "")[0..14],
+          (Etc.getlogin || "nologin").gsub(/\W/, "")[0..14],
+          Socket.gethostname.gsub(/\W/, "")[0..22],
+          Array.new(7) { rand(36).to_s(36) }.join,
+        ].join("-").tr("_", "-")
       end
 
       private
@@ -194,6 +190,7 @@ module Kitchen
           private_networking: config[:private_networking],
           ipv6: config[:ipv6],
           user_data: config[:user_data],
+          vpc_uuid: config[:vpcs],
           tags: if config[:tags].is_a?(String)
                   config[:tags].split(/\s+|,\s+|,+/)
                 else
@@ -204,8 +201,8 @@ module Kitchen
         resp = client.droplets.create(droplet)
 
         if resp.class != DropletKit::Droplet
-          error JSON.parse(resp)['message']
-          error 'Please check your access token is set correctly.'
+          error JSON.parse(resp)["message"]
+          error "Please check your access token is set correctly."
         else
           resp
         end

data/lib/kitchen/driver/digitalocean_version.rb

@@ -20,7 +20,7 @@
 module Kitchen
   module Driver
     # Version string for Digital Ocean Kitchen driver
-    DIGITALOCEAN_VERSION = '0.10.7'
+    DIGITALOCEAN_VERSION = "0.13.0"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.10.7
+  version: 0.13.0
 platform: ruby
 authors:
 - Greg Fitzgerald
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: droplet_kit
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.7'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.7'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -39,7 +39,7 @@ dependencies:
         version: '1.17'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,21 +49,7 @@ dependencies:
         version: '1.17'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
@@ -135,19 +121,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: chefstyle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: 2.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -204,7 +190,7 @@ homepage: https://github.com/test-kitchen/kitchen-digitalocean
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -212,15 +198,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Digital Ocean
 test_files: []