From b8fc3e56bfcf6f7c9d1df519d3299b9fbcd64fe2 Mon Sep 17 00:00:00 2001 From: Joonas Bergius Date: Tue, 11 Feb 2025 16:17:33 -0600 Subject: [PATCH 01/10] chore(component): Switch go.wasmcloud.dev/component to Go 1.24 Signed-off-by: Joonas Bergius --- component/go.mod | 4 +++- component/sdk.go | 2 +- component/tools.go | 7 ------- 3 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 component/tools.go diff --git a/component/go.mod b/component/go.mod index 1d114e97..6d4acd2b 100644 --- a/component/go.mod +++ b/component/go.mod @@ -1,6 +1,6 @@ module go.wasmcloud.dev/component -go 1.23.0 +go 1.24 require ( github.com/samber/slog-common v0.18.1 @@ -22,3 +22,5 @@ require ( golang.org/x/sys v0.29.0 // indirect golang.org/x/text v0.21.0 // indirect ) + +tool go.bytecodealliance.org/cmd/wit-bindgen-go diff --git a/component/sdk.go b/component/sdk.go index b6969b88..74249c9d 100644 --- a/component/sdk.go +++ b/component/sdk.go @@ -1,6 +1,6 @@ package component -//go:generate go run go.bytecodealliance.org/cmd/wit-bindgen-go generate --world sdk --out gen ./wit +//go:generate go tool wit-bindgen-go generate --world sdk --out gen ./wit import ( "embed" diff --git a/component/tools.go b/component/tools.go deleted file mode 100644 index 681bfce9..00000000 --- a/component/tools.go +++ /dev/null @@ -1,7 +0,0 @@ -//go:build tools - -package main - -import ( - _ "go.bytecodealliance.org/cmd/wit-bindgen-go" -) From 83576ab1339eb7652ec841de5c7db6fe346f50cd Mon Sep 17 00:00:00 2001 From: Joonas Bergius Date: Tue, 11 Feb 2025 16:22:27 -0600 Subject: [PATCH 02/10] chore(examples): Switch http-client component example to Go 1.24 Signed-off-by: Joonas Bergius --- examples/component/http-client/go.mod | 4 +++- examples/component/http-client/main.go | 2 +- examples/component/http-client/tools.go | 7 ------- 3 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 examples/component/http-client/tools.go diff --git a/examples/component/http-client/go.mod b/examples/component/http-client/go.mod index 6bda9753..7f868fed 100644 --- a/examples/component/http-client/go.mod +++ b/examples/component/http-client/go.mod @@ -1,6 +1,6 @@ module github.com/wasmCloud/go/examples/component/http-client -go 1.23.0 +go 1.24 require ( go.bytecodealliance.org v0.5.0 @@ -21,5 +21,7 @@ require ( golang.org/x/sys v0.29.0 // indirect ) +tool go.bytecodealliance.org/cmd/wit-bindgen-go + // NOTE(lxf): Remove this line if running outside of wasmCloud/go repository replace go.wasmcloud.dev/component => ../../../component diff --git a/examples/component/http-client/main.go b/examples/component/http-client/main.go index 41646acd..be6bce03 100644 --- a/examples/component/http-client/main.go +++ b/examples/component/http-client/main.go @@ -1,6 +1,6 @@ package main -//go:generate go run go.bytecodealliance.org/cmd/wit-bindgen-go generate --world example --out gen ./wit +//go:generate go tool wit-bindgen-go generate --world example --out gen ./wit import ( "io" diff --git a/examples/component/http-client/tools.go b/examples/component/http-client/tools.go deleted file mode 100644 index 681bfce9..00000000 --- a/examples/component/http-client/tools.go +++ /dev/null @@ -1,7 +0,0 @@ -//go:build tools - -package main - -import ( - _ "go.bytecodealliance.org/cmd/wit-bindgen-go" -) From 5af8514a065ff6f57b4287342154cbb711741295 Mon Sep 17 00:00:00 2001 From: Joonas Bergius Date: Tue, 11 Feb 2025 16:28:10 -0600 Subject: [PATCH 03/10] chore(examples): Switch http-keyvalue-crud component example to Go 1.24 Signed-off-by: Joonas Bergius --- examples/component/http-keyvalue-crud/go.mod | 7 ++++++- examples/component/http-keyvalue-crud/main.go | 2 +- examples/component/http-keyvalue-crud/main_test.go | 4 ++-- examples/component/http-keyvalue-crud/tools.go | 8 -------- 4 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 examples/component/http-keyvalue-crud/tools.go diff --git a/examples/component/http-keyvalue-crud/go.mod b/examples/component/http-keyvalue-crud/go.mod index a6ef8579..556edb18 100644 --- a/examples/component/http-keyvalue-crud/go.mod +++ b/examples/component/http-keyvalue-crud/go.mod @@ -1,6 +1,6 @@ module github.com/wasmCloud/go/examples/component/http-keyvalue-crud -go 1.23.0 +go 1.24 require ( github.com/julienschmidt/httprouter v1.3.0 @@ -25,3 +25,8 @@ require ( golang.org/x/sys v0.29.0 // indirect golang.org/x/tools v0.28.0 // indirect ) + +tool ( + go.bytecodealliance.org/cmd/wit-bindgen-go + go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go +) diff --git a/examples/component/http-keyvalue-crud/main.go b/examples/component/http-keyvalue-crud/main.go index 9014e6a1..3235c456 100644 --- a/examples/component/http-keyvalue-crud/main.go +++ b/examples/component/http-keyvalue-crud/main.go @@ -1,4 +1,4 @@ -//go:generate go run go.bytecodealliance.org/cmd/wit-bindgen-go generate --world component --out gen ./wit +//go:generate go tool wit-bindgen-go generate --world component --out gen ./wit package main import ( diff --git a/examples/component/http-keyvalue-crud/main_test.go b/examples/component/http-keyvalue-crud/main_test.go index 319214e2..b64fb162 100644 --- a/examples/component/http-keyvalue-crud/main_test.go +++ b/examples/component/http-keyvalue-crud/main_test.go @@ -1,4 +1,4 @@ -//go:generate go run go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go +//go:generate go tool wadge-bindgen-go package main @@ -47,7 +47,7 @@ func TestIncomingHandler(t *testing.T) { } defer resp.Body.Close() - if want, got := []byte("Hello from Go!\n"), buf; !bytes.Equal(want, got) { + if want, got := []byte("{\"message\":\"GET, POST, or DELETE to /crud/ (with JSON payload for POSTs)\"}\n"), buf; !bytes.Equal(want, got) { t.Fatalf("unexpected response body: want %q, got %q", want, got) } }) diff --git a/examples/component/http-keyvalue-crud/tools.go b/examples/component/http-keyvalue-crud/tools.go deleted file mode 100644 index c55dbc1e..00000000 --- a/examples/component/http-keyvalue-crud/tools.go +++ /dev/null @@ -1,8 +0,0 @@ -//go:build tools - -package main - -import ( - _ "go.bytecodealliance.org/cmd/wit-bindgen-go" - _ "go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go" -) From b67ff573d86df2e212f46cb6ce043ae5cc9c06f3 Mon Sep 17 00:00:00 2001 From: Joonas Bergius Date: Tue, 11 Feb 2025 16:30:04 -0600 Subject: [PATCH 04/10] chore(examples): Switch http-password-checker component example to Go 1.24 Signed-off-by: Joonas Bergius --- examples/component/http-password-checker/go.mod | 7 ++++++- examples/component/http-password-checker/main.go | 2 +- examples/component/http-password-checker/main_test.go | 2 +- examples/component/http-password-checker/tools.go | 8 -------- 4 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 examples/component/http-password-checker/tools.go diff --git a/examples/component/http-password-checker/go.mod b/examples/component/http-password-checker/go.mod index 70416c2a..0a62d220 100644 --- a/examples/component/http-password-checker/go.mod +++ b/examples/component/http-password-checker/go.mod @@ -1,6 +1,6 @@ module http-password-checker -go 1.23.0 +go 1.24 require ( github.com/stretchr/testify v1.10.0 @@ -29,3 +29,8 @@ require ( golang.org/x/tools v0.29.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +tool ( + go.bytecodealliance.org/cmd/wit-bindgen-go + go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go +) diff --git a/examples/component/http-password-checker/main.go b/examples/component/http-password-checker/main.go index a0d66fc9..c6d96ce5 100644 --- a/examples/component/http-password-checker/main.go +++ b/examples/component/http-password-checker/main.go @@ -1,4 +1,4 @@ -//go:generate go run go.bytecodealliance.org/cmd/wit-bindgen-go generate --world hello --out gen ./wit +//go:generate go tool wit-bindgen-go generate --world hello --out gen ./wit package main import ( diff --git a/examples/component/http-password-checker/main_test.go b/examples/component/http-password-checker/main_test.go index 6a7feaf3..76ee8379 100644 --- a/examples/component/http-password-checker/main_test.go +++ b/examples/component/http-password-checker/main_test.go @@ -1,4 +1,4 @@ -//go:generate go run go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go -test +//go:generate go tool wadge-bindgen-go -test package main diff --git a/examples/component/http-password-checker/tools.go b/examples/component/http-password-checker/tools.go deleted file mode 100644 index c55dbc1e..00000000 --- a/examples/component/http-password-checker/tools.go +++ /dev/null @@ -1,8 +0,0 @@ -//go:build tools - -package main - -import ( - _ "go.bytecodealliance.org/cmd/wit-bindgen-go" - _ "go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go" -) From 20691732365262b3c5aab646d6f1069b578a46df Mon Sep 17 00:00:00 2001 From: Joonas Bergius Date: Tue, 11 Feb 2025 16:31:13 -0600 Subject: [PATCH 05/10] chore(examples): Switch http-server component example to Go 1.24 Signed-off-by: Joonas Bergius --- examples/component/http-server/go.mod | 7 ++++++- examples/component/http-server/main.go | 2 +- examples/component/http-server/main_test.go | 2 +- examples/component/http-server/tools.go | 8 -------- 4 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 examples/component/http-server/tools.go diff --git a/examples/component/http-server/go.mod b/examples/component/http-server/go.mod index e383b6b5..c500d0cf 100644 --- a/examples/component/http-server/go.mod +++ b/examples/component/http-server/go.mod @@ -1,6 +1,6 @@ module github.com/wasmCloud/go/examples/component/http-server -go 1.23.0 +go 1.24 require ( github.com/stretchr/testify v1.10.0 @@ -35,3 +35,8 @@ require ( // NOTE(lxf): Remove this line if running outside of wasmCloud/go repository replace go.wasmcloud.dev/component => ../../../component + +tool ( + go.bytecodealliance.org/cmd/wit-bindgen-go + go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go +) diff --git a/examples/component/http-server/main.go b/examples/component/http-server/main.go index 6a2bb1b4..df9b5b12 100644 --- a/examples/component/http-server/main.go +++ b/examples/component/http-server/main.go @@ -1,4 +1,4 @@ -//go:generate go run go.bytecodealliance.org/cmd/wit-bindgen-go generate --world example --out gen ./wit +//go:generate go tool wit-bindgen-go generate --world example --out gen ./wit package main diff --git a/examples/component/http-server/main_test.go b/examples/component/http-server/main_test.go index 915d1ac3..0cd385eb 100644 --- a/examples/component/http-server/main_test.go +++ b/examples/component/http-server/main_test.go @@ -1,4 +1,4 @@ -//go:generate go run go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go -test +//go:generate go tool wadge-bindgen-go -test package main diff --git a/examples/component/http-server/tools.go b/examples/component/http-server/tools.go deleted file mode 100644 index c55dbc1e..00000000 --- a/examples/component/http-server/tools.go +++ /dev/null @@ -1,8 +0,0 @@ -//go:build tools - -package main - -import ( - _ "go.bytecodealliance.org/cmd/wit-bindgen-go" - _ "go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go" -) From ad5195ae0e48288cfdbee7410dee94d1fe7eebf2 Mon Sep 17 00:00:00 2001 From: Joonas Bergius Date: Tue, 11 Feb 2025 16:32:32 -0600 Subject: [PATCH 06/10] chore(examples): Switch invoke component example to Go 1.24 Signed-off-by: Joonas Bergius --- examples/component/invoke/go.mod | 7 ++++++- examples/component/invoke/main.go | 2 +- examples/component/invoke/main_test.go | 2 +- examples/component/invoke/tools.go | 8 -------- 4 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 examples/component/invoke/tools.go diff --git a/examples/component/invoke/go.mod b/examples/component/invoke/go.mod index 623f9a33..29d361e7 100644 --- a/examples/component/invoke/go.mod +++ b/examples/component/invoke/go.mod @@ -1,6 +1,6 @@ module github.com/wasmCloud/go/examples/component/invoke -go 1.23.0 +go 1.24 require ( github.com/stretchr/testify v1.10.0 @@ -33,3 +33,8 @@ require ( // NOTE(lxf): Remove this line if running outside of wasmCloud/go repository replace go.wasmcloud.dev/component => ../../../component + +tool ( + go.bytecodealliance.org/cmd/wit-bindgen-go + go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go +) diff --git a/examples/component/invoke/main.go b/examples/component/invoke/main.go index f551bc1b..e8f34320 100644 --- a/examples/component/invoke/main.go +++ b/examples/component/invoke/main.go @@ -1,4 +1,4 @@ -//go:generate go run go.bytecodealliance.org/cmd/wit-bindgen-go generate --world example --out gen ./wit +//go:generate go tool wit-bindgen-go generate --world example --out gen ./wit package main diff --git a/examples/component/invoke/main_test.go b/examples/component/invoke/main_test.go index b5bf3cb7..04c13a02 100644 --- a/examples/component/invoke/main_test.go +++ b/examples/component/invoke/main_test.go @@ -1,4 +1,4 @@ -//go:generate go run go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go -test +//go:generate go tool wadge-bindgen-go -test package main diff --git a/examples/component/invoke/tools.go b/examples/component/invoke/tools.go deleted file mode 100644 index c55dbc1e..00000000 --- a/examples/component/invoke/tools.go +++ /dev/null @@ -1,8 +0,0 @@ -//go:build tools - -package main - -import ( - _ "go.bytecodealliance.org/cmd/wit-bindgen-go" - _ "go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go" -) From 6addfac1a15bd7f3a53072567be9b9f7d40eb2d3 Mon Sep 17 00:00:00 2001 From: Joonas Bergius Date: Tue, 11 Feb 2025 16:40:13 -0600 Subject: [PATCH 07/10] chore(examples): Switch wasitel-http component example to Go 1.24 Signed-off-by: Joonas Bergius --- examples/component/wasitel-http/go.mod | 4 +++- examples/component/wasitel-http/main.go | 2 +- examples/component/wasitel-http/tools.go | 7 ------- 3 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 examples/component/wasitel-http/tools.go diff --git a/examples/component/wasitel-http/go.mod b/examples/component/wasitel-http/go.mod index 0fa34245..186b12e9 100644 --- a/examples/component/wasitel-http/go.mod +++ b/examples/component/wasitel-http/go.mod @@ -1,6 +1,6 @@ module wasitel-http -go 1.23.2 +go 1.24 require ( go.bytecodealliance.org v0.5.0 @@ -32,3 +32,5 @@ require ( golang.org/x/mod v0.22.0 // indirect golang.org/x/sys v0.29.0 // indirect ) + +tool go.bytecodealliance.org/cmd/wit-bindgen-go diff --git a/examples/component/wasitel-http/main.go b/examples/component/wasitel-http/main.go index f708e4b7..dd784381 100644 --- a/examples/component/wasitel-http/main.go +++ b/examples/component/wasitel-http/main.go @@ -1,4 +1,4 @@ -//go:generate go run go.bytecodealliance.org/cmd/wit-bindgen-go generate --world example --out gen ./wit +//go:generate go tool wit-bindgen-go generate --world example --out gen ./wit package main diff --git a/examples/component/wasitel-http/tools.go b/examples/component/wasitel-http/tools.go deleted file mode 100644 index 681bfce9..00000000 --- a/examples/component/wasitel-http/tools.go +++ /dev/null @@ -1,7 +0,0 @@ -//go:build tools - -package main - -import ( - _ "go.bytecodealliance.org/cmd/wit-bindgen-go" -) From 4faa16e29ecb56396716e45c2aa71797449addfa Mon Sep 17 00:00:00 2001 From: Joonas Bergius Date: Tue, 11 Feb 2025 16:51:01 -0600 Subject: [PATCH 08/10] chore(ci): Update component Go workflow to use Go 1.24 friendly golangci-lint version Signed-off-by: Joonas Bergius --- .github/workflows/component-go.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/component-go.yaml b/.github/workflows/component-go.yaml index 418bbde3..c28787ea 100644 --- a/.github/workflows/component-go.yaml +++ b/.github/workflows/component-go.yaml @@ -16,7 +16,7 @@ on: env: TINYGO_VERSION: "0.33.0" - GOLANGCI_VERSION: "v1.61" + GOLANGCI_VERSION: "v1.64.2" WASH_VERSION: "0.37.0" WASM_TOOLS_VERSION: "1.220.0" From 1dec000e8890ed1e37c282ce3c6c7b8943f693b1 Mon Sep 17 00:00:00 2001 From: Joonas Bergius Date: Fri, 7 Mar 2025 17:49:18 -0500 Subject: [PATCH 09/10] chore(ci): Update workflows to use TinyGo 0.36 for Go 1.24 support Signed-off-by: Joonas Bergius --- .github/workflows/component-go.yaml | 7 ++----- .github/workflows/templates-go.yaml | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/component-go.yaml b/.github/workflows/component-go.yaml index c28787ea..47054c76 100644 --- a/.github/workflows/component-go.yaml +++ b/.github/workflows/component-go.yaml @@ -15,7 +15,7 @@ on: - 'examples/component/**' env: - TINYGO_VERSION: "0.33.0" + TINYGO_VERSION: "0.36.0" GOLANGCI_VERSION: "v1.64.2" WASH_VERSION: "0.37.0" WASM_TOOLS_VERSION: "1.220.0" @@ -88,9 +88,6 @@ jobs: - http-password-checker - invoke - sqldb-postgres-query - tinygo-version: - - "0.33.0" - - "0.34.0" runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -99,7 +96,7 @@ jobs: go-version-file: "./examples/component/${{ matrix.example }}/go.mod" - uses: acifani/setup-tinygo@b2ba42b249c7d3efdfe94166ec0f48b3191404f7 # v2.0.0 with: - tinygo-version: ${{ matrix.tinygo-version }} + tinygo-version: ${{ env.TINYGO_VERSION }} - uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0 with: version: ${{ env.GOLANGCI_VERSION }} diff --git a/.github/workflows/templates-go.yaml b/.github/workflows/templates-go.yaml index 67e1bded..8f4e1ee7 100644 --- a/.github/workflows/templates-go.yaml +++ b/.github/workflows/templates-go.yaml @@ -13,7 +13,7 @@ on: - "templates/**" env: - TINYGO_VERSION: "0.34.0" + TINYGO_VERSION: "0.36.0" GOLANGCI_VERSION: "v1.61" WASH_VERSION: "0.37.0" WASM_TOOLS_VERSION: "1.220.0" From 9aec23e688346d68aa78def383f18d6691c23f40 Mon Sep 17 00:00:00 2001 From: Joonas Bergius Date: Fri, 7 Mar 2025 17:55:53 -0500 Subject: [PATCH 10/10] chore(component): Update golangci-lint config Signed-off-by: Joonas Bergius --- component/.golangci.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/component/.golangci.yaml b/component/.golangci.yaml index 1edecd77..71994fe1 100644 --- a/component/.golangci.yaml +++ b/component/.golangci.yaml @@ -3,7 +3,6 @@ run: modules-download-mode: readonly output: - uniq-by-line: false show-stats: true sort-results: true sort-order: @@ -11,6 +10,9 @@ output: - severity - file +issues: + uniq-by-line: false + linters: enable: - gofmt