skull_island 2.0.0 → 2.2.0

data/lib/skull_island/resources/service.rb

@@ -10,14 +10,16 @@ module SkullIsland
       include Helpers::Meta
 
       property :name
-      property :retries
+      property :retries,            validate: true
       property :protocol,           validate: true, required: true
       property :host,               validate: true, required: true
       property :port,               validate: true, required: true
+      property :tls_verify,         type: :boolean
       property :path
       property :connect_timeout,    validate: true
       property :write_timeout,      validate: true
       property :read_timeout,       validate: true
+      property :ca_certificates,    validate: true, preprocess: true, postprocess: true
       property :client_certificate, validate: true, preprocess: true, postprocess: true
       property :created_at, read_only: true, postprocess: true
       property :updated_at, read_only: true, postprocess: true
@@ -42,23 +44,32 @@ module SkullIsland
           resource.connect_timeout = rdata['connect_timeout'] if rdata['connect_timeout']
           resource.write_timeout = rdata['write_timeout'] if rdata['write_timeout']
           resource.read_timeout = rdata['read_timeout'] if rdata['read_timeout']
+          resource.tls_verify = rdata['tls_verify'] if rdata['tls_verify']
           resource.delayed_set(:client_certificate, rdata) if rdata['client_certificate']
+          resource.delayed_set(:ca_certificates, rdata) if rdata['ca_certificates']
           resource.tags = rdata['tags'] if rdata['tags']
           resource.project = project if project
           resource.import_time = (time || Time.now.utc.to_i) if project
           resource.import_update_or_skip(index: index, verbose: verbose, test: test)
           known_ids << resource.id
 
-          Route.batch_import(
+          previous_routes = resource.routes.dup
+
+          added_routes = Route.batch_import(
             (rdata['routes'] || []).map { |r| r.merge('service' => { 'id' => resource.id }) },
             verbose: verbose,
             test: test,
             project: project,
-            time: time
+            time: time,
+            cleanup: false
           )
+
+          Route.cleanup_except(project, added_routes, previous_routes)
         end
 
         cleanup_except(project, known_ids) if project
+
+        known_ids
       end
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity
@@ -87,6 +98,8 @@ module SkullIsland
         Plugin.where(:service, self, api_client: api_client)
       end
 
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
       # rubocop:disable Metrics/AbcSize
       def export(options = {})
         hash = {
@@ -102,7 +115,15 @@ module SkullIsland
         }
         hash['routes'] = routes.collect { |route| route.export(exclude: 'service') }
         hash['tags'] = tags unless tags.empty?
-        hash['client_certificate'] = client_certificate if client_certificate
+        if client_certificate&.name
+          hash['client_certificate'] = "<%= lookup :certificate, '#{client_certificate.name}' %>"
+        elsif client_certificate
+          hash['client_certificate'] = { 'id' => client_certificate.id }
+        end
+        if ca_certificates && !ca_certificates.empty?
+          hash['ca_certificates'] = export_ca_certificates
+        end
+        hash['tls_verify'] = tls_verify if [true, false].include?(tls_verify)
         [*options[:exclude]].each do |exclude|
           hash.delete(exclude.to_s)
         end
@@ -111,12 +132,14 @@ module SkullIsland
         end
         hash.reject { |_, value| value.nil? }
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/PerceivedComplexity
       # rubocop:enable Metrics/AbcSize
 
       def modified_existing?
         return false unless new?
 
-        # Find routes of the same name
+        # Find services of the same name
         same_name = self.class.where(:name, name)
 
         existing = same_name.size == 1 ? same_name.first : nil
@@ -146,6 +169,33 @@ module SkullIsland
 
       private
 
+      def export_ca_certificates
+        ca_certificates.map do |cacert|
+          cacert.name ? "<%= lookup :ca_certificate, '#{cacert.name}', raw: true %>" : cacert.id
+        end
+      end
+
+      def postprocess_ca_certificates(value)
+        if value.respond_to?(:to_a)
+          value.to_a.map do |cacert|
+            CACertificate.new(
+              entity: { 'id' => cacert },
+              lazy: true,
+              tainted: false,
+              api_client: api_client
+            )
+          end
+        else
+          value
+        end
+      end
+
+      def preprocess_ca_certificates(input)
+        input.to_a.map do |cacert|
+          cacert.is_a?(String) ? cacert : cacert.id
+        end
+      end
+
       def postprocess_client_certificate(value)
         if value.is_a?(Hash)
           Certificate.new(
@@ -160,13 +210,31 @@ module SkullIsland
       end
 
       def preprocess_client_certificate(input)
-        if input.is_a?(Hash)
+        case input
+        when Hash
           input
+        when String
+          { 'id' => input }
         else
           { 'id' => input.id }
         end
       end
 
+      # Validates {#ca_certificates} on set
+      def validate_ca_certificates(value)
+        # only Arrays (or Enumarables) are supported
+        return false unless value.is_a?(Array) || value.respond_to?(:to_a)
+
+        # Can only contain a array of Strings or CACertificates
+        value.to_a.reject { |v| v.is_a?(String) || v.is_a?(CACertificate) }.empty?
+      end
+
+      # Used to validate {#client_certificate} on set
+      def validate_client_certificate(value)
+        # only Strings, Hashes, or Certificates are allowed
+        value.is_a?(String) || value.is_a?(Hash) || value.is_a?(Certificate)
+      end
+
       # Used to validate {#protocol} on set
       def validate_protocol(value)
         # only HTTP and HTTPS are allowed
@@ -185,6 +253,12 @@ module SkullIsland
         value.is_a?(Integer) && value.positive? && (1...65_535).cover?(value)
       end
 
+      # Used to validate {#retries} on set
+      def validate_retries(value)
+        # only positive Integers of the right value are allowed
+        value.is_a?(Integer) && value.positive? && (1...65_535).cover?(value)
+      end
+
       # Used to validate {#connect_timeout} on set
       def validate_connect_timeout(value)
         # only positive Integers are allowed

data/lib/skull_island/resources/upstream.rb

@@ -18,7 +18,7 @@ module SkullIsland
       property :hash_fallback_header, validate: true
       property :hash_on_cookie, validate: true
       property :hash_on_cookie_path, validate: true
-      property :healthchecks, validate: true
+      property :healthchecks, validate: true, postprocess: true
       property :host_header, validate: true
       property :created_at, read_only: true, postprocess: true
       property :tags, validate: true, preprocess: true, postprocess: true
@@ -65,6 +65,8 @@ module SkullIsland
         end
 
         cleanup_except(project, known_ids) if project
+
+        known_ids
       end
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity
@@ -160,6 +162,11 @@ module SkullIsland
 
       private
 
+      # Prunes empty values from the healthchecks Hash
+      def postprocess_healthchecks(value)
+        value.is_a?(Hash) ? value.prune : value
+      end
+
       # Validates the upstream balancing {#algorithm}
       def validate_algorithm(value)
         %w[round-robin consistent-hashing least-connections].include?(value)

data/lib/skull_island/resources/upstream_target.rb

@@ -38,6 +38,8 @@ module SkullIsland
         end
 
         cleanup_except(project, known_ids) if project
+
+        known_ids
       end
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity
@@ -49,7 +51,7 @@ module SkullIsland
       end
 
       def self.get(id, options = {})
-        if options[:upstream]&.is_a?(Upstream)
+        if options[:upstream].is_a?(Upstream)
           options[:upstream].target(id)
         elsif options[:upstream]
           upstream_opts = options.merge(lazy: true)
@@ -106,9 +108,10 @@ module SkullIsland
       end
 
       def preprocess_upstream(input)
-        if input.is_a?(Hash)
+        case input
+        when Hash
           input
-        elsif input.is_a?(String)
+        when String
           { 'id' => input }
         else
           { 'id' => input.id }

data/lib/skull_island/validations/api_client.rb

@@ -34,7 +34,7 @@ module SkullIsland
         valid = name.is_a? String
         begin
           u = URI.parse(name)
-          valid = false unless u.class == URI::HTTP || u.class == URI::HTTPS
+          valid = false unless u.is_a?(URI::HTTP) || u.is_a?(URI::HTTPS)
         rescue URI::InvalidURIError
           valid = false
         end

data/lib/skull_island/validations/resource.rb

@@ -24,7 +24,7 @@ module SkullIsland
       def validate_tags(value)
         # allow only valid hostnames
         value.each do |tag|
-          return false unless tag.is_a?(String) && tag.match?(/^[\w_\-\.~]+$/)
+          return false unless tag.is_a?(String) && tag.match?(/^[\w_\-.~]+$/)
         end
         true
       end

data/lib/skull_island/version.rb

@@ -3,7 +3,7 @@
 module SkullIsland
   VERSION = [
     2, # Major
-    0, # Minor
+    2, # Minor
     0  # Patch
   ].join('.')
 end

data/skull_island.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'coveralls', '~> 0.7'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.50'
   spec.add_development_dependency 'simplecov', '~> 0.17'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skull_island
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deepsort
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -241,6 +241,7 @@ files:
 - bin/console
 - bin/setup
 - exe/skull_island
+- lib/core_extensions/hash/pruning.rb
 - lib/core_extensions/string/transformations.rb
 - lib/skull_island.rb
 - lib/skull_island/api_client.rb
@@ -305,8 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Ruby SDK for Kong