From d5e4c698c51a6ef39551184f99eb4d1605f671d9 Mon Sep 17 00:00:00 2001
From: Thibault Charbonnier <thibaultcha@me.com>
Date: Mon, 4 Mar 2024 10:55:33 -0800
Subject: [PATCH] chore(*) rename module to 'ngx_wasmx_module' (but in docs &
 paths)

---
 .github/workflows/ci-large.yml           | 2 +-
 .github/workflows/ci.yml                 | 4 ++--
 Makefile                                 | 2 +-
 config                                   | 2 +-
 docs/INSTALL.md                          | 2 +-
 src/common/debug/ngx_wasm_debug_module.c | 2 +-
 src/common/lua/ngx_wasm_lua_resolver.c   | 2 +-
 src/wasm/wrt/ngx_wrt_wasmer.c            | 2 +-
 util/build.sh                            | 2 +-
 util/release.sh                          | 4 ++--
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci-large.yml b/.github/workflows/ci-large.yml
index 0dec3d8bd..d271d3803 100644
--- a/.github/workflows/ci-large.yml
+++ b/.github/workflows/ci-large.yml
@@ -35,7 +35,7 @@ jobs:
         hup: [hup, no_hup]
         module_type: [static, dynamic]
         include:
-          # OpenResty + static ngx_wasm_module
+          # OpenResty + static ngx_wasmx_module
           - label: dynamic_module
             os: ubuntu-latest
             cc: gcc-12
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 806b94bd9..cefcb7195 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,7 +76,7 @@ jobs:
             ssl: ssl
             debug: debug
             hup: no_hup
-          # Nginx + dynamic ngx_wasm_module + HUP
+          # Nginx + dynamic ngx_wasmx_module + HUP
           - label: dynamic_nginx
             os: ubuntu-latest
             cc: gcc-12
@@ -109,7 +109,7 @@ jobs:
             ssl: ssl
             debug: debug
             hup: no_hup
-          # OpenResty + dynamic ngx_wasm_module
+          # OpenResty + dynamic ngx_wasmx_module
           - label: dynamic_openresty
             os: ubuntu-latest
             cc: gcc-12
diff --git a/Makefile b/Makefile
index 95d9ea339..5438ead1a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ NGX_BUILD_WASMER_RUSTFLAGS ?= -g -C opt-level=0 -C debuginfo=1
 NGX_BUILD_WASMTIME_RUSTFLAGS ?= -g -C opt-level=0 -C debuginfo=1
 NGX_BUILD_WASMTIME_PROFILE ?= debug
 
-# Private - ngx_wasm_module development
+# Private - ngx_wasmx_module development
 export NGX_BUILD_DIR_SCR ?=
 export NGX_BUILD_DIR_PATCHED ?=
 export NGX_BUILD_DIR_BUILDROOT ?=
diff --git a/config b/config
index 00607ef01..dd1c748ee 100644
--- a/config
+++ b/config
@@ -461,7 +461,7 @@ fi
 ###############################################################################
 
 if [ "$ngx_module_link" = DYNAMIC ]; then
-    # ngx_wasm_module.so (dynamic module)
+    # ngx_wasmx_module.so (dynamic module)
     . auto/module
 
     # add other modules into this bundled one
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index 01a84d567..62cf112f7 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -67,7 +67,7 @@ Download any of the source code releases at
 https://github.com/Kong/ngx_wasm_module/releases and extract the archive:
 
 ```
-tar -xvf ngx_wasm_module-*.tar.gz
+tar -xvf ngx_wasmx_module-*.tar.gz
 ```
 
 [Back to TOC](#table-of-contents)
diff --git a/src/common/debug/ngx_wasm_debug_module.c b/src/common/debug/ngx_wasm_debug_module.c
index 11e1a3414..ba78c4aa7 100644
--- a/src/common/debug/ngx_wasm_debug_module.c
+++ b/src/common/debug/ngx_wasm_debug_module.c
@@ -35,7 +35,7 @@ ngx_wasm_debug_init(ngx_cycle_t *cycle)
 
     /**
      * ngx_wasm_phase_lookup NULL return branch is unreacheable in
-     * normal ngx_wasm_module usage.
+     * normal ngx_wasmx_module usage.
      */
     ngx_wa_assert(
         ngx_wasm_phase_lookup(&ngx_wasm_debug_subsystem, 3) == NULL
diff --git a/src/common/lua/ngx_wasm_lua_resolver.c b/src/common/lua/ngx_wasm_lua_resolver.c
index 8e3ef2d19..89adc14ac 100644
--- a/src/common/lua/ngx_wasm_lua_resolver.c
+++ b/src/common/lua/ngx_wasm_lua_resolver.c
@@ -1,7 +1,7 @@
 /**
  * DNS resolution for Proxy-Wasm filters running in Kong Gateway.
  *
- * ngx_wasm_module handles DNS resolution via Nginx's configured `resolver`
+ * ngx_wasmx_module handles DNS resolution via Nginx's configured `resolver`
  * (http{}, wasm{}, or default from ngx_wasm.h). However, Kong Gateway's DNS
  * resolution is handled by the Gateway's Lua-land resolver: resty.dns.client.
  *
diff --git a/src/wasm/wrt/ngx_wrt_wasmer.c b/src/wasm/wrt/ngx_wrt_wasmer.c
index 9ad6f7a6b..b71bc900c 100644
--- a/src/wasm/wrt/ngx_wrt_wasmer.c
+++ b/src/wasm/wrt/ngx_wrt_wasmer.c
@@ -8,7 +8,7 @@
 #include <ngx_wasi.h>
 
 
-#define NGX_WRT_WASMER_CONFIG_NAME  "ngx_wasm_module"
+#define NGX_WRT_WASMER_CONFIG_NAME  "ngx_wasmx_module"
 
 
 typedef void (*wasmer_feature_set_pt)(struct wasmer_features_t * features,
diff --git a/util/build.sh b/util/build.sh
index fd9cd24fd..1bae986b0 100755
--- a/util/build.sh
+++ b/util/build.sh
@@ -17,7 +17,7 @@ source $NGX_WASM_DIR/util/_lib.sh
 
 show_help() {
     cat << EOF
-Build Nginx or OpenResty with ngx_wasm_module.
+Build Nginx or OpenResty with ngx_wasmx_module.
 
 Lots of build options are supported through environment variables; consult
 _lib.sh or DEVELOPER.md.
diff --git a/util/release.sh b/util/release.sh
index ff131537d..709331bad 100755
--- a/util/release.sh
+++ b/util/release.sh
@@ -151,7 +151,7 @@ if [ -z "$name" ]; then
     fi
 fi
 
-DIST_SRC="ngx_wasm_module-$name"
+DIST_SRC="$(get_addon_name)-$name"
 DIR_BUILD_DOCKERFILES=$NGX_WASM_DIR/assets/release/Dockerfiles
 DIR_BUILD=$DIR_DIST_WORK/build
 DIR_DIST_SRC=$DIR_DIST_WORK/$DIST_SRC
@@ -333,7 +333,7 @@ build_with_runtime() {
     LD_FLAGS="$save_LD_FLAGS"
 }
 
-# ngx_wasm_module-$name.tar.gz (sources)
+# ngx_wasmx_module-$name.tar.gz (sources)
 
 release_source() {
     notice "Creating source archive..."