legion-transport 1.1.9 → 1.2.0

data/NOTICE.txt

@@ -0,0 +1,9 @@
+Legion::Transport(legion-transport)
+Copyright 2021 Optum
+
+Project Description:
+====================
+Connects the LegionIO framework to the transport tier(RabbitMQ)
+
+Author(s):
+Esity

data/README.md

@@ -1,3 +1,91 @@
-# Legion::Transport
+Legion::Transport
+=====
 
-Used to connect Legion to RabbitMQ and is a core component of Legion.
+Legion::Transport is the gem responsible for connecting LegionIO to the FIFO queue system(RabbitMQ over AMQP 0.9.1)
+
+Supported Ruby versions and implementations
+------------------------------------------------
+
+Legion::Transport should work identically on:
+
+* JRuby 9.2+
+* Ruby 2.4+
+
+
+Installation and Usage
+------------------------
+
+You can verify your installation using this piece of code:
+
+```bash
+gem install legion-transport
+```
+
+```ruby
+require 'legion/transport'
+conn = Legion::Transport::Connection
+conn.setup
+conn.channel # => ::Bunny::Channel
+conn.session # => ::Bunny::Session
+```
+
+Settings
+----------
+
+```json
+{
+  "type": "rabbitmq",
+  "connected": false,
+  "logger_level": "info",
+  "messages": {
+    "encrypt": false,
+    "ttl": null,
+    "priority": 0,
+    "persistent": true
+  },
+  "prefetch": 2,
+  "exchanges": {
+    "type": "topic",
+    "arguments": {},
+    "auto_delete": false,
+    "durable": true,
+    "internal": false
+  },
+  "queues": {
+    "manual_ack": true,
+    "durable": true,
+    "exclusive": false,
+    "block": false,
+    "auto_delete": false,
+    "arguments": {
+      "x-max-priority": 255,
+      "x-overflow": "reject-publish"
+    }
+  },
+  "connection": {
+    "read_timeout": 1,
+    "heartbeat": 30,
+    "automatically_recover": true,
+    "continuation_timeout": 4000,
+    "network_recovery_interval": 1,
+    "connection_timeout": 1,
+    "frame_max": 65536,
+    "user": "guest",
+    "password": "guest",
+    "host": "127.0.0.1",
+    "port": "5672",
+    "vhost": "/",
+    "recovery_attempts": 100,
+    "logger_level": "info",
+    "connected": false
+  },
+  "channel": {
+    "default_worker_pool_size": 1,
+    "session_worker_pool_size": 8
+  }
+}
+```
+Authors
+----------
+
+* [Matthew Iverson](https://github.com/Esity) - current maintainer

data/SECURITY.md

@@ -0,0 +1,9 @@
+# Security Policy
+
+## Supported Versions
+| Version | Supported          |
+| ------- | ------------------ |
+| 1.x.x   | :white_check_mark: |
+
+## Reporting a Vulnerability
+To be added

data/attribution.txt

@@ -0,0 +1 @@
+Add attributions here.

data/legion-transport.gemspec

@@ -1,40 +1,33 @@
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'legion/transport/version'
+# frozen_string_literal: true
+
+require_relative 'lib/legion/transport/version'
 
 Gem::Specification.new do |spec|
   spec.name = 'legion-transport'
   spec.version       = Legion::Transport::VERSION
   spec.authors       = ['Esity']
-  spec.email         = ['matthewdiverson@gmail.com']
-
-  spec.summary       = 'Used by Legion to connect with RabbitMQ'
-  spec.description   = 'The Legion transport gem'
-  spec.homepage      = 'https://bitbucket.org/legion-io/legion-transport'
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.email         = %w[matthewdiverson@gmail.com ruby@optum.com]
 
+  spec.summary       = 'Manages the connection to the transport tier(RabbitMQ)'
+  spec.description   = 'The Gem to connect LegionIO and it\'s extensions to the transport tier'
+  spec.homepage      = 'https://github.com/Optum/legion-transport'
+  spec.license       = 'Apache-2.0'
+  spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.5'
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.test_files        = spec.files.select { |p| p =~ %r{^test/.*_test.rb} }
+  spec.extra_rdoc_files  = %w[README.md LICENSE CHANGELOG.md]
   spec.metadata = {
-    'bug_tracker_uri' => 'https://legionio.atlassian.net/projects/TRANSPORT/issues',
-    'changelog_uri' => 'https://bitbucket.org/legion-io/legion-transport/src/master/CHANGELOG.md',
-    'homepage_uri' => 'https://bitbucket.org/legion-io/legion-transport',
-    'wiki_uri' => 'https://bitbucket.org/legion-io/legion-transport/wiki/Home'
+    'bug_tracker_uri' => 'https://github.com/Optum/legion-transport/issues',
+    'changelog_uri' => 'https://github.com/Optum/legion-transport/src/main/CHANGELOG.md',
+    'documentation_uri' => 'https://github.com/Optum/legion-transport',
+    'homepage_uri' => 'https://github.com/Optum/LegionIO',
+    'source_code_uri' => 'https://github.com/Optum/legion-transport',
+    'wiki_uri' => 'https://github.com/Optum/legion-transport/wiki'
   }
 
-  spec.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'legion-logging'
-  spec.add_development_dependency 'legion-settings'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rspec_junit_formatter'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'simplecov_json_formatter'
-
   spec.add_dependency 'bunny', '>= 2.17.0'
   spec.add_dependency 'concurrent-ruby', '>= 1.1.7'
   spec.add_dependency 'legion-json'
+  spec.add_dependency 'legion-settings'
 end

data/lib/legion/transport.rb

@@ -1,5 +1,6 @@
-require_relative 'transport/version'
-require_relative 'transport/settings'
+require 'legion/transport/version'
+require 'legion/settings'
+require 'legion/transport/settings'
 
 module Legion
   module Transport
@@ -12,6 +13,28 @@ module Legion
       TYPE = 'bunny'.freeze
       CONNECTOR = ::Bunny
     end
+
+    class << self
+      def logger
+        @logger unless @logger.nil?
+
+        if ::Legion.const_defined?('Logging')
+          @logger = ::Legion::Logging
+        else
+          require 'logger'
+          @logger = ::Logger.new($stdout)
+          @logger.level = Logger::ERROR
+        end
+
+        @logger
+      end
+
+      def settings
+        Legion::Settings[:transport] if Legion.const_defined? 'Settings'
+
+        Legion::Transport::Settings.default
+      end
+    end
   end
 
   require_relative 'transport/common'

data/lib/legion/transport/common.rb

@@ -52,14 +52,14 @@ module Legion
       end
 
       def close!
-        Legion::Logging.error 'close! called'
+        Legion::Transport.logger.error 'close! called'
         false unless Legion::Transport::Connection.channel_open?
         Legion::Transport::Connection.channel.close
       end
 
       def close
-        Legion::Logging.error 'close called'
-        Legion::Logging.warn 'close called, but method is called close!'
+        Legion::Transport.logger.error 'close called'
+        Legion::Transport.logger.warn 'close called, but method is called close!'
         close!
       end
 

data/lib/legion/transport/connection.rb

@@ -23,7 +23,7 @@ module Legion
         end
 
         def setup(connection_name: 'Legion', **) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-          Legion::Logging.info("Using transport connector: #{Legion::Transport::CONNECTOR}")
+          Legion::Transport.logger.info("Using transport connector: #{Legion::Transport::CONNECTOR}")
 
           if @session.respond_to?(:value) && session.respond_to?(:closed?) && session.closed?
             @channel_thread = Concurrent::ThreadLocalVar.new(nil)
@@ -46,7 +46,7 @@ module Legion
               connector.new(
                 Legion::Settings[:transport][:connection],
                 connection_name: connection_name,
-                logger: Legion::Logging::Logger.new(level: 'warn'),
+                logger: Legion::Transport.logger,
                 log_level: :info
               )
             )
@@ -58,15 +58,19 @@ module Legion
           end
 
           if session.respond_to? :on_blocked
-            session.on_blocked { Legion::Logging.warn('Legion::Transport is being blocked by RabbitMQ!') }
+            session.on_blocked { Legion::Transport.logger.warn('Legion::Transport is being blocked by RabbitMQ!') }
           end
 
           if session.respond_to? :on_unblocked
-            session.on_unblocked { Legion::Logging.info('Legion::Transport is no longer being blocked by RabbitMQ') }
+            session.on_unblocked do
+              Legion::Transport.logger.info('Legion::Transport is no longer being blocked by RabbitMQ')
+            end
           end
 
           if session.respond_to? :after_recovery_completed
-            session.after_recovery_completed { Legion::Logging.info('Legion::Transport has completed recovery') }
+            session.after_recovery_completed do
+              Legion::Transport.logger.info('Legion::Transport has completed recovery')
+            end
           end
 
           true

data/lib/legion/transport/connection/ssl.rb

@@ -0,0 +1,35 @@
+module Legion
+  module Transport
+    module Connection
+      module SSL
+        def settings
+          Legion::Settings[:transport][:tls] || {}
+        end
+
+        def use_vault_pki?
+          settings[:use_vault_pki] && Legion::Settings[:crypt][:vault][:connected]
+        end
+
+        def use_tls?
+          settings[:use_tls] || Legion::Settings[:transport][:port] == 5671
+        end
+
+        def tls_cert
+          settings[:tls_cert]
+        end
+
+        def tls_key
+          settings[:tls_key]
+        end
+
+        def ca_certs
+          settings[:ca_certs]
+        end
+
+        def verify_peer?
+          settings[:verify_peer] || false
+        end
+      end
+    end
+  end
+end

data/lib/legion/transport/connection/vault.rb

@@ -0,0 +1,9 @@
+module Legion
+  module Transport
+    module Connection
+      module Vault
+        # vault write pki/issue/example-dot-com common_name=www.my-website.com
+      end
+    end
+  end
+end

data/lib/legion/transport/exchange.rb

@@ -22,7 +22,7 @@ module Legion
       end
 
       def delete_exchange(exchange)
-        Legion::Logging.warn "Exchange:#{exchange} exists with wrong parameters, deleting and creating"
+        Legion::Transport.logger.warn "Exchange:#{exchange} exists with wrong parameters, deleting and creating"
         channel.exchange_delete(exchange)
       end
 
@@ -31,9 +31,14 @@ module Legion
         hash[:durable] = true
         hash[:auto_delete] = false
         hash[:arguments] = {}
+        hash[:passive] = passive?
         hash
       end
 
+      def passive?
+        false
+      end
+
       def exchange_name
         self.class.ancestors.first.to_s.split('::')[2].downcase
       end
@@ -54,7 +59,10 @@ module Legion
       end
 
       def channel
-        Legion::Transport::Connection.channel
+        @channel ||= Legion::Transport::Connection.channel
+      rescue ChannelLevelException => e
+        @channel = Legion::Transport::Connection.channel
+        raise e unless @channel.open?
       end
     end
   end

data/lib/legion/transport/exchanges/crypt.rb

@@ -1,7 +1,7 @@
 module Legion
   module Transport
     module Exchanges
-      class Lex < Legion::Transport::Exchange
+      class Crypt < Legion::Transport::Exchange
         def exchange_name
           'crypt'
         end

data/lib/legion/transport/exchanges/extensions.rb

@@ -0,0 +1,11 @@
+module Legion
+  module Transport
+    module Exchanges
+      class Extensions < Legion::Transport::Exchange
+        def exchange_name
+          'extensions'
+        end
+      end
+    end
+  end
+end

data/lib/legion/transport/exchanges/lex.rb

@@ -1,10 +1,7 @@
 module Legion
   module Transport
     module Exchanges
-      class Lex < Legion::Transport::Exchange
-        def exchange_name
-          'lex'
-        end
+      class Lex < Legion::Transport::Exchanges::Extensions
       end
     end
   end

data/lib/legion/transport/message.rb

@@ -19,7 +19,38 @@ module Legion
                               type: options[:type] || type,
                               priority: options[:priority] || priority,
                               expiration: options[:expiration] || expiration,
-                              headers: headers)
+                              headers: headers,
+                              persistent: persistent,
+                              message_id: message_id,
+                              timestamp: timestamp)
+      end
+
+      def app_id
+        @options[:app_id] if @options.key? :app_id
+
+        'legion'
+      end
+
+      def message_id
+        @options[:message_id] || @options[:task_id]
+      end
+
+      # user_id Sender's identifier. https://www.rabbitmq.com/extensions.html#validated-user-id
+      def user_id
+        @options[:user_id] || Legion::Transport.settings[:connection][:user]
+      end
+
+      def reply_to
+        @options[:reply_to]
+      end
+
+      # ID of the message that this message is a reply to
+      def correlation_id
+        nil
+      end
+
+      def persistent
+        @options[:persistent] || Legion::Transport.settings[:messages][:persistent]
       end
 
       def expiration
@@ -27,6 +58,8 @@ module Legion
           @options[:expiration]
         elsif @options.key? :ttl
           @options[:ttl]
+        elsif Legion::Transport.settings[:messages].key? :expiration
+          Legion::Transport.settings[:messages][:expiration]
         end
       end
 
@@ -80,8 +113,8 @@ module Legion
         end
         @options[:headers]
       rescue StandardError => e
-        Legion::Logging.error e.message
-        Legion::Logging.error e.backtrace
+        Legion::Transport.logger.error e.message
+        Legion::Transport.logger.error e.backtrace
       end
 
       def priority
@@ -101,7 +134,7 @@ module Legion
       end
 
       def timestamp
-        now.to_i
+        Time.now.to_i
       end
 
       def validate