aws_lambda_ric 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b33180932d42b43cbe38aaf19aca5a30c01212a209cec6eb577b62e8139f4d36
-  data.tar.gz: 64b49034a0cd70a4e974c8bb2c56c8e73cc607b36e66de08622f8daa3fba982f
+  metadata.gz: 2f26bf52b90d1b1db9d7a2e81944ac57e1727ff0e65cc4b3b9b5273487b26114
+  data.tar.gz: 129773fdf51a5971dbac1661298f364303326d20d98491d600ae482a2e9f81d6
 SHA512:
-  metadata.gz: 0dd4f76dabca24fcae696e0780be387eee6bdff75d1bf9b7f95f1d9e5a37a10823bb9f24b521bb9d64e55bf718b36a5a7f9c84625b7bb25fd4cf88eedaf89498
-  data.tar.gz: 6a95a1763b7263a87201ac82153cb27344e96927a582e3bae95003f29e3dbf1f60089d5791526624cd863d2b17983cdf03c9074a39b8cb85617f082bd796d550
+  metadata.gz: 136489e2b2b18427a00b12000b47ad8831b4b1ffef289f7ff340ac1f81af782e0cb782c73d78deaa7ba5abd1e2966fed9f9e94b07313296fc1223d425e5a3f2c
+  data.tar.gz: 3f8a95ad5cae417e6e64496b8ba4405f9b85d8c5402017a89921cb08b020762600abe14faca92e8b79df5fd5777340d7c157925606588992d9e1a33c326c075a

data/Gemfile.lock

@@ -1,22 +1,37 @@
 PATH
   remote: .
   specs:
-    aws_lambda_ric (1.0.1)
+    aws_lambda_ric (1.0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (6.0.3.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    concurrent-ruby (1.1.7)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
     minitest (5.14.2)
     rake (13.0.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.8)
+      thread_safe (~> 0.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
+  activesupport (~> 6.0.1)
   aws_lambda_ric!
   bundler (>= 2.0)
   minitest (~> 5.0)
   rake (~> 13.0)
 
 BUNDLED WITH
-   2.2.0.rc.2
+   2.2.2

data/README.md

@@ -113,7 +113,7 @@ This runs the image as a container and starts up an endpoint locally at `http://
 3) Post an event to the following endpoint using a curl command: 
 
 ```shell script
-curl -XPOST "http://localhost:9000/2015-03-31/functions/function/invocations" -d '{}'.
+curl -XPOST "http://localhost:9000/2015-03-31/functions/function/invocations" -d '{}'
 ```
 
 This command invokes the function running in the container image and returns a response.
@@ -141,6 +141,18 @@ Then,
 * to run integration tests: `make test-integ`
 * to run smoke tests: `make test-smoke`
 
+### Troubleshooting
+While running integration tests, you might encounter the Docker Hub rate limit error with the following body:
+```
+You have reached your pull rate limit. You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limits
+```
+To fix the above issue, consider authenticating to a Docker Hub account by setting the Docker Hub credentials as below CodeBuild environment variables.
+```shell script
+DOCKERHUB_USERNAME=<dockerhub username>
+DOCKERHUB_PASSWORD=<dockerhub password>
+```
+Recommended way is to set the Docker Hub credentials in CodeBuild job by retrieving them from AWS Secrets Manager.
+
 ## Security
 
 If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.

data/aws_lambda_ric.gemspec

@@ -37,4 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '>= 2.0'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'activesupport', '~> 6.0.1'
 end

data/lib/aws_lambda_ric.rb

@@ -8,6 +8,7 @@ require_relative 'aws_lambda_ric/lambda_handler'
 require_relative 'aws_lambda_ric/lambda_context'
 require_relative 'aws_lambda_ric/lambda_logger'
 require_relative 'aws_lambda_ric/lambda_log_formatter'
+require_relative 'aws_lambda_ric/logger_patch'
 require_relative 'aws_lambda_ric/telemetry_log_sink'
 require_relative 'aws_lambda_ric/aws_lambda_marshaller'
 require_relative 'aws_lambda_ric/xray_cause'
@@ -25,8 +26,8 @@ module AwsLambdaRuntimeInterfaceClient
 
     ENV_VAR_RUNTIME_API = 'AWS_LAMBDA_RUNTIME_API'
 
-    def initialize(runtime_server_addr)
-      @lambda_server = LambdaServer.new(runtime_server_addr)
+    def initialize(runtime_server_addr, user_agent)
+      @lambda_server = LambdaServer.new(runtime_server_addr, user_agent)
       @runtime_loop_active = true # if false, we will exit the program
       @exit_code = 0
     end
@@ -149,23 +150,7 @@ module AwsLambdaRuntimeInterfaceClient
 
     def mutate_std_logger
       Logger.class_eval do
-        alias_method :orig_initialize, :initialize
-        def initialize(logdev, shift_age = 0, shift_size = 1048576, level: 'debug',
-                       progname: nil, formatter: nil, datetime_format: nil,
-                       binmode: false, shift_period_suffix: '%Y%m%d')
-          #  use unpatched constructor if logdev is a filename or an IO Object other than $stdout or $stderr
-          if logdev && logdev != $stdout && logdev != $stderr
-            orig_initialize(logdev, shift_age, shift_size, level, progname,
-                            formatter, datetime_format, binmode, shift_period_suffix)
-          else
-            self.level = level
-            self.progname = progname
-            @default_formatter = LambdaLogFormatter.new
-            self.datetime_format = datetime_format
-            self.formatter = formatter
-            @logdev = AwsLambdaRuntimeInterfaceClient::TelemetryLoggingHelper.telemetry_log_sink
-          end
-        end
+        prepend LoggerPatch
       end
     end
 

data/lib/aws_lambda_ric/bootstrap.rb

@@ -30,9 +30,16 @@ module Bootstrap
     end
     app_root = Dir.pwd
     handler = ARGV[0]
-    lambda_runner = AwsLambdaRuntimeInterfaceClient::LambdaRunner.new(fetch_runtime_server)
+    lambda_runner = AwsLambdaRuntimeInterfaceClient::LambdaRunner.new(fetch_runtime_server, get_user_agent)
     puts "Executing '#{handler}' in function directory '#{app_root}'"
     lambda_runner.run(app_root, handler)
   end
 
+  def self.get_user_agent
+    ruby_version = RUBY_VERSION.to_s
+    version = AwsLambdaRuntimeInterfaceClient::VERSION
+ 
+    "aws-lambda-ruby/#{ruby_version}-#{version}"
+  end
+
 end

data/lib/aws_lambda_ric/lambda_server.rb

@@ -10,21 +10,22 @@ class LambdaServer
   LAMBDA_DEFAULT_SERVER_ADDRESS = '127.0.0.1:9001'
   LAMBDA_RUNTIME_API_VERSION = '2018-06-01'
 
-  MAX_HEADER_SIZE = 1024 * 1024
-  LONG_TIMEOUT = 1_000_000
+  MAX_HEADER_SIZE_BYTES = 1024 * 1024
+  LONG_TIMEOUT_MS = 1_000_000
 
-  def initialize(server_address)
+  def initialize(server_address, user_agent)
     server_address ||= LAMBDA_DEFAULT_SERVER_ADDRESS
-    @server_address = 'http://' + server_address + '/' + LAMBDA_RUNTIME_API_VERSION
+    @server_address = "http://#{server_address}/#{LAMBDA_RUNTIME_API_VERSION}"
+    @user_agent = user_agent
   end
 
   def next_invocation
     next_invocation_uri = URI(@server_address + '/runtime/invocation/next')
     begin
       http = Net::HTTP.new(next_invocation_uri.host, next_invocation_uri.port)
-      http.read_timeout = LONG_TIMEOUT
+      http.read_timeout = LONG_TIMEOUT_MS
       resp = http.start do |connection|
-        connection.get(next_invocation_uri.path)
+        connection.get(next_invocation_uri.path, { 'User-Agent' => @user_agent })
       end
       if resp.is_a?(Net::HTTPSuccess)
         request_id = resp['Lambda-Runtime-Aws-Request-Id']
@@ -51,7 +52,7 @@ class LambdaServer
       Net::HTTP.post(
           response_uri,
           response_object,
-          { 'Content-Type' => content_type }
+          { 'Content-Type' => content_type, 'User-Agent' => @user_agent }
       )
     rescue StandardError => e
       raise LambdaErrors::LambdaRuntimeError.new(e)
@@ -61,8 +62,8 @@ class LambdaServer
   def send_error_response(request_id:, error_object:, error:, xray_cause:)
     response_uri = URI(@server_address + "/runtime/invocation/#{request_id}/error")
     begin
-      headers = { 'Lambda-Runtime-Function-Error-Type' => error.runtime_error_type }
-      headers['Lambda-Runtime-Function-XRay-Error-Cause'] = xray_cause if xray_cause.bytesize < MAX_HEADER_SIZE
+      headers = { 'Lambda-Runtime-Function-Error-Type' => error.runtime_error_type, 'User-Agent' => @user_agent }
+      headers['Lambda-Runtime-Function-XRay-Error-Cause'] = xray_cause if xray_cause.bytesize < MAX_HEADER_SIZE_BYTES
       Net::HTTP.post(
           response_uri,
           error_object.to_json,
@@ -79,7 +80,7 @@ class LambdaServer
       Net::HTTP.post(
           uri,
           error_object.to_json,
-          { 'Lambda-Runtime-Function-Error-Type' => error.runtime_error_type }
+          { 'Lambda-Runtime-Function-Error-Type' => error.runtime_error_type, 'User-Agent' => @user_agent }
       )
     rescue StandardError => e
       raise LambdaErrors::LambdaRuntimeInitError.new(e)

data/lib/aws_lambda_ric/logger_patch.rb

@@ -0,0 +1,21 @@
+# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+module LoggerPatch
+  def initialize(logdev, shift_age = 0, shift_size = 1048576, level: 'debug',
+                 progname: nil, formatter: nil, datetime_format: nil,
+                 binmode: false, shift_period_suffix: '%Y%m%d')
+    #  use unpatched constructor if logdev is a filename or an IO Object other than $stdout or $stderr
+    if logdev && logdev != $stdout && logdev != $stderr
+      super(logdev, shift_age, shift_size, level: level, progname: progname,
+                      formatter: formatter, datetime_format: datetime_format,
+                      binmode: binmode, shift_period_suffix: shift_period_suffix)
+    else
+      self.level = level
+      self.progname = progname
+      @default_formatter = LambdaLogFormatter.new
+      self.datetime_format = datetime_format
+      self.formatter = formatter
+      @logdev = AwsLambdaRuntimeInterfaceClient::TelemetryLoggingHelper.telemetry_log_sink
+    end
+  end
+end

data/lib/aws_lambda_ric/version.rb

@@ -3,5 +3,5 @@
 # frozen_string_literal: true
 
 module AwsLambdaRuntimeInterfaceClient
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws_lambda_ric
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - AWS Lambda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.0.1
 description: The AWS Lambda Ruby Runtime Interface Client implements the Lambda programming
   model for Ruby.
 email: 
@@ -76,6 +90,7 @@ files:
 - lib/aws_lambda_ric/lambda_log_formatter.rb
 - lib/aws_lambda_ric/lambda_logger.rb
 - lib/aws_lambda_ric/lambda_server.rb
+- lib/aws_lambda_ric/logger_patch.rb
 - lib/aws_lambda_ric/telemetry_log_sink.rb
 - lib/aws_lambda_ric/version.rb
 - lib/aws_lambda_ric/xray_cause.rb