refactor(aws-lambda): refactor aws-lambda plugin code with lua-resty-aws

.requirements

@@ -4,6 +4,7 @@ OPENRESTY=1.21.4.1
 LUAROCKS=3.9.2
 OPENSSL=3.1.2
 PCRE=8.45
+LIBEXPAT=2.5.0
 
 LUA_KONG_NGINX_MODULE=4d19e8d19c6dbc07eba5cf6f5ebacad95266f928 # 0.6.0
 LUA_RESTY_LMDB=951926f20b674a0622236a0e331b359df1c02d9b # 1.3.0

Makefile

@@ -12,10 +12,12 @@ ifeq ($(OS), darwin)
 OPENSSL_DIR ?= $(shell brew --prefix)/opt/openssl
 GRPCURL_OS ?= osx
 YAML_DIR ?= $(shell brew --prefix)/opt/libyaml
+EXPAT_DIR ?= $(HOMEBREW_DIR)/opt/expat
 else
 OPENSSL_DIR ?= /usr
 GRPCURL_OS ?= $(OS)
 YAML_DIR ?= /usr
+EXPAT_DIR ?= $(LIBRARY_PREFIX)
 endif
 
 ifeq ($(MACHINE), aarch64)

build/BUILD.bazel

@@ -8,6 +8,7 @@ exports_files([
 
 lib_deps = [
     "@openssl",  #TODO: select over fips (but select doesn't work in list comprehension)
+    "@libexpat",
 ]
 
 install_lib_deps_cmd = "\n".join([

build/libexpat/BUILD.bazel

@@ -0,0 +1,16 @@
+load("@bazel_skylib//rules:build_test.bzl", "build_test")
+
+exports_files(
+    [
+        "BUILD.libexpat.bazel",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+build_test(
+    name = "build",
+    targets = [
+        "@libexpat//:libexpat",
+    ],
+    visibility = ["//:__pkg__"],
+)

build/libexpat/BUILD.libexpat.bazel

@@ -0,0 +1,58 @@
+load("@rules_foreign_cc//foreign_cc:defs.bzl", "configure_make")
+load("@kong_bindings//:variables.bzl", "KONG_VAR")
+
+filegroup(
+    name = "all_srcs",
+    srcs = glob(
+        include = ["**"],
+        exclude = ["*.bazel"],
+    ),
+)
+
+configure_make(
+    name = "libexpat",
+    configure_command = "configure",
+    configure_in_place = True,
+    configure_options = [
+        # configure a miminal feature set at first so that we don't
+        # end up depend to a lot of dependencies; do not when turning
+        # on any of the feature below, we need to add it o kong package's
+        # dependencies, and compile it (under build/cross_deps) for
+        # cross build platforms
+        "--enable-static=no",
+        "--without-xmlwf",
+        "--without-examples",
+        "--without-docbook",
+    ] + select({
+        "@kong//:aarch64-linux-anylibc-cross": [
+            "--host=aarch64-linux",
+        ],
+        "@kong//:x86_64-linux-musl-cross": [
+            "--host=x86_64-linux-musl",
+        ],
+        "//conditions:default": [],
+    }),
+    env = select({
+        "@platforms//os:macos": {
+            # don't use rule_foreign_cc's libtool as archiver as it seems to be a bug
+            # see https://github.com/bazelbuild/rules_foreign_cc/issues/947
+            "AR": "/usr/bin/ar",
+        },
+        "//conditions:default": {},
+    }),
+    lib_source = ":all_srcs",
+    # out_lib_dir = "lib",
+    out_shared_libs = select({
+        "@platforms//os:macos": [
+            "libexpat.1.dylib",
+        ],
+        "//conditions:default": [
+            "libexpat.so.1",
+        ],
+    }),
+    targets = [
+        "-j" + KONG_VAR["NPROC"],
+        "install -j" + KONG_VAR["NPROC"],
+    ],
+    visibility = ["//visibility:public"],
+)

build/libexpat/repositories.bzl

@@ -0,0 +1,20 @@
+"""A module defining the third party dependency OpenResty"""
+
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@kong_bindings//:variables.bzl", "KONG_VAR")
+
+def libexpat_repositories():
+    """Defines the libexpat repository"""
+
+    version = KONG_VAR["LIBEXPAT"]
+    tag = "R_" + version.replace(".", "_")
+
+    maybe(
+        http_archive,
+        name = "libexpat",
+        url = "https://github.com/libexpat/libexpat/releases/download/" + tag + "/expat-" + version + ".tar.gz",
+        sha256 = "6b902ab103843592be5e99504f846ec109c1abb692e85347587f237a4ffa1033",
+        strip_prefix = "expat-" + version,
+        build_file = "//build/libexpat:BUILD.libexpat.bazel",
+    )

build/luarocks/BUILD.luarocks.bazel

@@ -43,6 +43,7 @@ genrule(
     name = "luarocks_exec",
     srcs = [
         "@openssl",
+        "@libexpat",
     ] + select({
         "@kong//:any-cross": ["@cross_deps_libyaml//:libyaml"],
         "//conditions:default": [
@@ -65,6 +66,7 @@ touch "$$ROCKS_DIR/../luarocks_config.lua"
 ROCKS_CONFIG=$$(readlink -f "$$ROCKS_DIR/../luarocks_config.lua")
 
 OPENSSL_DIR=$$WORKSPACE_PATH/$$(echo '$(locations @openssl)' | awk '{print $$1}')
+EXPAT_DIR=$$WORKSPACE_PATH/$$(echo '$(locations @libexpat)' | awk '{print $$1}')
 
 # we use system libyaml on macos
 if [[ "$$OSTYPE" == "darwin"* ]]; then
@@ -120,6 +122,7 @@ export EXT_BUILD_ROOT=$$WORKSPACE_PATH # for musl
 $$host_luajit $$WORKSPACE_PATH/$$LUAROCKS_HOST/bin/luarocks \\$$@ \\
     OPENSSL_DIR=$$OPENSSL_DIR \\
     CRYPTO_DIR=$$OPENSSL_DIR \\
+    EXPAT_DIR=$$EXPAT_DIR \\
     YAML_DIR=$$YAML_DIR
 EOF
 """,

build/repositories.bzl

@@ -5,6 +5,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
 load("//build/luarocks:luarocks_repositories.bzl", "luarocks_repositories")
 load("//build/cross_deps:repositories.bzl", "cross_deps_repositories")
+load("//build/libexpat:repositories.bzl", "libexpat_repositories")
 load("@kong_bindings//:variables.bzl", "KONG_VAR")
 
 _SRCS_BUILD_FILE_CONTENT = """
@@ -139,6 +140,7 @@ def kong_resty_websocket_repositories():
     )
 
 def build_repositories():
+    libexpat_repositories()
     luarocks_repositories()
 
     kong_resty_websocket_repositories()

kong-3.5.0-0.rockspec

@@ -33,6 +33,7 @@ dependencies = {
   "lua-protobuf == 0.5.0",
   "lua-resty-healthcheck == 1.6.2",
   "lua-messagepack == 0.5.2",
+  "lua-resty-aws == 1.3.0",
   "lua-resty-openssl == 0.8.23",
   "lua-resty-counter == 0.2.1",
   "lua-resty-ipmatcher == 0.6.1",
@@ -437,13 +438,8 @@ build = {
     ["kong.plugins.request-termination.handler"] = "kong/plugins/request-termination/handler.lua",
     ["kong.plugins.request-termination.schema"] = "kong/plugins/request-termination/schema.lua",
 
-    ["kong.plugins.aws-lambda.aws-serializer"]       = "kong/plugins/aws-lambda/aws-serializer.lua",
     ["kong.plugins.aws-lambda.handler"]              = "kong/plugins/aws-lambda/handler.lua",
-    ["kong.plugins.aws-lambda.iam-ec2-credentials"]  = "kong/plugins/aws-lambda/iam-ec2-credentials.lua",
-    ["kong.plugins.aws-lambda.iam-ecs-credentials"]  = "kong/plugins/aws-lambda/iam-ecs-credentials.lua",
-    ["kong.plugins.aws-lambda.iam-sts-credentials"]  = "kong/plugins/aws-lambda/iam-sts-credentials.lua",
     ["kong.plugins.aws-lambda.schema"]               = "kong/plugins/aws-lambda/schema.lua",
-    ["kong.plugins.aws-lambda.v4"]                   = "kong/plugins/aws-lambda/v4.lua",
     ["kong.plugins.aws-lambda.request-util"]         = "kong/plugins/aws-lambda/request-util.lua",
 
     ["kong.plugins.grpc-gateway.deco"] = "kong/plugins/grpc-gateway/deco.lua",

kong/db/dao/plugins.lua

@@ -355,5 +355,29 @@ function Plugins:get_handlers()
   return list
 end
 
+function Plugins:execute_plugin_init()
+  local handlers, err = self:get_handlers()
+  if not handlers then
+    return nil, err
+  end
+
+  local errors
+
+  for _, handler in ipairs(handlers) do
+    if implements(handler.handler, "init") then
+      local ok, err = pcall(handler.handler.init, handler.handler)
+      if not ok then
+        errors = errors or {}
+        errors[#errors + 1] = "on plugin '" .. handler.name .. "': " .. tostring(err)
+      end
+    end
+  end
+
+  if errors then
+    return nil, "error executing plugin init: " .. table.concat(errors, "; ")
+  end
+
+  return true
+end
 
 return Plugins

kong/init.lua

@@ -628,6 +628,8 @@ function Kong.init()
   -- Load plugins as late as possible so that everything is set up
   assert(db.plugins:load_plugin_schemas(config.loaded_plugins))
 
+  assert(db.plugins:execute_plugin_init())
+
   if is_stream_module then
     stream_api.load_handlers()
   end