consul_watcher 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10385ebf26cabbcdba284431f87c9220f38a25821abcf3376e0031bfc709c43e
-  data.tar.gz: 27222ff9322f8a02c854f7b6c3690ea2962701a6bd0e47b7ed1541aacec34868
+  metadata.gz: 229edb91677150898553354f076ef07e1789d2adfe3b1a648a48d61778d474a2
+  data.tar.gz: 665d041e916790682cb375795302f448c55dcf74b5e411a851b2d7e5e3962fb3
 SHA512:
-  metadata.gz: 0f42d44e314a742465176b6633c73c804b0a099f2cd37d9862c2ad38d19f068376de808162cf0b7a6012acff9b2b0a56f5bcdd22d13b3ba9b527f7537f5e2707
-  data.tar.gz: 99b25756b89c30013daeef453756331eaaa87b61d57660c62c55926bd96af1d35b5b88745fafd59ef67532a7702f7c195e8b343ea77e52430019fa9c051c27c2
+  metadata.gz: e82d5923dab083db57f3d7c1a71641e8420ac0f52cd166d6acb06fc33b7149e3780c88b291996ff61f6e02982720800e36d7f4cbf7133826d1577ce5a3f05c03
+  data.tar.gz: 5ff07f4b9ff6b5d5644db74acb4d9b72b864bf38db98a1e1130cc4e3faa992eb8323569a7b6a64df1aa494de40e2dea92a777017c801abe0a0a5f7272f691fbc

data/Rakefile

@@ -37,7 +37,7 @@ task up: [:start_deps] do
 end
 
 task :consume do
-  ConsulWatcher::RakeHelper.config_rabbitmq
+  ConsulWatcher::RakeHelper.config_amqp
   puts 'Starting queue consumer'
   ConsulWatcher::RakeHelper.consumer_start
 end

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/docker-entrypoint.sh

@@ -8,6 +8,8 @@ echo "CLI_ARGS: \"${@}\""
 echo "WATCH_ARGS: \"${WATCH_ARGS}\""
 echo "WATCH_SCRIPT: \"${WATCH_SCRIPT}\""
 echo "CONSUL_HTTP_ADDR: \"${CONSUL_HTTP_ADDR}\""
+export CONSUL_DC="$(curl ${CONSUL_HTTP_ADDR}/v1/agent/self | jq -r '.Config.Datacenter')"
+echo "CONSUL_DC: \"${CONSUL_DC}\""
 echo "RUN_ONCE: \"${RUN_ONCE}\""
 if [[ ${#} != 0 ]]; then
   exec $@

data/lib/consul_watcher.rb

@@ -9,12 +9,13 @@ require 'consul_watcher/filters'
 # Top Level module to run watch logic
 module ConsulWatcher
   def self.watch(config)
+    dc = ENV['CONSUL_DC']
     logger = Logger.new(STDOUT)
     logger.level = Logger::INFO
     assemble(config)
     current_watch_json = $stdin.read
     previous_watch_json = @storage.fetch
-    changes = @watch_type.get_changes(previous_watch_json, current_watch_json)
+    changes = @watch_type.get_changes(previous_watch_json, current_watch_json, dc)
     changes.each do |change|
       @destination.send(change)
     end

data/lib/consul_watcher/destination/amqp.rb

@@ -12,32 +12,32 @@ module ConsulWatcher
 
       def initialize(destination_config)
         initialize_variables(destination_config)
-        setup_rabbitmq
+        setup_amqp
       end
 
-      def setup_rabbitmq
-        @conn = Bunny.new(rabbitmq_opts)
+      def setup_amqp
+        @conn = Bunny.new(amqp_opts)
         @conn.start
         @ch = @conn.create_channel
         @ex = Bunny::Exchange.new(@ch,
                                   :topic,
-                                  @rabbitmq_exchange,
+                                  @amqp_exchange,
                                   durable: true)
       end
 
-      def rabbitmq_opts
+      def amqp_opts
         opts = {}
-        opts[:vhost] = @rabbitmq_vhost
-        opts[:username] = @rabbitmq_username
-        opts[:password] = @rabbitmq_password
-        if @rabbitmq_addresses
-          opts[:addresses] = @rabbitmq_addresses
-        elsif @rabbitmq_hosts
-          opts[:hosts] = @rabbitmq_hosts
-          opts[:port] = @rabbitmq_port if @rabbitmq_port
-        elsif @rabbitmq_host
-          opts[:host] = @rabbitmq_host
-          opts[:port] = @rabbitmq_port if @rabbitmq_port
+        opts[:vhost] = @amqp_vhost
+        opts[:username] = @amqp_username
+        opts[:password] = @amqp_password
+        if @amqp_addresses
+          opts[:addresses] = @amqp_addresses
+        elsif @amqp_hosts
+          opts[:hosts] = @amqp_hosts
+          opts[:port] = @amqp_port if @amqp_port
+        elsif @amqp_host
+          opts[:host] = @amqp_host
+          opts[:port] = @amqp_port if @amqp_port
         end
         opts
       end
@@ -60,14 +60,14 @@ module ConsulWatcher
         logger.level = Logger::DEBUG
         {
           logger: logger,
-          rabbitmq_host: nil,
-          rabbitmq_hosts: nil,
-          rabbitmq_addresses: nil,
-          rabbitmq_port: '5672',
-          rabbitmq_vhost: '/',
-          rabbitmq_username: 'guest',
-          rabbitmq_password: 'guest',
-          rabbitmq_exchange: 'amq.topic'
+          amqp_host: nil,
+          amqp_hosts: nil,
+          amqp_addresses: nil,
+          amqp_port: '5672',
+          amqp_vhost: '/',
+          amqp_username: 'guest',
+          amqp_password: 'guest',
+          amqp_exchange: 'amq.topic'
         }
       end
     end

data/lib/consul_watcher/watch_type/key.rb

@@ -2,6 +2,7 @@
 
 require 'base64'
 require 'flazm_ruby_helpers/class'
+require 'diplomat'
 
 module ConsulWatcher
   module WatchType
@@ -13,11 +14,11 @@ module ConsulWatcher
         initialize_variables(watch_config)
       end
 
-      def get_changes(previous_watch_json, current_watch_json)
+      def get_changes(previous_watch_json, current_watch_json, dc)
         json_diff = get_diff(previous_watch_json, current_watch_json)
 
         changes = json_diff.each.collect do |change|
-          formatted_change = format_change('key', change)
+          formatted_change = format_change('key', change, dc)
           decode(formatted_change) if @decode_values
           formatted_change
         end.compact
@@ -52,10 +53,11 @@ module ConsulWatcher
         end.reduce({}, :merge)
       end
 
-      def format_change(watch_type, change)
+      def format_change(watch_type, change, dc)
         old_value, new_value = change_values(change)
         {
           'id' => "consul_watcher.key.#{change[1][0].tr('/', '.')}",
+          'consul_dc' => dc,
           'watch_type' => watch_type,
           'key_path' =>  change[1][0],
           'key_property' => change[1][1],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul_watcher
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ryan Fortman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2019-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler