chore: reorganize repo

Signed-off-by: Roman Volosatovs <[email protected]>
wasmCloud · Sep 16, 2024 · d5d6293 · d5d6293
1 parent 50a6353
commit d5d6293
Show file tree

Hide file tree

Showing 207 changed files with 8,682 additions and 223 deletions.
diff --git a/.github/workflows/west.yml b/.github/workflows/west.yml
@@ -45,13 +45,13 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - uses: actions/setup-go@v5
         with:
-          go-version-file: 'go/go.mod'
+          go-version-file: 'go.mod'
       - uses: cargo-bins/[email protected]
       - run: rustup show
       #- run: cargo test --workspace --all-targets
       - run: cargo binstall -y [email protected]
-      - run: go generate ./go/...
-      - run: go test ./go/...
+      - run: go generate ./...
+      - run: go test ./...
       - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         with:
           name: west-${{ matrix.config.target }}

diff --git a/go/bindings/bindings.go → bindings/bindings.go b/go/bindings/bindings.go → bindings/bindings.go
diff --git a/go/bindings/wasi/cli/environment/empty.s → bindings/wasi/cli/environment/empty.s b/go/bindings/wasi/cli/environment/empty.s → bindings/wasi/cli/environment/empty.s
diff --git a/...s/wasi/cli/environment/environment.wit.go → ...s/wasi/cli/environment/environment.wit.go b/...s/wasi/cli/environment/environment.wit.go → ...s/wasi/cli/environment/environment.wit.go
diff --git a/go/bindings/wasi/cli/exit/empty.s → bindings/wasi/cli/exit/empty.s b/go/bindings/wasi/cli/exit/empty.s → bindings/wasi/cli/exit/empty.s
diff --git a/go/bindings/wasi/cli/exit/exit.wit.go → bindings/wasi/cli/exit/exit.wit.go b/go/bindings/wasi/cli/exit/exit.wit.go → bindings/wasi/cli/exit/exit.wit.go
diff --git a/go/bindings/wasi/cli/imports/imports.wit.go → bindings/wasi/cli/imports/imports.wit.go b/go/bindings/wasi/cli/imports/imports.wit.go → bindings/wasi/cli/imports/imports.wit.go
diff --git a/go/bindings/wasi/cli/stderr/empty.s → bindings/wasi/cli/stderr/empty.s b/go/bindings/wasi/cli/stderr/empty.s → bindings/wasi/cli/stderr/empty.s
diff --git a/go/bindings/wasi/cli/stderr/stderr.wit.go → bindings/wasi/cli/stderr/stderr.wit.go b/go/bindings/wasi/cli/stderr/stderr.wit.go → bindings/wasi/cli/stderr/stderr.wit.go
diff --git a/go/bindings/wasi/cli/stdin/empty.s → bindings/wasi/cli/stdin/empty.s b/go/bindings/wasi/cli/stdin/empty.s → bindings/wasi/cli/stdin/empty.s
diff --git a/go/bindings/wasi/cli/stdin/stdin.wit.go → bindings/wasi/cli/stdin/stdin.wit.go b/go/bindings/wasi/cli/stdin/stdin.wit.go → bindings/wasi/cli/stdin/stdin.wit.go
diff --git a/go/bindings/wasi/cli/stdout/empty.s → bindings/wasi/cli/stdout/empty.s b/go/bindings/wasi/cli/stdout/empty.s → bindings/wasi/cli/stdout/empty.s
diff --git a/go/bindings/wasi/cli/stdout/stdout.wit.go → bindings/wasi/cli/stdout/stdout.wit.go b/go/bindings/wasi/cli/stdout/stdout.wit.go → bindings/wasi/cli/stdout/stdout.wit.go
diff --git a/go/bindings/wasi/cli/terminal-input/empty.s → bindings/wasi/cli/terminal-input/empty.s b/go/bindings/wasi/cli/terminal-input/empty.s → bindings/wasi/cli/terminal-input/empty.s
diff --git a/.../cli/terminal-input/terminal-input.wit.go → .../cli/terminal-input/terminal-input.wit.go b/.../cli/terminal-input/terminal-input.wit.go → .../cli/terminal-input/terminal-input.wit.go
diff --git a/go/bindings/wasi/cli/terminal-output/empty.s → bindings/wasi/cli/terminal-output/empty.s b/go/bindings/wasi/cli/terminal-output/empty.s → bindings/wasi/cli/terminal-output/empty.s
diff --git a/...li/terminal-output/terminal-output.wit.go → ...li/terminal-output/terminal-output.wit.go b/...li/terminal-output/terminal-output.wit.go → ...li/terminal-output/terminal-output.wit.go
diff --git a/go/bindings/wasi/cli/terminal-stderr/empty.s → bindings/wasi/cli/terminal-stderr/empty.s b/go/bindings/wasi/cli/terminal-stderr/empty.s → bindings/wasi/cli/terminal-stderr/empty.s
diff --git a/...li/terminal-stderr/terminal-stderr.wit.go → ...li/terminal-stderr/terminal-stderr.wit.go b/...li/terminal-stderr/terminal-stderr.wit.go → ...li/terminal-stderr/terminal-stderr.wit.go
diff --git a/go/bindings/wasi/cli/terminal-stdin/empty.s → bindings/wasi/cli/terminal-stdin/empty.s b/go/bindings/wasi/cli/terminal-stdin/empty.s → bindings/wasi/cli/terminal-stdin/empty.s
diff --git a/.../cli/terminal-stdin/terminal-stdin.wit.go → .../cli/terminal-stdin/terminal-stdin.wit.go b/.../cli/terminal-stdin/terminal-stdin.wit.go → .../cli/terminal-stdin/terminal-stdin.wit.go
diff --git a/go/bindings/wasi/cli/terminal-stdout/empty.s → bindings/wasi/cli/terminal-stdout/empty.s b/go/bindings/wasi/cli/terminal-stdout/empty.s → bindings/wasi/cli/terminal-stdout/empty.s
diff --git a/...li/terminal-stdout/terminal-stdout.wit.go → ...li/terminal-stdout/terminal-stdout.wit.go b/...li/terminal-stdout/terminal-stdout.wit.go → ...li/terminal-stdout/terminal-stdout.wit.go
diff --git a/...ndings/wasi/clocks/imports/imports.wit.go → bindings/wasi/clocks/imports/imports.wit.go b/...ndings/wasi/clocks/imports/imports.wit.go → bindings/wasi/clocks/imports/imports.wit.go
diff --git a/...dings/wasi/clocks/monotonic-clock/empty.s → bindings/wasi/clocks/monotonic-clock/empty.s b/...dings/wasi/clocks/monotonic-clock/empty.s → bindings/wasi/clocks/monotonic-clock/empty.s
diff --git a/...ks/monotonic-clock/monotonic-clock.wit.go → ...ks/monotonic-clock/monotonic-clock.wit.go b/...ks/monotonic-clock/monotonic-clock.wit.go → ...ks/monotonic-clock/monotonic-clock.wit.go
diff --git a/go/bindings/wasi/clocks/wall-clock/empty.s → bindings/wasi/clocks/wall-clock/empty.s b/go/bindings/wasi/clocks/wall-clock/empty.s → bindings/wasi/clocks/wall-clock/empty.s
diff --git a/.../wasi/clocks/wall-clock/wall-clock.wit.go → .../wasi/clocks/wall-clock/wall-clock.wit.go b/.../wasi/clocks/wall-clock/wall-clock.wit.go → .../wasi/clocks/wall-clock/wall-clock.wit.go
diff --git a/...gs/wasi/filesystem/imports/imports.wit.go → ...gs/wasi/filesystem/imports/imports.wit.go b/...gs/wasi/filesystem/imports/imports.wit.go → ...gs/wasi/filesystem/imports/imports.wit.go
diff --git a/go/bindings/wasi/filesystem/preopens/empty.s → bindings/wasi/filesystem/preopens/empty.s b/go/bindings/wasi/filesystem/preopens/empty.s → bindings/wasi/filesystem/preopens/empty.s
diff --git a/.../wasi/filesystem/preopens/preopens.wit.go → .../wasi/filesystem/preopens/preopens.wit.go b/.../wasi/filesystem/preopens/preopens.wit.go → .../wasi/filesystem/preopens/preopens.wit.go
diff --git a/go/bindings/wasi/filesystem/types/abi.go → bindings/wasi/filesystem/types/abi.go b/go/bindings/wasi/filesystem/types/abi.go → bindings/wasi/filesystem/types/abi.go
diff --git a/go/bindings/wasi/filesystem/types/empty.s → bindings/wasi/filesystem/types/empty.s b/go/bindings/wasi/filesystem/types/empty.s → bindings/wasi/filesystem/types/empty.s
diff --git a/...ndings/wasi/filesystem/types/types.wit.go → bindings/wasi/filesystem/types/types.wit.go b/...ndings/wasi/filesystem/types/types.wit.go → bindings/wasi/filesystem/types/types.wit.go
diff --git a/go/bindings/wasi/http/types/abi.go → bindings/wasi/http/types/abi.go b/go/bindings/wasi/http/types/abi.go → bindings/wasi/http/types/abi.go
diff --git a/go/bindings/wasi/http/types/empty.s → bindings/wasi/http/types/empty.s b/go/bindings/wasi/http/types/empty.s → bindings/wasi/http/types/empty.s
diff --git a/go/bindings/wasi/http/types/types.wit.go → bindings/wasi/http/types/types.wit.go b/go/bindings/wasi/http/types/types.wit.go → bindings/wasi/http/types/types.wit.go
diff --git a/go/bindings/wasi/io/error/empty.s → bindings/wasi/io/error/empty.s b/go/bindings/wasi/io/error/empty.s → bindings/wasi/io/error/empty.s
diff --git a/go/bindings/wasi/io/error/error.wit.go → bindings/wasi/io/error/error.wit.go b/go/bindings/wasi/io/error/error.wit.go → bindings/wasi/io/error/error.wit.go
diff --git a/go/bindings/wasi/io/imports/imports.wit.go → bindings/wasi/io/imports/imports.wit.go b/go/bindings/wasi/io/imports/imports.wit.go → bindings/wasi/io/imports/imports.wit.go
diff --git a/go/bindings/wasi/io/poll/empty.s → bindings/wasi/io/poll/empty.s b/go/bindings/wasi/io/poll/empty.s → bindings/wasi/io/poll/empty.s
diff --git a/go/bindings/wasi/io/poll/poll.wit.go → bindings/wasi/io/poll/poll.wit.go b/go/bindings/wasi/io/poll/poll.wit.go → bindings/wasi/io/poll/poll.wit.go
diff --git a/go/bindings/wasi/io/streams/abi.go → bindings/wasi/io/streams/abi.go b/go/bindings/wasi/io/streams/abi.go → bindings/wasi/io/streams/abi.go
diff --git a/go/bindings/wasi/io/streams/empty.s → bindings/wasi/io/streams/empty.s b/go/bindings/wasi/io/streams/empty.s → bindings/wasi/io/streams/empty.s
diff --git a/go/bindings/wasi/io/streams/streams.wit.go → bindings/wasi/io/streams/streams.wit.go b/go/bindings/wasi/io/streams/streams.wit.go → bindings/wasi/io/streams/streams.wit.go
diff --git a/...ndings/wasi/random/imports/imports.wit.go → bindings/wasi/random/imports/imports.wit.go b/...ndings/wasi/random/imports/imports.wit.go → bindings/wasi/random/imports/imports.wit.go
diff --git a/...indings/wasi/random/insecure-seed/empty.s → bindings/wasi/random/insecure-seed/empty.s b/...indings/wasi/random/insecure-seed/empty.s → bindings/wasi/random/insecure-seed/empty.s
diff --git a/...random/insecure-seed/insecure-seed.wit.go → ...random/insecure-seed/insecure-seed.wit.go b/...random/insecure-seed/insecure-seed.wit.go → ...random/insecure-seed/insecure-seed.wit.go
diff --git a/go/bindings/wasi/random/insecure/empty.s → bindings/wasi/random/insecure/empty.s b/go/bindings/wasi/random/insecure/empty.s → bindings/wasi/random/insecure/empty.s
diff --git a/...ings/wasi/random/insecure/insecure.wit.go → ...ings/wasi/random/insecure/insecure.wit.go b/...ings/wasi/random/insecure/insecure.wit.go → ...ings/wasi/random/insecure/insecure.wit.go
diff --git a/go/bindings/wasi/random/random/empty.s → bindings/wasi/random/random/empty.s b/go/bindings/wasi/random/random/empty.s → bindings/wasi/random/random/empty.s
diff --git a/go/bindings/wasi/random/random/random.wit.go → bindings/wasi/random/random/random.wit.go b/go/bindings/wasi/random/random/random.wit.go → bindings/wasi/random/random/random.wit.go
diff --git a/...dings/wasi/sockets/imports/imports.wit.go → bindings/wasi/sockets/imports/imports.wit.go b/...dings/wasi/sockets/imports/imports.wit.go → bindings/wasi/sockets/imports/imports.wit.go
diff --git a/...ngs/wasi/sockets/instance-network/empty.s → ...ngs/wasi/sockets/instance-network/empty.s b/...ngs/wasi/sockets/instance-network/empty.s → ...ngs/wasi/sockets/instance-network/empty.s
diff --git a/.../instance-network/instance-network.wit.go → .../instance-network/instance-network.wit.go b/.../instance-network/instance-network.wit.go → .../instance-network/instance-network.wit.go
diff --git a/...ndings/wasi/sockets/ip-name-lookup/abi.go → bindings/wasi/sockets/ip-name-lookup/abi.go b/...ndings/wasi/sockets/ip-name-lookup/abi.go → bindings/wasi/sockets/ip-name-lookup/abi.go
diff --git a/...dings/wasi/sockets/ip-name-lookup/empty.s → bindings/wasi/sockets/ip-name-lookup/empty.s b/...dings/wasi/sockets/ip-name-lookup/empty.s → bindings/wasi/sockets/ip-name-lookup/empty.s
diff --git a/...kets/ip-name-lookup/ip-name-lookup.wit.go → ...kets/ip-name-lookup/ip-name-lookup.wit.go b/...kets/ip-name-lookup/ip-name-lookup.wit.go → ...kets/ip-name-lookup/ip-name-lookup.wit.go
diff --git a/go/bindings/wasi/sockets/network/abi.go → bindings/wasi/sockets/network/abi.go b/go/bindings/wasi/sockets/network/abi.go → bindings/wasi/sockets/network/abi.go
diff --git a/go/bindings/wasi/sockets/network/empty.s → bindings/wasi/sockets/network/empty.s b/go/bindings/wasi/sockets/network/empty.s → bindings/wasi/sockets/network/empty.s
diff --git a/...dings/wasi/sockets/network/network.wit.go → bindings/wasi/sockets/network/network.wit.go b/...dings/wasi/sockets/network/network.wit.go → bindings/wasi/sockets/network/network.wit.go
diff --git a/...gs/wasi/sockets/tcp-create-socket/empty.s → ...gs/wasi/sockets/tcp-create-socket/empty.s b/...gs/wasi/sockets/tcp-create-socket/empty.s → ...gs/wasi/sockets/tcp-create-socket/empty.s
diff --git a/...cp-create-socket/tcp-create-socket.wit.go → ...cp-create-socket/tcp-create-socket.wit.go b/...cp-create-socket/tcp-create-socket.wit.go → ...cp-create-socket/tcp-create-socket.wit.go
diff --git a/go/bindings/wasi/sockets/tcp/abi.go → bindings/wasi/sockets/tcp/abi.go b/go/bindings/wasi/sockets/tcp/abi.go → bindings/wasi/sockets/tcp/abi.go
diff --git a/go/bindings/wasi/sockets/tcp/empty.s → bindings/wasi/sockets/tcp/empty.s b/go/bindings/wasi/sockets/tcp/empty.s → bindings/wasi/sockets/tcp/empty.s
diff --git a/go/bindings/wasi/sockets/tcp/tcp.wit.go → bindings/wasi/sockets/tcp/tcp.wit.go b/go/bindings/wasi/sockets/tcp/tcp.wit.go → bindings/wasi/sockets/tcp/tcp.wit.go
diff --git a/...gs/wasi/sockets/udp-create-socket/empty.s → ...gs/wasi/sockets/udp-create-socket/empty.s b/...gs/wasi/sockets/udp-create-socket/empty.s → ...gs/wasi/sockets/udp-create-socket/empty.s
diff --git a/...dp-create-socket/udp-create-socket.wit.go → ...dp-create-socket/udp-create-socket.wit.go b/...dp-create-socket/udp-create-socket.wit.go → ...dp-create-socket/udp-create-socket.wit.go
diff --git a/go/bindings/wasi/sockets/udp/abi.go → bindings/wasi/sockets/udp/abi.go b/go/bindings/wasi/sockets/udp/abi.go → bindings/wasi/sockets/udp/abi.go
diff --git a/go/bindings/wasi/sockets/udp/empty.s → bindings/wasi/sockets/udp/empty.s b/go/bindings/wasi/sockets/udp/empty.s → bindings/wasi/sockets/udp/empty.s
diff --git a/go/bindings/wasi/sockets/udp/udp.wit.go → bindings/wasi/sockets/udp/udp.wit.go b/go/bindings/wasi/sockets/udp/udp.wit.go → bindings/wasi/sockets/udp/udp.wit.go
diff --git a/go/bindings/west.go → bindings/west.go b/go/bindings/west.go → bindings/west.go
@@ -3,5 +3,5 @@
 package bindings
 
 import (
-	_ "github.com/rvolosatovs/west/go/bindings/west/test/http-test"
+	_ "github.com/rvolosatovs/west/bindings/west/test/http-test"
 )
diff --git a/go/bindings/west/test/http-test/empty.s → bindings/west/test/http-test/empty.s b/go/bindings/west/test/http-test/empty.s → bindings/west/test/http-test/empty.s
diff --git a/...ings/west/test/http-test/http-test.wit.go → ...ings/west/test/http-test/http-test.wit.go b/...ings/west/test/http-test/http-test.wit.go → ...ings/west/test/http-test/http-test.wit.go
diff --git a/go/bindings/west/test/imports/imports.wit.go → bindings/west/test/imports/imports.wit.go b/go/bindings/west/test/imports/imports.wit.go → bindings/west/test/imports/imports.wit.go
diff --git a/go/cmd/west-bindgen-go/main.go → cmd/west-bindgen-go/main.go b/go/cmd/west-bindgen-go/main.go → cmd/west-bindgen-go/main.go
@@ -466,7 +466,7 @@ func generate(path string) error {
 		},
 		{
 			Name: &ast.Ident{Name: "west"},
-			Path: &ast.BasicLit{Kind: token.STRING, Value: `"github.com/rvolosatovs/west/go"`},
+			Path: &ast.BasicLit{Kind: token.STRING, Value: `"github.com/rvolosatovs/west"`},
 		},
 	}
 	for path, name := range goImports {

diff --git a/go/go.mod → go.mod b/go/go.mod → go.mod
@@ -1,14 +1,16 @@
-module github.com/rvolosatovs/west/go
+module github.com/rvolosatovs/west
 
 go 1.23.0
 
-require golang.org/x/tools v0.24.0
+require (
+	github.com/stretchr/testify v1.9.0
+	github.com/ydnar/wasm-tools-go v0.1.5
+	golang.org/x/tools v0.24.0
+)
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/stretchr/testify v1.9.0 // indirect
-	github.com/ydnar/wasm-tools-go v0.1.5 // indirect
 	golang.org/x/mod v0.20.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

diff --git a/go/go.sum → go.sum b/go/go.sum → go.sum
@@ -12,6 +12,7 @@ golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
 golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
 golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/go.work b/go.work
@@ -1,5 +1,5 @@
 go 1.23.0
 
-use ./go
+use ./.
 
-replace github.com/rvolosatovs/west/go v0.0.1 => ./go
+replace github.com/rvolosatovs/west v0.0.1 => ./.
diff --git a/go.work.sum b/go.work.sum
@@ -8,3 +8,4 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t
 golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
 golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
diff --git a/go/internal/tests/sync/sync.go b/go/internal/tests/sync/sync.go
diff --git a/go/west_darwin_amd64.go b/go/west_darwin_amd64.go
diff --git a/go/west_darwin_arm64.go b/go/west_darwin_arm64.go
diff --git a/go/west_linux_amd64.go b/go/west_linux_amd64.go
diff --git a/go/west_linux_arm64.go b/go/west_linux_arm64.go
diff --git a/go/west_windows_amd64.go b/go/west_windows_amd64.go
diff --git a/go/internal/tests/sync/bindings/.gitkeep → tests/go/sync/bindings/.gitkeep b/go/internal/tests/sync/bindings/.gitkeep → tests/go/sync/bindings/.gitkeep
diff --git a/tests/go/sync/bindings/west-test/sync/guest/guest.wit.go b/tests/go/sync/bindings/west-test/sync/guest/guest.wit.go