Skip to content

Move wasip2 sdk to v3 directory #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 10, 2025
Merged

Move wasip2 sdk to v3 directory #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ test-integration: http/testdata/http-tinygo/main.wasm
go test -v -count=1 .

.PHONY: test-integration-wasip2
test-integration-wasip2:
cd v2 && go test -v -count=1 .
test-integration-wasip2:
cd v3 && go test -v -count=1 .

http/testdata/http-tinygo/main.wasm: generate
http/testdata/http-tinygo/main.wasm: http/testdata/http-tinygo/main.go
Expand Down
12 changes: 0 additions & 12 deletions v2/examples/http/go.mod
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions v2/examples/kv/go.mod
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions v2/examples/llm/go.mod
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions v2/examples/variables/go.mod
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions v2/http/testdata/http-tinygo/go.mod
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions v2/kv/testdata/key-value/go.mod
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions v2/variables/testdata/variables/go.mod
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions v2/README.md → v3/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ Regeneratin bindings:

- install tooling as specified above
- make sure they are on PATH and picking up the versions as specified above
- cd `<root>/v2`
- Run: `wit-bindgen-go generate -w http-trigger -p github.com/spinframework/spin-go-sdk/v2/internal --out internal ./wit`
- cd `<root>/v3`
- Run: `wit-bindgen-go generate -w http-trigger -p github.com/spinframework/spin-go-sdk/v3/internal --out internal ./wit`

Testing:

- cd `<root>/v2/examples/http`
- cd `<root>/v3/examples/http`
- Run `spin build`
- Run `spin up`
- In a separate terminal, run: `curl http://127.0.0.1:3000/hello`
12 changes: 12 additions & 0 deletions v3/examples/http/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module github.com/spinframework/spin-go-sdk/v3/examples/http

go 1.23.2

require github.com/spinframework/spin-go-sdk/v3 v3.0.0

require (
github.com/julienschmidt/httprouter v1.3.0 // indirect
go.bytecodealliance.org/cm v0.2.2 // indirect
)

replace github.com/spinframework/spin-go-sdk/v3 => ../../
0 v2/examples/http/go.sum → v3/examples/http/go.sum
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion v2/examples/http/main.go → v3/examples/http/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"net/http"

spinhttp "github.com/spinframework/spin-go-sdk/v2/http"
spinhttp "github.com/spinframework/spin-go-sdk/v3/http"
)

func init() {
Expand Down
3 changes: 2 additions & 1 deletion v2/http/testdata/http-tinygo/spin.toml → v3/examples/http/spin.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ component = "hello"
[component.hello]
source = "main.wasm"
[component.hello.build]
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"
command = "tinygo build -target=wasip2 --wit-package $(go list -mod=readonly -m -f '{{.Dir}}' github.com/spinframework/spin-go-sdk/v3)/wit --wit-world http-trigger -gc=leaking -no-debug -o main.wasm main.go"

12 changes: 12 additions & 0 deletions v3/examples/kv/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module github.com/spinframework/spin-go-sdk/v3/examples/kv

go 1.24.1

require github.com/spinframework/spin-go-sdk/v3 v3.0.0

require (
github.com/julienschmidt/httprouter v1.3.0 // indirect
go.bytecodealliance.org/cm v0.2.2 // indirect
)

replace github.com/spinframework/spin-go-sdk/v3 => ../../
0 v2/examples/kv/go.sum → v3/examples/kv/go.sum
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions v2/examples/kv/main.go → v3/examples/kv/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"net/http"

spinhttp "github.com/spinframework/spin-go-sdk/v2/http"
"github.com/spinframework/spin-go-sdk/v2/kv"
spinhttp "github.com/spinframework/spin-go-sdk/v3/http"
"github.com/spinframework/spin-go-sdk/v3/kv"
)

func init() {
Expand Down
3 changes: 2 additions & 1 deletion v2/examples/kv/spin.toml → v3/examples/kv/spin.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ component = "hello"
source = "main.wasm"
key_value_stores = ["default"]
[component.hello.build]
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"
command = "tinygo build -target=wasip2 --wit-package $(go list -mod=readonly -m -f '{{.Dir}}' github.com/spinframework/spin-go-sdk/v3)/wit --wit-world http-trigger -gc=leaking -no-debug -o main.wasm main.go"

0 v2/examples/llm/.gitignore → v3/examples/llm/.gitignore
View file
Open in desktop
File renamed without changes.
12 changes: 12 additions & 0 deletions v3/examples/llm/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module github.com/spinframework/spin-go-sdk/v3/examples/llm

go 1.24.1

require github.com/spinframework/spin-go-sdk/v3 v3.0.0

require (
github.com/julienschmidt/httprouter v1.3.0 // indirect
go.bytecodealliance.org/cm v0.2.2 // indirect
)

replace github.com/spinframework/spin-go-sdk/v3 => ../../
0 v2/examples/llm/go.sum → v3/examples/llm/go.sum
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions v2/examples/llm/main.go → v3/examples/llm/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"net/http"

spinhttp "github.com/spinframework/spin-go-sdk/v2/http"
"github.com/spinframework/spin-go-sdk/v2/llm"
spinhttp "github.com/spinframework/spin-go-sdk/v3/http"
"github.com/spinframework/spin-go-sdk/v3/llm"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion v2/examples/llm/spin.toml → v3/examples/llm/spin.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ source = "main.wasm"
allowed_outbound_hosts = []
ai_models = ["llama2-chat", "all-minilm-l6-v2"]
[component.llm.build]
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"
command = "tinygo build -target=wasip2 --wit-package $(go list -mod=readonly -m -f '{{.Dir}}' github.com/spinframework/spin-go-sdk/v3)/wit --wit-world http-trigger -gc=leaking -no-debug -o main.wasm main.go"
watch = ["**/*.go", "go.mod"]
12 changes: 12 additions & 0 deletions v3/examples/variables/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module github.com/spinframework/spin-go-sdk/v3/examples/variables

go 1.24.1

require github.com/spinframework/spin-go-sdk/v3 v3.0.0

require (
github.com/julienschmidt/httprouter v1.3.0 // indirect
go.bytecodealliance.org/cm v0.2.2 // indirect
)

replace github.com/spinframework/spin-go-sdk/v3 => ../../
0 v2/examples/variables/go.sum → v3/examples/variables/go.sum
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions v2/examples/variables/main.go → v3/examples/variables/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"net/http"

spinhttp "github.com/spinframework/spin-go-sdk/v2/http"
"github.com/spinframework/spin-go-sdk/v2/variables"
spinhttp "github.com/spinframework/spin-go-sdk/v3/http"
"github.com/spinframework/spin-go-sdk/v3/variables"
)

func init() {
Expand Down
3 changes: 2 additions & 1 deletion v2/examples/variables/spin.toml → v3/examples/variables/spin.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ source = "main.wasm"
message = "I'm a {{object}}"

[component.hello.build]
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"
command = "tinygo build -target=wasip2 --wit-package $(go list -mod=readonly -m -f '{{.Dir}}' github.com/spinframework/spin-go-sdk/v3)/wit --wit-world http-trigger -gc=leaking -no-debug -o main.wasm main.go"

2 changes: 1 addition & 1 deletion v2/go.mod → v3/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/spinframework/spin-go-sdk/v2
module github.com/spinframework/spin-go-sdk/v3

go 1.23.2

Expand Down
0 v2/go.sum → v3/go.sum
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions v2/http/client.go → v3/http/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"io"
"net/http"

outgoinghandler "github.com/spinframework/spin-go-sdk/v2/internal/wasi/http/v0.2.0/outgoing-handler"
"github.com/spinframework/spin-go-sdk/v2/internal/wasi/http/v0.2.0/types"
outgoinghandler "github.com/spinframework/spin-go-sdk/v3/internal/wasi/http/v0.2.0/outgoing-handler"
"github.com/spinframework/spin-go-sdk/v3/internal/wasi/http/v0.2.0/types"
"go.bytecodealliance.org/cm"
)

Expand Down
2 changes: 1 addition & 1 deletion v2/http/convertor_incoming_request.go → v3/http/convertor_incoming_request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io"
"net/http"

"github.com/spinframework/spin-go-sdk/v2/internal/wasi/http/v0.2.0/types"
"github.com/spinframework/spin-go-sdk/v3/internal/wasi/http/v0.2.0/types"
"go.bytecodealliance.org/cm"
)

Expand Down
2 changes: 1 addition & 1 deletion v2/http/convertor_outgoing_request.go → v3/http/convertor_outgoing_request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package http
import (
"net/http"

"github.com/spinframework/spin-go-sdk/v2/internal/wasi/http/v0.2.0/types"
"github.com/spinframework/spin-go-sdk/v3/internal/wasi/http/v0.2.0/types"
"go.bytecodealliance.org/cm"
)

Expand Down
4 changes: 2 additions & 2 deletions v2/http/convertor_outgoing_response.go → v3/http/convertor_outgoing_response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"net/http"
"strings"

"github.com/spinframework/spin-go-sdk/v2/internal/wasi/http/v0.2.0/types"
"github.com/spinframework/spin-go-sdk/v2/internal/wasi/io/v0.2.0/streams"
"github.com/spinframework/spin-go-sdk/v3/internal/wasi/http/v0.2.0/types"
"github.com/spinframework/spin-go-sdk/v3/internal/wasi/io/v0.2.0/streams"
"go.bytecodealliance.org/cm"
)

Expand Down
6 changes: 3 additions & 3 deletions v2/http/http.go → v3/http/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"os"

"github.com/julienschmidt/httprouter"
incominghandler "github.com/spinframework/spin-go-sdk/v2/internal/wasi/http/v0.2.0/incoming-handler"
"github.com/spinframework/spin-go-sdk/v2/internal/wasi/http/v0.2.0/types"
"github.com/spinframework/spin-go-sdk/v2/wit"
incominghandler "github.com/spinframework/spin-go-sdk/v3/internal/wasi/http/v0.2.0/incoming-handler"
"github.com/spinframework/spin-go-sdk/v3/internal/wasi/http/v0.2.0/types"
"github.com/spinframework/spin-go-sdk/v3/wit"
)

// force wit files to be shipped with sdk dependency
Expand Down
2 changes: 1 addition & 1 deletion v2/http/streams.go → v3/http/streams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"io"

"github.com/spinframework/spin-go-sdk/v2/internal/wasi/io/v0.2.0/streams"
"github.com/spinframework/spin-go-sdk/v3/internal/wasi/io/v0.2.0/streams"
)

type inputStreamReader struct {
Expand Down
12 changes: 12 additions & 0 deletions v3/http/testdata/http-tinygo/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module github.com/spinframework/spin-go-sdk/v3/http/testdata/http

go 1.23.2

require github.com/spinframework/spin-go-sdk/v3 v3.0.0

require (
github.com/julienschmidt/httprouter v1.3.0 // indirect
go.bytecodealliance.org/cm v0.2.2 // indirect
)

replace github.com/spinframework/spin-go-sdk/v3 => ../../../
0 v2/http/testdata/http-tinygo/go.sum → v3/http/testdata/http-tinygo/go.sum
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion v2/http/testdata/http-tinygo/main.go → v3/http/testdata/http-tinygo/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"net/http"

spinhttp "github.com/spinframework/spin-go-sdk/v2/http"
spinhttp "github.com/spinframework/spin-go-sdk/v3/http"
)

func init() {
Expand Down
3 changes: 2 additions & 1 deletion v2/examples/http/spin.toml → v3/http/testdata/http-tinygo/spin.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ component = "hello"
[component.hello]
source = "main.wasm"
[component.hello.build]
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"
command = "tinygo build -target=wasip2 --wit-package $(go list -mod=readonly -m -f '{{.Dir}}' github.com/spinframework/spin-go-sdk/v3)/wit --wit-world http-trigger -gc=leaking -no-debug -o main.wasm main.go"

0 v2/integration_test.go → v3/integration_test.go
View file
Open in desktop
File renamed without changes.
0 v2/internal/fermyon/spin/config/abi.go → v3/internal/fermyon/spin/config/abi.go
View file
Open in desktop
File renamed without changes.
0 ...ternal/fermyon/spin/config/config.wasm.go → ...ternal/fermyon/spin/config/config.wasm.go
View file
Open in desktop
File renamed without changes.
0 ...nternal/fermyon/spin/config/config.wit.go → ...nternal/fermyon/spin/config/config.wit.go
View file
Open in desktop
File renamed without changes.
0 v2/internal/fermyon/spin/config/empty.s → v3/internal/fermyon/spin/config/empty.s
View file
Open in desktop
File renamed without changes.
0 ...yon/spin/http-trigger/http-trigger.wit.go → ...yon/spin/http-trigger/http-trigger.wit.go
View file
Open in desktop
File renamed without changes.
0 ...fermyon/spin/http-types/http-types.wit.go → ...fermyon/spin/http-types/http-types.wit.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion v2/internal/fermyon/spin/http/abi.go → v3/internal/fermyon/spin/http/abi.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 v2/internal/fermyon/spin/http/empty.s → v3/internal/fermyon/spin/http/empty.s
View file
Open in desktop
File renamed without changes.
0 v2/internal/fermyon/spin/http/http.wasm.go → v3/internal/fermyon/spin/http/http.wasm.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion v2/internal/fermyon/spin/http/http.wit.go → v3/internal/fermyon/spin/http/http.wit.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion v2/internal/fermyon/spin/inbound-http/abi.go → v3/internal/fermyon/spin/inbound-http/abi.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...nternal/fermyon/spin/inbound-http/empty.s → ...nternal/fermyon/spin/inbound-http/empty.s
View file
Open in desktop
File renamed without changes.
0 ...spin/inbound-http/inbound-http.exports.go → ...spin/inbound-http/inbound-http.exports.go
View file
Open in desktop
File renamed without changes.
0 ...on/spin/inbound-http/inbound-http.wasm.go → ...on/spin/inbound-http/inbound-http.wasm.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...yon/spin/inbound-http/inbound-http.wit.go → ...yon/spin/inbound-http/inbound-http.wit.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 v2/internal/fermyon/spin/key-value/abi.go → v3/internal/fermyon/spin/key-value/abi.go
View file
Open in desktop
File renamed without changes.
0 v2/internal/fermyon/spin/key-value/empty.s → v3/internal/fermyon/spin/key-value/empty.s
View file
Open in desktop
File renamed without changes.
0 .../fermyon/spin/key-value/key-value.wasm.go → .../fermyon/spin/key-value/key-value.wasm.go
View file
Open in desktop
File renamed without changes.
0 ...l/fermyon/spin/key-value/key-value.wit.go → ...l/fermyon/spin/key-value/key-value.wit.go
View file
Open in desktop
File renamed without changes.
0 v2/internal/fermyon/spin/llm/abi.go → v3/internal/fermyon/spin/llm/abi.go
View file
Open in desktop
File renamed without changes.
0 v2/internal/fermyon/spin/llm/empty.s → v3/internal/fermyon/spin/llm/empty.s
View file
Open in desktop
File renamed without changes.
0 v2/internal/fermyon/spin/llm/llm.wasm.go → v3/internal/fermyon/spin/llm/llm.wasm.go
View file
Open in desktop
File renamed without changes.
0 v2/internal/fermyon/spin/llm/llm.wit.go → v3/internal/fermyon/spin/llm/llm.wit.go
View file
Open in desktop
File renamed without changes.
0 v2/internal/fermyon/spin/mysql/abi.go → v3/internal/fermyon/spin/mysql/abi.go
View file
Open in desktop
File renamed without changes.
0 v2/internal/fermyon/spin/mysql/empty.s → v3/internal/fermyon/spin/mysql/empty.s
View file
Open in desktop
File renamed without changes.
0 v2/internal/fermyon/spin/mysql/mysql.wasm.go → v3/internal/fermyon/spin/mysql/mysql.wasm.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion v2/internal/fermyon/spin/mysql/mysql.wit.go → v3/internal/fermyon/spin/mysql/mysql.wit.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 v2/internal/fermyon/spin/postgres/abi.go → v3/internal/fermyon/spin/postgres/abi.go
View file
Open in desktop
File renamed without changes.
0 v2/internal/fermyon/spin/postgres/empty.s → v3/internal/fermyon/spin/postgres/empty.s
View file
Open in desktop
File renamed without changes.
0 ...al/fermyon/spin/postgres/postgres.wasm.go → ...al/fermyon/spin/postgres/postgres.wasm.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nal/fermyon/spin/postgres/postgres.wit.go → ...nal/fermyon/spin/postgres/postgres.wit.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...rmyon/spin/rdbms-types/rdbms-types.wit.go → ...rmyon/spin/rdbms-types/rdbms-types.wit.go
View file
Open in desktop
File renamed without changes.
0 ...rmyon/spin/redis-types/redis-types.wit.go → ...rmyon/spin/redis-types/redis-types.wit.go
View file
Open in desktop
File renamed without changes.
0 v2/internal/fermyon/spin/redis/empty.s → v3/internal/fermyon/spin/redis/empty.s
View file
Open in desktop
File renamed without changes.
0 v2/internal/fermyon/spin/redis/redis.wasm.go → v3/internal/fermyon/spin/redis/redis.wasm.go
View file
Open in desktop
File renamed without changes.
Loading