Prod Release 09/14/2023 (#159)

* Bump gopkg.in/yaml.v3 from 3.0.0-20210107192922-496545a6307b to 3.0.0 (#133)

Bumps gopkg.in/yaml.v3 from 3.0.0-20210107192922-496545a6307b to 3.0.0.

---
updated-dependencies:
- dependency-name: gopkg.in/yaml.v3
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: John Halbert <[email protected]>

* Add renovate.json (#66)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: John Halbert <[email protected]>

* Update alpine Docker tag to v3.18 (#136)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update bitnami/golang Docker tag to v1.20 (#139)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update amazon/dynamodb-local Docker tag to v1.22.0 (#138)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update module github.com/aws/aws-sdk-go to v1.45.5 (#140)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update module github.com/getsentry/sentry-go to v0.24.0 (#141)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update module github.com/rs/zerolog to v1.30.0 (#144)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update module github.com/go-redis/redis/v8 to v8.11.5 (#142)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update module github.com/stretchr/testify to v1.8.4 (#145)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update module google.golang.org/protobuf to v1.31.0 (#146)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update actions/checkout action to v4 (#147)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update actions/setup-go action to v4 (#148)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update module github.com/prometheus/client_golang to v1.16.0 (#143)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update module github.com/aws/aws-sdk-go to v1.45.6 (#153)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update module github.com/go-chi/chi to v5 (#151)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update module github.com/go-chi/chi to v5 (#154)

* Update module github.com/go-chi/chi to v5

* Update go.mod, go.sum

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: John Halbert <[email protected]>

* Update module github.com/go-chi/chi to v5 (#155)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update module github.com/aws/aws-sdk-go to v1.45.7 (#156)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update module github.com/go-chi/chi to v5 (#157)

* Update module github.com/go-chi/chi to v5

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: John Halbert <[email protected]>

* Update module github.com/aws/aws-sdk-go to v1.45.8 (#158)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update amazon/dynamodb-local Docker tag to v2 (#149)

* Update amazon/dynamodb-local Docker tag to v2

* Update access key id & secret for local dynamo

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: John Halbert <[email protected]>

* Update module github.com/go-redis/redis/v8 to v9 (#152)

* Update module github.com/go-redis/redis/v8 to v9

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: John Halbert <[email protected]>

* Update module github.com/brave-intl/bat-go to v1 (#150)

* Update module github.com/brave-intl/bat-go to v1

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: John Halbert <[email protected]>

* Update module github.com/getsentry/sentry-go to v0.24.1 (#161)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update github.com/brave-intl/bat-go/libs digest to 8b4fe85 (#160)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/ci.yml

@@ -14,9 +14,9 @@ jobs:
     name: ci
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
           go-version: 1.18
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM bitnami/golang:1.18 as builder
+FROM bitnami/golang:1.20 as builder
 
 ARG VERSION
 ARG BUILD_TIME
@@ -13,7 +13,7 @@ RUN CGO_ENABLED=0 GOOS=linux go build \
     -ldflags "-X github.com/brave/go-sync/server.version=${VERSION} -X github.com/brave/go-sync/server.buildTime=${BUILD_TIME} -X github.com/brave/go-sync/server.commit=${COMMIT}" \
     -o main .
 
-FROM alpine:3.6 as artifact
+FROM alpine:3.18 as artifact
 RUN apk add --update ca-certificates # Certificates for SSL
 COPY --from=builder /src/main main
 

cache/redis.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-redis/redis/v8"
+	"github.com/redis/go-redis/v9"
 )
 
 // RedisClient is a wrapper to support clients for standalone redis and redis

controller/controller.go

@@ -6,15 +6,15 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/brave-intl/bat-go/middleware"
-	"github.com/brave-intl/bat-go/utils/closers"
+	"github.com/brave-intl/bat-go/libs/closers"
+	"github.com/brave-intl/bat-go/libs/middleware"
 	"github.com/brave/go-sync/cache"
 	"github.com/brave/go-sync/command"
 	syncContext "github.com/brave/go-sync/context"
 	"github.com/brave/go-sync/datastore"
 	syncMiddleware "github.com/brave/go-sync/middleware"
 	"github.com/brave/go-sync/schema/protobuf/sync_pb"
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/rs/zerolog/log"
 	"google.golang.org/protobuf/proto"
 )
@@ -51,7 +51,7 @@ func Command(cache *cache.Cache, db datastore.Datastore) http.HandlerFunc {
 				http.Error(w, "Create gzip reader failed", http.StatusInternalServerError)
 				return
 			}
-			defer closers.Panic(gr)
+			defer closers.Panic(ctx, gr)
 			reader = gr
 		}
 

docker-compose.yml

@@ -23,8 +23,8 @@ services:
       - SENTRY_DSN
       - ENV=local
       - DEBUG=1
-      - AWS_ACCESS_KEY_ID=#
-      - AWS_SECRET_ACCESS_KEY=#
+      - AWS_ACCESS_KEY_ID=GOSYNC
+      - AWS_SECRET_ACCESS_KEY=GOSYNC
       - AWS_REGION=us-west-2
       - AWS_ENDPOINT=http://dynamo-local:8000
       - REDIS_URL=redis:6379
@@ -48,8 +48,8 @@ services:
       - SENTRY_DSN
       - ENV=local
       - DEBUG=1
-      - AWS_ACCESS_KEY_ID=#
-      - AWS_SECRET_ACCESS_KEY=#
+      - AWS_ACCESS_KEY_ID=GOSYNC
+      - AWS_SECRET_ACCESS_KEY=GOSYNC
       - AWS_REGION=us-west-2
       - AWS_ENDPOINT=http://dynamo-local:8000
       - TABLE_NAME=client-entity-dev

dynamo.Dockerfile

@@ -1,12 +1,12 @@
 ARG DB_LOCATION=/home/dynamodblocal/db
-FROM amazon/dynamodb-local:1.12.0 AS install
+FROM amazon/dynamodb-local:2.0.0 AS install
 
 USER root
 RUN yum -y install awscli
 
 USER dynamodblocal
-ENV AWS_ACCESS_KEY_ID=#
-ENV AWS_SECRET_ACCESS_KEY=#
+ENV AWS_ACCESS_KEY_ID=GOSYNC
+ENV AWS_SECRET_ACCESS_KEY=GOSYNC
 ARG AWS_ENDPOINT=http://localhost:8000
 ARG AWS_REGION=us-west-2
 ARG DB_LOCATION
@@ -20,7 +20,7 @@ RUN mkdir -p ${DB_LOCATION} && \
       --endpoint-url ${AWS_ENDPOINT} --region ${AWS_REGION} && \
       kill $DYNAMO_PID
 
-FROM amazon/dynamodb-local:1.12.0
+FROM amazon/dynamodb-local:2.0.0
 
 ARG DB_LOCATION
 COPY --chown=dynamodblocal:dynamodblocal --from=install ${DB_LOCATION} /db

go.mod

@@ -3,41 +3,44 @@ module github.com/brave/go-sync
 go 1.18
 
 require (
-	github.com/aws/aws-sdk-go v1.37.19
-	github.com/brave-intl/bat-go v0.5.1
-	github.com/getsentry/sentry-go v0.11.0
-	github.com/go-chi/chi v4.1.2+incompatible
-	github.com/go-redis/redis/v8 v8.10.0
-	github.com/prometheus/client_golang v1.11.1
-	github.com/rs/zerolog v1.23.0
+	github.com/aws/aws-sdk-go v1.45.8
+	github.com/brave-intl/bat-go/libs v0.0.0-20230913115141-8b4fe85da72c
+	github.com/getsentry/sentry-go v0.24.1
+	github.com/go-chi/chi/v5 v5.0.10
+	github.com/prometheus/client_golang v1.16.0
+	github.com/redis/go-redis/v9 v9.1.0
+	github.com/rs/zerolog v1.30.0
 	github.com/satori/go.uuid v1.2.0
-	github.com/stretchr/testify v1.7.0
-	google.golang.org/protobuf v1.26.0-rc.1
+	github.com/stretchr/testify v1.8.4
+	google.golang.org/protobuf v1.31.0
 )
 
 require (
-	github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 // indirect
+	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/golang/protobuf v1.4.3 // indirect
+	github.com/go-chi/chi v4.1.2+incompatible // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/gomodule/redigo v2.0.0+incompatible // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.26.0 // indirect
-	github.com/prometheus/procfs v0.6.0 // indirect
-	github.com/rs/xid v1.2.1 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/rogpeppe/go-internal v1.11.0 // indirect
+	github.com/rs/xid v1.5.0 // indirect
 	github.com/shengdoushi/base58 v1.0.0 // indirect
-	github.com/stretchr/objx v0.2.0 // indirect
-	github.com/throttled/throttled v2.2.4+incompatible // indirect
-	go.opentelemetry.io/otel v0.20.0 // indirect
-	go.opentelemetry.io/otel/metric v0.20.0 // indirect
-	go.opentelemetry.io/otel/trace v0.20.0 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/throttled/throttled v2.2.5+incompatible // indirect
 	golang.org/x/crypto v0.7.0 // indirect
-	golang.org/x/sys v0.6.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	golang.org/x/sys v0.8.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )