consult 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b95340130b792146eeee73303c8a617ef7ce1a9d4748a124e3d8b46658280a5
-  data.tar.gz: 9103d4414a1d933a82a49f917143fb3d6d2d2f0ecd6b11f79089f0d0477c6a75
+  metadata.gz: 46ea3e316eba29453ae4fd2b33bf73e38112b21a14cc4f87c2ce906c0d139309
+  data.tar.gz: 96ba993d95a8ef6ab6f315856a943b11fada8eacb2bddf618fb372f15a08643a
 SHA512:
-  metadata.gz: 9047b28026836b804685e285839d58e29bd3b4cfc53ba9e29d207e27d26afe217a15d21d8b74557a17503fe958287e2b35cb3171cfa02382a93ae8846bbe761e
-  data.tar.gz: fbeacae84e7a885817ad3bc9e058ed6c83d1d27e0825466bd0dc334690a8beca29a9bc7a38e85f2136933102e3b425ff5aa70000abcd347adfb9732dfe221d0c
+  metadata.gz: f47bc8fccf91f7efcd5ae3b9042e1c22d93a8c5a2f375a934ea5aaddae7eb0b8ecb7c63384367abf5428453f5bad98a2513b7b75ebf421ac15ba3a9c353ed05a
+  data.tar.gz: 8500c4dd097cfbc4c82cd3f9054c006214a4d51cf0ca0e79ae77655c2392581f341c031dfbdb66d1804d418148489411f164c46a7c58f0e055c2d70d18f22993

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+#### 0.8.2
+
+* Use `X-Consul-Token` header for Consul authentication. See the [Consul docs](https://www.consul.io/api/index.html#authentication) for details. ([#19](https://github.com/veracross/consult/pull/19))
+
 #### 0.8.1
 
 * Obey template location order as specified in consult's config

data/docker-compose.yml

@@ -1,11 +1,11 @@
 version: '3'
 services:
   consul:
-    image: consul:1.2.3
+    image: consul:1.3.0
     ports:
       - "8500:8500"
   vault:
-    image: vault:0.11.1
+    image: vault:0.11.3
     environment:
       - VAULT_DEV_ROOT_TOKEN_ID=94e1a9ed-5d72-5677-27ab-ebc485cca368
     cap_add:

data/lib/consult.rb

@@ -40,7 +40,9 @@ module Consult
       # Additionally: prefer env vars over explicit config
       configured_address = @config[:consul].delete(:address)
       @config[:consul][:url] = ENV['CONSUL_HTTP_ADDR'] || configured_address || @config[:consul][:url]
-      @config[:consul][:acl_token] = consul_token
+      # If a consul token exists, treat it as special
+      # See https://github.com/WeAreFarmGeek/diplomat/pull/160
+      (@config[:consul][:options] ||= {}).merge!(headers: {'X-Consul-Token' => consul_token}) if consul_token.present?
 
       Diplomat.configure do |c|
         @config[:consul].each do |opt, val|
@@ -82,7 +84,7 @@ module Consult
     def consul_token
       ENV['CONSUL_HTTP_TOKEN'] ||
         @config[:consul].delete(:token) ||
-        @config[:consul][:acl_token] ||
+        @config[:consul].delete(:acl_token) ||
         (CONSUL_DISK_TOKEN.exist? ? CONSUL_DISK_TOKEN.read.chomp : nil)
     end
   end

data/lib/consult/version.rb

@@ -1,3 +1,3 @@
 module Consult
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consult
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Jeff Fraser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport