cleanup

Signed-off-by: Takeshi Yoneda <t.y.mathetake@gmail.com>

Author: mathetake

.github/workflows/commit.yaml

@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 jobs:
-  build_and_unit_test:
+  build_and_test:
     name: Build and Unit Test (${{ matrix.platform.arch }}, ${{ matrix.platform.os }})
     runs-on: ${{ matrix.platform.os }}
     strategy:
@@ -64,6 +64,7 @@ jobs:
       - run: make check
       - run: make test
       - run: make build
+      - run: make integration-test
 
   docker_build_and_integration_test:
     name: Build and Run Integration Tests

Makefile

@@ -28,6 +28,12 @@ precommit: precommit-go precommit-rust
 
 .PHONY: precommit-go
 precommit-go: ## This runs the linter, formatter, and tidy on the Go codebase.
+	@$(call print_task,Tidying Go modules)
+	@find . -name "go.mod" \
+	| grep go.mod \
+	| xargs -I {} bash -c 'dirname {}' \
+	| xargs -I {} bash -c 'cd {} && $(call print_subtask,Tidying {}) && go mod tidy -v;'
+	@$(call print_success,Tidying completed)
 	@$(call print_task,Running linter)
 	@$(call print_subtask,Checking ./...)
 	@cd go && go tool golangci-lint run --build-tags==cgo ./...
@@ -40,12 +46,6 @@ precommit-go: ## This runs the linter, formatter, and tidy on the Go codebase.
 	@$(call print_subtask,Running gci)
 	@cd go && go tool gci write -s standard -s default -s "prefix(github.com/envoyproxy/dynamic-modules-examples)" `find . -name '*.go'`
 	@$(call print_success,Formatting completed)
-	@$(call print_task,Tidying Go modules)
-	@find . -name "go.mod" \
-	| grep go.mod \
-	| xargs -I {} bash -c 'dirname {}' \
-	| xargs -I {} bash -c 'cd {} && $(call print_subtask,Tidying {}) && go mod tidy -v;'
-	@$(call print_success,Tidying completed)
 
 .PHONY: precommt-rust
 precommit-rust: ## This runs the linter, formatter, and tidy on the Rust codebase.
@@ -89,9 +89,19 @@ build-go: ## Build the Go dynamic module.
 	@$(call print_task,Building Go dynamic module)
 	@cd go && go build -buildmode=c-shared -o libgo_module.so .
 	@$(call print_success,Go dynamic module built at go/libgo_module.so)
+	@$(call print_task,Copying Go dynamic module for easier use with Envoy)
+	@cp go/libgo_module.so integration/libgo_module.so
 
 .PHONY: build-rust
 build-rust: ## Build the Rust dynamic module.
 	@$(call print_task,Building Rust dynamic module)
 	@cd rust && cargo build
 	@$(call print_success,Rust dynamic module built at rust/target/debug/librust_module.so)
+	@$(call print_task,Copying Rust dynamic module for easier use with Envoy)
+	@cp rust/target/debug/librust_module.dylib integration/librust_module.so
+
+.PHONY: integration-test
+integration-test: build-go build-rust ## Run the integration tests.
+	@$(call print_task,Running integration tests)
+	@cd integration && go test -v ./...
+	@$(call print_success,Integration tests completed)

README.md

@@ -29,65 +29,10 @@ The tracking issue for dynamic modules in general is [here](https://github.com/e
 
 ## Development
 
-### Rust Dynamic Module
-
-To build and test the modules locally without Envoy, you can use `cargo` to build them just like any other Rust project:
-
-```
-cd rust
-cargo build
-cargo test
-cargo clippy -- -D warnings
-cargo fmt --all -- --check
-```
-
-### Go Dynamic Module
-To build and test the modules locally without Envoy, you can use `go` to build them just like any other Go project:
-
-```
-cd go
-go test ./... -v
-go build -buildmode=c-shared -o libgo_module.so .
-go tool golangci-lint run
-find . -type f -name '*.go' | xargs go tool gofumpt -l -w
-```
-
-### Build Envoy + Example Dynamic Module Docker Image
-
-To build the example modules and bundle them with Envoy, simply run
-
-```
-docker buildx build . -t envoy-with-dynamic-modules:latest [--platform linux/amd64,linux/arm64]
-```
-
-where `--platform` is optional and can be used to build for multiple platforms.
-
-### Run Envoy + Example Dynamic Module Docker Image
-
-The example Envoy configuration yaml is in [`integration/envoy.yaml`](integration/envoy.yaml) which is also used
-to run the integration tests. Assuming you built the Docker image with the tag `envoy-with-dynamic-modules:latest`, you can run Envoy with the following command:
-
-```
-docker run --network host -v $(pwd):/examples -w /examples/integration envoy-with-dynamic-modules:latest --config-path ./envoy.yaml
-```
-
-Then execute, for example, the following command to test the passthrough and access log filters:
-
-```
-curl localhost:1062/uuid
-```
-
-### Run integration tests with the built example Envoy + Dynamic Module Docker Image.
-
-The integration tests are in the `integration` directory. Assuming you built the Docker image with the tag `envoy-with-dynamic-modules:latest`, you can run the integration tests with the following command:
-```
-cd integration
-go test . -v -count=1
-```
-
-If you want to explicitly specify the docker image, use `ENVOY_IMAGE` environment variable:
 ```
-ENVOY_IMAGE=foo-bar-image:latest go test . -v -count=1
+make test # Run all unit tests
+make build # Build all dynamic modules
+make integration-test # Run integration tests with Envoy
 ```
 
 [6d9bb7d9a85d616b220d1f8fe67b61f82bbdb8d3]: https://github.com/envoyproxy/envoy/tree/6d9bb7d9a85d616b220d1f8fe67b61f82bbdb8d3

go/go.mod

@@ -1,16 +1,17 @@
 module github.com/envoyproxy/dynamic-modules-examples/go
 
-go 1.24.2
+go 1.25.6
 
 tool (
 	github.com/daixiang0/gci
 	github.com/golangci/golangci-lint/cmd/golangci-lint
+	github.com/tetratelabs/func-e/cmd/func-e
 	mvdan.cc/gofumpt
 )
 
 require (
 	github.com/dop251/goja v0.0.0-20250630131328-58d95d85e994
-	github.com/stretchr/testify v1.10.0
+	github.com/stretchr/testify v1.11.1
 )
 
 require (
@@ -21,7 +22,7 @@ require (
 	github.com/Antonboom/errname v1.0.0 // indirect
 	github.com/Antonboom/nilnil v1.0.1 // indirect
 	github.com/Antonboom/testifylint v1.5.2 // indirect
-	github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
+	github.com/BurntSushi/toml v1.5.0 // indirect
 	github.com/Crocmagnon/fatcontext v0.7.1 // indirect
 	github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
 	github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.1 // indirect
@@ -48,11 +49,13 @@ require (
 	github.com/charithe/durationcheck v0.0.10 // indirect
 	github.com/chavacava/garif v0.1.0 // indirect
 	github.com/ckaznocha/intrange v0.3.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
 	github.com/curioswitch/go-reassign v0.3.0 // indirect
 	github.com/daixiang0/gci v0.13.7 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/denis-tingaikin/go-header v0.5.0 // indirect
 	github.com/dlclark/regexp2 v1.11.4 // indirect
+	github.com/ebitengine/purego v0.9.0 // indirect
 	github.com/ettle/strcase v0.2.0 // indirect
 	github.com/fatih/color v1.18.0 // indirect
 	github.com/fatih/structtag v1.2.0 // indirect
@@ -61,6 +64,7 @@ require (
 	github.com/fzipp/gocyclo v0.6.0 // indirect
 	github.com/ghostiam/protogetter v0.3.9 // indirect
 	github.com/go-critic/go-critic v0.12.0 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
 	github.com/go-toolsmith/astcast v1.1.0 // indirect
 	github.com/go-toolsmith/astcopy v1.1.0 // indirect
@@ -111,6 +115,7 @@ require (
 	github.com/ldez/tagliatelle v0.7.1 // indirect
 	github.com/ldez/usetesting v0.4.2 // indirect
 	github.com/leonklingele/grouper v1.1.2 // indirect
+	github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
 	github.com/macabu/inamedparam v0.1.3 // indirect
 	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/maratori/testableexamples v1.0.0 // indirect
@@ -133,6 +138,7 @@ require (
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/polyfloyd/go-errorlint v1.7.1 // indirect
+	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/prometheus/client_golang v1.12.1 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.32.1 // indirect
@@ -145,13 +151,15 @@ require (
 	github.com/raeperd/recvcheck v0.2.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rogpeppe/go-internal v1.14.1 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/ryancurrah/gomodguard v1.3.5 // indirect
 	github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
 	github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
 	github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect
 	github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
 	github.com/sashamelentyev/usestdlibvars v1.28.0 // indirect
 	github.com/securego/gosec/v2 v2.22.2 // indirect
+	github.com/shirou/gopsutil/v4 v4.25.9 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/sivchari/containedctx v1.0.3 // indirect
 	github.com/sivchari/tenv v1.12.1 // indirect
@@ -169,18 +177,25 @@ require (
 	github.com/subosito/gotenv v1.4.1 // indirect
 	github.com/tdakkota/asciicheck v0.4.1 // indirect
 	github.com/tetafro/godot v1.5.0 // indirect
+	github.com/tetratelabs/func-e v1.3.0 // indirect
 	github.com/timakin/bodyclose v0.0.0-20241017074812-ed6a65f985e3 // indirect
 	github.com/timonwong/loggercheck v0.10.1 // indirect
+	github.com/tklauser/go-sysconf v0.3.15 // indirect
+	github.com/tklauser/numcpus v0.10.0 // indirect
 	github.com/tomarrell/wrapcheck/v2 v2.10.0 // indirect
 	github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
+	github.com/ulikunitz/xz v0.5.15 // indirect
 	github.com/ultraware/funlen v0.2.0 // indirect
 	github.com/ultraware/whitespace v0.2.0 // indirect
+	github.com/urfave/cli/v2 v2.27.7 // indirect
 	github.com/uudashr/gocognit v1.2.0 // indirect
 	github.com/uudashr/iface v1.3.1 // indirect
 	github.com/xen0n/gosmopolitan v1.2.2 // indirect
+	github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
 	github.com/yagipy/maintidx v1.0.0 // indirect
 	github.com/yeya24/promlinter v0.3.0 // indirect
 	github.com/ykadowak/zerologlint v0.1.5 // indirect
+	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	gitlab.com/bosi/decorder v0.4.2 // indirect
 	go-simpler.org/musttag v0.13.0 // indirect
 	go-simpler.org/sloglint v0.9.0 // indirect
@@ -191,7 +206,7 @@ require (
 	golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
 	golang.org/x/mod v0.24.0 // indirect
 	golang.org/x/sync v0.13.0 // indirect
-	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/sys v0.35.0 // indirect
 	golang.org/x/text v0.22.0 // indirect
 	golang.org/x/tools v0.32.0 // indirect
 	google.golang.org/protobuf v1.36.5 // indirect