From 5e0f72c89b00f13c456ba80895ff4c1781e3abd7 Mon Sep 17 00:00:00 2001 From: cohix Date: Fri, 3 Sep 2021 12:12:11 -0400 Subject: [PATCH] update reactr and Golang versoin --- Dockerfile | 2 +- go.mod | 2 +- go.sum | 10 ++-------- vendor/github.com/suborbital/reactr/rcap/cache.go | 2 +- vendor/modules.txt | 2 +- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1cb353bf..c55afe9c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16 as builder +FROM golang:1.17 as builder RUN mkdir -p /go/src/github.com/suborbital/atmo COPY . /go/src/github.com/suborbital/atmo/ diff --git a/go.mod b/go.mod index 6711dfa4..c0278472 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/sethvargo/go-envconfig v0.3.2 github.com/spf13/cobra v1.1.3 github.com/suborbital/grav v0.4.2-0.20210826173646-7874eba0763f - github.com/suborbital/reactr v0.12.0 + github.com/suborbital/reactr v0.12.1-0.20210903155831-ca5a3a8a5f9b github.com/suborbital/subo v0.0.18 github.com/suborbital/vektor v0.4.1 golang.org/x/mod v0.4.2 diff --git a/go.sum b/go.sum index f967400c..a75de77d 100644 --- a/go.sum +++ b/go.sum @@ -258,14 +258,8 @@ github.com/suborbital/reactr v0.10.1-0.20210703023052-41aca888467c/go.mod h1:eLc github.com/suborbital/reactr v0.10.1-0.20210703165139-b58e147cf44c/go.mod h1:9+nF032WyZX5p+sdeyVctWyaokSDYHDe1tpuItk9Tgc= github.com/suborbital/reactr v0.11.1-0.20210806212346-26bc1d469301/go.mod h1:ZhWGNCH5boA+jJD9Jf/rthZ7OKb7+zRqiDI7c8lU078= github.com/suborbital/reactr v0.11.1-0.20210811160758-b715bc22e760/go.mod h1:WKIsmoKHawZoJd7X34xXH7P7i5s+33ln3gCZZIvtwAo= -github.com/suborbital/reactr v0.11.2-0.20210826193629-84138c19fd57 h1:Ej900lvs501fdmxM61GTUAcj1uCBxe/3HcDBK7eaJ2s= -github.com/suborbital/reactr v0.11.2-0.20210826193629-84138c19fd57/go.mod h1:Iwf+qgiGyf7kjxJOXiWX71XyozGZb30Db9fsebog5o4= -github.com/suborbital/reactr v0.11.2-0.20210831130940-db5e07a44f64 h1:wzEHGbcmwY/I79ylbFsUmfMp39ueT9k2BQHYNoKTEZU= -github.com/suborbital/reactr v0.11.2-0.20210831130940-db5e07a44f64/go.mod h1:G2WF/19leahWGLGaWx/0vCu3g/Ovt2ALWIslL2v8+rE= -github.com/suborbital/reactr v0.11.2-0.20210831133942-ee8abd68fe5d h1:h1yoH0CjdFWWcNIx27nYvP3WQ++TQj2TowXilHn4vnY= -github.com/suborbital/reactr v0.11.2-0.20210831133942-ee8abd68fe5d/go.mod h1:G2WF/19leahWGLGaWx/0vCu3g/Ovt2ALWIslL2v8+rE= -github.com/suborbital/reactr v0.12.0 h1:Yyy6c7M/fgjVpLY2A0sgcp8wL9v0PK2xM7/RcAu93Lw= -github.com/suborbital/reactr v0.12.0/go.mod h1:G2WF/19leahWGLGaWx/0vCu3g/Ovt2ALWIslL2v8+rE= +github.com/suborbital/reactr v0.12.1-0.20210903155831-ca5a3a8a5f9b h1:BE+pPTipScWgGQ7h8PzlBfPNKAfPmn8pJolOsFpLfl4= +github.com/suborbital/reactr v0.12.1-0.20210903155831-ca5a3a8a5f9b/go.mod h1:G2WF/19leahWGLGaWx/0vCu3g/Ovt2ALWIslL2v8+rE= github.com/suborbital/subo v0.0.18 h1:LSZXf7qRkSZKiIFZe61sF4fV7vfwW3cAeEM7z8Ptbio= github.com/suborbital/subo v0.0.18/go.mod h1:bCfpNhqLwemsHK21F9r1BwCNS6A6AeIuwVAlGymSf/8= github.com/suborbital/vektor v0.2.2/go.mod h1:6YQE7r6t1JcVs3twpqjXDftsLUaTNUk5YorRKHcDamI= diff --git a/vendor/github.com/suborbital/reactr/rcap/cache.go b/vendor/github.com/suborbital/reactr/rcap/cache.go index bb7e87b0..a26724ba 100644 --- a/vendor/github.com/suborbital/reactr/rcap/cache.go +++ b/vendor/github.com/suborbital/reactr/rcap/cache.go @@ -14,7 +14,7 @@ var ErrCacheKeyNotFound = errors.New("key not found") type CacheConfig struct { Enabled bool `json:"enabled" yaml:"enabled"` Rules CacheRules `json:"rules" yaml:"rules"` - RedisConfig *RedisConfig `json:"redis,omitempty" yaml:"redis,omitetmpty"` + RedisConfig *RedisConfig `json:"redis,omitempty" yaml:"redis,omitempty"` } type CacheRules struct { diff --git a/vendor/modules.txt b/vendor/modules.txt index 40344fc8..425f4a37 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -58,7 +58,7 @@ github.com/suborbital/grav/discovery/local github.com/suborbital/grav/grav github.com/suborbital/grav/transport/nats github.com/suborbital/grav/transport/websocket -# github.com/suborbital/reactr v0.12.0 +# github.com/suborbital/reactr v0.12.1-0.20210903155831-ca5a3a8a5f9b ## explicit; go 1.17 github.com/suborbital/reactr/rcap github.com/suborbital/reactr/request