Skip to content

Commit ae26b6e

Browse files
committed
ref(sdk/go): Refactor the Redis Go SDK to be more idiomatic
- Introduces a client struct responsible for handling the connection - Refactor the `Execute()` arguments Signed-off-by: Adam Reese <[email protected]>
1 parent fd3a9a7 commit ae26b6e

File tree

6 files changed

+231
-150
lines changed

6 files changed

+231
-150
lines changed
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
module github.com/fermyon/spin/templates/spin-http-tinygo-outbound-http
22

3-
go 1.17
3+
go 1.18
44

55
require github.com/fermyon/spin/sdk/go v0.0.0
66

7-
require (
8-
github.com/julienschmidt/httprouter v1.3.0 // indirect
9-
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
10-
)
7+
require github.com/julienschmidt/httprouter v1.3.0 // indirect
118

129
replace github.com/fermyon/spin/sdk/go v0.0.0 => ../../sdk/go/
Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,2 @@
1-
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
21
github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
32
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
4-
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
5-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
6-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
7-
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
8-
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w=
9-
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
10-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
11-
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
12-
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
13-
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
14-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
15-
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
16-
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
17-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
18-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
19-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
20-
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
22-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
23-
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
24-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
25-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
26-
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
27-
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
28-
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
29-
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
30-
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
31-
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
32-
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
33-
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
34-
golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
35-
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

examples/tinygo-outbound-redis/main.go

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
package main
22

33
import (
4+
"fmt"
45
"net/http"
56
"os"
6-
"strconv"
77
"reflect"
8-
"fmt"
8+
"sort"
9+
"strconv"
910

10-
"golang.org/x/exp/slices"
1111
spin_http "github.com/fermyon/spin/sdk/go/http"
1212
"github.com/fermyon/spin/sdk/go/redis"
1313
)
1414

1515
func init() {
1616

1717
// handler for the http trigger
18-
spin_http.Handle(func(w http.ResponseWriter, r *http.Request) {
18+
spin_http.Handle(func(w http.ResponseWriter, _ *http.Request) {
1919

2020
// addr is the environment variable set in `spin.toml` that points to the
2121
// address of the Redis server.
@@ -28,19 +28,21 @@ func init() {
2828
// payload is the data publish to the redis channel.
2929
payload := []byte(`Hello redis from tinygo!`)
3030

31-
if err := redis.Publish(addr, channel, payload); err != nil {
31+
rdb := redis.NewClient(addr)
32+
33+
if err := rdb.Publish(channel, payload); err != nil {
3234
http.Error(w, err.Error(), http.StatusInternalServerError)
3335
return
3436
}
3537

3638
// set redis `mykey` = `myvalue`
37-
if err := redis.Set(addr, "mykey", []byte("myvalue")); err != nil {
39+
if err := rdb.Set("mykey", []byte("myvalue")); err != nil {
3840
http.Error(w, err.Error(), http.StatusInternalServerError)
3941
return
4042
}
4143

4244
// get redis payload for `mykey`
43-
if payload, err := redis.Get(addr, "mykey"); err != nil {
45+
if payload, err := rdb.Get("mykey"); err != nil {
4446
http.Error(w, err.Error(), http.StatusInternalServerError)
4547
return
4648
} else {
@@ -50,7 +52,7 @@ func init() {
5052
}
5153

5254
// incr `spin-go-incr` by 1
53-
if payload, err := redis.Incr(addr, "spin-go-incr"); err != nil {
55+
if payload, err := rdb.Incr("spin-go-incr"); err != nil {
5456
http.Error(w, err.Error(), http.StatusInternalServerError)
5557
return
5658
} else {
@@ -60,27 +62,27 @@ func init() {
6062
}
6163

6264
// delete `spin-go-incr` and `mykey`
63-
if payload, err := redis.Del(addr, []string{"spin-go-incr", "mykey", "non-existing-key"}); err != nil {
65+
if payload, err := rdb.Del("spin-go-incr", "mykey", "non-existing-key"); err != nil {
6466
http.Error(w, err.Error(), http.StatusInternalServerError)
6567
} else {
6668
w.Write([]byte("deleted keys num: "))
6769
w.Write([]byte(strconv.FormatInt(payload, 10)))
6870
w.Write([]byte("\n"))
6971
}
7072

71-
if _, err := redis.Sadd(addr, "myset", []string{"foo", "bar"}); err != nil {
73+
if _, err := rdb.Sadd("myset", "foo", "bar"); err != nil {
7274
http.Error(w, err.Error(), http.StatusInternalServerError)
7375
return
7476
}
7577

7678
{
7779
expected := []string{"bar", "foo"}
78-
payload, err := redis.Smembers(addr, "myset")
80+
payload, err := rdb.Smembers("myset")
7981
if err != nil {
8082
http.Error(w, err.Error(), http.StatusInternalServerError)
8183
return
8284
}
83-
slices.Sort(payload)
85+
sort.Strings(payload)
8486
if !reflect.DeepEqual(payload, expected) {
8587
http.Error(
8688
w,
@@ -95,14 +97,14 @@ func init() {
9597
}
9698
}
9799

98-
if _, err := redis.Srem(addr, "myset", []string{"bar"}); err != nil {
100+
if _, err := rdb.Srem("myset", "bar"); err != nil {
99101
http.Error(w, err.Error(), http.StatusInternalServerError)
100102
return
101103
}
102104

103105
{
104106
expected := []string{"foo"}
105-
if payload, err := redis.Smembers(addr, "myset"); err != nil {
107+
if payload, err := rdb.Smembers("myset"); err != nil {
106108
http.Error(w, err.Error(), http.StatusInternalServerError)
107109
return
108110
} else if !reflect.DeepEqual(payload, expected) {
@@ -119,27 +121,24 @@ func init() {
119121
}
120122
}
121123

122-
message := redis.RedisParameter{Kind: redis.RedisParameterKindBinary, Val: []byte("message")}
123-
hello := redis.RedisParameter{Kind: redis.RedisParameterKindBinary, Val: []byte("hello")}
124-
if _, err := redis.Execute(addr, "set", []redis.RedisParameter{message, hello}); err != nil {
124+
if _, err := rdb.Execute("set", "message", "hello"); err != nil {
125125
http.Error(w, err.Error(), http.StatusInternalServerError)
126126
return
127127
}
128128

129-
world := redis.RedisParameter{Kind: redis.RedisParameterKindBinary, Val: []byte(" world")}
130-
if _, err := redis.Execute(addr, "append", []redis.RedisParameter{message, world}); err != nil {
129+
if _, err := rdb.Execute("append", "message", " world"); err != nil {
131130
http.Error(w, err.Error(), http.StatusInternalServerError)
132131
return
133132
}
134133

135-
if payload, err := redis.Execute(addr, "get", []redis.RedisParameter{message}); err != nil {
134+
if payload, err := rdb.Execute("get", "message"); err != nil {
136135
http.Error(w, err.Error(), http.StatusInternalServerError)
137136
return
138137
} else if !reflect.DeepEqual(
139138
payload,
140-
[]redis.RedisResult{redis.RedisResult{
141-
Kind: redis.RedisResultKindBinary,
142-
Val: []byte("hello world"),
139+
[]*redis.Result{{
140+
Kind: redis.ResultKindBinary,
141+
Val: []byte("hello world"),
143142
}}) {
144143
http.Error(w, "unexpected GET result", http.StatusInternalServerError)
145144
return

0 commit comments

Comments
 (0)