uc3-dmp-rds 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d98a77984b506defc6ce70bf2e3a4af4b3416abd753aef216206f344cf50fb7e
-  data.tar.gz: d27e9407f0353a89a162c114136de5ff37c17d074b7172513f920141d3c224fd
+  metadata.gz: 1ceba0e24d5a6a925fde46a68d7d8f1586aa29bf1687e94000d989f6ab522e3e
+  data.tar.gz: 0d6ef838acd8ce79e5638e83b45c8bbdb72cd919863916ad0d48d5658ab079b8
 SHA512:
-  metadata.gz: f8de55acaa42d0779359c6e21f6fb20bfa017dc85037d4e83ff8af3ff147d1f5a317d9cd5ede369165fa1501ba325f3556b0dde37026bdc5a4829a83b2a8e0cb
-  data.tar.gz: 4844fd62ff75d92bccd97bd4c2788b62085cbc71fa9c08a69861cb651f0820c7342342a535a8989cbeb0fe5ac30227557b319882da790a024a69f409a893cf88
+  metadata.gz: 7aa9e392a307c55483d432c487ef5a5c0ab6c501e7e3081646f5945ba7fe5322fd29b2eb1d3b81d110f94db0ec252f624fcdcf70a4f903df0cdc434e2851b99b
+  data.tar.gz: 2ced3df663f4dc6ee3d360625ff12c3a267c9a136c1d9535a54a41d51092691a7e8e316ec39fb8eca207b98807abc623f0a47bcaacbca3dd6c55275997211fba

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

@@ -6,58 +6,60 @@ 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_NO_CONNECTION = 'No current database connection. Call Uc3DmpRds.connect first'
 
     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?
+
+puts "CONNECT - host: #{ENV['DATABASE_HOST']}, port: #{ENV['DATABASE_PORT']}, name: #{ENV['DATABASE_NAME']}, username: #{username}, password.lenght: #{password.length}"
+
+        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'
         )
+
+puts connection.inspect
+puts "CONNECTED? #{ActiveRecord::Base.connected?}"
+
         ActiveRecord::Base.connected?
       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?
+        raise AdapterError, 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)
       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.6'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-rds
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 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