Skip to content

Commit 2757940

Browse files
committed
update go-modules and cm package. regen bindings
Signed-off-by: Rajat Jindal <[email protected]>
1 parent 383ffc5 commit 2757940

File tree

235 files changed

+2670
-3965
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

235 files changed

+2670
-3965
lines changed

v2/README.md

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,24 @@ Notes:
66

77
The current version of tooling used for this work:
88

9-
- ydnar/wasm-tools-go `a45ed842846a419a5efd02b9384e14417cc90817`
10-
- wasm-tools `wasm-tools 1.216.0 (28c8962b1 2024-08-22)`
11-
- tinygo version 0.33.0 darwin/arm64 (using go version go1.22.6 and LLVM version 18.1.2)
12-
- spin 2.8.0-pre0 (74d3517 2024-08-30)
9+
- wit-bindgen-go `wit-bindgen-go version (devel) (0e3b31e354b31b4f2d5e7d5163e29fb2ffd0b052)`
10+
- wasm-tools `wasm-tools 1.227.1`
11+
- tinygo `tinygo version 0.37.0 darwin/arm64 (using go version go1.24.1 and LLVM version 19.1.2)`
12+
- spin `spin 3.2.0-pre0 (3d07b0cb 2025-03-14)`
13+
- go `go version go1.24.1 darwin/arm64`
14+
- binaryen tools `binaryen-version_123`
1315

16+
17+
Regeneratin bindings:
18+
19+
- install tooling as specified above
20+
- make sure they are on PATH and picking up the versions as specified above
21+
- cd `<root>/v2`
22+
- Run: `wit-bindgen-go generate -w http-trigger -p github.com/spinframework/spin-go-sdk/v2/internal --out internal ./wit`
23+
24+
Testing:
25+
26+
- cd `<root>/v2/examples/http`
27+
- Run `spin build`
28+
- Run `spin up`
29+
- In a separate terminal, run: `curl http://127.0.0.1:3000/hello`

v2/examples/http/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
module github.com/fermyon/spin-go-sdk/v2/examples/http
1+
module github.com/spinframework/spin-go-sdk/v2/examples/http
22

33
go 1.23.2
44

5-
require github.com/fermyon/spin-go-sdk/v2 v2.0.0
5+
require github.com/spinframework/spin-go-sdk/v2 v2.0.0
66

77
require (
88
github.com/julienschmidt/httprouter v1.3.0 // indirect
9-
go.bytecodealliance.org v0.4.0 // indirect
9+
go.bytecodealliance.org/cm v0.2.2 // indirect
1010
)
1111

12-
replace github.com/fermyon/spin-go-sdk/v2 => ../../
12+
replace github.com/spinframework/spin-go-sdk/v2 => ../../

v2/examples/http/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
22
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
3-
go.bytecodealliance.org v0.4.0 h1:SRwgZIcXR54AmbJg9Y3AMgDlZlvD8dffteBYW+nCD3k=
4-
go.bytecodealliance.org v0.4.0/go.mod h1:hkdjfgQ/bFZYUucnm9cn0Q8/SHO3iT0rzskYlkV4Jy0=
3+
go.bytecodealliance.org/cm v0.2.2 h1:M9iHS6qs884mbQbIjtLX1OifgyPG9DuMs2iwz8G4WQA=
4+
go.bytecodealliance.org/cm v0.2.2/go.mod h1:JD5vtVNZv7sBoQQkvBvAAVKJPhR/bqBH7yYXTItMfZI=

v2/examples/http/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"net/http"
66

7-
spinhttp "github.com/fermyon/spin-go-sdk/v2/http"
7+
spinhttp "github.com/spinframework/spin-go-sdk/v2/http"
88
)
99

1010
func init() {
@@ -14,8 +14,8 @@ func init() {
1414

1515
w.WriteHeader(http.StatusOK)
1616
fmt.Fprintln(w, "== RESPONSE ==")
17-
fmt.Fprintln(w, "Hello Fermyon!")
18-
fmt.Fprintln(w, "Hello again Fermyon!")
17+
fmt.Fprintln(w, "Hello spinframework!")
18+
fmt.Fprintln(w, "Hello again spinframework!")
1919
})
2020
}
2121

v2/examples/http/spin.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ component = "hello"
1313
[component.hello]
1414
source = "main.wasm"
1515
[component.hello.build]
16-
command = "tinygo build -target=wasip2 --wit-package $(go list -mod=readonly -m -f '{{.Dir}}' github.com/fermyon/spin-go-sdk/v2)/wit --wit-world http-trigger -gc=leaking -no-debug -o main.wasm main.go"
16+
command = "tinygo build -target=wasip2 --wit-package $(go list -mod=readonly -m -f '{{.Dir}}' github.com/spinframework/spin-go-sdk/v2)/wit --wit-world http-trigger -gc=leaking -no-debug -o main.wasm main.go"

v2/go.mod

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
1-
module github.com/fermyon/spin-go-sdk/v2
1+
module github.com/spinframework/spin-go-sdk/v2
22

33
go 1.23.2
44

55
require (
66
github.com/julienschmidt/httprouter v1.3.0
7-
go.bytecodealliance.org v0.4.0
7+
go.bytecodealliance.org v0.6.2
8+
go.bytecodealliance.org/cm v0.2.2
9+
)
10+
11+
require (
12+
github.com/coreos/go-semver v0.3.1 // indirect
13+
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
14+
github.com/klauspost/compress v1.17.11 // indirect
15+
github.com/opencontainers/go-digest v1.0.0 // indirect
16+
github.com/regclient/regclient v0.8.2 // indirect
17+
github.com/sirupsen/logrus v1.9.3 // indirect
18+
github.com/tetratelabs/wazero v1.9.0 // indirect
19+
github.com/ulikunitz/xz v0.5.12 // indirect
20+
github.com/urfave/cli/v3 v3.0.0-beta1 // indirect
21+
golang.org/x/mod v0.23.0 // indirect
22+
golang.org/x/sys v0.30.0 // indirect
823
)

v2/go.sum

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,39 @@
1+
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
2+
github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
3+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5+
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4=
6+
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
17
github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
28
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
9+
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
10+
github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
11+
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
12+
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
13+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
14+
github.com/regclient/regclient v0.8.2 h1:23BQ3jWgKYHHIXUhp/S9laVJDHDoOQaQCzXMJ4undVE=
15+
github.com/regclient/regclient v0.8.2/go.mod h1:uGyetv0o6VLyRDjtfeBqp/QBwRLJ3Hcn07/+8QbhNcM=
16+
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
17+
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
18+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
19+
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
20+
github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I=
21+
github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM=
22+
github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
23+
github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
24+
github.com/urfave/cli/v3 v3.0.0-beta1 h1:6DTaaUarcM0wX7qj5Hcvs+5Dm3dyUTBbEwIWAjcw9Zg=
25+
github.com/urfave/cli/v3 v3.0.0-beta1/go.mod h1:FnIeEMYu+ko8zP1F9Ypr3xkZMIDqW3DR92yUtY39q1Y=
326
go.bytecodealliance.org v0.4.0 h1:SRwgZIcXR54AmbJg9Y3AMgDlZlvD8dffteBYW+nCD3k=
427
go.bytecodealliance.org v0.4.0/go.mod h1:hkdjfgQ/bFZYUucnm9cn0Q8/SHO3iT0rzskYlkV4Jy0=
28+
go.bytecodealliance.org v0.6.2 h1:Jy4u5DVmSkXgsnwojBhJ+AD/YsJsR3VzVnxF0xRCqTQ=
29+
go.bytecodealliance.org v0.6.2/go.mod h1:gqjTJm0y9NSksG4py/lSjIQ/SNuIlOQ+hCIEPQwtJgA=
30+
go.bytecodealliance.org/cm v0.2.2 h1:M9iHS6qs884mbQbIjtLX1OifgyPG9DuMs2iwz8G4WQA=
31+
go.bytecodealliance.org/cm v0.2.2/go.mod h1:JD5vtVNZv7sBoQQkvBvAAVKJPhR/bqBH7yYXTItMfZI=
32+
golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
33+
golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
34+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
35+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
36+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
37+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
38+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
39+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

v2/http/client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"io"
66
"net/http"
77

8-
outgoinghandler "github.com/fermyon/spin-go-sdk/v2/internal/wasi/http/v0.2.0/outgoing-handler"
9-
"github.com/fermyon/spin-go-sdk/v2/internal/wasi/http/v0.2.0/types"
8+
outgoinghandler "github.com/spinframework/spin-go-sdk/v2/internal/wasi/http/v0.2.0/outgoing-handler"
9+
"github.com/spinframework/spin-go-sdk/v2/internal/wasi/http/v0.2.0/types"
1010
"go.bytecodealliance.org/cm"
1111
)
1212

v2/http/convertor_incoming_request.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"io"
66
"net/http"
77

8-
"github.com/fermyon/spin-go-sdk/v2/internal/wasi/http/v0.2.0/types"
8+
"github.com/spinframework/spin-go-sdk/v2/internal/wasi/http/v0.2.0/types"
99
"go.bytecodealliance.org/cm"
1010
)
1111

v2/http/convertor_outgoing_request.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package http
33
import (
44
"net/http"
55

6-
"github.com/fermyon/spin-go-sdk/v2/internal/wasi/http/v0.2.0/types"
6+
"github.com/spinframework/spin-go-sdk/v2/internal/wasi/http/v0.2.0/types"
77
"go.bytecodealliance.org/cm"
88
)
99

0 commit comments

Comments
 (0)