Merge pull request #1976 from adamreese/chore/tinygo-examples

adamreese · web-flow · commit 46da3d7deb7d · 2023-10-27T13:26:31.000-07:00
chore(examples): Update Go import paths to v2
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
@@ -1,9 +1,9 @@
 module outbound-http-to-same-app
 
-go 1.17
+go 1.20
 
-require github.com/fermyon/spin/sdk/go v0.0.0
+require github.com/fermyon/spin/sdk/go/v2 v2.0.0
 
 require github.com/julienschmidt/httprouter v1.3.0 // indirect
 
-replace github.com/fermyon/spin/sdk/go v0.0.0 => ../../../sdk/go/
+replace github.com/fermyon/spin/sdk/go/v2 v2.0.0 => ../../../sdk/go/
diff --git a/examples/http-tinygo-outbound-http/outbound-http-to-same-app/main.go b/examples/http-tinygo-outbound-http/outbound-http-to-same-app/main.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	spinhttp "github.com/fermyon/spin/sdk/go/http"
+	spinhttp "github.com/fermyon/spin/sdk/go/v2/http"
 )
 
 func init() {
diff --git a/examples/http-tinygo-outbound-http/tinygo-hello/go.mod b/examples/http-tinygo-outbound-http/tinygo-hello/go.mod
@@ -1,9 +1,9 @@
 module github.com/fermyon/spin/templates/spin-http-tinygo-outbound-http
 
-go 1.17
+go 1.20
 
-require github.com/fermyon/spin/sdk/go v0.0.0
+require github.com/fermyon/spin/sdk/go/v2 v2.0.0
 
 require github.com/julienschmidt/httprouter v1.3.0 // indirect
 
-replace github.com/fermyon/spin/sdk/go v0.0.0 => ../../../sdk/go/
+replace github.com/fermyon/spin/sdk/go/v2 v2.0.0 => ../../../sdk/go/
diff --git a/examples/http-tinygo-outbound-http/tinygo-hello/main.go b/examples/http-tinygo-outbound-http/tinygo-hello/main.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"os"
 
-	spinhttp "github.com/fermyon/spin/sdk/go/http"
+	spinhttp "github.com/fermyon/spin/sdk/go/v2/http"
 )
 
 func init() {
diff --git a/examples/http-tinygo-router/go.mod b/examples/http-tinygo-router/go.mod
@@ -1,9 +1,9 @@
 module github.com/fermyon/spin/templates/spin-http-tinygo
 
-go 1.17
+go 1.20
 
-require github.com/fermyon/spin/sdk/go v0.0.0
+require github.com/fermyon/spin/sdk/go/v2 v2.0.0
 
 require github.com/julienschmidt/httprouter v1.3.0 // indirect
 
-replace github.com/fermyon/spin/sdk/go v0.0.0 => ../../sdk/go/
+replace github.com/fermyon/spin/sdk/go/v2 v2.0.0 => ../../sdk/go/
diff --git a/examples/http-tinygo-router/main.go b/examples/http-tinygo-router/main.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	spinhttp "github.com/fermyon/spin/sdk/go/http"
+	spinhttp "github.com/fermyon/spin/sdk/go/v2/http"
 )
 
 func init() {
diff --git a/examples/http-tinygo/go.mod b/examples/http-tinygo/go.mod
@@ -1,9 +1,9 @@
 module github.com/fermyon/spin/templates/spin-http-tinygo
 
-go 1.17
+go 1.20
 
-require github.com/fermyon/spin/sdk/go v0.0.0
+require github.com/fermyon/spin/sdk/go/v2 v2.0.0
 
 require github.com/julienschmidt/httprouter v1.3.0 // indirect
 
-replace github.com/fermyon/spin/sdk/go v0.0.0 => ../../sdk/go/
+replace github.com/fermyon/spin/sdk/go/v2 v2.0.0 => ../../sdk/go/
diff --git a/examples/http-tinygo/main.go b/examples/http-tinygo/main.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"net/http"
 
-	spinhttp "github.com/fermyon/spin/sdk/go/http"
+	spinhttp "github.com/fermyon/spin/sdk/go/v2/http"
 )
 
 func init() {
diff --git a/examples/tinygo-key-value/go.mod b/examples/tinygo-key-value/go.mod
@@ -1,9 +1,9 @@
 module github.com/fermyon/spin/templates/spin-http-tinygo-key-value
 
-go 1.17
+go 1.20
 
-require github.com/fermyon/spin/sdk/go v0.0.0
+require github.com/fermyon/spin/sdk/go/v2 v2.0.0
 
 require github.com/julienschmidt/httprouter v1.3.0 // indirect
 
-replace github.com/fermyon/spin/sdk/go v0.0.0 => ../../sdk/go/
+replace github.com/fermyon/spin/sdk/go/v2 v2.0.0 => ../../sdk/go/
diff --git a/examples/tinygo-key-value/main.go b/examples/tinygo-key-value/main.go
@@ -4,8 +4,8 @@ import (
 	"io"
 	"net/http"
 
-	spin_http "github.com/fermyon/spin/sdk/go/http"
-	"github.com/fermyon/spin/sdk/go/kv"
+	spin_http "github.com/fermyon/spin/sdk/go/v2/http"
+	"github.com/fermyon/spin/sdk/go/v2/kv"
 )
 
 func init() {
diff --git a/examples/tinygo-llm/go.mod b/examples/tinygo-llm/go.mod
@@ -1,9 +1,9 @@
 module github.com/tinygo_llm
 
-go 1.17
+go 1.20
 
-require github.com/fermyon/spin/sdk/go v0.0.0
+require github.com/fermyon/spin/sdk/go/v2 v2.0.0
 
 require github.com/julienschmidt/httprouter v1.3.0 // indirect
 
-replace github.com/fermyon/spin/sdk/go v0.0.0 => ../../sdk/go/
+replace github.com/fermyon/spin/sdk/go/v2 v2.0.0 => ../../sdk/go/
diff --git a/examples/tinygo-llm/main.go b/examples/tinygo-llm/main.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"net/http"
 
-	spinhttp "github.com/fermyon/spin/sdk/go/http"
-	"github.com/fermyon/spin/sdk/go/llm"
+	spinhttp "github.com/fermyon/spin/sdk/go/v2/http"
+	"github.com/fermyon/spin/sdk/go/v2/llm"
 )
 
 func init() {
diff --git a/examples/tinygo-outbound-mysql/go.mod b/examples/tinygo-outbound-mysql/go.mod
@@ -2,8 +2,8 @@ module github.com/tinygo_mysql
 
 go 1.20
 
-require github.com/fermyon/spin/sdk/go v0.0.0
+require github.com/fermyon/spin/sdk/go/v2 v2.0.0
 
 require github.com/julienschmidt/httprouter v1.3.0 // indirect
 
-replace github.com/fermyon/spin/sdk/go v0.0.0 => ../../sdk/go/
+replace github.com/fermyon/spin/sdk/go/v2 v2.0.0 => ../../sdk/go/
diff --git a/examples/tinygo-outbound-mysql/main.go b/examples/tinygo-outbound-mysql/main.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"os"
 
-	spinhttp "github.com/fermyon/spin/sdk/go/http"
-	"github.com/fermyon/spin/sdk/go/mysql"
+	spinhttp "github.com/fermyon/spin/sdk/go/v2/http"
+	"github.com/fermyon/spin/sdk/go/v2/mysql"
 )
 
 type Pet struct {
diff --git a/examples/tinygo-outbound-pg/go.mod b/examples/tinygo-outbound-pg/go.mod
@@ -2,8 +2,8 @@ module github.com/tinygo_outbound_pg
 
 go 1.20
 
-require github.com/fermyon/spin/sdk/go v0.0.0
+require github.com/fermyon/spin/sdk/go/v2 v2.0.0
 
 require github.com/julienschmidt/httprouter v1.3.0 // indirect
 
-replace github.com/fermyon/spin/sdk/go v0.0.0 => ../../sdk/go/
+replace github.com/fermyon/spin/sdk/go/v2 v2.0.0 => ../../sdk/go/
diff --git a/examples/tinygo-outbound-pg/main.go b/examples/tinygo-outbound-pg/main.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"os"
 
-	spinhttp "github.com/fermyon/spin/sdk/go/http"
-	"github.com/fermyon/spin/sdk/go/pg"
+	spinhttp "github.com/fermyon/spin/sdk/go/v2/http"
+	"github.com/fermyon/spin/sdk/go/v2/pg"
 )
 
 type Pet struct {
diff --git a/examples/tinygo-outbound-redis/go.mod b/examples/tinygo-outbound-redis/go.mod
@@ -1,9 +1,9 @@
 module github.com/fermyon/spin/templates/spin-http-tinygo-outbound-http
 
-go 1.18
+go 1.20
 
-require github.com/fermyon/spin/sdk/go v0.0.0
+require github.com/fermyon/spin/sdk/go/v2 v2.0.0
 
 require github.com/julienschmidt/httprouter v1.3.0 // indirect
 
-replace github.com/fermyon/spin/sdk/go v0.0.0 => ../../sdk/go/
+replace github.com/fermyon/spin/sdk/go/v2 v2.0.0 => ../../sdk/go/
diff --git a/examples/tinygo-outbound-redis/main.go b/examples/tinygo-outbound-redis/main.go
@@ -8,8 +8,8 @@ import (
 	"sort"
 	"strconv"
 
-	spin_http "github.com/fermyon/spin/sdk/go/http"
-	"github.com/fermyon/spin/sdk/go/redis"
+	spin_http "github.com/fermyon/spin/sdk/go/v2/http"
+	"github.com/fermyon/spin/sdk/go/v2/redis"
 )
 
 func init() {
diff --git a/examples/tinygo-redis/go.mod b/examples/tinygo-redis/go.mod
@@ -1,7 +1,9 @@
 module github.com/fermyon/spin/examples/tinygo-redis
 
-go 1.17
+go 1.20
 
-require github.com/fermyon/spin/sdk/go v0.0.0
+require github.com/fermyon/spin/sdk/go/v2 v2.0.0
 
-replace github.com/fermyon/spin/sdk/go v0.0.0 => ../../sdk/go/
+require github.com/julienschmidt/httprouter v1.3.0 // indirect
+
+replace github.com/fermyon/spin/sdk/go/v2 v2.0.0 => ../../sdk/go/
diff --git a/examples/tinygo-redis/main.go b/examples/tinygo-redis/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/fermyon/spin/sdk/go/redis"
+	"github.com/fermyon/spin/sdk/go/v2/redis"
 )
 
 func init() {
diff --git a/examples/tinygo-sqlite/go.mod b/examples/tinygo-sqlite/go.mod
@@ -2,8 +2,8 @@ module github.com/tinygo_sqlite
 
 go 1.20
 
-require github.com/fermyon/spin/sdk/go v0.0.0
+require github.com/fermyon/spin/sdk/go/v2 v2.0.0
 
 require github.com/julienschmidt/httprouter v1.3.0 // indirect
 
-replace github.com/fermyon/spin/sdk/go v0.0.0 => ../../sdk/go/
+replace github.com/fermyon/spin/sdk/go/v2 v2.0.0 => ../../sdk/go/
diff --git a/examples/tinygo-sqlite/main.go b/examples/tinygo-sqlite/main.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"net/http"
 
-	spinhttp "github.com/fermyon/spin/sdk/go/http"
-	"github.com/fermyon/spin/sdk/go/sqlite"
+	spinhttp "github.com/fermyon/spin/sdk/go/v2/http"
+	"github.com/fermyon/spin/sdk/go/v2/sqlite"
 )
 
 type Pet struct {
diff --git a/examples/variables-tinygo/go.mod b/examples/variables-tinygo/go.mod
@@ -1,9 +1,9 @@
 module github.com/fermyon/spin/templates/spin-http-tinygo
 
-go 1.17
+go 1.20
 
-require github.com/fermyon/spin/sdk/go v0.0.0
+require github.com/fermyon/spin/sdk/go/v2 v2.0.0
 
 require github.com/julienschmidt/httprouter v1.3.0 // indirect
 
-replace github.com/fermyon/spin/sdk/go v0.0.0 => ../../sdk/go/
+replace github.com/fermyon/spin/sdk/go/v2 v2.0.0 => ../../sdk/go/
diff --git a/examples/variables-tinygo/main.go b/examples/variables-tinygo/main.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/fermyon/spin/sdk/go/config"
-	spinhttp "github.com/fermyon/spin/sdk/go/http"
+	"github.com/fermyon/spin/sdk/go/v2/config"
+	spinhttp "github.com/fermyon/spin/sdk/go/v2/http"
 )
 
 func init() {
diff --git a/sdk/go/readme.md b/sdk/go/readme.md
@@ -7,7 +7,7 @@ executor.
 ```go
 import (
 	"fmt"
-	spinhttp "github.com/fermyon/spin/sdk/go/http"
+	spinhttp "github.com/fermyon/spin/sdk/go/v2/http"
 )
 
 func init() {

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"net/http"`
`6`	`6`
`7`		`- spinhttp "github.com/fermyon/spin/sdk/go/http"`
	`7`	`+ spinhttp "github.com/fermyon/spin/sdk/go/v2/http"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func init() {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"net/http"`
`7`	`7`	`"os"`
`8`	`8`
`9`		`- spinhttp "github.com/fermyon/spin/sdk/go/http"`
	`9`	`+ spinhttp "github.com/fermyon/spin/sdk/go/v2/http"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func init() {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"io"`
`6`	`6`	`"net/http"`
`7`	`7`
`8`		`- spinhttp "github.com/fermyon/spin/sdk/go/http"`
	`8`	`+ spinhttp "github.com/fermyon/spin/sdk/go/v2/http"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func init() {`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"io"`
`5`	`5`	`"net/http"`
`6`	`6`
`7`		`- spin_http "github.com/fermyon/spin/sdk/go/http"`
`8`		`- "github.com/fermyon/spin/sdk/go/kv"`
	`7`	`+ spin_http "github.com/fermyon/spin/sdk/go/v2/http"`
	`8`	`+ "github.com/fermyon/spin/sdk/go/v2/kv"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func init() {`