Skip to content

Commit 8f6aed3

Browse files
flrghflrgh
committed
chore(build): remove ngx_wasm_module from default builds
1 parent 1e3fd83 commit 8f6aed3

25 files changed

+19
-146
lines changed

‎.busted

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
return {
2+
_all = {
3+
["exclude-tags"] = {
4+
"wasm",
5+
},
6+
},
27
default = {
38
lpath = "./?.lua;./?/init.lua;",
49
-- make setup() and teardown() behave like their lazy_ variants

‎.github/workflows/build.yml

-6
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@ jobs:
2525
- name: Checkout Kong source code
2626
uses: actions/checkout@v4
2727

28-
# these aren't necessarily used by all tests, but building them here will
29-
# ensures that we have a warm cache when other tests _do_ need to build the
30-
# filters
31-
- name: Build WASM Test Filters
32-
uses: ./.github/actions/build-wasm-test-filters
33-
3428
- name: Generate cache key
3529
id: cache-key
3630
uses: ./.github/actions/build-cache-key

‎.github/workflows/build_and_test.yml

-3
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,6 @@ jobs:
247247
path: ${{ env.BUILD_ROOT }}
248248
key: ${{ needs.build.outputs.cache-key }}
249249

250-
- name: Build WASM Test Filters
251-
uses: ./.github/actions/build-wasm-test-filters
252-
253250
- name: Add gRPC test host names
254251
run: |
255252
echo "127.0.0.1 grpcs_1.test" | sudo tee -a /etc/hosts

‎BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,10 @@ config_setting(
183183
visibility = ["//visibility:public"],
184184
)
185185

186-
# --//:wasmx=true
186+
# --//:wasmx=false
187187
bool_flag(
188188
name = "wasmx",
189-
build_setting_default = True,
189+
build_setting_default = False,
190190
visibility = ["//visibility:public"],
191191
)
192192

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ install-dev-rocks: build-venv
122122
fi \
123123
done;
124124

125-
dev: install-rust-toolchain build-venv install-dev-rocks bin/grpcurl bin/h2client wasm-test-filters
125+
dev: install-rust-toolchain build-venv install-dev-rocks bin/grpcurl bin/h2client
126126

127127
build-release: check-bazel
128128
$(BAZEL) clean --expunge

‎changelog/unreleased/kong/disable-ngx-wasm-module.yml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
message: "**Wasm**: Bumped `ngx_wasm_module` to `9136e463a6f1d80755ce66c88c3ddecd0eb5e25d`"
2+
type: dependency

‎scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt

-11
Original file line numberDiff line numberDiff line change
@@ -177,16 +177,6 @@
177177
Needed :
178178
- libc.so.6
179179

180-
- Path : /usr/local/openresty/nginx/modules/ngx_wasmx_module.so
181-
Needed :
182-
- libdl.so.2
183-
- libm.so.6
184-
- libpthread.so.0
185-
- libgcc_s.so.1
186-
- libc.so.6
187-
- ld-linux-x86-64.so.2
188-
Rpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib:/usr/local/openresty/lualib
189-
190180
- Path : /usr/local/openresty/nginx/sbin/nginx
191181
Needed :
192182
- libdl.so.2
@@ -205,7 +195,6 @@
205195
- lua-resty-events
206196
- lua-resty-lmdb
207197
- ngx_brotli
208-
- ngx_wasmx_module
209198
OpenSSL : OpenSSL 3.4.1 11 Feb 2025
210199
DWARF : True
211200
DWARF - ngx_http_request_t related DWARF DIEs: True

‎scripts/explain_manifest/fixtures/amazonlinux-2023-amd64.txt

-9
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,6 @@
154154
Needed :
155155
- libc.so.6
156156

157-
- Path : /usr/local/openresty/nginx/modules/ngx_wasmx_module.so
158-
Needed :
159-
- libm.so.6
160-
- libgcc_s.so.1
161-
- libc.so.6
162-
- ld-linux-x86-64.so.2
163-
Runpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib:/usr/local/openresty/lualib
164-
165157
- Path : /usr/local/openresty/nginx/sbin/nginx
166158
Needed :
167159
- libcrypt.so.2
@@ -178,7 +170,6 @@
178170
- lua-resty-events
179171
- lua-resty-lmdb
180172
- ngx_brotli
181-
- ngx_wasmx_module
182173
OpenSSL : OpenSSL 3.4.1 11 Feb 2025
183174
DWARF : True
184175
DWARF - ngx_http_request_t related DWARF DIEs: True

‎scripts/explain_manifest/fixtures/amazonlinux-2023-arm64.txt

-9
Original file line numberDiff line numberDiff line change
@@ -178,14 +178,6 @@
178178
Needed :
179179
- libc.so.6
180180

181-
- Path : /usr/local/openresty/nginx/modules/ngx_wasmx_module.so
182-
Needed :
183-
- libm.so.6
184-
- libgcc_s.so.1
185-
- libc.so.6
186-
- ld-linux-aarch64.so.1
187-
Rpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib:/usr/local/openresty/lualib
188-
189181
- Path : /usr/local/openresty/nginx/sbin/nginx
190182
Needed :
191183
- libcrypt.so.2
@@ -202,7 +194,6 @@
202194
- lua-kong-nginx-module/stream
203195
- lua-resty-events
204196
- lua-resty-lmdb
205-
- ngx_wasmx_module
206197
OpenSSL : OpenSSL 3.4.1 11 Feb 2025
207198
DWARF : True
208199
DWARF - ngx_http_request_t related DWARF DIEs: True

‎scripts/explain_manifest/fixtures/debian-11-amd64.txt

-11
Original file line numberDiff line numberDiff line change
@@ -151,16 +151,6 @@
151151
Needed :
152152
- libc.so.6
153153

154-
- Path : /usr/local/openresty/nginx/modules/ngx_wasmx_module.so
155-
Needed :
156-
- libdl.so.2
157-
- libm.so.6
158-
- libpthread.so.0
159-
- libgcc_s.so.1
160-
- libc.so.6
161-
- ld-linux-x86-64.so.2
162-
Runpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib:/usr/local/openresty/lualib
163-
164154
- Path : /usr/local/openresty/nginx/sbin/nginx
165155
Needed :
166156
- libdl.so.2
@@ -179,7 +169,6 @@
179169
- lua-resty-events
180170
- lua-resty-lmdb
181171
- ngx_brotli
182-
- ngx_wasmx_module
183172
OpenSSL : OpenSSL 3.4.1 11 Feb 2025
184173
DWARF : True
185174
DWARF - ngx_http_request_t related DWARF DIEs: True

‎scripts/explain_manifest/fixtures/debian-12-amd64.txt

-9
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,6 @@
144144
Needed :
145145
- libc.so.6
146146

147-
- Path : /usr/local/openresty/nginx/modules/ngx_wasmx_module.so
148-
Needed :
149-
- libm.so.6
150-
- libgcc_s.so.1
151-
- libc.so.6
152-
- ld-linux-x86-64.so.2
153-
Runpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib:/usr/local/openresty/lualib
154-
155147
- Path : /usr/local/openresty/nginx/sbin/nginx
156148
Needed :
157149
- libcrypt.so.1
@@ -168,7 +160,6 @@
168160
- lua-resty-events
169161
- lua-resty-lmdb
170162
- ngx_brotli
171-
- ngx_wasmx_module
172163
OpenSSL : OpenSSL 3.4.1 11 Feb 2025
173164
DWARF : True
174165
DWARF - ngx_http_request_t related DWARF DIEs: True

‎scripts/explain_manifest/fixtures/el8-amd64.txt

-11
Original file line numberDiff line numberDiff line change
@@ -161,16 +161,6 @@
161161
Needed :
162162
- libc.so.6
163163

164-
- Path : /usr/local/openresty/nginx/modules/ngx_wasmx_module.so
165-
Needed :
166-
- libdl.so.2
167-
- libm.so.6
168-
- libpthread.so.0
169-
- libgcc_s.so.1
170-
- libc.so.6
171-
- ld-linux-x86-64.so.2
172-
Rpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib:/usr/local/openresty/lualib
173-
174164
- Path : /usr/local/openresty/nginx/sbin/nginx
175165
Needed :
176166
- libdl.so.2
@@ -189,7 +179,6 @@
189179
- lua-resty-events
190180
- lua-resty-lmdb
191181
- ngx_brotli
192-
- ngx_wasmx_module
193182
OpenSSL : OpenSSL 3.4.1 11 Feb 2025
194183
DWARF : True
195184
DWARF - ngx_http_request_t related DWARF DIEs: True

‎scripts/explain_manifest/fixtures/el9-amd64.txt

-9
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,6 @@
154154
Needed :
155155
- libc.so.6
156156

157-
- Path : /usr/local/openresty/nginx/modules/ngx_wasmx_module.so
158-
Needed :
159-
- libm.so.6
160-
- libgcc_s.so.1
161-
- libc.so.6
162-
- ld-linux-x86-64.so.2
163-
Rpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib:/usr/local/openresty/lualib
164-
165157
- Path : /usr/local/openresty/nginx/sbin/nginx
166158
Needed :
167159
- libcrypt.so.2
@@ -178,7 +170,6 @@
178170
- lua-resty-events
179171
- lua-resty-lmdb
180172
- ngx_brotli
181-
- ngx_wasmx_module
182173
OpenSSL : OpenSSL 3.4.1 11 Feb 2025
183174
DWARF : True
184175
DWARF - ngx_http_request_t related DWARF DIEs: True

‎scripts/explain_manifest/fixtures/el9-arm64.txt

-9
Original file line numberDiff line numberDiff line change
@@ -178,14 +178,6 @@
178178
Needed :
179179
- libc.so.6
180180

181-
- Path : /usr/local/openresty/nginx/modules/ngx_wasmx_module.so
182-
Needed :
183-
- libm.so.6
184-
- libgcc_s.so.1
185-
- libc.so.6
186-
- ld-linux-aarch64.so.1
187-
Rpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib:/usr/local/openresty/lualib
188-
189181
- Path : /usr/local/openresty/nginx/sbin/nginx
190182
Needed :
191183
- libcrypt.so.2
@@ -202,7 +194,6 @@
202194
- lua-kong-nginx-module/stream
203195
- lua-resty-events
204196
- lua-resty-lmdb
205-
- ngx_wasmx_module
206197
OpenSSL : OpenSSL 3.4.1 11 Feb 2025
207198
DWARF : True
208199
DWARF - ngx_http_request_t related DWARF DIEs: True

‎scripts/explain_manifest/fixtures/ubuntu-20.04-amd64.txt

-11
Original file line numberDiff line numberDiff line change
@@ -155,16 +155,6 @@
155155
Needed :
156156
- libc.so.6
157157

158-
- Path : /usr/local/openresty/nginx/modules/ngx_wasmx_module.so
159-
Needed :
160-
- libdl.so.2
161-
- libm.so.6
162-
- libpthread.so.0
163-
- libgcc_s.so.1
164-
- libc.so.6
165-
- ld-linux-x86-64.so.2
166-
Runpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib:/usr/local/openresty/lualib
167-
168158
- Path : /usr/local/openresty/nginx/sbin/nginx
169159
Needed :
170160
- libdl.so.2
@@ -183,7 +173,6 @@
183173
- lua-resty-events
184174
- lua-resty-lmdb
185175
- ngx_brotli
186-
- ngx_wasmx_module
187176
OpenSSL : OpenSSL 3.4.1 11 Feb 2025
188177
DWARF : True
189178
DWARF - ngx_http_request_t related DWARF DIEs: True

‎scripts/explain_manifest/fixtures/ubuntu-22.04-amd64.txt

-9
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,6 @@
148148
Needed :
149149
- libc.so.6
150150

151-
- Path : /usr/local/openresty/nginx/modules/ngx_wasmx_module.so
152-
Needed :
153-
- libm.so.6
154-
- libgcc_s.so.1
155-
- libc.so.6
156-
- ld-linux-x86-64.so.2
157-
Runpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib:/usr/local/openresty/lualib
158-
159151
- Path : /usr/local/openresty/nginx/sbin/nginx
160152
Needed :
161153
- libcrypt.so.1
@@ -172,7 +164,6 @@
172164
- lua-resty-events
173165
- lua-resty-lmdb
174166
- ngx_brotli
175-
- ngx_wasmx_module
176167
OpenSSL : OpenSSL 3.4.1 11 Feb 2025
177168
DWARF : True
178169
DWARF - ngx_http_request_t related DWARF DIEs: True

‎scripts/explain_manifest/fixtures/ubuntu-22.04-arm64.txt

-9
Original file line numberDiff line numberDiff line change
@@ -164,14 +164,6 @@
164164
- libc.so.6
165165
- ld-linux-aarch64.so.1
166166

167-
- Path : /usr/local/openresty/nginx/modules/ngx_wasmx_module.so
168-
Needed :
169-
- libm.so.6
170-
- libgcc_s.so.1
171-
- libc.so.6
172-
- ld-linux-aarch64.so.1
173-
Runpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib:/usr/local/openresty/lualib
174-
175167
- Path : /usr/local/openresty/nginx/sbin/nginx
176168
Needed :
177169
- libcrypt.so.1
@@ -189,7 +181,6 @@
189181
- lua-resty-events
190182
- lua-resty-lmdb
191183
- ngx_brotli
192-
- ngx_wasmx_module
193184
OpenSSL : OpenSSL 3.4.1 11 Feb 2025
194185
DWARF : True
195186
DWARF - ngx_http_request_t related DWARF DIEs: True

‎scripts/explain_manifest/fixtures/ubuntu-24.04-amd64.txt

-9
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,6 @@
148148
Needed :
149149
- libc.so.6
150150

151-
- Path : /usr/local/openresty/nginx/modules/ngx_wasmx_module.so
152-
Needed :
153-
- libm.so.6
154-
- libgcc_s.so.1
155-
- libc.so.6
156-
- ld-linux-x86-64.so.2
157-
Runpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib:/usr/local/openresty/lualib
158-
159151
- Path : /usr/local/openresty/nginx/sbin/nginx
160152
Needed :
161153
- libcrypt.so.1
@@ -172,7 +164,6 @@
172164
- lua-resty-events
173165
- lua-resty-lmdb
174166
- ngx_brotli
175-
- ngx_wasmx_module
176167
OpenSSL : OpenSSL 3.4.1 11 Feb 2025
177168
DWARF : True
178169
DWARF - ngx_http_request_t related DWARF DIEs: True

‎scripts/explain_manifest/fixtures/ubuntu-24.04-arm64.txt

-9
Original file line numberDiff line numberDiff line change
@@ -164,14 +164,6 @@
164164
- libc.so.6
165165
- ld-linux-aarch64.so.1
166166

167-
- Path : /usr/local/openresty/nginx/modules/ngx_wasmx_module.so
168-
Needed :
169-
- libm.so.6
170-
- libgcc_s.so.1
171-
- libc.so.6
172-
- ld-linux-aarch64.so.1
173-
Runpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib:/usr/local/openresty/lualib
174-
175167
- Path : /usr/local/openresty/nginx/sbin/nginx
176168
Needed :
177169
- libcrypt.so.1
@@ -189,7 +181,6 @@
189181
- lua-resty-events
190182
- lua-resty-lmdb
191183
- ngx_brotli
192-
- ngx_wasmx_module
193184
OpenSSL : OpenSSL 3.4.1 11 Feb 2025
194185
DWARF : True
195186
DWARF - ngx_http_request_t related DWARF DIEs: True

‎spec/02-integration/10-external-plugins/03-wasm_spec.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ local helpers = require "spec.helpers"
22

33
for _, strategy in helpers.each_strategy() do
44

5-
describe("external plugins and wasm #" .. strategy, function()
5+
describe("external plugins and #wasm #" .. strategy, function()
66
describe("wasm enabled in conjunction with unused pluginservers", function()
77
it("does not prevent kong from starting", function()
88
require("kong.runloop.wasm").enable({

‎spec/02-integration/20-wasm/01-admin-api_spec.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ end
1616
-- no cassandra support
1717
for _, strategy in helpers.each_strategy({ "postgres" }) do
1818

19-
describe("wasm admin API [#" .. strategy .. "]", function()
19+
describe("#wasm admin API [#" .. strategy .. "]", function()
2020
local admin
2121
local bp, db
2222
local service, route
@@ -541,7 +541,7 @@ describe("wasm admin API [#" .. strategy .. "]", function()
541541
end)
542542
end)
543543

544-
describe("wasm admin API - wasm = off [#" .. strategy .. "]", function()
544+
describe("#wasm admin API - wasm = off [#" .. strategy .. "]", function()
545545
local admin
546546
local bp, db
547547
local service

0 commit comments

Comments
 (0)