Skip to content

Commit

Permalink
Update GCP dependencies for GKE workload identity support (#91)
Browse files Browse the repository at this point in the history
Co-authored-by: Yash Bhutwala <[email protected]>
  • Loading branch information
lfittl and yashbhutwala authored Oct 9, 2020
1 parent cbf2f08 commit e811d50
Show file tree
Hide file tree
Showing 772 changed files with 94,126 additions and 91,310 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ integration_test/*.json
integration_test/*.out
coverage.out
bin/
.idea/
23 changes: 5 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
module github.com/pganalyze/collector

require (
cloud.google.com/go v0.49.0 // indirect
cloud.google.com/go/pubsub v1.1.0
cloud.google.com/go v0.68.0 // indirect
cloud.google.com/go/pubsub v1.8.1
github.com/Azure/azure-amqp-common-go v1.1.4
github.com/Azure/azure-event-hubs-go v1.3.1
github.com/Azure/go-autorest v11.1.1+incompatible
Expand All @@ -17,13 +17,10 @@ require (
github.com/getsentry/raven-go v0.0.0-20161115135411-3f7439d3e74d
github.com/go-ini/ini v1.18.0
github.com/go-ole/go-ole v0.0.0-20160708033836-be49f7c07711 // indirect
github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 // indirect
github.com/golang/protobuf v1.3.2
github.com/google/go-cmp v0.3.1 // indirect
github.com/golang/protobuf v1.4.2
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
github.com/gorhill/cronexpr v0.0.0-20160318121724-f0984319b442
github.com/guregu/null v0.0.0-20160228005316-41961cea0328
github.com/jstemmer/go-junit-report v0.9.1 // indirect
github.com/jtolds/gls v4.2.0+incompatible // indirect
github.com/juju/syslog v0.0.0-20150205155936-6be94e8b7187
github.com/keybase/go-ps v0.0.0-20160809205621-9c11ca40a479
Expand All @@ -39,18 +36,8 @@ require (
github.com/shirou/w32 v0.0.0-20160204003529-3c9377fc6748 // indirect
github.com/smartystreets/assertions v0.0.0-20160707190355-2063fd1cc7c9 // indirect
github.com/smartystreets/goconvey v0.0.0-20160704134950-4622128e06c7 // indirect
go.opencensus.io v0.22.2 // indirect
golang.org/x/exp v0.0.0-20191129062945-2f5052295587 // indirect
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect
golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933
golang.org/x/oauth2 v0.0.0-20191122200657-5d9234df094c // indirect
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect
golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d // indirect
google.golang.org/api v0.14.0
google.golang.org/appengine v1.6.5 // indirect
google.golang.org/genproto v0.0.0-20191115221424-83cc0476cb11 // indirect
google.golang.org/grpc v1.25.1 // indirect
golang.org/x/net v0.0.0-20200927032502-5d4f70055728
google.golang.org/api v0.32.0
)

go 1.14
245 changes: 235 additions & 10 deletions go.sum

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions input/system/google_cloudsql/log_subscriber.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ func setupPubSubSubscriber(ctx context.Context, wg *sync.WaitGroup, logger *util
if config.GcpCredentialsFile != "" {
logger.PrintVerbose("Using GCP credentials file located at: %s", config.GcpCredentialsFile)
opts = append(opts, option.WithCredentialsFile(config.GcpCredentialsFile))
} else {
logger.PrintVerbose("No GCP credentials file provided; assuming GKE workload identity or VM-associated service account")
}
client, err := pubsub.NewClient(ctx, projectID, opts...)
if err != nil {
Expand Down
Loading

0 comments on commit e811d50

Please sign in to comment.