Move 1Password environment handling to function

boxcutter · Nov 8, 2024 · cfa376f · cfa376f
1 parent 5c98044
commit cfa376f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 32 deletions.
diff --git a/cookbooks/boxcutter_onepassword/libraries/onepassword.rb b/cookbooks/boxcutter_onepassword/libraries/onepassword.rb
@@ -1,25 +1,13 @@
 module Boxcutter
   class OnePassword
     def self.op_read(reference, type = 'auto')
-      puts "MISCHA op_read type=#{type}"
-      if op_connect_server_token_found? && ['auto', 'connect_server'].include?(type)
-        environment = {
-          'OP_CONNECT_HOST' => token_from_env_or_file('OP_CONNECT_TOKEN', op_connect_host_path),
-          'OP_CONNECT_TOKEN' => token_from_env_or_file('OP_CONNECT_TOKEN', op_connect_token_path),
-        }
-      elsif op_service_account_token_found? && ['auto', 'service_account'].include?(type)
-        environment = {
-          'OP_SERVICE_ACCOUNT_TOKEN' => token_from_env_or_file('OP_SERVICE_ACCOUNT_TOKEN',
-                                                               op_service_account_token_path),
-        }
-      else
-        fail 'boxcutter_onepassword[op_read]: 1Password token not found'
-      end
+      environment = op_environment(type)
 
       if !::File.exist?('/usr/local/bin/op')
         install_op_cli
       end
 
+      # 1Password Connect Server does not support op user get --me
       if ['auto', 'service_account'].include?(type)
         command = '/usr/local/bin/op user get --me'
         shellout = Mixlib::ShellOut.new(command, env: environment)
@@ -36,19 +24,7 @@ def self.op_read(reference, type = 'auto')
     end
 
     def self.op_document_get(item, vault, type = 'auto')
-      if op_connect_server_token_found? && ['auto', 'connect_server'].include?(type)
-        environment = {
-          'OP_CONNECT_HOST' => token_from_env_or_file('OP_CONNECT_TOKEN', op_connect_host_path),
-          'OP_CONNECT_TOKEN' => token_from_env_or_file('OP_CONNECT_TOKEN', op_connect_token_path),
-        }
-      elsif op_service_account_token_found? && ['auto', 'service_account'].include?(type)
-        environment = {
-          'OP_SERVICE_ACCOUNT_TOKEN' => token_from_env_or_file('OP_SERVICE_ACCOUNT_TOKEN',
-                                                               op_service_account_token_path),
-        }
-      else
-        fail 'boxcutter_onepassword[op_read]: 1Password token not found'
-      end
+      environment = op_environment(type)
 
       if !::File.exist?('/usr/local/bin/op')
         install_op_cli
@@ -64,10 +40,25 @@ def self.op_document_get(item, vault, type = 'auto')
       shellout.run_command
       shellout.error!
       shellout.stdout.strip
-      # puts "MISCHA: error stderr=#{shellout.stderr}, stdout=#{shellout.stdout}"
-      # next if shellout.error?
-      #
-      # return shellout.stdout.strip
+    end
+
+    def self.op_environment(type)
+      puts "MISCHA op_read type=#{type}"
+      if op_connect_server_token_found? && ['auto', 'connect_server'].include?(type)
+        environment = {
+          'OP_CONNECT_HOST' => token_from_env_or_file('OP_CONNECT_TOKEN', op_connect_host_path),
+          'OP_CONNECT_TOKEN' => token_from_env_or_file('OP_CONNECT_TOKEN', op_connect_token_path),
+        }
+      elsif op_service_account_token_found? && ['auto', 'service_account'].include?(type)
+        environment = {
+          'OP_SERVICE_ACCOUNT_TOKEN' => token_from_env_or_file('OP_SERVICE_ACCOUNT_TOKEN',
+                                                               op_service_account_token_path),
+        }
+      else
+        fail 'boxcutter_onepassword[op_read]: 1Password token not found'
+      end
+
+      environment
     end
 
     # If "op_read" is called during compile time, this might happen before

diff --git a/...boxcutter_onepassword/test/cookbooks/boxcutter_onepassword_test/recipes/connect_server.rb b/...boxcutter_onepassword/test/cookbooks/boxcutter_onepassword_test/recipes/connect_server.rb
@@ -16,7 +16,7 @@
 
 # stuff = Boxcutter::OnePassword.op_read('op://Automation-Org/nexus admin blue/password', 'connect_server')
 # puts "MISCHA: stuff=#{stuff}"
-#
+
 # op item get 'sandbox-connect-server Access Token: sandbox-connect-server-access-token' --vault Automation-Org
 # op item get 7etjvtlft4u4wlbkxvprahvmzq --vault Automation-Org --format json
 # op read 'op://Automation-Org/7etjvtlft4u4wlbkxvprahvmzq/credential'