kitchen-digitalocean 0.10.5 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43e94d9f41aa6901bbb0b89fcfd29066777da3cf2173854d6d7d9384c4539ae6
-  data.tar.gz: 2da25883e2dd1db900b25107522519591fa368606d20141f2e09f573559675a7
+  metadata.gz: 9385e2dcac33c049d24246b388455a57505ec0012e2e2f0498546f2d3df5f2f2
+  data.tar.gz: 49cfa38d38d2b0947f2ac3f4e416486abf01e2b048f12114f6abf7708c83c14d
 SHA512:
-  metadata.gz: a47f1cd3c40434602b540583db48f29cd759b80c010c62c4040050ca3a8644fc50cde6c55c5bf0a4d57287e48dabeaa421354bb6455e1ee6d476771683493f55
-  data.tar.gz: 06a5c98a66929a6abb25683094b75021343ba2bfe03b42649928ec9c5c884f63f3df76454afe516f2980e32ab68c23d052278e194bbd18885d3ce9efd7e05e4e
+  metadata.gz: 9a111b6c63dee8ad2aeff8e2d45a063759813913ef87e5b038ce07ed3535df32597f40d2386e3a47ca014ada395d61d0621faef7b4d4cc1a706e9e9e70916389
+  data.tar.gz: 5370fd93696fa9f37b7ecd5ab935a82265306453555d46e185b581ee623330f4d46d0bca5fbe51af11be64863227dcc50224764c9423425ade2601fe5c0aeda0

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, '512mb'
+      default_config :size, '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,26 @@ module Kitchen
       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'
+      }.freeze
+
       def create(state)
         server = create_server
 
@@ -86,7 +108,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 +154,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 +196,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,35 +232,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',
-          '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',
-          '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.5'
+    DIGITALOCEAN_VERSION = '0.11.2'
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.11.2
 platform: ruby
 authors:
 - Greg Fitzgerald
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2020-09-29 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: '0.92'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '0.92'
 - !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
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Digital Ocean
 test_files: []