constancy 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65a3785bc8276043c12dd3a82fc0da2f23db508f8ccb9de6e074ef3fb34a0c01
-  data.tar.gz: 6f83ec7f19dfe57f28ae56b9179c3c34b9b5419c1bfc8c3f7f4338d08564675b
+  metadata.gz: d3e4e575fc5f80a0782fe1b893049209d976179f6d372f32511211d29f04c0fa
+  data.tar.gz: d516a0d7c2311358205415a811eea26212fba7e7ebc1f6c0e3f2f0ff9df8b193
 SHA512:
-  metadata.gz: 6b4a9af5164674a87cc132d026fd7b7a1205f30ed94d255e37fa43d0ac46922235ab665836c7158f862441106947e3792bcd5d2338ca76f8ceb3cf4c22738c7b
-  data.tar.gz: 3b589b72c830dd07283e5fc5a19c5feb9f7404e4d3f949fa20915a44e9bf91a7fb03b9409e9d66805bb7343dbcdf9d33542bdb69373bc55020f5c82ee26900de
+  metadata.gz: ba9ee9f9c89fcfe995ce3383d273fa08788284e1d064b4a00f994fdf6f8bfdbdefcbb1589f0af7be278e243d9c1e1457a8b03089b139040b9e3a1725da5cf28a
+  data.tar.gz: 32ba1fd6a825ba89989ca6128ad1a4fbbaa18f7a5603524de59f2c424bc1aac4d09ed6684a06af306bef8bb493727e4b6d7880de29e66d0f611b511124cde64d

data/README.md

@@ -123,17 +123,17 @@ required. An example `constancy.yml` is below including explanatory comments:
       #   The REST API endpoint of your Vault server
       url: https://your.vault.example
 
-      # path - the path to the endpoint from which to read the Consul token
+      # consul_token_path - the path to the endpoint from which to read the Consul token
       #   The Vault URI path to the Consul token - can be either the Consul
       #   dynamic backend or a KV endpoint with a static value. If the dynamic
       #   backend is used, the lease will be automatically revoked when
       #   constancy exits.
-      path: consul/creds/my-role
+      consul_token_path: consul/creds/my-role
 
-      # field - name of the field in which the Consul token is stored
+      # consul_token_field - name of the field in which the Consul token is stored
       #   Defaults to 'token' which is the field used by the dynamic backend
       #   but can be set to something else for static values.
-      field: token
+      consul_token_field: token
 
     sync:
       # sync is an array of hashes of sync target configurations

data/lib/constancy/config.rb

@@ -10,11 +10,11 @@ class Constancy
     CONFIG_FILENAMES = %w( constancy.yml )
     VALID_CONFIG_KEYS = %w( sync consul vault constancy )
     VALID_CONSUL_CONFIG_KEYS = %w( url datacenter token_source )
-    VALID_VAULT_CONFIG_KEYS = %w( url path field )
+    VALID_VAULT_CONFIG_KEYS = %w( url consul_token_path consul_token_field )
     VALID_CONSTANCY_CONFIG_KEYS = %w( verbose chomp delete color )
     DEFAULT_CONSUL_URL = "http://localhost:8500"
     DEFAULT_CONSUL_TOKEN_SOURCE = "none"
-    DEFAULT_VAULT_FIELD = "token"
+    DEFAULT_VAULT_CONSUL_TOKEN_FIELD = "token"
 
     attr_accessor :config_file, :base_dir, :consul, :sync_targets, :target_whitelist
 
@@ -127,9 +127,9 @@ class Constancy
           raise Constancy::ConfigFileInvalid.new("Only the following keys are valid in the vault config: #{Constancy::Config::VALID_VAULT_CONFIG_KEYS.join(", ")}")
         end
 
-        vault_path = raw['vault']['path']
+        vault_path = raw['vault']['consul_token_path']
         if vault_path.nil? or vault_path == ""
-          raise Constancy::ConfigFileInvalid.new("vault.path must be specified to use vault as a token source")
+          raise Constancy::ConfigFileInvalid.new("vault.consul_token_path must be specified to use vault as a token source")
         end
 
         # prioritize the config file over environment variables for vault address
@@ -148,7 +148,7 @@ class Constancy
           end
         end
 
-        vault_field = raw['vault']['field'] || Constancy::Config::DEFAULT_VAULT_FIELD
+        vault_field = raw['vault']['consul_token_field'] || Constancy::Config::DEFAULT_VAULT_CONSUL_TOKEN_FIELD
 
         ENV['VAULT_ADDR'] = vault_addr
         ENV['VAULT_TOKEN'] = vault_token

data/lib/constancy/version.rb

@@ -1,5 +1,5 @@
 # This software is public domain. No rights are reserved. See LICENSE for more information.
 
 class Constancy
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constancy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - David Adams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-24 00:00:00.000000000 Z
+date: 2018-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: imperium