constancy 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3e4e575fc5f80a0782fe1b893049209d976179f6d372f32511211d29f04c0fa
-  data.tar.gz: d516a0d7c2311358205415a811eea26212fba7e7ebc1f6c0e3f2f0ff9df8b193
+  metadata.gz: 95dfa86b6395376d98383dccb8aaf492a34bea246f8fda4b084144f3bc95e297
+  data.tar.gz: 233a2fcf66cdce878d38cb25f49404c30381c6fe6d9c202e704978fa743303fb
 SHA512:
-  metadata.gz: ba9ee9f9c89fcfe995ce3383d273fa08788284e1d064b4a00f994fdf6f8bfdbdefcbb1589f0af7be278e243d9c1e1457a8b03089b139040b9e3a1725da5cf28a
-  data.tar.gz: 32ba1fd6a825ba89989ca6128ad1a4fbbaa18f7a5603524de59f2c424bc1aac4d09ed6684a06af306bef8bb493727e4b6d7880de29e66d0f611b511124cde64d
+  metadata.gz: '09a3aa2bab4129d27abf9bc6f404fbeed92ef754a1a11876422cbbe8bbbc2127eec94c73d1feb4103ae082a56a5c498daccb5e604f31525f70dc0ef7796e76a8'
+  data.tar.gz: d884c7212d308784b756a3f2900a6658cfc7c766584b7c7f236191f89649e997e0c2d46c2f370e3f8cd6be76f5ff537b32c5ac03019be20697dbd93af1116206

data/lib/constancy.rb

@@ -16,8 +16,8 @@ class Constancy
       @@config ||= Constancy::Config.new
     end
 
-    def configure(path: nil, targets: nil)
-      @@config = Constancy::Config.new(path: path, targets: targets)
+    def configure(path: nil, targets: nil, call_external_apis: true)
+      @@config = Constancy::Config.new(path: path, targets: targets, call_external_apis: call_external_apis)
     end
 
     def configured?

data/lib/constancy/cli.rb

@@ -64,11 +64,11 @@ USAGE
         exit 1
       end
 
-      def configure
+      def configure(call_external_apis: true)
         return if Constancy.configured?
 
         begin
-          Constancy.configure(path: self.config_file, targets: self.targets)
+          Constancy.configure(path: self.config_file, targets: self.targets, call_external_apis: call_external_apis)
 
         rescue Constancy::ConfigFileNotFound
           if self.config_file.nil?

data/lib/constancy/cli/config_command.rb

@@ -5,11 +5,22 @@ class Constancy
     class ConfigCommand
       class << self
         def run
-          Constancy::CLI.configure
+          Constancy::CLI.configure(call_external_apis: false)
 
-          puts "Config file: #{Constancy.config.config_file}"
-          puts " Consul URL: #{Constancy.config.consul.url}"
-          puts "    Verbose: #{Constancy.config.verbose?.to_s.bold}"
+          puts " Config file: #{Constancy.config.config_file}"
+          puts "  Consul URL: #{Constancy.config.consul.url}"
+          puts "     Verbose: #{Constancy.config.verbose?.to_s.bold}"
+          if Constancy.config.consul_token_source == "env"
+            puts
+            puts "Token Source: CONSUL_TOKEN or CONSUL_HTTP_TOKEN environment variable"
+
+          elsif Constancy.config.consul_token_source == "vault"
+            puts
+            puts "Token Source: Vault"
+            puts "   Vault URL: #{Constancy.config.vault_config.url}"
+            puts "  Token Path: #{Constancy.config.vault_config.consul_token_path}"
+            puts " Token Field: #{Constancy.config.vault_config.consul_token_field}"
+          end
           puts
           puts "Sync target defaults:"
           puts "  Chomp trailing newlines from local files: #{Constancy.config.chomp?.to_s.bold}"

data/lib/constancy/config.rb

@@ -1,5 +1,7 @@
 # This software is public domain. No rights are reserved. See LICENSE for more information.
 
+require 'ostruct'
+
 class Constancy
   class ConfigFileNotFound < RuntimeError; end
   class ConfigFileInvalid < RuntimeError; end
@@ -16,7 +18,7 @@ class Constancy
     DEFAULT_CONSUL_TOKEN_SOURCE = "none"
     DEFAULT_VAULT_CONSUL_TOKEN_FIELD = "token"
 
-    attr_accessor :config_file, :base_dir, :consul, :sync_targets, :target_whitelist
+    attr_accessor :config_file, :base_dir, :consul, :consul_token_source, :sync_targets, :target_whitelist, :call_external_apis, :vault_config
 
     class << self
       # discover the nearest config file
@@ -34,7 +36,7 @@ class Constancy
       end
     end
 
-    def initialize(path: nil, targets: nil)
+    def initialize(path: nil, targets: nil, call_external_apis: true)
       if path.nil? or File.directory?(path)
         self.config_file = Constancy::Config.discover(dir: path)
       elsif File.exist?(path)
@@ -50,6 +52,7 @@ class Constancy
       self.config_file = File.expand_path(self.config_file)
       self.base_dir = File.dirname(self.config_file)
       self.target_whitelist = targets
+      self.call_external_apis = call_external_apis
       parse!
     end
 
@@ -106,7 +109,8 @@ class Constancy
       # start with a token from the environment, regardless of the token_source setting
       consul_token = ENV['CONSUL_HTTP_TOKEN'] || ENV['CONSUL_TOKEN']
 
-      case raw['consul']['token_source'] || Constancy::Config::DEFAULT_CONSUL_TOKEN_SOURCE
+      self.consul_token_source = raw['consul']['token_source'] || Constancy::Config::DEFAULT_CONSUL_TOKEN_SOURCE
+      case self.consul_token_source
       when "none"
         # nothing to do
 
@@ -150,29 +154,38 @@ class Constancy
 
         vault_field = raw['vault']['consul_token_field'] || Constancy::Config::DEFAULT_VAULT_CONSUL_TOKEN_FIELD
 
-        ENV['VAULT_ADDR'] = vault_addr
-        ENV['VAULT_TOKEN'] = vault_token
-
-        begin
-          response = Vault.logical.read(vault_path)
-          consul_token = response.data[vault_field.to_sym]
-
-          if response.lease_id
-            at_exit {
-              begin
-                Vault.sys.revoke(response.lease_id)
-              rescue => e
-                # this is fine
-              end
-            }
+        self.vault_config = OpenStruct.new(
+          url: vault_addr,
+          consul_token_path: vault_path,
+          consul_token_field: vault_field,
+        )
+
+        # don't waste time talking to Vault if this is just a config parsing run
+        if self.call_external_apis
+          ENV['VAULT_ADDR'] = vault_addr
+          ENV['VAULT_TOKEN'] = vault_token
+
+          begin
+            response = Vault.logical.read(vault_path)
+            consul_token = response.data[vault_field.to_sym]
+
+            if response.lease_id
+              at_exit {
+                begin
+                  Vault.sys.revoke(response.lease_id)
+                rescue => e
+                  # this is fine
+                end
+              }
+            end
+
+          rescue => e
+            raise Constancy::VaultConfigInvalid.new("Are you logged in to Vault?\n\n#{e}")
           end
 
-        rescue => e
-          raise Constancy::VaultConfigInvalid.new("Are you logged in to Vault?\n\n#{e}")
-        end
-
-        if consul_token.nil? or consul_token == ""
-          raise Constancy::VaultConfigInvalid.new("Could not acquire a Consul token from Vault")
+          if consul_token.nil? or consul_token == ""
+            raise Constancy::VaultConfigInvalid.new("Could not acquire a Consul token from Vault")
+          end
         end
 
       else

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.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: constancy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - David Adams