BAU: allow forms data_api to specify db user

Author: whi-tw

support/forms-cli/lib/commands/data_api.rb

@@ -13,7 +13,7 @@ def run
     parse_options
     return unless aws_authenticated? && valid_options?
 
-    @connection = DataApiConnection.new(fetch_environment, @options[:database], @options[:cluster])
+    @connection = DataApiConnection.new(fetch_environment, @options[:database], @options[:cluster], @options[:user])
 
     begin
       print execute_statement
@@ -74,6 +74,10 @@ def parse_options
       opts.on("-sSTATEMENT", "--statement=STATEMENT", "[Mandatory] The statement to execute") do |statement|
         @options[:statement] = statement
       end
+
+      opts.on("-uUSER", "--user=USER", "The database user to connect as") do |user|
+        @options[:user] = user
+      end
     }.parse!
   end
 

support/forms-cli/lib/utilities/data_api_connection.rb

@@ -9,10 +9,11 @@
 
 # Executes statements on AWS RDS using the Data API.
 class DataApiConnection
-  def initialize(env, database_name, cluster_name)
+  def initialize(env, database_name, cluster_name, database_user = nil)
     @env = env
     @database_name = database_name
     @cluster_name = cluster_name || default_cluster_name
+    @database_user = database_user || database_name
 
     @data_service = Aws::RDSDataService::Client.new
     @rds = Aws::RDS::Client.new
@@ -43,8 +44,7 @@ def default_cluster_name
   end
 
   def query_credential_arn
-    secret_name = "rds-db-credentials/#{query_database_resource_id}/#{@database_name}"
-    # secret_name = "data-api/#{@env}/#{@database_name}/rds-credentials"
+    secret_name = "rds-db-credentials/#{query_database_resource_id}/#{@database_user}"
 
     begin
       secret = @secrets_manager.describe_secret({ secret_id: secret_name })