uc3-dmp-api-core 0.0.17 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efebb403fd0b700fb57385c2b63e66cb0aec9530b3f6b08bf3dd85dd2417aef7
-  data.tar.gz: 93ab1915f7db8882f065b53fc8e1616228c9b1b3d345ce68df82e26c3ad6dcf8
+  metadata.gz: 5ce7df10e928100fae5b672089be84d873cf758ecac695c9c571abb0ab02a407
+  data.tar.gz: 93dc08eb6b46eefbe86c236edcd273679eadffad2e7283f59016d2ffbbc25ee6
 SHA512:
-  metadata.gz: bff15a217476c17d0dfd3985b8462b2a8ada6956ff697f8de7a574faf55a441f3cd3e9c58cdd802a902630e76cd6d24e3e80f3d6afa076049f8472ab6bce758a
-  data.tar.gz: 928f0bb01da885343052564b4f1bb45b483c34d7a3bc49ec88b5d5f2f5947577634beab236937802aed17f49f91d0ed9c6fcfe46f47203b11c9c6389eb372294
+  metadata.gz: 3f312834841be19dd00700c2be8b9627f8c68321a8264733af87a87bec0e2863b857591c51e5489a26aabdbfbf236213d79511ac1d3294c87abf28d4876655de
+  data.tar.gz: 15c9bd557334bbaf9338ec1e2fd2904522f728d30ffeac6a2c6d498fce5620ce22fc92ebb11eac2e9e8b3e620d4632ff898f973c02be5a1d66c14aefd1be8159

data/lib/uc3-dmp-api-core/responder.rb

@@ -25,7 +25,7 @@ module Uc3DmpApiCore
       # Returns a hash that is a valid Lambda API response
       # --------------------------------------------------------------------------------
       # rubocop:disable Metrics/AbcSize
-      def respond(status: DEFAULT_STATUS_CODE, items: [], errors: [], **args)
+      def respond(status: DEFAULT_STATUS_CODE, logger: nil, items: [], errors: [], **args)
         url = _url_from_event(event: args[:event]) || SsmReader.get_ssm_value(key: 'api_base_url')
         return _standard_error(url: url) if url.nil?
 
@@ -44,7 +44,10 @@ module Uc3DmpApiCore
         body = body.merge(Paginator.pagination_meta(url: url, item_count: item_count, params: args))
 
         # If this is a server error, then notify the administrator!
-        LogWriter.log_error(source: url, message: errors, details: body, event: args[:event]) if status.to_s[0] == '5'
+        if status.to_s[0] == '5' && !logger.nil?
+          logger.error(message: errors, details: body)
+          Notifier.notify_administrator(source: logger.source, details: body, event: logger.event)
+        end
 
         { statusCode: status.to_i, body: body.compact.to_json, headers: headers }
       rescue StandardError => e

data/lib/uc3-dmp-api-core/ssm_reader.rb

@@ -9,7 +9,7 @@ module Uc3DmpApiCore
   # Shared helper methods for accessing SSM parameters
   # ----------------------------------------------------
   class SsmReader
-    SOURCE = 'SsmReader gem'
+    SOURCE = 'Uc3DmpApiCore::SsmReader'
 
     class << self
       # Return all of the available keys
@@ -20,48 +20,30 @@ module Uc3DmpApiCore
       # Fetch the value for the specified :key
       # ----------------------------------------------------
       # rubocop:disable Metrics/AbcSize
-      def get_ssm_value(key:, provenance_name: nil)
+      def get_ssm_value(key:, provenance_name: nil, logger: nil)
         full_key = _ssm_keys[:"#{key.downcase}"] unless key.nil?
-
-puts "FULL KEY: #{full_key}"
-
+        logger.debug(message: "Looking for SSM Key: #{full_key}")
         return nil if full_key.nil?
 
         key_vals = { env: ENV.fetch('LAMBDA_ENV', 'dev').to_s.downcase }
         # Swap in the provenance name if applicable
         key_vals[:provenance] = provenance_name unless provenance_name.nil? ||
                                                        !full_key.include?('%{provenance}')
-
-puts "KEY VALS: #{key_vals}"
-
-        fetch_value(key: format(full_key, key_vals))
+        fetch_value(key: format(full_key, key_vals, logger: logger))
       rescue Aws::Errors::ServiceError => e
-        LogWriter.log_error(
-          source: "#{SOURCE} - looking for #{key}", message: e.message, details: e.backtrace
-        )
+        puts "Fatal error in #{SOURCE} - #{e.message}" if logger.nil?
+        logger.error(message: "Looking for SSM Key: #{key} - #{e.message}", details: e.backtrace) unless logger.nil?
         nil
       end
       # rubocop:enable Metrics/AbcSize
 
       # Call SSM to get the value for the specified key
-      def fetch_value(key:)
+      def fetch_value(key:, logger: nil)
         resp = Aws::SSM::Client.new.get_parameter(name: key, with_decryption: true)
-
-puts "FETCHING `#{key}` -- GOT: #{resp.inspect}"
-
+        logger.debug(message: "Searching for SSM Key: #{key}, Found: '#{resp&.parameter&.value}'") unless logger.nil?
         resp.nil? || resp.parameter.nil? ? nil : resp.parameter.value
       end
 
-      # Checks to see if debug mode has been enabled in SSM
-      # ----------------------------------------------------
-      def debug_mode?
-
-puts "Checking to see if we are in debug mode."
-puts "Key: #{_ssm_keys[:debug_mode]}, Val: #{get_ssm_value(key: _ssm_keys[:debug_mode])}, Downcased: #{get_ssm_value(key: _ssm_keys[:debug_mode])&.to_s&.downcase&.strip} "
-
-        get_ssm_value(key: _ssm_keys[:debug_mode])&.to_s&.downcase&.strip == 'true'
-      end
-
       private
 
       # DMPTool/DMPHub SSM keys. See the installation guide for information about how these values are used
@@ -72,7 +54,6 @@ puts "Key: #{_ssm_keys[:debug_mode]}, Val: #{get_ssm_value(key: _ssm_keys[:debug
           administrator_email: '/uc3/dmp/hub/%{env}/AdminEmail',
           api_base_url: '/uc3/dmp/hub/%{env}/ApiBaseUrl',
           base_url: '/uc3/dmp/hub/%{env}/BaseUrl',
-          debug_mode: '/uc3/dmp/hub/%{env}/Debug',
 
           dmp_id_api_url: '/uc3/dmp/hub/%{env}/EzidApiUrl',
           dmp_id_base_url: '/uc3/dmp/hub/%{env}/EzidBaseUrl',

data/lib/uc3-dmp-api-core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uc3DmpApiCore
-  VERSION = '0.0.17'
+  VERSION = '0.0.19'
 end

data/lib/uc3-dmp-api-core.rb

@@ -4,7 +4,6 @@
 require 'aws-sdk-sns'
 require 'aws-sdk-ssm'
 
-require 'uc3-dmp-api-core/log_writer'
 require 'uc3-dmp-api-core/notifier'
 require 'uc3-dmp-api-core/paginator'
 require 'uc3-dmp-api-core/responder'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-api-core
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.19
 platform: ruby
 authors:
 - Brian Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-03 00:00:00.000000000 Z
+date: 2023-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -131,7 +131,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/uc3-dmp-api-core.rb
-- lib/uc3-dmp-api-core/log_writer.rb
 - lib/uc3-dmp-api-core/notifier.rb
 - lib/uc3-dmp-api-core/paginator.rb
 - lib/uc3-dmp-api-core/responder.rb

data/lib/uc3-dmp-api-core/log_writer.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module Uc3DmpApiCore
-  # Standardized ways for logging messages and errors to CloudWatch
-  #
-  # Methods expect the following inputs:
-  #   - source:       the name of the Lambda function or Layer file
-  #   - message:      the error message as a String or Array of Strings
-  #   - details:      any additional context as a Hash
-  #   - event:        the Lambda event if available
-  #
-  # --------------------------------------------------------------------------------
-  class LogWriter
-    class << self
-      # rubocop:disable Metrics/AbcSize
-      def log_error(source:, message:, details: {}, event: {})
-        return false if source.nil? || message.nil?
-
-        message = message.join(', ') if message.is_a?(Array)
-        # Is there a better way here than just 'print'? This ends up in the CloudWatch logs
-        puts "ERROR: #{source} - #{message}"
-        puts " - DETAILS: #{details.to_json}" if details.is_a?(Hash) && details.keys.any?
-        puts " - EVENT: #{event.to_json}" if event.is_a?(Hash) && event.keys.any?
-
-        Notifier.notify_administrator(source: source, details: details, event: event)
-      end
-      # rubocop:enable Metrics/AbcSize
-
-      def log_message(source:, message:, details: {}, event: {})
-        return false if source.nil? || message.nil?
-
-        message = message.join(', ') if message.is_a?(Array)
-
-        # Is there a better way here than just 'print'? This ends up in the CloudWatch logs
-        puts "INFO: #{source} - #{message}"
-        puts " - DETAILS: #{details.to_json}" if details.is_a?(Hash) && details.keys.any?
-        puts " - EVENT: #{event.to_json}" if event.is_a?(Hash) && event.keys.any?
-        true
-      end
-    end
-  end
-end