consult 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d0e9e0e2f63b060fe1fae95c3a95c93d7cf89654dcf18c5cd7c7928a346db2b
-  data.tar.gz: 6c5316a1093c3806deb091aa74f38a1f65101f8fcc1d4525f4f60a50731737f9
+  metadata.gz: 371b66af8be47b598b8ee428856c17d35864b5ba93b3bff8ad0852c4d403d2fe
+  data.tar.gz: ce70cfa1f22a21d6255ae2fd1a867b2950765ca5c3b8b3c4f8090aab8f0c28d1
 SHA512:
-  metadata.gz: fc4a191a7b1b362b9655cecbfcb83b63354f10659d4a84d899bb271ce0013b82f2c1a9e08f008cbade94ac4132e47438bd3dd3f3fd7ce40cad4c5d54a26d4702
-  data.tar.gz: 05c1543f7f774dae4c7fdeb25e2dbc51f732ea63d09b276e663b29aca2f40b88df80a6e6c83fb4a10b51e2e91217f5c3c0e52ef0d8b9630669f032aa386fade2
+  metadata.gz: f72c7410f792f22c1bdc4d095b9f2fb122943625f2be6876461f692acd378fbd4bce6ce14797fe387d59d8ffaaf827612b3a7fb908d880a07b2933dddf294d03
+  data.tar.gz: f19a08e8ec11f404c82c6344885c36cc9346d04fbdaa7de8fdb9ddb3fe7059d1cc4c7d4c472a2a2ad41a642a87e338b5aa49a4eff36b0a19cd795dc29b48ee9f

data/.gitignore

@@ -5,7 +5,7 @@
 /doc/
 /pkg/
 /spec/reports/
-/spec/support/rendered/*.yml
+/spec/support/rendered/*
 /tmp/
 
 # rspec failure tracking

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+#### 0.8.0
+
+* Add support for multiple sources for a single template ([#14](https://github.com/veracross/consult/pull/14))
+* Add support for Consul-sourced templates ([#15](https://github.com/veracross/consult/pull/15))
+* Don't crash on rendering errors ([#16](https://github.com/veracross/consult/pull/16))
+
 #### 0.7.3
 
 * Add `key` function to templates to pull kv data from Consul

data/README.md

@@ -88,14 +88,20 @@ test:
       dest: config/secrets.yml
 
 production:
-  # example: override vault token in production
-  vault:
-    token: 1397af7aede2-8923-412d-3eb9-8fcd5aed
   templates:
-    # excluded from non-production environments
-    should_be_excluded:
-      path: config/templates/fake.yml
-      dest: config/fake.yml
+    # You can concatenate multiple files together
+    my_config:
+      paths:
+        - config/templates/one.yml
+        - config/templates/two.yml
+      dest: config/my_config.yml
+
+    # Templates can come from Consul
+    your_config:
+      consul_keys:
+        - some/consul/key
+        - another/consul/key
+      dest: config/your_config.txt
 ```
 
 ### Templates

data/docker-compose.yml

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

data/lib/consult.rb

@@ -19,7 +19,6 @@ module Consult
 
   class << self
     attr_reader :config, :templates
-
     def load(config_dir: nil)
       root directory: config_dir
       yaml = root.join('config', 'consult.yml')

data/lib/consult/template.rb

@@ -15,18 +15,28 @@ module Consult
     end
 
     def render(save: true)
-      renderer = ERB.new(File.read(path, encoding: 'utf-8'), nil, '-')
+      # Attempt to render
+      renderer = ERB.new(contents, nil, '-')
       result = renderer.result(binding)
 
       File.open(dest, 'w') { |f| f << result } if save
       result
     rescue StandardError => e
-      puts "Error rendering template: #{name}"
-      raise e
+      STDERR.puts "Error rendering template: #{name}"
+      STDERR.puts e
+      nil
     end
 
     def path
-      resolve @config.fetch(:path)
+      resolve @config[:path]
+    end
+
+    def paths
+      @config.fetch(:paths, []).map { |path| resolve(path) }
+    end
+
+    def vars
+      @config[:vars]
     end
 
     def dest
@@ -42,5 +52,26 @@ module Consult
       return true if !config.key?(:ttl) || !dest.exist?
       dest.mtime < (Time.now - @config[:ttl].to_i)
     end
+
+    private
+
+    # Concatenate all the source templates together, in the order provided
+    # Disk contents go first
+    def contents
+      disk_contents + consul_contents
+    end
+
+    def consul_contents
+      [@config[:consul_key], @config[:consul_keys]].compact.flatten.map do |key|
+        Diplomat::Kv.get(key, options: nil, not_found: :return, found: :return)
+      end.join
+    end
+
+    # Concatenate all the source templates together, in the order provided
+    def disk_contents
+      [path, paths].compact.flatten.map do |file_path|
+        File.read file_path, encoding: 'utf-8'
+      end.join
+    end
   end
 end

data/lib/consult/utilities.rb

@@ -3,6 +3,7 @@
 module Consult
   module Utilities
     def resolve(path)
+      return unless path
       pathname = Pathname.new(path)
       pathname.relative? ? Consult.root.join(pathname) : pathname
     end

data/lib/consult/version.rb

@@ -1,3 +1,3 @@
 module Consult
-  VERSION = '0.7.3'
+  VERSION = '0.8.0'
 end

metadata

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