From 1107459c58763ea1277f49fb83812461518177a5 Mon Sep 17 00:00:00 2001 From: Michael Martin Date: Mon, 14 Aug 2023 13:51:40 -0700 Subject: [PATCH] fix(wasm): remove hardcoded isolation level This was added during local development to work around a bug but is no longer desired and disallows setting the isolation level via kong.conf. --- CHANGELOG.md | 3 +++ kong.conf.default | 1 - kong/runloop/wasm.lua | 4 +--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42b7af25028e..b37b96a03df8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,6 +50,9 @@ [#11328](https://github.com/Kong/kong/pull/11328) - Fix an issue that response status code is not real upstream status when using kong.response function. [#11437](https://github.com/Kong/kong/pull/11437) +- Removed a hardcoded proxy-wasm isolation level setting that was preventing the + `nginx_http_proxy_wasm_isolation` configuration value from taking effect. + [#11407](https://github.com/Kong/kong/pull/11407) #### Plugins diff --git a/kong.conf.default b/kong.conf.default index 5a0ac9b80d36..c77883eaaa0e 100644 --- a/kong.conf.default +++ b/kong.conf.default @@ -2062,7 +2062,6 @@ # - `wasm_call` # - `module` # - `proxy_wasm` -# - `proxy_wasm_isolation` # - `resolver_add` # - `proxy_wasm_request_headers_in_access` # - `shm_queue` diff --git a/kong/runloop/wasm.lua b/kong/runloop/wasm.lua index 08ef1ffc9bf2..64502ca6b084 100644 --- a/kong/runloop/wasm.lua +++ b/kong/runloop/wasm.lua @@ -49,7 +49,6 @@ local sha256 = utils.sha256_bin local VERSION_KEY = "filter_chains:version" local TTL_ZERO = { ttl = 0 } -local ATTACH_OPTS = {} --- @@ -576,7 +575,6 @@ local function enable(kong_config) _G.dns_client = _G.dns_client or dns(kong_config) proxy_wasm = proxy_wasm or require "resty.wasmx.proxy_wasm" - ATTACH_OPTS.isolation = proxy_wasm.isolations.FILTER ENABLED = true STATUS = STATUS_ENABLED @@ -670,7 +668,7 @@ function _M.attach(ctx) ctx.ran_wasm = true - local ok, err = proxy_wasm.attach(chain.c_plan, ATTACH_OPTS) + local ok, err = proxy_wasm.attach(chain.c_plan) if not ok then log(CRIT, "failed attaching ", chain.label, " filter chain to request: ", err) return kong.response.error(500)