kitchen-digitalocean 0.10.6 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dda13045b2257dfc135440bc8b914c7d8aad2750482d95fbab8b4359b8569ff3
-  data.tar.gz: cc679c57581330bb1f96a5a0242d9be8b409b9a65a762b198a989a1019112c6b
+  metadata.gz: 799bdf4032943a828a9e301f4627c041f5b1c53a446a9e3fc94a1e7c2857e9eb
+  data.tar.gz: bc667b0ec4efaef1e90a94330d5ed7605a98a5cf8dfe72664ed5f4326ef9cc31
 SHA512:
-  metadata.gz: 618a06bedb2511b70e094f7ac279aca2c2c2269a34ce5bdc57bc12353829a983271971ae2e302ff7ad260d557ec4630de44be0b0a6807181746d417a612b96f3
-  data.tar.gz: fca4f2030644bcaa244f7b06043b3621cc7522be9365b217111f829227189bcbbcfa64faee67c2dd8b92c8dccdb903e1040fec217fb65280f787ba88463fc756
+  metadata.gz: 07bf2504e78e1ce84f3e09bdb1b566aad331553242792622317c01fc13d266611d596e106e26b437807e8a7e678bbbbc824a96abaecef5ea35dec2074b652453
+  data.tar.gz: 8b3d820d5ca6402ebc0d71861552af622d06ca468e33abed098246960f889303f202e0aae9204037fc6d7b9bdcdaaeb155b94689be1e5b2fec429c8592d3e6c3

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 'benchmark' unless defined?(Benchmark)
+require 'droplet_kit' unless defined?(DropletKit)
 require 'kitchen'
-require 'etc'
-require 'socket'
-require 'json'
+require 'etc' unless defined?(Etc)
+require 'socket' unless defined?(Socket)
+require 'json' unless defined?(JSON)
+autoload :YAML, 'yaml'
 
 module Kitchen
   module Driver
@@ -32,7 +33,7 @@ module Kitchen
     class Digitalocean < Kitchen::Driver::SSHBase
       default_config :username, 'root'
       default_config :port, '22'
-      default_config :size, '1gb'
+      default_config :size, 's-1vcpu-1gb'
       default_config :monitoring, false
       default_config(:image, &:default_image)
       default_config(:server_name, &:default_name)
@@ -41,6 +42,7 @@ 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'
@@ -57,6 +59,20 @@ module Kitchen
       required_config :digitalocean_access_token
       required_config :ssh_key_ids
 
+      PLATFORM_SLUG_MAP = {
+        '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)
         server = create_server
 
@@ -86,7 +102,7 @@ module Kitchen
                      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
@@ -132,8 +148,8 @@ module Kitchen
       # platform => slug mappings, and falls back to using just the platform as
       # provided if it can't find a mapping.
       def default_image
-        platform_to_slug_mapping.fetch(instance.platform.name,
-                                       instance.platform.name)
+        PLATFORM_SLUG_MAP.fetch(instance.platform.name,
+                                instance.platform.name)
       end
 
       # Generate what should be a unique server name up to 63 total chars
@@ -174,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
@@ -209,37 +226,6 @@ module Kitchen
       def debug_client_config
         debug("digitalocean_api_key #{config[:digitalocean_access_token]}")
       end
-
-      def platform_to_slug_mapping
-        {
-          'centos-6' => 'centos-6-x64',
-          'centos-7' => 'centos-7-x64',
-          'centos-8' => 'centos-8-x64',
-          'coreos-stable' => 'coreos-stable-x64',
-          'coreos-beta' => 'coreos-beta-x64',
-          'coreos-alpha' => 'coreos-alpha-x64',
-          'debian-7' => 'debian-7-x64',
-          'debian-8' => 'debian-8-x64',
-          'debian-9' => 'debian-9-x64',
-          'debian-10' => 'debian-10-x64',
-          'fedora-27' => 'fedora-27-x64',
-          'fedora-28' => 'fedora-28-x64',
-          'fedora-29' => 'fedora-29-x64',
-          'fedora-30' => 'fedora-30-x64',
-          'fedora-31' => 'fedora-31-x64',
-          'freebsd-12' => 'freebsd-12-x64-zfs',
-          'freebsd-11.2' => 'freebsd-11-2-x64-zfs',
-          'freebsd-11.1' => 'freebsd-11-1-x64-zfs',
-          'freebsd-11.0' => 'freebsd-11-0-x64-zfs',
-          'freebsd-10.3' => 'freebsd-10-3-x64-zfs',
-          'freebsd-10.4' => 'freebsd-10-4-x64-zfs',
-          'ubuntu-14' => 'ubuntu-14-04-x64',
-          'ubuntu-16' => 'ubuntu-16-04-x64',
-          'ubuntu-17' => 'ubuntu-17-10-x64',
-          'ubuntu-18' => 'ubuntu-18-04-x64',
-          'ubuntu-19' => 'ubuntu-19-04-x64'
-        }
-      end
     end
   end
 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.6'
+    DIGITALOCEAN_VERSION = '0.12.0'
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.10.6
+  version: 0.12.0
 platform: ruby
 authors:
 - Greg Fitzgerald
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2021-04-13 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'
@@ -140,14 +140,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -204,7 +204,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 +212,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: []