Skip to content

Commit

Permalink
feat: Bump deps due to v2.x testnet upgrade [DEV-3796] (#267)
Browse files Browse the repository at this point in the history
* build(deps): Bump the go_modules group across 1 directory with 2 updates

Bumps the go_modules group with 2 updates in the / directory: [github.com/lestrrat-go/jwx](https://github.com/lestrrat-go/jwx) and google.golang.org/protobuf.


Updates `github.com/lestrrat-go/jwx` from 1.2.26 to 1.2.29
- [Release notes](https://github.com/lestrrat-go/jwx/releases)
- [Changelog](https://github.com/lestrrat-go/jwx/blob/v1.2.29/Changes)
- [Commits](lestrrat-go/jwx@v1.2.26...v1.2.29)

Updates `google.golang.org/protobuf` from 1.32.0 to 1.33.0

---
updated-dependencies:
- dependency-name: github.com/lestrrat-go/jwx
  dependency-type: direct:production
  dependency-group: go_modules-security-group
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
  dependency-group: go_modules-security-group
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update package due to testnet upgrade

* npm update

* Bump golang version to 1.21

* Return back golangci-lint configuration to 1.18

* debug

* Fix "File exists" error

* Fix the correct section

* Change golangci-lint versions

* Downgrade github actions golang version

* Return deps back

* Make lint the same as cheqd-node

* Update package-lock.json

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ankur Banerjee <[email protected]>
  • Loading branch information
3 people authored Apr 9, 2024
1 parent 094640a commit 9ab37f2
Show file tree
Hide file tree
Showing 8 changed files with 435 additions and 402 deletions.
17 changes: 15 additions & 2 deletions .github/linters/.golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ linters-settings:
- badCall # Remove this after CI workflow PR

gofumpt:
lang-version: "1.18"
lang-version: "1.21"

misspell:
ignore-words:
Expand All @@ -52,7 +52,7 @@ linters-settings:

stylecheck:
# Select the Go version to target.
go: "1.18"
go: "1.21"
# STxxxx checks in https://staticcheck.io/docs/configuration/options/#checks
# Default: ["*"]
checks: ["all"]
Expand All @@ -62,3 +62,16 @@ linters-settings:
- "github.com/onsi/gomega"
# https://staticcheck.io/docs/configuration/options/#initialisms
initialisms: ["ACL", "API", "ASCII", "CPU", "CSS", "DNS", "EOF", "GUID", "HTML", "HTTP", "HTTPS", "ID", "IP", "JSON", "QPS", "RAM", "RPC", "SLA", "SMTP", "SQL", "SSH", "TCP", "TLS", "TTL", "UDP", "UI", "GID", "UID", "UUID", "URI", "URL", "UTF8", "VM", "XML", "XMPP", "XSRF", "XSS", "SIP", "RTP", "AMQP", "DB", "TS"]

depguard:
rules:
main:
files:
- $all
list-mode: lax
allow: "*"

goconst:
min-occurrences: 5
ignore-tests: true
ignore-strings: "echo '"
8 changes: 5 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,14 @@ jobs:
- uses: actions/setup-go@v5
with:
go-version-file: ./go.mod
cache: true

# cache = false cause there is an open issue related to "File exists" error.
# https://github.com/golangci/golangci-lint-action/issues/807
cache: false

- name: Run golangci-lint
uses: golangci/golangci-lint-action@v4
with:
version: v1.52.2
version: v1.56.2
args: --config .github/linters/.golangci.yaml

super-lint:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ install: go.sum go-version
GO_MAJOR_VERSION = $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1)
GO_MINOR_VERSION = $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2)
MIN_GO_MAJOR_VERSION = 1
MIN_GO_MINOR_VERSION = 18
MIN_GO_MINOR_VERSION = 21
GO_VERSION_ERROR = Golang version $(GO_MAJOR_VERSION).$(GO_MINOR_VERSION) is not supported, \
please update to at least $(MIN_GO_MAJOR_VERSION).$(MIN_GO_MINOR_VERSION)

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
### STAGE 1: Build cheqd did-resolver binary pre-requisites ###
#####################################################################

FROM golang:1.20-alpine AS builder
FROM golang:1.21-alpine AS builder

# Install minimum necessary dependencies
ENV PACKAGES make git bash linux-headers findutils
Expand Down
32 changes: 17 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,34 +1,36 @@
module github.com/cheqd/did-resolver

go 1.20
go 1.21

toolchain go1.21.0

require (
github.com/cheqd/cheqd-node/api/v2 v2.1.0
github.com/cheqd/cheqd-node/api/v2 v2.2.0-develop.1
github.com/go-resty/resty/v2 v2.11.0
github.com/google/uuid v1.6.0
github.com/labstack/echo/v4 v4.11.4
github.com/lestrrat-go/jwx v1.2.26
github.com/lestrrat-go/jwx v1.2.29
github.com/mr-tron/base58 v1.2.0
github.com/multiformats/go-multibase v0.2.0
github.com/onsi/ginkgo/v2 v2.15.0
github.com/onsi/gomega v1.30.0
github.com/onsi/ginkgo/v2 v2.17.1
github.com/onsi/gomega v1.32.0
github.com/rs/zerolog v1.32.0
github.com/spf13/viper v1.16.0
github.com/swaggo/echo-swagger v1.4.1
github.com/swaggo/swag v1.16.3
google.golang.org/grpc v1.62.0
google.golang.org/protobuf v1.32.0
google.golang.org/grpc v1.62.1
google.golang.org/protobuf v1.33.0
)

require (
github.com/KyleBanks/depth v1.2.1 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.3 // indirect
github.com/cosmos/cosmos-sdk/api v0.1.0 // indirect
github.com/cosmos/gogoproto v1.4.6 // indirect
github.com/cosmos/gogoproto v1.4.10 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/spec v0.20.8 // indirect
Expand All @@ -44,7 +46,7 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/labstack/gommon v0.4.2 // indirect
github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
github.com/lestrrat-go/blackmagic v1.0.1 // indirect
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
github.com/lestrrat-go/httpcc v1.0.1 // indirect
github.com/lestrrat-go/iter v1.0.2 // indirect
github.com/lestrrat-go/option v1.0.1 // indirect
Expand All @@ -65,13 +67,13 @@ require (
github.com/swaggo/files/v2 v2.0.0 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
golang.org/x/crypto v0.18.0 // indirect
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.16.1 // indirect
golang.org/x/tools v0.17.0 // indirect
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
Expand Down
Loading

0 comments on commit 9ab37f2

Please sign in to comment.