hiera-eyaml-vault 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 291b9a166f451189dcab835ed1d4646186406e5440d75741245ba1347cc70c03
-  data.tar.gz: 3f69928461ee51c450d91a3aee90e1b852b4b437449027fdf654b3831ac7621a
+  metadata.gz: 0b6e6ef8cb8f9ff71e46513889e36cd2b3c3eb32f354deabfff2da9d8ea5ce49
+  data.tar.gz: ba672c9d3826736c8447cbe591b9872585a55aad302f764be35a628aea15d312
 SHA512:
-  metadata.gz: 5f447b2bea6645258e6c65e78610dfb99c8ce8382da36e8cd2388051456c1ae6bcb1918d0af47996df7b5bfc89c6785b31e95425c26a30c83b901f98a06ae5e3
-  data.tar.gz: 17fd1cca051a4d4ad536157639b5daa7a271faec0f6f6aa9c7c6b1d3d5736eaf7dddb3a9204c964f17a7ff5755630c47d3477362ee162556f27d4fea025dce31
+  metadata.gz: 1b894c43c2983db672c463cb5c175a5686306ce83b56ebbcf7f8159d596a1e0924f06a927b69280dbe4cc69ad2a92df3417f8fa04f1589e422b70a5adf29f816
+  data.tar.gz: 257776c55b5e580cb97d4ba3fc4eeae8347ef9150dca831552f57a4436f35dd31cbfa182a47730fb21756801b1bece5f59f90eabe852ec8c39a358acba2624d0

data/lib/hiera/backend/eyaml/encryptors/vault.rb

@@ -14,7 +14,7 @@ class Hiera
           end
 
 
-          VERSION = "0.0.2"
+          VERSION = "1.0.0"
           HTTP_HANDLER = Hiera::Backend::Eyaml::Encryptors::Vault::Httphandler
 
           self.tag = 'VAULT'
@@ -48,6 +48,16 @@ class Hiera
               default: true
             },
 
+            :ssl_cert => {
+              desc: "SSL Certificate to connect with",
+              type: :string
+            },
+
+            :ssl_key => {
+              desc: "SSL Private key to connect with",
+              type: :string
+            },
+
             :keyname => {
               desc: "Vault transit key name (default 'hiera')",
               type: :string,
@@ -62,13 +72,34 @@ class Hiera
           }
           class << self
 
+            def config_file
+              ENV['EYAML_CONFIG'] || File.join(ENV['HOME'], '.eyaml/config.yaml') || '/etc/eyaml/config.yaml'
+            end
+
+            def load_config
+              if File.exists?(config_File)
+                @config_defaults = YAML.load_file(config_file)
+              end
+            end
+
+            # Allow the inherited options method to allow for local
+            # configuration to fall back on
+            #
+            def option(key)
+              return super(key) if super(key)
+
+              load_config if @config_defaults.nil?
+              unless @config_defaults.nil?
+                return @config_defaults[key.to_s] if @config_defaults[key.to_s]
+              end
+              super
+            end
+
             def create_keys
               diagnostic_message = self.option :diagnostic_message 
               puts "Create_keys: #{diagnostic_message}"
             end
 
-            #### BEGIN IMPORT
-
             def vault_url(endpoint)
               uri = []
               uri << option(:addr)
@@ -111,12 +142,13 @@ class Hiera
 
 
             def token_configured?
+              return true if ENV['VAULT_TOKEN']
               not option(:token).nil?
             end
 
             def token
               authenticate
-              option(:token) || @approle_token
+              ENV['VAULT_TOKEN'] || option(:token) || @approle_token
             end
 
             def authenticate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiera-eyaml-vault
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiera-eyaml
@@ -52,8 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Encryption plugin for hiera-eyaml to use Vault's transit secrets engine