Merge pull request #3036 from bitzesty/env-var-changes

chore: ENV var changes for new platform

app/controllers/healthcheck_controller.rb

@@ -62,7 +62,7 @@ def check_cache
   end
 
   def check_redis
-    Redis.new(url: PaasResolver.redis_uri).ping
+    Redis.new(url: CredentialsResolver.redis_uri).ping
     { success: true }
   rescue => e
     { success: false, message: e.message }

config/database.yml

@@ -13,5 +13,5 @@ test:
 
 production:
   <<: *default
-  url: <%= PaasResolver.pgsql_uri %>
+  url: <%= CredentialsResolver.pgsql_uri %>
   pool: <%= ENV['DB_POOL'] || ENV['MAX_THREADS'] || 5 %>

config/initializers/sidekiq.rb

@@ -2,9 +2,9 @@
   config.logger = Appsignal::Logger.new("sidekiq")
   config.logger.formatter = Sidekiq::Logger::Formatters::WithoutTimestamp.new
 
-  config.redis = { url: PaasResolver.redis_uri }
+  config.redis = { url: CredentialsResolver.redis_uri }
 end
 
 Sidekiq.configure_client do |config|
-  config.redis = { url: PaasResolver.redis_uri }
+  config.redis = { url: CredentialsResolver.redis_uri }
 end

lib/credentials_resolver.rb

@@ -0,0 +1,27 @@
+module CredentialsResolver
+  module_function
+
+  def redis_uri
+    ENV["REDIS_ENDPOINT"].presence || JSON.parse(ENV["VCAP_SERVICES"])["redis"][0]["credentials"]["uri"]
+  rescue
+    ENV["REDIS_URL"]
+  end
+
+  def pgsql_uri
+    if ENV["DATABASE_CREDENTIALS"].present?
+      parse_database_config(ENV["DATABASE_CREDENTIALS"])
+    else
+      # Fallback to the original logic
+      JSON.parse(ENV["VCAP_SERVICES"])["postgres"][0]["credentials"]["uri"]
+    end
+  rescue
+    ENV["DATABASE_URL"]
+  end
+
+  def parse_database_config(config_json)
+    config = JSON.parse(config_json)
+
+    # Construct the database URI
+    "#{config["engine"]}://#{config["username"]}:#{config["password"]}@#{config["host"]}:#{config["port"]}/#{config["dbname"]}"
+  end
+end