Updated dependencies and Go version (#29)

ziflex · web-flow · commit c1085313276f · 2022-11-16T11:51:58.000-05:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.16
+          go-version: ^1.19
         id: go
 
       - name: Check out code into the Go module directory
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.16
+          go-version: ^1.19
       - name: Set up env vars
         run: |
           export FERRET_VERSION=$(sh versions.sh ferret)
diff --git a/.gitignore b/.gitignore
@@ -109,4 +109,5 @@ bin
 *.log
 *.orig
 dist
-coverage.txt
+coverage.txt
+.private
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:alpine AS builder
+FROM golang:1.19-alpine AS builder
 
 # Install git.
 # Git is required for fetching the dependencies.
@@ -13,7 +13,7 @@ COPY . .
 RUN CGO_ENABLED=0 GOOS=linux make compile
 
 # Build the final container. And install
-FROM montferret/chromium:99.0.4844.0 as runner
+FROM montferret/chromium:106.0.5249.0 as runner
 
 RUN apt-get update && apt-get install -y dumb-init
 
diff --git a/Dockerfile.release b/Dockerfile.release
@@ -1,4 +1,4 @@
-FROM montferret/chromium:99.0.4844.0
+FROM montferret/chromium:106.0.5249.0
 
 RUN apt-get update && apt-get install -y dumb-init ca-certificates
 
diff --git a/go.mod b/go.mod
@@ -1,24 +1,24 @@
 module github.com/MontFerret/worker
 
-go 1.17
+go 1.19
 
 require (
-	github.com/MontFerret/ferret v0.16.6
+	github.com/MontFerret/ferret v0.16.7
 	github.com/go-waitfor/waitfor v1.0.0
 	github.com/go-waitfor/waitfor-http v1.0.0
-	github.com/hashicorp/golang-lru v0.5.4
-	github.com/labstack/echo/v4 v4.6.3
+	github.com/hashicorp/golang-lru/v2 v2.0.1
+	github.com/labstack/echo/v4 v4.9.1
 	github.com/namsral/flag v1.7.4-pre
 	github.com/pkg/errors v0.9.1
-	github.com/rs/zerolog v1.26.1
-	github.com/ziflex/lecho/v3 v3.1.0
+	github.com/rs/zerolog v1.28.0
+	github.com/ziflex/lecho/v3 v3.3.0
 )
 
 require (
 	github.com/PuerkitoBio/goquery v1.8.0 // indirect
 	github.com/andybalholm/cascadia v1.3.1 // indirect
-	github.com/antchfx/htmlquery v1.2.4 // indirect
-	github.com/antchfx/xpath v1.2.0 // indirect
+	github.com/antchfx/htmlquery v1.2.5 // indirect
+	github.com/antchfx/xpath v1.2.1 // indirect
 	github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20211211185417-43fb4c2dbe28 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
 	github.com/corpix/uarand v0.1.1 // indirect
@@ -27,18 +27,18 @@ require (
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/gorilla/css v1.0.0 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
-	github.com/labstack/gommon v0.3.1 // indirect
+	github.com/labstack/gommon v0.4.0 // indirect
 	github.com/mafredri/cdp v0.32.0 // indirect
-	github.com/mattn/go-colorable v0.1.11 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/sethgrid/pester v1.1.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.1 // indirect
-	github.com/wI2L/jettison v0.7.3 // indirect
-	golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e // indirect
+	github.com/wI2L/jettison v0.7.4 // indirect
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
 	golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20211103235746-7861aae1554b // indirect
+	golang.org/x/sys v0.0.0-20220318055525-2edf467146b5 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/internal/storage/cache.go b/internal/storage/cache.go
@@ -1,19 +1,20 @@
 package storage
 
 import (
-	"github.com/hashicorp/golang-lru"
+	"github.com/MontFerret/ferret/pkg/runtime"
+	"github.com/hashicorp/golang-lru/v2"
 
 	"github.com/MontFerret/worker/pkg/caching"
 )
 
 type InMemoryCache struct {
-	store *lru.Cache
+	store *lru.Cache[string, *runtime.Program]
 }
 
-func NewCache(opts ...caching.Option) (caching.Cache, error) {
+func NewCache(opts ...caching.Option) (caching.Cache[*runtime.Program], error) {
 	options := caching.NewOptions(opts...)
 
-	store, err := lru.New(int(options.Size))
+	store, err := lru.New[string, *runtime.Program](int(options.Size))
 
 	if err != nil {
 		return nil, err
@@ -22,14 +23,14 @@ func NewCache(opts ...caching.Option) (caching.Cache, error) {
 	return &InMemoryCache{store}, nil
 }
 
-func (cache *InMemoryCache) Set(key, value interface{}) {
+func (cache *InMemoryCache) Set(key string, value *runtime.Program) {
 	cache.store.Add(key, value)
 }
 
-func (cache *InMemoryCache) Get(key interface{}) (interface{}, bool) {
+func (cache *InMemoryCache) Get(key string) (*runtime.Program, bool) {
 	return cache.store.Get(key)
 }
 
-func (cache *InMemoryCache) Contains(key interface{}) bool {
+func (cache *InMemoryCache) Contains(key string) bool {
 	return cache.store.Contains(key)
 }
diff --git a/pkg/caching/cache.go b/pkg/caching/cache.go
@@ -1,9 +1,9 @@
 package caching
 
-type Cache interface {
-	Set(key, value interface{})
+type Cache[T any] interface {
+	Set(key string, value T)
 
-	Get(key interface{}) (interface{}, bool)
+	Get(key string) (T, bool)
 
-	Contains(key interface{}) bool
+	Contains(key string) bool
 }
diff --git a/pkg/worker/options.go b/pkg/worker/options.go
@@ -3,6 +3,7 @@ package worker
 import (
 	"fmt"
 
+	"github.com/MontFerret/ferret/pkg/runtime"
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/worker/pkg/caching"
 )
@@ -17,7 +18,7 @@ type (
 		functions []core.Functions
 		noStdlib  bool
 		cdp       CDPSettings
-		cache     caching.Cache
+		cache     caching.Cache[*runtime.Program]
 	}
 
 	Option func(opts *Options)
@@ -59,7 +60,7 @@ func WithCustomCDP(cdp CDPSettings) Option {
 	}
 }
 
-func WithCache(cache caching.Cache) Option {
+func WithCache(cache caching.Cache[*runtime.Program]) Option {
 	return func(opts *Options) {
 		opts.cache = cache
 	}
diff --git a/pkg/worker/worker.go b/pkg/worker/worker.go
@@ -17,7 +17,7 @@ import (
 type Worker struct {
 	comp    *compiler.Compiler
 	drivers []drivers.Driver
-	cache   caching.Cache
+	cache   caching.Cache[*runtime.Program]
 }
 
 // New returns Worker without file system access.
@@ -87,7 +87,7 @@ func (w *Worker) compiledOrCached(text string) (*runtime.Program, error) {
 		found, isFound := w.cache.Get(text)
 
 		if isFound && found != nil {
-			program = found.(*runtime.Program)
+			program = found
 		}
 	}
 
diff --git a/reference/ferret-worker.yaml b/reference/ferret-worker.yaml
@@ -62,6 +62,14 @@ paths:
           description: OK
           schema:
             $ref: '#/definitions/QueryResult'
+        '400':
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/Error'
+        '500':
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/Error'
       description: Execute a query.
       parameters:
         - in: body
@@ -124,15 +132,19 @@ definitions:
       - text
   QueryResult:
     title: Result
-    anyOf:
-      - type: object
-      - type: array
-        items: {}
-      - type: string
-        properties: {}
-      - type: number
-        properties: {}
-      - type: boolean
-        properties: {}
-      - properties: {}
-        x-nullable: true
+    type:
+      - object
+      - string
+      - number
+      - integer
+      - boolean
+      - array
+    x-nullable: true
+  Error:
+    title: Error
+    type: object
+    properties:
+      error:
+        type: string
+    required:
+      - error

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM montferret/chromium:99.0.4844.0`
	`1`	`+FROM montferret/chromium:106.0.5249.0`
`2`	`2`
`3`	`3`	`RUN apt-get update && apt-get install -y dumb-init ca-certificates`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,20 @@`
`1`	`1`	`package storage`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/hashicorp/golang-lru"`
	`4`	`+ "github.com/MontFerret/ferret/pkg/runtime"`
	`5`	`+ "github.com/hashicorp/golang-lru/v2"`
`5`	`6`
`6`	`7`	`"github.com/MontFerret/worker/pkg/caching"`
`7`	`8`	`)`
`8`	`9`
`9`	`10`	`type InMemoryCache struct {`
`10`		`- store *lru.Cache`
	`11`	`+ store lru.Cache[string, runtime.Program]`
`11`	`12`	`}`
`12`	`13`
`13`		`-func NewCache(opts ...caching.Option) (caching.Cache, error) {`
	`14`	`+func NewCache(opts ...caching.Option) (caching.Cache[*runtime.Program], error) {`
`14`	`15`	`options := caching.NewOptions(opts...)`
`15`	`16`
`16`		`- store, err := lru.New(int(options.Size))`
	`17`	`+ store, err := lru.New[string, *runtime.Program](int(options.Size))`
`17`	`18`
`18`	`19`	`if err != nil {`
`19`	`20`	`return nil, err`
`@@ -22,14 +23,14 @@ func NewCache(opts ...caching.Option) (caching.Cache, error) {`
`22`	`23`	`return &InMemoryCache{store}, nil`
`23`	`24`	`}`
`24`	`25`
`25`		`-func (cache *InMemoryCache) Set(key, value interface{}) {`
	`26`	`+func (cache InMemoryCache) Set(key string, value runtime.Program) {`
`26`	`27`	`cache.store.Add(key, value)`
`27`	`28`	`}`
`28`	`29`
`29`		`-func (cache *InMemoryCache) Get(key interface{}) (interface{}, bool) {`
	`30`	`+func (cache InMemoryCache) Get(key string) (runtime.Program, bool) {`
`30`	`31`	`return cache.store.Get(key)`
`31`	`32`	`}`
`32`	`33`
`33`		`-func (cache *InMemoryCache) Contains(key interface{}) bool {`
	`34`	`+func (cache *InMemoryCache) Contains(key string) bool {`
`34`	`35`	`return cache.store.Contains(key)`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package worker`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`
	`6`	`+ "github.com/MontFerret/ferret/pkg/runtime"`
`6`	`7`	`"github.com/MontFerret/ferret/pkg/runtime/core"`
`7`	`8`	`"github.com/MontFerret/worker/pkg/caching"`
`8`	`9`	`)`
`@@ -17,7 +18,7 @@ type (`
`17`	`18`	`functions []core.Functions`
`18`	`19`	`noStdlib bool`
`19`	`20`	`cdp CDPSettings`
`20`		`- cache caching.Cache`
	`21`	`+ cache caching.Cache[*runtime.Program]`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`Option func(opts *Options)`
`@@ -59,7 +60,7 @@ func WithCustomCDP(cdp CDPSettings) Option {`
`59`	`60`	`}`
`60`	`61`	`}`
`61`	`62`
`62`		`-func WithCache(cache caching.Cache) Option {`
	`63`	`+func WithCache(cache caching.Cache[*runtime.Program]) Option {`
`63`	`64`	`return func(opts *Options) {`
`64`	`65`	`opts.cache = cache`
`65`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`	`type Worker struct {`
`18`	`18`	`comp *compiler.Compiler`
`19`	`19`	`drivers []drivers.Driver`
`20`		`- cache caching.Cache`
	`20`	`+ cache caching.Cache[*runtime.Program]`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`// New returns Worker without file system access.`
`@@ -87,7 +87,7 @@ func (w Worker) compiledOrCached(text string) (runtime.Program, error) {`
`87`	`87`	`found, isFound := w.cache.Get(text)`
`88`	`88`
`89`	`89`	`if isFound && found != nil {`
`90`		`- program = found.(*runtime.Program)`
	`90`	`+ program = found`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`