Skip to content

Commit

Permalink
Upgrade dependences
Browse files Browse the repository at this point in the history
- Increase minimum Go version to 1.17
- Upgraded to `nats-2.2.2`
- Upgraded to `jwt-2.0.1`
- Upgraded to `crypto-0.14.0`
- Upgraded to `yaml-2.2.8`
- Upgraded to `client_golang-1.11.1`

Signed-off-by: Nicolas Bock <[email protected]>
  • Loading branch information
nicolasbock committed Oct 8, 2023
1 parent deac301 commit ba6aa2f
Show file tree
Hide file tree
Showing 6 changed files with 111 additions and 33 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/dependency-check.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
# Dependency Review Action
#
# This Action will scan dependency manifest files that change as part of a Pull Request, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
#
# Source repository: https://github.com/actions/dependency-review-action
# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
name: Dependency Review
on:
- pull_request
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/ghcr-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.16
go-version: "1.17"

- name: Test and Build
run: make all
Expand Down Expand Up @@ -68,8 +68,6 @@ jobs:
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.processor_meta.outputs.tags }}
labels: ${{ steps.processor_meta.outputs.labels }}
# cache-from: type=gha
cache-to: type=gha,mode=max

- name: Extract Docker metadata - monitor
id: monitor_meta
Expand All @@ -87,5 +85,3 @@ jobs:
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.monitor_meta.outputs.tags }}
labels: ${{ steps.monitor_meta.outputs.labels }}
# cache-from: type=gha
cache-to: type=gha,mode=max
2 changes: 1 addition & 1 deletion .github/workflows/test-and-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
test:
strategy:
matrix:
go-version: [ 1.16, 1.17, 1.18 ]
go-version: [ "1.17", "1.18", "1.19", "1.20", "1.21" ]
os: [ ubuntu-latest ]
runs-on: ${{ matrix.os }}

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ In order to stand up a development environment, you will need
- `make`
- `docker`
- `docker-compose`
- `golang >= 1.16`
- `golang >= 1.17`

For running a docker based installation locally you will need a sandbox account
on Salesforce and a sandbox directory on files.com. Supply
Expand Down
59 changes: 52 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,24 +1,69 @@
module github.com/canonical/athena-core

go 1.16
go 1.17

require (
github.com/Files-com/files-sdk-go v1.0.180
github.com/flosch/pongo2/v4 v4.0.2
github.com/go-orm/gorm v0.0.0-20161201081620-eb06255b667d
github.com/go-sql-driver/mysql v1.6.0
github.com/jinzhu/gorm v1.9.16 // indirect
github.com/jinzhu/now v1.1.2 // indirect
github.com/klauspost/compress v1.12.3 // indirect
github.com/lileio/pubsub/v2 v2.5.0
github.com/makyo/snuffler v0.0.0-20190210075944-33446730a4fe
github.com/mattn/go-sqlite3 v1.14.7 // indirect
github.com/nats-io/nats-server/v2 v2.2.2 // indirect
github.com/nats-io/nats-streaming-server v0.21.2 // indirect
github.com/nats-io/stan.go v0.8.3
github.com/simpleforce/simpleforce v0.0.0-20211207104336-af9d9a281fea
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.7.0
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
github.com/appscode/go-querystring v0.0.0-20170504095604-0126cfb3f1dc // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dropbox/godropbox v0.0.0-20200228041828-52ad444d3502 // indirect
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.4.3 // indirect
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
github.com/hashicorp/go-hclog v0.14.1 // indirect
github.com/hashicorp/go-retryablehttp v0.6.6 // indirect
github.com/jinzhu/gorm v1.9.16 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.2 // indirect
github.com/klauspost/compress v1.13.4 // indirect
github.com/lileio/logr v1.1.0 // indirect
github.com/lpar/date v1.0.0 // indirect
github.com/mattn/go-sqlite3 v1.14.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/nats-io/nats-server/v2 v2.2.2 // indirect
github.com/nats-io/nats-streaming-server v0.21.2 // indirect
github.com/nats-io/nats.go v1.13.1-0.20220121202836-972a071d373d // indirect
github.com/nats-io/nkeys v0.3.0 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 // indirect
github.com/opentracing/opentracing-go v1.1.0 // indirect
github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.3 // indirect
github.com/openzipkin/zipkin-go v0.2.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.11.1 // 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/sanity-io/litter v1.2.0 // indirect
github.com/segmentio/ksuid v1.0.3 // indirect
github.com/stretchr/objx v0.1.1 // indirect
github.com/zenthangplus/goccm v0.0.0-20200608171100-39e9e08b694a // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
google.golang.org/grpc v1.29.1 // indirect
google.golang.org/protobuf v1.26.0-rc.1 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
moul.io/http2curl v1.0.0 // indirect
)
Loading

0 comments on commit ba6aa2f

Please sign in to comment.