uc3-dmp-rds 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9364f66606e9e1778f3c0168139c989b14620af4f1a901a749ddb5efaede07f3
-  data.tar.gz: 27e912c3644030d29c410b3fd6bcb6a8ec4b8723925c07c0771bfc6297ed46f2
+  metadata.gz: 4181722f3ac149e1843e0372c04cc326341021eef62df0d52efafbf524fb4876
+  data.tar.gz: 9e561848f90dc6961e89f8b051b6dac8f896d119bf6f4e25e409fcf5ac1f4562
 SHA512:
-  metadata.gz: 37d01cf1cd4e06757543641aa5a004abb696ec47d4560d1fea957500990338faa279ac525930421efb6fbc3bf7b09bf745e0550e76bccc673544646c52a07825
-  data.tar.gz: 7815071cda74253caebc6ca8c82b37fc1d94d2b27ec4709a12c7a8996aec81b694e2eba356929562499ec49bd32556173e09220546c930ffb18eabc7a39f5f08
+  metadata.gz: 439be8d21f8eb86b72d0599e0bcfa89e93c032a372bcf4321462cd83435995a9115433bf533a3b88930c2f641b058eb54df7cdca9e80f85979b8dbd632d5919a
+  data.tar.gz: 6118678a2c94fbd6d871d15403ab17fc4e52434b422fe7bf1b093aa481ab97d41615cd5037a9a032ce230626a72452c01f0ad7fa23728e9c4f6ee934f03a0898

data/lib/uc3-dmp-rds/adapter.rb

@@ -6,58 +6,58 @@ require 'aws-sdk-sns'
 require 'aws-sdk-ssm'
 require 'mysql2'
 
-require 'uc3-dmp-api-core'
-
 module Uc3DmpRds
+  # Error from the Rds Adapter
+  class AdapterError < StandardError; end
+
   # A module to interact with the RDS DB. Expects the following ENV variables to be set:
   #     DATABASE_HOST:  The host URL
   #     DATABASE_PORT:  The port to use
   #     DATABASE_NAME:  The name of the database
   #
-  # and the following from the AWS SSM parameter store:
+  # and the following should be passed into the :connect method:
   #     RDS_USERNAME:   The RDS username
   #     RDS_PASSWORD:   The RDS password
   #
   class Adapter
-    MSG_NO_CONNECTION = 'No current database connection. Call Uc3DmpRds.connect first.'
-    MSG_KEYWORDS_INVALID = 'The parameters specified do not match those in the SQL query.'
+    MSG_KEYWORDS_INVALID = 'The parameters specified do not match those in the SQL query'
+    MSG_MISSING_CREDENTIALS = 'No username and/or password specified'
+    MSG_UNABLE_TO_CONNECT = 'Unable to establish a connection'
+    MSG_UNABLE_TO_QUERY = 'Unable to process the query'
 
     class << self
       # Connect to the RDS instance
-      def connect(debug: false)
-        creds = _credentials
-        ActiveRecord::Base.establish_connection(
+      def connect(username:, password:)
+        raise AdapterError, MSG_MISSING_CREDENTIALS if username.nil? || username.to_s.strip.empty? ||
+                                                       password.nil? || password.to_s.strip.empty?
+
+        connection = ActiveRecord::Base.establish_connection(
           adapter: 'mysql2',
           host: ENV.fetch('DATABASE_HOST', nil),
           port: ENV.fetch('DATABASE_PORT', nil),
           database: ENV.fetch('DATABASE_NAME', nil),
-          username: creds[:username],
-          password: creds[:password],
+          username: username,
+          password: password,
           encoding: 'utf8mb4'
         )
-        ActiveRecord::Base.connected?
+        !connection.nil?
+      rescue StandardError => e
+        raise AdapterError, "#{MSG_UNABLE_TO_CONNECT} - #{e.message}"
       end
 
       # Execute the specified query using ActiveRecord's helpers to sanitize the input
       def execute_query(sql:, **params)
-        raise StandardError, MSG_NO_CONNECTION unless ActiveRecord::Base.connected?
         return [] unless sql.is_a?(String) && !sql.strip.empty? && (params.nil? || params.is_a?(Hash))
         # Verify that all of the kewords are accounted for and that values were supplied
-        raise StandardError, MSG_KEYWORDS_INVALID unless _verify_params(sql: sql, params: params)
+        raise AdapterError, MSG_KEYWORDS_INVALID unless _verify_params(sql: sql, params: params)
 
         ActiveRecord::Base.simple_execute(sql, params)
+      rescue StandardError => e
+        raise AdapterError, "#{MSG_UNABLE_TO_QUERY} - #{e.message}"
       end
 
       private
 
-      # Fetch the DB credentials from SSM parameter store
-      def _credentials
-        {
-          username: Uc3DmpApiCore::SsmReader.get_ssm_value(key: :rds_username),
-          password: Uc3DmpApiCore::SsmReader.get_ssm_value(key: :rds_password)
-        }
-      end
-
       # Verify that all params defined in the SQL exist in the params hash and vice versa
       # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def _verify_params(sql:, params:)

data/lib/uc3-dmp-rds/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uc3DmpRds
-  VERSION = '0.0.7'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-rds
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Brian Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-02 00:00:00.000000000 Z
+date: 2023-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_simple_execute
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.5
-- !ruby/object:Gem::Dependency
-  name: uc3-dmp-api-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +122,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.50.2
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.17.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.17.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement