Update environment variable handling

Author: Taucher2003

bin/discord

@@ -5,8 +5,7 @@ require_relative '../lib/pyxis'
 require 'discordrb'
 require 'discordrb/webhooks'
 
-token = File.read(ENV.fetch('PYXIS_DC_RELEASE_TOOLS_TOKEN'))
-bot = Discordrb::Bot.new(token: token, intents: %i[servers])
+bot = Discordrb::Bot.new(token: Pyxis::Environment.discord_bot_token, intents: %i[servers])
 
 def build_command(name, description)
   {

lib/pyxis/environment.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Pyxis
+  module Environment
+    module_function
+
+    def discord_bot_token
+      File.read(ENV.fetch('PYXIS_DC_RELEASE_TOOLS_TOKEN'))
+    end
+
+    def github_release_tools_private_key
+      File.read(ENV.fetch('PYXIS_GH_RELEASE_TOOLS_PRIVATE_KEY'))
+    end
+
+    def github_release_tools_approver_private_key
+      File.read(ENV.fetch('PYXIS_GH_RELEASE_TOOLS_APPROVER_PRIVATE_KEY'))
+    end
+
+    def gitlab_release_tools_token
+      File.read(ENV.fetch('PYXIS_GL_RELEASE_TOOLS_PRIVATE_TOKEN'))
+    end
+
+    def dry_run
+      ENV.fetch('DRY_RUN', 'true').downcase
+    end
+  end
+end

lib/pyxis/github_client.rb

@@ -8,12 +8,12 @@ class GithubClient
       release_tools: {
         app_id: 857194,
         installation_id: 69940866,
-        private_key_location: ENV.fetch('PYXIS_GH_RELEASE_TOOLS_PRIVATE_KEY'),
+        private_key: Pyxis::Environment.github_release_tools_private_key,
       },
       release_tools_approver: {
         app_id: 1373592,
         installation_id: 70116032,
-        private_key_location: ENV.fetch('PYXIS_GH_RELEASE_TOOLS_APPROVER_PRIVATE_KEY'),
+        private_key: Pyxis::Environment.github_release_tools_approver_private_key,
       },
     }.freeze
 
@@ -33,7 +33,7 @@ def without_auto_pagination(octokit)
 
       def create_installation_access_token(instance, options = {})
         config = CLIENT_CONFIGS[instance]
-        global_client = Octokit::Client.new(bearer_token: create_jwt(config[:private_key_location], config[:app_id]))
+        global_client = Octokit::Client.new(bearer_token: create_jwt(config[:private_key], config[:app_id]))
         logger.debug('Created JWT for client', app: global_client.app.slug)
         installation_token = Pyxis::GlobalStatus.with_faraday_dry_run_bypass do
           global_client.create_app_installation_access_token(config[:installation_id], options)
@@ -54,8 +54,7 @@ def create_octokit(instance)
         Octokit::Client.new(bearer_token: installation_token[:token])
       end
 
-      def create_jwt(private_key_path, client_id)
-        private_pem = File.read(private_key_path)
+      def create_jwt(private_pem, client_id)
         private_key = OpenSSL::PKey::RSA.new(private_pem)
 
         payload = {

lib/pyxis/gitlab_client.rb

@@ -8,7 +8,7 @@ class GitlabClient
 
     CLIENT_CONFIGS = {
       release_tools: {
-        private_token: ENV.fetch('PYXIS_GL_RELEASE_TOOLS_PRIVATE_TOKEN'),
+        private_token: Pyxis::Environment.gitlab_release_tools_token,
         user_id: 20643824,
       },
     }.freeze
@@ -24,7 +24,7 @@ def self.create_client(instance)
       options = {
         url: GITLAB_URL,
         headers: {
-          'Private-Token': File.read(client_config[:private_token]),
+          'Private-Token': client_config[:private_token],
         },
       }
 

lib/pyxis/global_status.rb

@@ -5,7 +5,7 @@ module GlobalStatus
     module_function
 
     def dry_run?
-      ENV.fetch('DRY_RUN', 'true').downcase == 'true'
+      Pyxis::Environment.dry_run == 'true'
     end
 
     def with_faraday_dry_run_bypass