Update Vault test utilities to use local 'VAULT_TOKEN' auth if not ru…

…nning in CI
voxpupuli · Jul 3, 2020 · c9ce004 · c9ce004
1 parent fca60fe
commit c9ce004
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -107,7 +107,11 @@ class { 'elasticsearch':
 
   c.before :context, :with_license do
     Vault.address = ENV['VAULT_ADDR']
-    Vault.auth.approle ENV['VAULT_APPROLE_ROLE_ID'], ENV['VAULT_APPROLE_SECRET_ID']
+    if ENV['CI']
+      Vault.auth.approle(ENV['VAULT_APPROLE_ROLE_ID'], ENV['VAULT_APPROLE_SECRET_ID'])
+    else
+      Vault.auth.token(ENV['VAULT_TOKEN'])
+    end
     licenses = Vault.with_retries(Vault::HTTPConnectionError) do
       Vault.logical.read(ENV['VAULT_PATH'])
     end.data

diff --git a/spec/spec_utilities.rb b/spec/spec_utilities.rb
@@ -104,9 +104,13 @@ def pid_file
 end
 
 def vault_available?
-  %w[VAULT_ADDR VAULT_APPROLE_ROLE_ID VAULT_APPROLE_SECRET_ID VAULT_PATH].select do |var|
-    ENV[var].nil?
-  end.empty?
+  if ENV['CI']
+    %w[VAULT_ADDR VAULT_APPROLE_ROLE_ID VAULT_APPROLE_SECRET_ID VAULT_PATH].select do |var|
+      ENV[var].nil?
+    end.empty?
+  else
+    true
+  end
 end
 
 def http_retry(url)