stuff

README.md

@@ -1,13 +1,13 @@
 # Email api golang skd
 
 ```shell
-go get git.s.int/golang/packages/email-api
+go get git.s.int/packages/go/email-api
 ```
 
 ````go
 package main
 
-import "git.s.int/packages/golang/email-api/client"
+import "git.s.int/packages/go/email-api/client"
 
 config := client.ConfigFromEnv()
 apiClient := client.NewClient(config)

client/configuration.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"git.s.int/golang/packages/utilities/Env"
+	"git.s.int/packages/go/utilities/Env"
 	"log"
 )
 

client/token.go

@@ -2,9 +2,8 @@ package client
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
-	"git.s.int/golang/packages/email-api/redis"
+	"git.s.int/packages/go/email-api/redis"
 	"net/http"
 	"time"
 )
@@ -69,7 +68,7 @@ func FromCache() *Token {
 
 	token := Token{}
 
-	result, err := rdb.Get(context.Background(), "api.access_token").Result()
+	result, err := rdb.Get("api.access_token").Result()
 	if err != nil {
 		return &token
 	}
@@ -89,7 +88,7 @@ func saveCache(token *Token) {
 
 	expiresIn := time.Duration(int64(token.ExpiresIn) * 100000000)
 
-	cmd := rdb.Set(context.Background(), "api.access_token", tokenJson, expiresIn)
+	cmd := rdb.Set("api.access_token", tokenJson, expiresIn)
 	result, err := cmd.Result()
 	if err != nil {
 		return

go.mod

@@ -1,14 +1,10 @@
-module git.s.int/packages/golang/email-api
+module git.s.int/packages/go/email-api
 
-go 1.21.1
+go 1.21.4
+
+require git.s.int/packages/go/utilities v1.2.2
 
 require (
-	git.s.int/golang/packages/email-api v1.1.1
-	git.s.int/golang/packages/utilities v1.2.0
-	github.com/redis/go-redis/v9 v9.3.0
-)
-
-require (
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/go-redis/redis v6.15.9+incompatible // indirect
+	github.com/redis/go-redis v6.15.9+incompatible // indirect
 )

go.sum

@@ -1,26 +1,6 @@
-git.s.int/golang/packages/email-api v1.1.1 h1:0R0LYrwsZ+4UuGO4hBO/Z8VqB6rMIdYt31rjHWeZZtk=
-git.s.int/golang/packages/email-api v1.1.1/go.mod h1:+bCCEa/s7pNh8oad8Vmz6t26jkWd6BujpOKORBp56z4=
-git.s.int/golang/packages/utilities v1.2.0 h1:UDsaEl0NOqPcHudMKcOGwtlShBoqCW3NXYZH9zh+Ju8=
-git.s.int/golang/packages/utilities v1.2.0/go.mod h1:5ZZDqKb5Y7B552oJjhaMVAj6r9xvqw/wkp1EADmT5wg=
-github.com/bsm/ginkgo/v2 v2.5.0 h1:aOAnND1T40wEdAtkGSkvSICWeQ8L3UASX7YVCqQx+eQ=
-github.com/bsm/ginkgo/v2 v2.5.0/go.mod h1:AiKlXPm7ItEHNc/2+OkrNG4E0ITzojb9/xWzvQ9XZ9w=
-github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
-github.com/bsm/gomega v1.20.0 h1:JhAwLmtRzXFTx2AkALSLa8ijZafntmhSoU63Ok18Uq8=
-github.com/bsm/gomega v1.20.0/go.mod h1:JifAceMQ4crZIWYUKrlGcmbN3bqHogVTADMD2ATsbwk=
-github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
-github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/redis/go-redis/v9 v9.0.2 h1:BA426Zqe/7r56kCcvxYLWe1mkaz71LKF77GwgFzSxfE=
-github.com/redis/go-redis/v9 v9.0.2/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps=
-github.com/redis/go-redis/v9 v9.3.0 h1:RiVDjmig62jIWp7Kk4XVLs0hzV6pI3PyTnnL0cnn0u0=
-github.com/redis/go-redis/v9 v9.3.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+git.s.int/packages/go/utilities v1.2.2 h1:IXKdrTgRc7tnDUB4sOWD/kjwgw9luUzvsaPzX+Dhm7Y=
+git.s.int/packages/go/utilities v1.2.2/go.mod h1:1nIS3PzUaLiNBBkyme408XbI725PiureeTV7iBXfUI0=
+github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg=
+github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
+github.com/redis/go-redis v6.15.9+incompatible h1:F+tnlesQSl3h9V8DdmtcYFdvkHLhbb7AgcLW6UJxnC4=
+github.com/redis/go-redis v6.15.9+incompatible/go.mod h1:ic6dLmR0d9rkHSzaa0Ab3QVRZcjopJ9hSSPCrecj/+s=

redis/redis.go

@@ -1,7 +1,8 @@
 package redis
 
 import (
-	"git.s.int/golang/packages/utilities/Env"
+	"git.s.int/packages/go/utilities/Env"
+	"github.com/go-redis/redis"
 	"strconv"
 )