add-vault-tokens 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98551be20acddbdf09ca21784850d0ff19f797d2
-  data.tar.gz: 8f3abf2605ea0f8ecdc3883f1c8e5e7df6b7da5d
+  metadata.gz: 436e279282f8b840ebde7603fc29c3a1677ab7dc
+  data.tar.gz: 9ad13038cafd810e0b7075ed8de06bc603cb970a
 SHA512:
-  metadata.gz: 03ba730cb989129fd8c18750ce384d9221c1fa67858f0083f8893a0f7d5cfefc7443d2738055a4ccad987786b45ec81978f9681d8b3e4cd18e3a7e9720890669
-  data.tar.gz: 209c0682a099a106505fd2212c387ced75ab010c9f85a6daaee4cd3308f232b91be895f6b7bd8fe3253038e3bc48b6853eb1019d85ad883bd7c8e7ac00c75b6c
+  metadata.gz: 42976d30ccb031824ac1d2cbc848bfe4ff24027defd10badb1918370f60c7c3192184b9234f1a4d88e62126e00cb84535c041af3f5d106bd30b6bce84c5602df
+  data.tar.gz: 4cbd9ef822398d6e4770240de364282bdf971b72bdb87f8ed198e16fe2c3e42fbb02f3b24d1f1a25541159acbf04d8490ef67e5cf807215244c2b5bb8223ffd2

data/exe/add-vault-tokens

@@ -5,7 +5,11 @@ require "psych"
 require "add_vault_tokens"
 
 # Set up command-line option defaults.
-options = { prefix: '', renew: true }
+options = {
+  prefix: '',
+  renew: true,
+  quiet: false
+}
 options[:prefix] = "#{ENV.fetch('VAULT_ENV')}-" if ENV.has_key?('VAULT_ENV')
 
 # Parse our command-line.
@@ -19,6 +23,10 @@ OptionParser.new do |opts|
   opts.on(nil, "--no-renew", "Do not renew our master token") do |nr|
     options[:renew] = false
   end
+
+  opts.on('q', "--quiet", "Do not print lots of output") do |nr|
+    options[:quiet] = true
+  end
 end.parse!
 paths = ARGV
 
@@ -26,7 +34,7 @@ paths = ARGV
 AddVaultTokens.connect
 
 # Renew our master token.
-if options[:renew]
+if options.fetch(:renew)
   STDERR.puts("Renewing VAULT_MASTER_TOKEN")
   AddVaultTokens.renew_master_token
 end
@@ -34,7 +42,8 @@ end
 # For each input file, add the appropriate tokens to each app.
 paths.each do |path|
   yml = Psych.load_file(path)
-  result = AddVaultTokens.add_tokens_to_apps(yml, prefix: options.fetch(:prefix))
+  result = AddVaultTokens.add_tokens_to_apps(yml, prefix: options.fetch(:prefix),
+                                             quiet: options.fetch(:quiet))
   File.write("#{path}.tmp", Psych.dump(result))
   # Atomically overwrite existing file.
   File.rename("#{path}.tmp", path)

data/lib/add_vault_tokens/version.rb

@@ -1,3 +1,3 @@
 module AddVaultTokens
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/add_vault_tokens.rb

@@ -36,20 +36,22 @@ module AddVaultTokens
     # appropriate vault-related environment variables injected.  If
     # specified, append `prefix` to each service name in the file before
     # looking up a policy.
-    def add_tokens_to_apps(parsed_yaml, prefix: "")
+    def add_tokens_to_apps(parsed_yaml, quiet: false, prefix: "")
       env = ENV.fetch('VAULT_ENV', nil)
       result = Marshal.load(Marshal.dump(parsed_yaml))
       result.each do |app_name, info|
         full_app_name = prefix + app_name
         if have_policy_for?(full_app_name)
-          STDERR.puts("Issuing token for #{full_app_name}")
+          STDERR.puts("Issuing token for #{full_app_name}") unless quiet
           token = create_token_for(full_app_name)
           info['environment'] ||= {}
           info['environment']['VAULT_ADDR'] = ENV.fetch('VAULT_ADDR')
           info['environment']['VAULT_ENV'] = env if env
           info['environment']['VAULT_TOKEN'] = token.auth.client_token
         else
-          STDERR.puts("WARNING: No policy for #{full_app_name}, so no token issued")
+          unless quiet
+            STDERR.puts("WARNING: No policy for #{full_app_name}, so no token issued")
+          end
         end
       end
       result

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: add-vault-tokens
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Eric Kidd