Skip to content

Commit

Permalink
Merge pull request #54 from silinternational/develop
Browse files Browse the repository at this point in the history
dependency update
  • Loading branch information
briskt authored Aug 2, 2024
2 parents f551b73 + 31f5b0c commit d9fa956
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 86 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

- uses: actions/setup-go@v5
with:
go-version: 1.21
go-version-file: 'go.mod'

- name: Unit tests
run: go test -v ./lib/googlesheets/...
Expand All @@ -34,4 +34,4 @@ jobs:
GOOGLE_AUTH_PRIVATE_KEY_ID: ${{ secrets.GOOGLE_AUTH_PRIVATE_KEY_ID }}
GOOGLE_AUTH_PRIVATE_KEY: ${{ secrets.GOOGLE_AUTH_PRIVATE_KEY }}
GOOGLE_AUTH_TOKEN_URI: ${{ secrets.GOOGLE_AUTH_TOKEN_URI }}
run: docker-compose -f action-services.yml run deploy
run: docker compose -f action-services.yml run deploy
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
cli:
docker-compose up -d app
docker compose up -d app

bash:
docker-compose run --rm app bash
docker compose run --rm app bash

test:
docker-compose run --rm app bash -c "go test ./lib/googlesheets/..."
docker compose run --rm app bash -c "go test ./lib/googlesheets/..."

clean:
docker-compose kill
docker-compose rm -f
docker compose kill
docker compose rm -f
2 changes: 0 additions & 2 deletions action-services.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3"

services:
deploy:
build: .
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3"

services:
app:
build: .
Expand Down
40 changes: 24 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,38 +1,46 @@
module github.com/silinternational/app-monitoring-archiver

go 1.21
// Ensure this tracks with Dockerfile
go 1.22

require (
github.com/aws/aws-lambda-go v1.41.0
github.com/aws/aws-lambda-go v1.47.0
github.com/silinternational/nodeping-cli v0.0.0-20190618205525-a054ccef23fc
github.com/spf13/cobra v1.8.0
github.com/stretchr/testify v1.8.4
golang.org/x/net v0.18.0
golang.org/x/oauth2 v0.14.0
google.golang.org/api v0.151.0
github.com/stretchr/testify v1.9.0
golang.org/x/net v0.24.0
golang.org/x/oauth2 v0.19.0
google.golang.org/api v0.176.1
)

require (
cloud.google.com/go/compute v1.23.3 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/auth v0.3.0 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
cloud.google.com/go/compute/metadata v0.3.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/googleapis/gax-go/v2 v2.12.3 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/silinternational/nodeping-go-client v0.0.0-20190618205520-2203b33a9e99 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/sys v0.15.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/otel/trace v1.26.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect
google.golang.org/grpc v1.63.2 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/resty.v1 v1.12.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit d9fa956

Please sign in to comment.