kitchen-digitalocean 0.11.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ee936b646475252b3c7690f1b75a05a41806f6a4c8acfea8b716b1f096607f7
-  data.tar.gz: 37ec7efe3db5588d1aeb609e3261ec00fe9b2bf62d7793967282bd208019c932
+  metadata.gz: e672cac2c1f48149a9137a73ed6de23524007a0166450dab83c4bd5298bb961d
+  data.tar.gz: b87d05c0319e8e5f7c27008c414019991b22f2ad5d8df87c5710e23c69185798
 SHA512:
-  metadata.gz: ddc4afea267452af18a249a95ba44f4772fbfbdfc914e0e40ebe17ef914fc186c9be42318ccd90ab4911ffb60c5e3174c934230cee054288ccb7eded877efdb8
-  data.tar.gz: d8961e6347160b8a5a9e8de7528cde4551831a7f8407998800ad1a6cb847100cb04d09dc4e5613aa188b9b52a95bacc546cbb9d46d1d57040b5bef950ebe77ff
+  metadata.gz: de30257dd64980a1066e3a24ce2e6ff33819948cd6e969da3653a97bef81854835a4611238234af18b5c818f5cafb1dab0e16d487248d0651497b8334e27e217
+  data.tar.gz: 6fb5d6cb238690e9863c67de3c8ef6bfd4c54809b4ea1086f20e2bf0c92c0aec34dfb96df94f03c8f2b5f35d78baff68960f107d120e660cfd02d401df5b49f1

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' 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)
+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)
@@ -43,40 +44,34 @@ module Kitchen
       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",
+        "debian-11" => "debian-11-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)
@@ -91,29 +86,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")
@@ -135,7 +130,7 @@ module Kitchen
 
           break unless droplet
 
-          if droplet.status != 'new'
+          if droplet.status != "new"
             client.droplets.delete(id: state[:server_id])
             break
           end
@@ -168,11 +163,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
@@ -207,8 +202,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.11.1'
+    DIGITALOCEAN_VERSION = "0.14.0"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Greg Fitzgerald
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2021-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: droplet_kit
@@ -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.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +198,14 @@ 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.1.2
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Digital Ocean