Merge pull request #1 from adamreese/update-import-paths

Update import paths to new package
spinframework · Feb 20, 2024 · 48ddef7 · 48ddef7
2 parents d4d8822 + b22d53f
commit 48ddef7
Show file tree

Hide file tree

Showing 80 changed files with 181 additions and 190 deletions.
diff --git a/examples/http-tinygo-outbound-http/README.md → examples/http-outbound/README.md b/examples/http-tinygo-outbound-http/README.md → examples/http-outbound/README.md
diff --git a/examples/http-outbound/hello/go.mod b/examples/http-outbound/hello/go.mod
@@ -0,0 +1,9 @@
+module examples/http-outbound/hello
+
+go 1.20
+
+require github.com/fermyon/spin-go-sdk v0.0.0
+
+require github.com/julienschmidt/httprouter v1.3.0 // indirect
+
+replace github.com/fermyon/spin-go-sdk v0.0.0 => ../../../
diff --git a/...und-http/outbound-http-to-same-app/go.sum → examples/http-outbound/hello/go.sum b/...und-http/outbound-http-to-same-app/go.sum → examples/http-outbound/hello/go.sum
diff --git a/...tinygo-outbound-http/tinygo-hello/main.go → examples/http-outbound/hello/main.go b/...tinygo-outbound-http/tinygo-hello/main.go → examples/http-outbound/hello/main.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"os"
 
-	spinhttp "github.com/fermyon/spin/sdk/go/v2/http"
+	spinhttp "github.com/fermyon/spin-go-sdk/http"
 )
 
 func init() {

diff --git a/examples/http-outbound/http-to-same-app/go.mod b/examples/http-outbound/http-to-same-app/go.mod
@@ -0,0 +1,9 @@
+module examples/http-outbound/http-to-same-app
+
+go 1.20
+
+require github.com/fermyon/spin-go-sdk v0.0.0
+
+require github.com/julienschmidt/httprouter v1.3.0 // indirect
+
+replace github.com/fermyon/spin-go-sdk v0.0.0 => ../../../
diff --git a/...-tinygo-outbound-http/tinygo-hello/go.sum → ...les/http-outbound/http-to-same-app/go.sum b/...-tinygo-outbound-http/tinygo-hello/go.sum → ...les/http-outbound/http-to-same-app/go.sum
diff --git a/...nd-http/outbound-http-to-same-app/main.go → ...es/http-outbound/http-to-same-app/main.go b/...nd-http/outbound-http-to-same-app/main.go → ...es/http-outbound/http-to-same-app/main.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	spinhttp "github.com/fermyon/spin/sdk/go/v2/http"
+	spinhttp "github.com/fermyon/spin-go-sdk/http"
 )
 
 func init() {

diff --git a/examples/http-tinygo-outbound-http/spin.toml → examples/http-outbound/spin.toml b/examples/http-tinygo-outbound-http/spin.toml → examples/http-outbound/spin.toml
@@ -3,31 +3,31 @@ spin_manifest_version = 2
 [application]
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "A simple Spin application written in (Tiny)Go that performs outbound HTTP requests."
-name = "spin-tinygo-outbound-http"
+name = "http-outbound-example"
 version = "1.0.0"
 
 [[trigger.http]]
 route = "/hello"
-component = "tinygo-hello"
+component = "hello"
 
 [[trigger.http]]
-route = "/outbound-http-to-same-app"
-component = "outbound-http-to-same-app"
+route = "/http-to-same-app"
+component = "http-to-same-app"
 
-[component.tinygo-hello]
-source = "tinygo-hello/main.wasm"
+[component.hello]
+source = "hello/main.wasm"
 allowed_outbound_hosts = [
-    "https://random-data-api.fermyon.app:443",
-    "https://postman-echo.com:443",
+  "https://random-data-api.fermyon.app:443",
+  "https://postman-echo.com:443",
 ]
-[component.tinygo-hello.build]
-workdir = "tinygo-hello"
+[component.hello.build]
+workdir = "hello"
 command = "tinygo build -target=wasi -gc=leaking -no-debug -o main.wasm main.go"
 
-[component.outbound-http-to-same-app]
-source = "outbound-http-to-same-app/main.wasm"
+[component.http-to-same-app]
+source = "http-to-same-app/main.wasm"
 # Use self to make outbound requests to components in the same Spin application.
 allowed_outbound_hosts = ["http://self"]
-[component.outbound-http-to-same-app.build]
-workdir = "outbound-http-to-same-app"
+[component.http-to-same-app.build]
+workdir = "http-to-same-app"
 command = "tinygo build -target=wasi -gc=leaking -no-debug -o main.wasm main.go"
diff --git a/examples/http-tinygo-router/README.md → examples/http-router/README.md b/examples/http-tinygo-router/README.md → examples/http-router/README.md
diff --git a/examples/http-router/go.mod b/examples/http-router/go.mod
@@ -0,0 +1,9 @@
+module examples/http-router
+
+go 1.20
+
+require github.com/fermyon/spin-go-sdk v0.0.0
+
+require github.com/julienschmidt/httprouter v1.3.0 // indirect
+
+replace github.com/fermyon/spin-go-sdk v0.0.0 => ../../
diff --git a/examples/http-tinygo-router/go.sum → examples/http-router/go.sum b/examples/http-tinygo-router/go.sum → examples/http-router/go.sum
diff --git a/examples/http-tinygo-router/main.go → examples/http-router/main.go b/examples/http-tinygo-router/main.go → examples/http-router/main.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	spinhttp "github.com/fermyon/spin/sdk/go/v2/http"
+	spinhttp "github.com/fermyon/spin-go-sdk/http"
 )
 
 func init() {

diff --git a/examples/http-tinygo-router/spin.toml → examples/http-router/spin.toml b/examples/http-tinygo-router/spin.toml → examples/http-router/spin.toml
@@ -3,14 +3,14 @@ spin_manifest_version = 2
 [application]
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "A simple Spin application written in (Tiny)Go."
-name = "spin-hello-tinygo"
+name = "hello-router-example"
 version = "1.0.0"
 
 [[trigger.http]]
 route = "/..."
-component = "tinygo-hello"
+component = "hello"
 
-[component.tinygo-hello]
+[component.hello]
 source = "main.wasm"
-[component.tinygo-hello.build]
+[component.hello.build]
 command = "tinygo build -target=wasi -gc=leaking -no-debug -o main.wasm main.go"
diff --git a/examples/http-tinygo-outbound-http/outbound-http-to-same-app/go.mod b/examples/http-tinygo-outbound-http/outbound-http-to-same-app/go.mod
diff --git a/examples/http-tinygo-outbound-http/tinygo-hello/go.mod b/examples/http-tinygo-outbound-http/tinygo-hello/go.mod
diff --git a/examples/http-tinygo-router/go.mod b/examples/http-tinygo-router/go.mod
diff --git a/examples/http-tinygo/go.mod b/examples/http-tinygo/go.mod
diff --git a/examples/http-tinygo/README.md → examples/http/README.md b/examples/http-tinygo/README.md → examples/http/README.md
diff --git a/examples/http/go.mod b/examples/http/go.mod
@@ -0,0 +1,9 @@
+module examples/http
+
+go 1.20
+
+require github.com/fermyon/spin-go-sdk v0.0.0
+
+require github.com/julienschmidt/httprouter v1.3.0 // indirect
+
+replace github.com/fermyon/spin-go-sdk v0.0.0 => ../../
diff --git a/examples/http-tinygo/go.sum → examples/http/go.sum b/examples/http-tinygo/go.sum → examples/http/go.sum
diff --git a/examples/http-tinygo/main.go → examples/http/main.go b/examples/http-tinygo/main.go → examples/http/main.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"net/http"
 
-	spinhttp "github.com/fermyon/spin/sdk/go/v2/http"
+	spinhttp "github.com/fermyon/spin-go-sdk/http"
 )
 
 func init() {

diff --git a/examples/http-tinygo/spin.toml → examples/http/spin.toml b/examples/http-tinygo/spin.toml → examples/http/spin.toml
@@ -3,14 +3,14 @@ spin_manifest_version = 2
 [application]
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "A simple Spin application written in (Tiny)Go."
-name = "spin-hello-tinygo"
+name = "hello-example"
 version = "1.0.0"
 
 [[trigger.http]]
 route = "/hello"
-component = "tinygo-hello"
+component = "hello"
 
-[component.tinygo-hello]
+[component.hello]
 source = "main.wasm"
-[component.tinygo-hello.build]
+[component.hello.build]
 command = "tinygo build -target=wasi -gc=leaking -no-debug -o main.wasm main.go"
diff --git a/examples/tinygo-key-value/README.md → examples/key-value/README.md b/examples/tinygo-key-value/README.md → examples/key-value/README.md
diff --git a/examples/key-value/go.mod b/examples/key-value/go.mod
@@ -0,0 +1,9 @@
+module examples/key-value
+
+go 1.20
+
+require github.com/fermyon/spin-go-sdk v0.0.0
+
+require github.com/julienschmidt/httprouter v1.3.0 // indirect
+
+replace github.com/fermyon/spin-go-sdk v0.0.0 => ../../
diff --git a/examples/tinygo-key-value/go.sum → examples/key-value/go.sum b/examples/tinygo-key-value/go.sum → examples/key-value/go.sum
diff --git a/examples/tinygo-key-value/main.go → examples/key-value/main.go b/examples/tinygo-key-value/main.go → examples/key-value/main.go
@@ -4,8 +4,8 @@ import (
 	"io"
 	"net/http"
 
-	spin_http "github.com/fermyon/spin/sdk/go/v2/http"
-	"github.com/fermyon/spin/sdk/go/v2/kv"
+	spin_http "github.com/fermyon/spin-go-sdk/http"
+	"github.com/fermyon/spin-go-sdk/kv"
 )
 
 func init() {

diff --git a/examples/tinygo-key-value/spin.toml → examples/key-value/spin.toml b/examples/tinygo-key-value/spin.toml → examples/key-value/spin.toml
@@ -2,7 +2,7 @@ spin_manifest_version = 2
 
 [application]
 authors = ["Fermyon Engineering <[email protected]>"]
-name = "tinygo-key-value-example"
+name = "key-value-example"
 version = "0.1.0"
 
 [[trigger.http]]

diff --git a/examples/tinygo-llm/.gitignore → examples/llm/.gitignore b/examples/tinygo-llm/.gitignore → examples/llm/.gitignore
diff --git a/examples/llm/go.mod b/examples/llm/go.mod
@@ -0,0 +1,9 @@
+module examples/llm
+
+go 1.20
+
+require github.com/fermyon/spin-go-sdk v0.0.0
+
+require github.com/julienschmidt/httprouter v1.3.0 // indirect
+
+replace github.com/fermyon/spin-go-sdk v0.0.0 => ../../
diff --git a/examples/tinygo-outbound-redis/go.sum → examples/llm/go.sum b/examples/tinygo-outbound-redis/go.sum → examples/llm/go.sum
diff --git a/examples/tinygo-llm/main.go → examples/llm/main.go b/examples/tinygo-llm/main.go → examples/llm/main.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"net/http"
 
-	spinhttp "github.com/fermyon/spin/sdk/go/v2/http"
-	"github.com/fermyon/spin/sdk/go/v2/llm"
+	spinhttp "github.com/fermyon/spin-go-sdk/http"
+	"github.com/fermyon/spin-go-sdk/llm"
 )
 
 func init() {

diff --git a/examples/tinygo-llm/spin.toml → examples/llm/spin.toml b/examples/tinygo-llm/spin.toml → examples/llm/spin.toml
@@ -3,17 +3,17 @@ spin_manifest_version = 2
 [application]
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "Simple example using the llm sdk."
-name = "tinygo-llm"
+name = "llm-example"
 version = "0.1.0"
 
 [[trigger.http]]
 route = "/..."
-component = "tinygo-llm"
+component = "llm"
 
-[component.tinygo-llm]
+[component.llm]
 source = "main.wasm"
 allowed_outbound_hosts = []
 ai_models = ["llama2-chat", "all-minilm-l6-v2"]
-[component.tinygo-llm.build]
+[component.llm.build]
 command = "tinygo build -target=wasi -gc=leaking -no-debug -o main.wasm main.go"
 watch = ["**/*.go", "go.mod"]
diff --git a/examples/tinygo-outbound-mysql/.gitignore → examples/mysql-outbound/.gitignore b/examples/tinygo-outbound-mysql/.gitignore → examples/mysql-outbound/.gitignore
diff --git a/examples/tinygo-outbound-mysql/db/pets.sql → examples/mysql-outbound/db/pets.sql b/examples/tinygo-outbound-mysql/db/pets.sql → examples/mysql-outbound/db/pets.sql
diff --git a/examples/mysql-outbound/go.mod b/examples/mysql-outbound/go.mod
@@ -0,0 +1,9 @@
+module examples/mysql-outbound
+
+go 1.20
+
+require github.com/fermyon/spin-go-sdk v0.0.0
+
+require github.com/julienschmidt/httprouter v1.3.0 // indirect
+
+replace github.com/fermyon/spin-go-sdk v0.0.0 => ../../
diff --git a/examples/variables-tinygo/go.sum → examples/mysql-outbound/go.sum b/examples/variables-tinygo/go.sum → examples/mysql-outbound/go.sum
diff --git a/examples/tinygo-outbound-mysql/main.go → examples/mysql-outbound/main.go b/examples/tinygo-outbound-mysql/main.go → examples/mysql-outbound/main.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"os"
 
-	spinhttp "github.com/fermyon/spin/sdk/go/v2/http"
-	"github.com/fermyon/spin/sdk/go/v2/mysql"
+	spinhttp "github.com/fermyon/spin-go-sdk/http"
+	"github.com/fermyon/spin-go-sdk/mysql"
 )
 
 type Pet struct {

diff --git a/examples/tinygo-outbound-mysql/spin.toml → examples/mysql-outbound/spin.toml b/examples/tinygo-outbound-mysql/spin.toml → examples/mysql-outbound/spin.toml
@@ -3,17 +3,17 @@ spin_manifest_version = 2
 [application]
 authors = ["Patrick Jiang <[email protected]>"]
 description = ""
-name = "tinygo-mysql"
+name = "mysql-outbound-example"
 version = "0.1.0"
 
 [[trigger.http]]
 route = "/..."
-component = "tinygo-mysql"
+component = "mysql"
 
-[component.tinygo-mysql]
+[component.mysql]
 environment = { DB_URL = "mysql://spin:[email protected]/spin_dev" }
 source = "main.wasm"
 allowed_outbound_hosts = ["mysql://127.0.0.1"]
-[component.tinygo-mysql.build]
+[component.mysql.build]
 command = "tinygo build -target=wasi -gc=leaking -o main.wasm main.go"
 watch = ["**/*.go", "go.mod"]
diff --git a/examples/tinygo-outbound-pg/db/pets.sql → examples/pg-outbound/db/pets.sql b/examples/tinygo-outbound-pg/db/pets.sql → examples/pg-outbound/db/pets.sql
diff --git a/examples/pg-outbound/go.mod b/examples/pg-outbound/go.mod
@@ -0,0 +1,9 @@
+module examples/pg-outbound
+
+go 1.20
+
+require github.com/fermyon/spin-go-sdk v0.0.0
+
+require github.com/julienschmidt/httprouter v1.3.0 // indirect
+
+replace github.com/fermyon/spin-go-sdk v0.0.0 => ../../
diff --git a/examples/tinygo-redis/go.sum → examples/pg-outbound/go.sum b/examples/tinygo-redis/go.sum → examples/pg-outbound/go.sum
@@ -1 +1,2 @@
+github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
diff --git a/examples/tinygo-outbound-pg/main.go → examples/pg-outbound/main.go b/examples/tinygo-outbound-pg/main.go → examples/pg-outbound/main.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"os"
 
-	spinhttp "github.com/fermyon/spin/sdk/go/v2/http"
-	"github.com/fermyon/spin/sdk/go/v2/pg"
+	spinhttp "github.com/fermyon/spin-go-sdk/http"
+	"github.com/fermyon/spin-go-sdk/pg"
 )
 
 type Pet struct {

diff --git a/examples/tinygo-outbound-pg/spin.toml → examples/pg-outbound/spin.toml b/examples/tinygo-outbound-pg/spin.toml → examples/pg-outbound/spin.toml
@@ -3,17 +3,17 @@ spin_manifest_version = 2
 [application]
 authors = ["Patrick Jiang <[email protected]>"]
 description = ""
-name = "tinygo-outbound-pg-example"
+name = "pg-outbound-example"
 version = "0.1.0"
 
 [[trigger.http]]
 route = "/..."
-component = "tinygo-outbound-pg-example"
+component = "pg-outbound"
 
-[component.tinygo-outbound-pg-example]
+[component.pg-outbound]
 environment = { DB_URL = "host=localhost user=postgres dbname=spin_dev" }
 source = "main.wasm"
 allowed_outbound_hosts = ["postgres://localhost"]
-[component.tinygo-outbound-pg-example.build]
+[component.pg-outbound.build]
 command = "tinygo build -target=wasi -gc=leaking -o main.wasm main.go"
 watch = ["**/*.go", "go.mod"]
diff --git a/examples/tinygo-outbound-redis/README.md → examples/redis-outbound/README.md b/examples/tinygo-outbound-redis/README.md → examples/redis-outbound/README.md
diff --git a/examples/redis-outbound/go.mod b/examples/redis-outbound/go.mod
@@ -0,0 +1,9 @@
+module examples/redis-outbound
+
+go 1.20
+
+require github.com/fermyon/spin-go-sdk v0.0.0
+
+require github.com/julienschmidt/httprouter v1.3.0 // indirect
+
+replace github.com/fermyon/spin-go-sdk v0.0.0 => ../../
diff --git a/examples/tinygo-llm/go.sum → examples/redis-outbound/go.sum b/examples/tinygo-llm/go.sum → examples/redis-outbound/go.sum
@@ -1,4 +1,2 @@
-github.com/fermyon/spin/sdk/go v1.4.1 h1:n8KTYTnkErTJdyMBBEtPmJe8dXrvMT6R7iVWbLRjq5E=
-github.com/fermyon/spin/sdk/go v1.4.1/go.mod h1:yb8lGesopgj/GwPzLPATxcOeqWZT/HjrzEFfwbztAXE=
 github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
diff --git a/examples/tinygo-outbound-redis/main.go → examples/redis-outbound/main.go b/examples/tinygo-outbound-redis/main.go → examples/redis-outbound/main.go
@@ -8,8 +8,8 @@ import (
 	"sort"
 	"strconv"
 
-	spin_http "github.com/fermyon/spin/sdk/go/v2/http"
-	"github.com/fermyon/spin/sdk/go/v2/redis"
+	spin_http "github.com/fermyon/spin-go-sdk/http"
+	"github.com/fermyon/spin-go-sdk/redis"
 )
 
 func init() {

diff --git a/examples/tinygo-outbound-redis/spin.toml → examples/redis-outbound/spin.toml b/examples/tinygo-outbound-redis/spin.toml → examples/redis-outbound/spin.toml
@@ -2,7 +2,7 @@ spin_manifest_version = 2
 
 [application]
 authors = ["Fermyon Engineering <[email protected]>"]
-name = "tinygo-outbound-redis-example"
+name = "redis-outbound-example"
 version = "0.1.0"
 
 [[trigger.http]]

diff --git a/examples/tinygo-redis/README.md → examples/redis/README.md b/examples/tinygo-redis/README.md → examples/redis/README.md
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
		github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=