feat(version) added Kong Enterprise version 3.4.0.0 (#418)

* feat(version) added Kong Enterprise version 3.4.0.0

* chore(version) added Kong Enterprise version 3.4.0.0 artifacts

* chore(Makefile): Fix overeager linter

The linter rule on this Makefile was linting the Kong script files in
addition to lint the Pongo ones. This is not appropriate, pongo linting
rules could be completely different from the gateway rules, they are
different projects.

Makefile

@@ -7,7 +7,7 @@ install:
 	fi
 
 lint:
-	bash -c 'shopt -s globstar nullglob &> /dev/null; shellcheck **/*.{sh,ksh,bash}'
+	bash -c 'shopt -s globstar nullglob &> /dev/null; shellcheck *.{sh,ksh,bash} assets/*.{sh,ksh,bash}'
 
 test:
 	cd assets/ci && ./run.sh --suite "Pongo test suite" && cd ../..

assets/kong_EE_versions.ver

@@ -12,3 +12,4 @@
 3.2.2.0
 3.3.0.0
 3.3.1.0
+3.4.0.0

kong-versions/3.4.0.0/kong/Makefile

@@ -0,0 +1,234 @@
+OS := $(shell uname | awk '{print tolower($$0)}')
+MACHINE := $(shell uname -m)
+
+# EE uses "busted-hjtest" while CE uses "busted-htest"
+DEV_ROCKS = "busted 2.1.2" "busted-hjtest 0.0.4" "luacheck 1.1.1" "lua-llthreads2 0.1.6" "ldoc 1.5.0" "luacov 0.15.0"
+WIN_SCRIPTS = "bin/busted" "bin/kong" "bin/kong-health"
+BUSTED_ARGS ?= -v
+TEST_CMD ?= bin/busted $(BUSTED_ARGS)
+
+BUILD_NAME ?= kong-dev
+BAZEL_ARGS ?= --verbose_failures --action_env=BUILD_NAME=$(BUILD_NAME) --//:skip_webui=true
+
+ifeq ($(OS), darwin)
+HOMEBREW_DIR ?= /opt/homebrew
+OPENSSL_DIR ?= $(shell brew --prefix)/opt/openssl
+EXPAT_DIR ?= $(HOMEBREW_DIR)/opt/expat
+LIBXML2_DIR ?= $(HOMEBREW_DIR)/opt/libxml2
+GRPCURL_OS ?= osx
+YAML_DIR ?= $(shell brew --prefix)/opt/libyaml
+else
+LIBRARY_PREFIX ?= /usr
+OPENSSL_DIR ?= $(LIBRARY_PREFIX)
+EXPAT_DIR ?= $(LIBRARY_PREFIX)
+LIBXML2_DIR ?= $(LIBRARY_PREFIX)
+GRPCURL_OS ?= $(OS)
+YAML_DIR ?= /usr
+endif
+
+ifeq ($(MACHINE), aarch64)
+GRPCURL_MACHINE ?= arm64
+H2CLIENT_MACHINE ?= arm64
+else
+GRPCURL_MACHINE ?= $(MACHINE)
+H2CLIENT_MACHINE ?= $(MACHINE)
+endif
+
+ifeq ($(MACHINE), aarch64)
+BAZELISK_MACHINE ?= arm64
+else ifeq ($(MACHINE), x86_64)
+BAZELISK_MACHINE ?= amd64
+else
+BAZELISK_MACHINE ?= $(MACHINE)
+endif
+
+.PHONY: install dev \
+	sca test test-integration test-plugins test-all \
+	pdk-phase-check functional-tests \
+	fix-windows release wasm-test-filters
+
+ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+KONG_SOURCE_LOCATION ?= $(ROOT_DIR)
+GRPCURL_VERSION ?= 1.8.5
+BAZLISK_VERSION ?= 1.17.0
+H2CLIENT_VERSION ?= 0.4.0
+BAZEL := $(shell command -v bazel 2> /dev/null)
+VENV = /dev/null # backward compatibility when no venv is built
+
+# Use x86_64 grpcurl v1.8.5 for Apple silicon chips
+ifeq ($(GRPCURL_OS)_$(MACHINE)_$(GRPCURL_VERSION), osx_arm64_1.8.5)
+GRPCURL_MACHINE = x86_64
+endif
+
+PACKAGE_TYPE ?= deb
+
+bin/bazel:
+	@curl -s -S -L \
+		https://github.com/bazelbuild/bazelisk/releases/download/v$(BAZLISK_VERSION)/bazelisk-$(OS)-$(BAZELISK_MACHINE) -o bin/bazel
+	@chmod +x bin/bazel
+
+bin/grpcurl:
+	@curl -s -S -L \
+		https://github.com/fullstorydev/grpcurl/releases/download/v$(GRPCURL_VERSION)/grpcurl_$(GRPCURL_VERSION)_$(GRPCURL_OS)_$(GRPCURL_MACHINE).tar.gz | tar xz -C bin;
+	@$(RM) bin/LICENSE
+
+bin/h2client:
+	@curl -s -S -L \
+		https://github.com/Kong/h2client/releases/download/v$(H2CLIENT_VERSION)/h2client_$(H2CLIENT_VERSION)_$(OS)_$(H2CLIENT_MACHINE).tar.gz | tar xz -C bin;
+	@$(RM) bin/README.md
+
+
+check-bazel: bin/bazel
+ifndef BAZEL
+	$(eval BAZEL := bin/bazel)
+endif
+
+wasm-test-filters:
+	./scripts/build-wasm-test-filters.sh
+
+build-kong: check-bazel
+	$(BAZEL) build //build:kong $(BAZEL_ARGS)
+
+build-venv: check-bazel
+	$(eval VENV := bazel-bin/build/$(BUILD_NAME)-venv.sh)
+
+	@if [ ! -e bazel-bin/build/$(BUILD_NAME)-venv.sh ]; then \
+		$(BAZEL) build //build:venv $(BAZEL_ARGS); \
+	fi
+
+install-dev-rocks: build-venv
+	@. $(VENV) ;\
+	for rock in $(DEV_ROCKS) ; do \
+	  if luarocks list --porcelain $$rock | grep -q "installed" ; then \
+		echo $$rock already installed, skipping ; \
+	  else \
+		echo $$rock not found, installing via luarocks... ; \
+		LIBRARY_PREFIX=$$(pwd)/bazel-bin/build/$(BUILD_NAME)/kong ; \
+		luarocks install $$rock OPENSSL_DIR=$$LIBRARY_PREFIX CRYPTO_DIR=$$LIBRARY_PREFIX YAML_DIR=$(YAML_DIR) || exit 1; \
+	  fi \
+	done;
+
+dev: build-venv install-dev-rocks bin/grpcurl bin/h2client wasm-test-filters
+
+build-release: check-bazel
+	$(BAZEL) clean --expunge
+	$(BAZEL) build //build:kong --verbose_failures --config release
+
+package/deb: check-bazel build-release
+	$(BAZEL) build --config release :kong_deb
+
+package/apk: check-bazel build-release
+	$(BAZEL) build --config release :kong_apk
+
+package/rpm: check-bazel build-release
+	$(BAZEL) build --config release :kong_el8 --action_env=RPM_SIGNING_KEY_FILE --action_env=NFPM_RPM_PASSPHRASE
+	$(BAZEL) build --config release :kong_el7 --action_env=RPM_SIGNING_KEY_FILE --action_env=NFPM_RPM_PASSPHRASE
+	$(BAZEL) build --config release :kong_aws2 --action_env=RPM_SIGNING_KEY_FILE --action_env=NFPM_RPM_PASSPHRASE
+	$(BAZEL) build --config release :kong_aws2022 --action_env=RPM_SIGNING_KEY_FILE --action_env=NFPM_RPM_PASSPHRASE
+
+functional-tests: dev test
+
+install: dev
+	@$(VENV) luarocks make
+
+clean: check-bazel
+	$(BAZEL) clean
+	$(RM) bin/bazel bin/grpcurl bin/h2client
+
+expunge: check-bazel
+	$(BAZEL) clean --expunge
+	$(RM) bin/bazel bin/grpcurl bin/h2client
+
+sca:
+	$(info Beginning static code analysis)
+	@luacheck --exclude-files ./distribution/ -q .
+	@!(grep -R -E -I -n -w '#only|#o' spec && echo "#only or #o tag detected") >&2
+	@!(grep -R -E -I -n -w '#only|#o' spec-ee && echo "#only or #o tag detected") >&2
+	@!(grep -R -E -I -n -- '---\s+ONLY' t && echo "--- ONLY block detected") >&2
+	@$(KONG_SOURCE_LOCATION)/scripts/copyright-header-checker
+
+trigger-api-tests:
+	-docker manifest inspect kong/kong-gateway-internal:${DOCKER_IMAGE_TAG} 2>&1 >/dev/null && \
+		curl \
+			-X POST \
+			-H "Accept: application/vnd.github+json" \
+			-H "Authorization: Bearer ${GITHUB_TOKEN}" \
+			https://api.github.com/repos/kong/kong-api-tests/dispatches \
+			-d '{"event_type":"per-commit-test","client_payload":{"docker_image":"kong/kong-gateway-internal:${DOCKER_IMAGE_TAG}"}' \
+
+test: dev
+	@$(VENV) $(TEST_CMD) spec/01-unit
+
+test-integration: dev
+	@$(VENV) $(TEST_CMD) spec/02-integration
+
+test-plugins-spec: dev
+	@$(VENV) $(TEST_CMD) spec/03-plugins
+
+test-all: dev
+	@$(VENV) $(TEST_CMD) spec/
+
+test-ee: dev
+	@$(VENV) $(TEST_CMD) spec-ee/01-unit
+
+test-integration-ee: dev
+	@$(VENV) $(TEST_CMD) spec-ee/02-integration
+
+test-plugins-spec-ee: dev
+	@$(VENV) $(TEST_CMD) spec-ee/03-plugins
+
+test-all-ee: dev
+	@$(VENV) $(TEST_CMD) spec-ee/
+
+test-custom: dev
+ifndef test_spec
+	$(error test_spec variable needs to be set, i.e. make test-custom test_spec=foo/bar/baz_spec.lua)
+endif
+	@$(VENV) $(TEST_CMD) $(test_spec)
+
+pdk-phase-checks: dev
+	rm -f t/phase_checks.stats
+	rm -f t/phase_checks.report
+	PDK_PHASE_CHECKS_LUACOV=1 prove -I. t/01*/*/00-phase*.t
+	luacov -c t/phase_checks.luacov
+	grep "ngx\\." t/phase_checks.report
+	grep "check_" t/phase_checks.report
+
+test-plugins-ee:
+ifndef EE_PLUGIN
+	$(error "Please use make plugins-ee EE_PLUGIN=plugin-name")
+endif
+	scripts/enterprise_plugin.sh build-deps
+	scripts/enterprise_plugin.sh test $(EE_PLUGIN)
+
+fix-windows:
+	@for script in $(WIN_SCRIPTS) ; do \
+	  echo Converting Windows file $$script ; \
+	  mv $$script $$script.win ; \
+	  tr -d '\015' <$$script.win >$$script ; \
+	  rm $$script.win ; \
+	  chmod 0755 $$script ; \
+	done;
+
+# the following targets are kept for backwards compatibility
+# dev is renamed to dev-legacy
+remove:
+	$(warning 'remove' target is deprecated, please use `make dev` instead)
+	-@luarocks remove kong
+
+dependencies: bin/grpcurl bin/h2client
+	$(warning 'dependencies' target is deprecated, this is now not needed when using `make dev`, but are kept for installation that are not built by Bazel)
+
+	for rock in $(DEV_ROCKS) ; do \
+	  if luarocks list --porcelain $$rock | grep -q "installed" ; then \
+		echo $$rock already installed, skipping ; \
+	  else \
+		echo $$rock not found, installing via luarocks... ; \
+		luarocks install $$rock OPENSSL_DIR=$(OPENSSL_DIR) CRYPTO_DIR=$(OPENSSL_DIR) YAML_DIR=$(YAML_DIR) || exit 1; \
+	  fi \
+	done;
+
+install-legacy:
+	@luarocks make OPENSSL_DIR=$(OPENSSL_DIR) CRYPTO_DIR=$(OPENSSL_DIR) YAML_DIR=$(YAML_DIR)
+
+dev-legacy: remove install-legacy dependencies

kong-versions/3.4.0.0/kong/bin/busted

@@ -0,0 +1,68 @@
+#!/usr/bin/env resty
+
+setmetatable(_G, nil)
+
+local pl_path = require("pl.path")
+
+local cert_path = pl_path.abspath("spec/fixtures/kong_spec.crt")
+
+local DEFAULT_RESTY_FLAGS=string.format(" -c 4096 --http-conf 'lua_ssl_trusted_certificate %s;' ", cert_path)
+
+if not os.getenv("KONG_BUSTED_RESPAWNED") then
+  -- initial run, so go update the environment
+  local script = {}
+  for line in io.popen("set"):lines() do
+    local ktvar, val = line:match("^KONG_TEST_([^=]*)=(.*)")
+    if ktvar then
+      -- reinserted KONG_TEST_xxx as KONG_xxx; append
+      table.insert(script, "export KONG_" .. ktvar .. "=" ..val)
+    end
+
+    local var = line:match("^(KONG_[^=]*)")
+    local var_for_spec = line:match("^(KONG_SPEC_[^=]*)")
+    if var and not var_for_spec then
+      -- remove existing KONG_xxx and KONG_TEST_xxx variables; prepend
+      table.insert(script, 1, "unset " .. var)
+    end
+  end
+  -- add cli recursion detection
+  table.insert(script, "export KONG_BUSTED_RESPAWNED=1")
+
+  -- XXX EE
+  table.insert(script, "export KONG_IS_TESTING=1")
+
+  -- rebuild the invoked commandline, while inserting extra resty-flags
+  local resty_flags = DEFAULT_RESTY_FLAGS
+  local cmd = { "exec", "/usr/bin/env", "resty" }
+  local cmd_prefix_count = #cmd
+  for i = 0, #arg do
+    if arg[i]:sub(1, 12) == "RESTY_FLAGS=" then
+      resty_flags = arg[i]:sub(13, -1)
+
+    else
+      table.insert(cmd, "'" .. arg[i] .. "'")
+    end
+  end
+
+  if resty_flags then
+    table.insert(cmd, cmd_prefix_count+1, resty_flags)
+  end
+
+  table.insert(script, table.concat(cmd, " "))
+
+  -- recurse cli command, with proper variables (un)set for clean testing
+  local _, _, rc = os.execute(table.concat(script, "; "))
+  os.exit(rc)
+end
+
+pcall(require, "luarocks.loader")
+
+require("kong.globalpatches")({
+  cli = true,
+  rbusted = true
+})
+
+-- Busted command-line runner
+require 'busted.runner'({ standalone = false })
+
+-- vim: set ft=lua ts=2 sw=2 sts=2 et :