inst-jobs 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c062c222e731bd490efe572108a508bf78faabee4479f7fe6927a89688d9ef0b
-  data.tar.gz: 3b1678fc017230e990bc7e8d4e652c23ab59413953ce72a312b13adfa7626193
+  metadata.gz: 9550c353f31dc1d34a15993bdfbf279d87979ebb625ae776fb6727d7dc9e897e
+  data.tar.gz: 379f8faac5d3369551b4012a00f522d7871a4001776120c4e02535b70bdef8a3
 SHA512:
-  metadata.gz: 8c1a722c17c9abc8f5c8a44cb28f6584dc9fb16c1edcccc8df566ad21a5f81af7a54fb70282e2689aee11947dcd96f44ca01dfe542d71c8d3d6b7f145a572ce7
-  data.tar.gz: 9a7a65c71820d4b04f1e1ac2bf498cf030490a597d075d87d4399a392a7da1bbf50cfb3d5eeb1dea9c357d11e00aabf5e469f062c1fe9cc4b02cc8ed08e1a192
+  metadata.gz: 4dbb7a9366256f16a0fd7fbf22938d94c7754cdd3d9189d3d7d94e0d8deda59859ec4822f1e3c1d05cc7a2a67c8501a79c83d7b0b69f91fd106d9b24b4f35b06
+  data.tar.gz: 637e09a985feeef6144e5b172a04c8ceee5980eed3b1b49f2597e33bbf26522c43244bc2778905ba400cf0de6485166258103e09aa7a765e261f8971b89b2c06

data/lib/delayed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delayed
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

data/lib/delayed/worker/consul_health_check.rb

@@ -9,52 +9,49 @@ module Delayed
     class ConsulHealthCheck < HealthCheck
       self.type_name = :consul
 
-      CONSUL_CONFIG_KEYS = %w{url host port ssl token connect_timeout receive_timeout send_timeout}.map(&:freeze).freeze
+      CONSUL_CONFIG_KEYS = %w{url acl_token}.map(&:freeze).freeze
       DEFAULT_SERVICE_NAME = 'inst-jobs_worker'.freeze
-      attr_reader :agent_client, :catalog_client
+      attr_reader :service_client, :health_client
 
       def initialize(*, **)
         super
         # Because we don't want the consul client to be a hard dependency we're
         # only requiring it once it's absolutely needed
-        require 'imperium'
+        require 'diplomat'
 
         if config.keys.any? { |k| CONSUL_CONFIG_KEYS.include?(k) }
-          consul_config = Imperium::Configuration.new.tap do |conf|
+          consul_config = Diplomat::Configuration.new.tap do |conf|
             CONSUL_CONFIG_KEYS.each do |key|
               conf.send("#{key}=", config[key]) if config[key]
             end
           end
-          @agent_client = Imperium::Agent.new(consul_config)
-          @catalog_client = Imperium::Catalog.new(consul_config)
+          @service_client = Diplomat::Service.new(configuration: consul_config)
+          @health_client = Diplomat::Health.new(configuration: consul_config)
         else
-          @agent_client = Imperium::Agent.default_client
-          @catalog_client = Imperium::Catalog.default_client
+          @service_client = Diplomat::Service.new
+          @health_client = Diplomat::Health.new
         end
       end
 
       def start
-        service = Imperium::Service.new({
+        @service_client.register({
           id: worker_name,
           name: service_name,
+          check: check_attributes
         })
-        service.add_check(check_attributes)
-        response = @agent_client.register_service(service)
-        response.ok?
       end
 
       def stop
-        response = @agent_client.deregister_service(worker_name)
-        response.ok? || response.not_found?
+        @service_client.deregister(worker_name)
       end
 
       def live_workers
-        live_nodes = @catalog_client.list_nodes_for_service(service_name)
-        if live_nodes.ok?
-          live_nodes.map(&:service_id)
-        else
-          raise "Unable to read from Consul catalog: #{live_nodes.content}"
-        end
+        # Filter out critical workers (probably nodes failing their serf health check)
+        live_nodes = @health_client.service(service_name, {
+          filter: 'not Checks.Status == critical'
+        })
+
+        live_nodes.map { |n| n.Service['ID']}
       end
 
       private

data/spec/delayed/worker/consul_health_check_spec.rb

@@ -1,76 +1,63 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'imperium'
 
 RSpec.describe Delayed::Worker::ConsulHealthCheck do
   let(:health_check) { Delayed::Worker::ConsulHealthCheck.new(worker_name: 'foobar') }
 
-  # can't use a verifying double for the response because the methods we're
-  # tryig to stub are actually on HTTP::Message
-  let(:response) { double('Imperium::Response') }
-  let(:agent_client) { instance_double(Imperium::Agent) }
-
-  before do
-    allow(Imperium::Agent).to receive(:default_client).and_return(agent_client)
-  end
-
   describe '#initialize' do
-    it 'must use the default agent client when the config is mostly empty' do
+    it 'must use a default service client when the config is mostly empty' do
       check = Delayed::Worker::ConsulHealthCheck.new(worker_name: 'foobar')
-      expect(check.agent_client).to eq Imperium::Agent.default_client
+      expect(check.service_client.configuration.url.to_s).to eq 'http://localhost:8500'
     end
 
-    it 'must create a new agent API client when the config has relevant keys set' do
+    it 'must create a new service API client when the config has relevant keys set' do
       check = Delayed::Worker::ConsulHealthCheck.new(worker_name: 'foobar', config: {url: 'http://consul.example.com:8500'})
-      agent_client = check.agent_client
-      expect(agent_client).to_not eq Imperium::Agent.default_client
-      expect(agent_client.config.url.to_s).to eq 'http://consul.example.com:8500'
+      service_client = check.service_client
+      expect(service_client.configuration.url.to_s).to eq 'http://consul.example.com:8500'
     end
   end
 
   describe '#start' do
     it 'must register this process as a service with consul' do
-      expect(response).to receive(:ok?).and_return(true)
-      expect(agent_client).to receive(:register_service)
-        .with(an_instance_of(Imperium::Service))
-        .and_return(response)
+      stub = stub_request(:put, "localhost:8500/v1/agent/service/register")
+        .with(body: hash_including({id: 'foobar' }))
+
       health_check.start
+
+      expect(stub).to have_been_requested
     end
 
 
     it 'must supply a args style check' do
-      allow(response).to receive(:ok?).and_return(true)
-      allow(agent_client).to receive(:register_service) { |service|
-        check = service.checks.first
-        expect(check.args).to_not be_nil
-        response
-      }
+      stub = stub_request(:put, "localhost:8500/v1/agent/service/register")
+        .with(body: hash_including({check:  WebMock::API.hash_including({args: anything})}))
+
       health_check.start
+
+      expect(stub).to have_been_requested
     end
 
     it 'must include the docker container id when the docker option is set to true' do
+      stub = stub_request(:put, "localhost:8500/v1/agent/service/register")
+        .with(body: hash_including({check:  WebMock::API.hash_including({docker_container_id: anything})}))
+
       local_health_check = Delayed::Worker::ConsulHealthCheck.new(
         worker_name: 'foobar',
         config: {docker: true}
       )
-      allow(response).to receive(:ok?).and_return(true)
-      allow(agent_client).to receive(:register_service) { |service|
-        check = service.checks.first
-        expect(check.docker_container_id).to_not be_nil
-        response
-      }
       local_health_check.start
+
+      expect(stub).to have_been_requested
     end
   end
 
   describe '#stop' do
     it 'must deregister the service from consul' do
-      allow(response).to receive(:ok?).and_return(true)
-      expect(agent_client).to receive(:deregister_service)
-        .with(health_check.worker_name)
-        .and_return(response)
+      stub = stub_request(:put, "localhost:8500/v1/agent/service/deregister/foobar")
+
       health_check.stop
+      expect(stub).to have_been_requested
     end
   end
 end

data/spec/spec_helper.rb

@@ -7,6 +7,8 @@ require 'database_cleaner'
 require 'rack/test'
 require 'test_after_commit' if ::Rails.version < '5'
 require 'timecop'
+require 'webmock/rspec'
+
 require 'pry'
 require 'byebug'
 
@@ -19,6 +21,7 @@ RSpec.configure do |config|
   config.before(:suite) do
     DatabaseCleaner.strategy = :transaction
     DatabaseCleaner.clean_with(:truncation)
+    WebMock.disable_net_connect!
   end
 
   config.before(:each) do |example|

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Tobias Luetke
 - Brian Palmer
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2021-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -172,33 +172,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !ruby/object:Gem::Dependency
-  name: imperium
+  name: diplomat
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 2.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -311,6 +311,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: webmock
+  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'
 - !ruby/object:Gem::Dependency
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
@@ -325,7 +339,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
-description: 
+description:
 email:
 - brianp@instructure.com
 executables:
@@ -441,7 +455,7 @@ files:
 homepage: https://github.com/instructure/inst-jobs
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -456,8 +470,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Instructure-maintained fork of delayed_job
 test_files: