fdk 0.0.18 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7202ae9a894c4f8441a14d462347e378a5a2a7b7bbfe491ab63422c18fd53220
-  data.tar.gz: 0b206f459aff8f18ccd90369f8f1d5817546bfd158f25c556d071af0dd481e1e
+  metadata.gz: 2e3bbd08c2801e8b98ab2a0ed065ec4833c1c76aa9557b80e789518b7536ebe9
+  data.tar.gz: aaad97f4e9a0ce65fca6ca275b65566cc080bfa71c727c3c801b95b7254518b4
 SHA512:
-  metadata.gz: a7166a00ed4d2132a545bb563ad4714836dee8c66bd7cc7f30b54f142054195f20f84f632c1bb7d591a77cf9bf8a4003ec39c013bc77f5f70f8c5f4f1b29cc2d
-  data.tar.gz: 7d01f662675303828e27365aa5d87cdc66543749a932a295e957132e47c648725576b6f0d568ade13e3dd7619bbdb6bd11e45a84b7037a86e3b54f166fe8b857
+  metadata.gz: 044ec13b6a88dd96f261a669171fbc9e86c7fbe414b76c32b01580387709c3b5b0ec18c0dfc242114207a61c401c0403c205da4c8d243cff11f6a073a254f0e2
+  data.tar.gz: 876ddbff791b328e57985b1147caa5e1c4fca063e2ef89d60f7d71595f1c209086e37109caee4ed3bfeb41a3e6aca830de8b6aa1449abbe6d8a00bc838848396

data/README.md

@@ -1,5 +1,5 @@
-# Ruby Function Developer Kit (FDK)
-This provides a Ruby framework for developing functions for use with [Fn](https://fnproject.github.io).
+# Function Development Kit for Ruby
+The Function Development Kit for Ruby (FDK for Ruby) provides a Ruby framework for developing functions for use with [Fn](https://fnproject.github.io).
 
 [![CircleCI](https://circleci.com/gh/fnproject/fdk-ruby.svg?style=svg)](https://circleci.com/gh/fnproject/fdk-ruby)
 

data/lib/fdk.rb

@@ -1,3 +1,21 @@
+# frozen_string_literal: true
+
+#
+# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require_relative "fdk/version"
 require_relative "fdk/runner"
 require_relative "fdk/context"

data/lib/fdk/call.rb

@@ -1,8 +1,25 @@
+# frozen_string_literal: true
+
+#
+# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module FDK
   # Call represents a call to the target function or lambda
   class Call
-    FILTER_HEADERS = ["content-length", "te", "transfer-encoding",
-                      "upgrade", "trailer"].freeze
+    FILTER_HEADERS = %w[content-length te transfer-encoding upgrade trailer].freeze
 
     attr_reader :request, :response
     attr_accessor :error

data/lib/fdk/context.rb

@@ -1,3 +1,21 @@
+# frozen_string_literal: true
+
+#
+# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require "date"
 
 module FDK

data/lib/fdk/function.rb

@@ -1,3 +1,21 @@
+# frozen_string_literal: true
+
+#
+# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module FDK
   # Function represents a function function or lambda
   class Function

data/lib/fdk/listener.rb

@@ -1,3 +1,21 @@
+# frozen_string_literal: true
+
+#
+# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module FDK
   # Represents the socket that Fn uses to communicate
   # with the FDK (and thence the function)
@@ -9,13 +27,16 @@ module FDK
   #
   # Fn waits for the socket_path to be created and then connects
   class Listener
-    attr_reader :url, :private_socket
+    attr_reader :url, :private_socket, :fn_logframe_name, :fn_logframe_hdr
 
     def initialize(url:)
       if url.nil? || !url.start_with?("unix:/")
         raise "Missing or invalid socket URL in FN_LISTENER."
       end
 
+      @fn_logframe_name = ENV["FN_LOGFRAME_NAME"]
+      @fn_logframe_hdr = ENV["FN_LOGFRAME_HDR"]
+
       @url = url
       @private_socket = UNIXServer.open(private_socket_path)
     end
@@ -46,16 +67,23 @@ module FDK
 
     def handle_request(fn_block:)
       local_socket = socket.accept
-      req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-      resp = WEBrick::HTTPResponse.new(WEBrick::Config::HTTP)
+      req, resp = new_req_resp
       req.parse(local_socket)
       FDK.debug "got request #{req}"
+      log_frame_header(req.header)
       fn_block.call(req, resp)
+      resp["Connection"] = "close" # we're not using keep alives sadly
       resp.send_response(local_socket)
       FDK.debug "sending resp  #{resp.status}, #{resp.header}"
       local_socket.close
     end
 
+    def new_req_resp
+      req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+      resp = WEBrick::HTTPResponse.new(WEBrick::Config::HTTP)
+      [req, resp]
+    end
+
     def socket_path
       @socket_path ||= url[5..url.length]
     end
@@ -63,5 +91,26 @@ module FDK
     def private_socket_path
       socket_path + ".private"
     end
+
+    def log_frame_header(headers)
+      return unless logframe_vars_exist
+
+      k = @fn_logframe_hdr.downcase
+      v = headers[k]
+      return if v.nil? || v.empty?
+
+      frm = "\n#{@fn_logframe_name}=#{v[0]}\n"
+      $stderr.print frm
+      $stderr.flush
+      $stdout.print frm
+      $stdout.flush
+    end
+
+    def logframe_vars_exist
+      return false if @fn_logframe_name.nil? || @fn_logframe_name.empty? ||
+                      @fn_logframe_hdr.nil? || @fn_logframe_hdr.empty?
+
+      true
+    end
   end
 end

data/lib/fdk/runner.rb

@@ -1,3 +1,21 @@
+# frozen_string_literal: true
+
+#
+# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require "webrick"
 require "fileutils"
 require "json"
@@ -7,7 +25,7 @@ require "set"
 # Executes it with input
 # Responds with output
 module FDK
-  FDK_LOG_THRESHOLD = "FDK_LOG_THRESHOLD".freeze
+  FDK_LOG_THRESHOLD = "FDK_LOG_THRESHOLD"
   FDK_LOG_DEBUG = 0
   FDK_LOG_DEFAULT = 1
 
@@ -18,7 +36,7 @@ module FDK
   # Writes the entry to STDERR if the log_level >= log_threshold
   # If no log level is specified, 1 is assumed.
   def self.log(entry:, log_level: FDK_LOG_DEFAULT)
-    STDERR.puts(entry) if log_level >= log_threshold
+    warn(entry) if log_level >= log_threshold
   end
 
   def self.log_error(error:)

data/lib/fdk/support_classes.rb

@@ -1,3 +1,21 @@
+# frozen_string_literal: true
+
+#
+# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module FDK
   # ParsedInput stores raw input and can parse it as
   # JSON (add extra formats as required)

data/lib/fdk/version.rb

@@ -1,3 +1,21 @@
+# frozen_string_literal: true
+
+#
+# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module FDK
-  VERSION = "0.0.18".freeze
+  VERSION = "0.0.25"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fdk
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.25
 platform: ruby
 authors:
 - Travis Reeder
@@ -10,28 +10,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -118,14 +118,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby FDK for Fn Project