-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bump cloud.google.com/go/kms from 1.15.5 to 1.21.0
Bumps [cloud.google.com/go/kms](https://github.com/googleapis/google-cloud-go) from 1.15.5 to 1.21.0. - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/documentai/CHANGES.md) - [Commits](googleapis/google-cloud-go@kms/v1.15.5...kms/v1.21.0) --- updated-dependencies: - dependency-name: cloud.google.com/go/kms dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
- Loading branch information
1 parent
1f9efad
commit 5a8f999
Showing
2 changed files
with
160 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| module github.com/grafana/grafana | ||
|
|
||
| go 1.21 | ||
| toolchain go1.23.6 | ||
|
|
||
| // Override docker/docker to avoid: | ||
| // go: github.com/drone-runners/[email protected] requires | ||
|
|
@@ -28,7 +29,7 @@ replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0. | |
| replace github.com/getkin/kin-openapi => github.com/getkin/kin-openapi v0.120.0 | ||
|
|
||
| require ( | ||
| cloud.google.com/go/storage v1.30.1 // @grafana/backend-platform | ||
| cloud.google.com/go/storage v1.50.0 // @grafana/backend-platform | ||
| cuelang.org/go v0.6.0-0.dev // @grafana/grafana-as-code | ||
| github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // @grafana/partner-datasources | ||
| github.com/Azure/go-autorest/autorest v0.11.29 // @grafana/backend-platform | ||
|
|
@@ -56,7 +57,7 @@ require ( | |
| github.com/golang/mock v1.6.0 // @grafana/alerting-squad-backend | ||
| github.com/golang/snappy v0.0.4 // @grafana/alerting-squad-backend | ||
| github.com/google/go-cmp v0.6.0 // @grafana/backend-platform | ||
| github.com/google/uuid v1.5.0 // @grafana/backend-platform | ||
| github.com/google/uuid v1.6.0 // @grafana/backend-platform | ||
| github.com/google/wire v0.5.0 // @grafana/backend-platform | ||
| github.com/gorilla/websocket v1.5.0 // @grafana/grafana-app-platform-squad | ||
| github.com/grafana/alerting v0.0.0-20231221110807-c17ec6241a66 // @grafana/alerting-squad-backend | ||
|
|
@@ -92,7 +93,7 @@ require ( | |
| github.com/prometheus/prometheus v1.8.2-0.20221021121301-51a44e6657c3 // @grafana/alerting-squad-backend | ||
| github.com/robfig/cron/v3 v3.0.1 // @grafana/backend-platform | ||
| github.com/russellhaering/goxmldsig v1.4.0 // @grafana/backend-platform | ||
| github.com/stretchr/testify v1.8.4 // @grafana/backend-platform | ||
| github.com/stretchr/testify v1.10.0 // @grafana/backend-platform | ||
| github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf // @grafana/backend-platform | ||
| github.com/ua-parser/uap-go v0.0.0-20211112212520-00c877edfe0f // @grafana/backend-platform | ||
| github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect | ||
|
|
@@ -103,19 +104,19 @@ require ( | |
| go.opentelemetry.io/collector/pdata v1.0.0-rc8 // @grafana/backend-platform | ||
| go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1 // @grafana/grafana-operator-experience-squad | ||
| go.opentelemetry.io/otel/exporters/jaeger v1.10.0 // @grafana/backend-platform | ||
| go.opentelemetry.io/otel/sdk v1.21.0 // @grafana/backend-platform | ||
| go.opentelemetry.io/otel/trace v1.21.0 // @grafana/backend-platform | ||
| golang.org/x/crypto v0.17.0 // @grafana/backend-platform | ||
| go.opentelemetry.io/otel/sdk v1.34.0 // @grafana/backend-platform | ||
| go.opentelemetry.io/otel/trace v1.34.0 // @grafana/backend-platform | ||
| golang.org/x/crypto v0.33.0 // @grafana/backend-platform | ||
| golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // @grafana/alerting-squad-backend | ||
| golang.org/x/net v0.19.0 // @grafana/oss-big-tent @grafana/partner-datasources | ||
| golang.org/x/oauth2 v0.15.0 // @grafana/grafana-authnz-team | ||
| golang.org/x/sync v0.5.0 // @grafana/alerting-squad-backend | ||
| golang.org/x/time v0.5.0 // @grafana/backend-platform | ||
| golang.org/x/tools v0.16.0 // @grafana/grafana-as-code | ||
| golang.org/x/net v0.35.0 // @grafana/oss-big-tent @grafana/partner-datasources | ||
| golang.org/x/oauth2 v0.26.0 // @grafana/grafana-authnz-team | ||
| golang.org/x/sync v0.11.0 // @grafana/alerting-squad-backend | ||
| golang.org/x/time v0.10.0 // @grafana/backend-platform | ||
| golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // @grafana/grafana-as-code | ||
| gonum.org/v1/gonum v0.12.0 // @grafana/observability-metrics | ||
| google.golang.org/api v0.149.0 // @grafana/backend-platform | ||
| google.golang.org/grpc v1.60.1 // @grafana/plugins-platform-backend | ||
| google.golang.org/protobuf v1.32.0 // @grafana/plugins-platform-backend | ||
| google.golang.org/api v0.222.0 // @grafana/backend-platform | ||
| google.golang.org/grpc v1.70.0 // @grafana/plugins-platform-backend | ||
| google.golang.org/protobuf v1.36.5 // @grafana/plugins-platform-backend | ||
| gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect | ||
| gopkg.in/ini.v1 v1.67.0 // @grafana/alerting-squad-backend | ||
| gopkg.in/mail.v2 v2.3.1 // @grafana/backend-platform | ||
|
|
@@ -140,7 +141,7 @@ require ( | |
| github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect | ||
| github.com/beorn7/perks v1.0.1 // indirect | ||
| github.com/cenkalti/backoff/v4 v4.2.1 // indirect | ||
| github.com/cespare/xxhash/v2 v2.2.0 // indirect | ||
| github.com/cespare/xxhash/v2 v2.3.0 // indirect | ||
| github.com/cheekybits/genny v1.0.0 // indirect | ||
| github.com/cockroachdb/apd/v2 v2.0.2 // indirect | ||
| github.com/deepmap/oapi-codegen v1.12.4 // indirect | ||
|
|
@@ -162,12 +163,12 @@ require ( | |
| github.com/go-openapi/validate v0.22.3 // indirect | ||
| github.com/golang-jwt/jwt/v4 v4.5.0 // @grafana/backend-platform | ||
| github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect | ||
| github.com/golang/glog v1.1.2 // indirect | ||
| github.com/golang/glog v1.2.3 // indirect | ||
| github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect | ||
| github.com/golang/protobuf v1.5.3 // @grafana/backend-platform | ||
| github.com/golang/protobuf v1.5.4 // @grafana/backend-platform | ||
| github.com/google/btree v1.1.2 // indirect | ||
| github.com/google/flatbuffers v23.1.21+incompatible // indirect | ||
| github.com/googleapis/gax-go/v2 v2.12.0 // @grafana/backend-platform | ||
| github.com/googleapis/gax-go/v2 v2.14.1 // @grafana/backend-platform | ||
| github.com/gorilla/mux v1.8.0 // @grafana/backend-platform | ||
| github.com/grafana/grafana-google-sdk-go v0.1.0 // @grafana/partner-datasources | ||
| github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 // indirect | ||
|
|
@@ -206,23 +207,22 @@ require ( | |
| github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect | ||
| github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect | ||
| github.com/sirupsen/logrus v1.9.3 // indirect | ||
| github.com/stretchr/objx v0.5.0 // indirect | ||
| github.com/stretchr/objx v0.5.2 // indirect | ||
| github.com/uber/jaeger-lib v2.4.1+incompatible // indirect | ||
| github.com/valyala/bytebufferpool v1.0.0 // indirect | ||
| github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect | ||
| go.mongodb.org/mongo-driver v1.13.1 // indirect | ||
| go.opencensus.io v0.24.0 // indirect | ||
| go.uber.org/atomic v1.11.0 // @grafana/alerting-squad-backend | ||
| go.uber.org/goleak v1.3.0 // indirect | ||
| golang.org/x/sys v0.15.0 // indirect | ||
| golang.org/x/text v0.14.0 // @grafana/backend-platform | ||
| golang.org/x/sys v0.30.0 // indirect | ||
| golang.org/x/text v0.22.0 // @grafana/backend-platform | ||
| golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect | ||
| google.golang.org/appengine v1.6.8 // indirect | ||
| google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect; @grafana/backend-platform | ||
| google.golang.org/genproto v0.0.0-20250122153221-138b5a5a4fd4 // indirect; @grafana/backend-platform | ||
| ) | ||
|
|
||
| require ( | ||
| cloud.google.com/go/kms v1.15.5 // @grafana/backend-platform | ||
| cloud.google.com/go/kms v1.21.0 // @grafana/backend-platform | ||
| github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 // @grafana/backend-platform | ||
| github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.9.0 // @grafana/backend-platform | ||
| github.com/Azure/azure-storage-blob-go v0.15.0 // @grafana/backend-platform | ||
|
|
@@ -243,7 +243,7 @@ require ( | |
| github.com/jmoiron/sqlx v1.3.5 // @grafana/backend-platform | ||
| github.com/matryer/is v1.4.0 // @grafana/grafana-as-code | ||
| github.com/urfave/cli v1.22.14 // @grafana/backend-platform | ||
| go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // @grafana/plugins-platform-backend | ||
| go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // @grafana/plugins-platform-backend | ||
| go.opentelemetry.io/contrib/propagators/jaeger v1.21.1 // @grafana/backend-platform | ||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // @grafana/backend-platform | ||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // @grafana/backend-platform | ||
|
|
@@ -267,14 +267,14 @@ require ( | |
| github.com/redis/go-redis/v9 v9.0.2 // @grafana/alerting-squad-backend | ||
| github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // @grafana/grafana-as-code | ||
| go.opentelemetry.io/contrib/samplers/jaegerremote v0.15.1 // @grafana/backend-platform | ||
| golang.org/x/mod v0.14.0 // @grafana/backend-platform | ||
| golang.org/x/mod v0.17.0 // @grafana/backend-platform | ||
| gopkg.in/square/go-jose.v2 v2.6.0 // @grafana/grafana-authnz-team | ||
| k8s.io/utils v0.0.0-20230726121419-3b25d923346b // @grafana/partner-datasources | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/spf13/cobra v1.8.0 // @grafana/grafana-app-platform-squad | ||
| go.opentelemetry.io/otel v1.21.0 // @grafana/backend-platform | ||
| go.opentelemetry.io/otel v1.34.0 // @grafana/backend-platform | ||
| k8s.io/apimachinery v0.29.0 // @grafana/grafana-app-platform-squad | ||
| k8s.io/apiserver v0.29.0 // @grafana/grafana-app-platform-squad | ||
| k8s.io/client-go v0.29.0 // @grafana/grafana-app-platform-squad | ||
|
|
@@ -291,8 +291,8 @@ require github.com/grafana/pyroscope/api v0.3.0 // @grafana/observability-traces | |
| require github.com/apache/arrow/go/v13 v13.0.0 // @grafana/observability-metrics | ||
|
|
||
| require ( | ||
| cloud.google.com/go v0.111.0 // indirect | ||
| cloud.google.com/go/compute/metadata v0.2.3 // indirect | ||
| cloud.google.com/go v0.118.2 // indirect | ||
| cloud.google.com/go/compute/metadata v0.6.0 // indirect | ||
| github.com/Azure/azure-pipeline-go v0.2.3 // indirect | ||
| github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e // indirect | ||
| github.com/Masterminds/goutils v1.1.1 // indirect | ||
|
|
@@ -338,8 +338,8 @@ require ( | |
| github.com/google/cel-go v0.17.7 // indirect | ||
| github.com/google/go-querystring v1.1.0 // indirect | ||
| github.com/google/gofuzz v1.2.0 // indirect | ||
| github.com/google/s2a-go v0.1.7 // indirect | ||
| github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect | ||
| github.com/google/s2a-go v0.1.9 // indirect | ||
| github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect | ||
| github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db // indirect | ||
| github.com/grafana/sqlds/v2 v2.3.10 // indirect | ||
| github.com/hashicorp/go-cleanhttp v0.5.2 // indirect | ||
|
|
@@ -380,7 +380,7 @@ require ( | |
| github.com/russross/blackfriday/v2 v2.1.0 // indirect | ||
| github.com/segmentio/asm v1.2.0 // indirect | ||
| github.com/shopspring/decimal v1.2.0 // indirect | ||
| github.com/spf13/afero v1.9.2 // indirect | ||
| github.com/spf13/afero v1.10.0 // indirect | ||
| github.com/spf13/cast v1.5.0 // indirect | ||
| github.com/spf13/jwalterweatherman v1.1.0 // indirect | ||
| github.com/spf13/pflag v1.0.5 // @grafana-app-platform-squad | ||
|
|
@@ -396,14 +396,14 @@ require ( | |
| go.etcd.io/etcd/api/v3 v3.5.10 // indirect | ||
| go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect | ||
| go.etcd.io/etcd/client/v3 v3.5.10 // indirect | ||
| go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect | ||
| go.opentelemetry.io/otel/metric v1.21.0 // indirect | ||
| go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect | ||
| go.opentelemetry.io/otel/metric v1.34.0 // indirect | ||
| go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect | ||
| go.uber.org/multierr v1.11.0 // indirect | ||
| go.uber.org/zap v1.26.0 // indirect | ||
| golang.org/x/term v0.15.0 // indirect | ||
| google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect | ||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect | ||
| golang.org/x/term v0.29.0 // indirect | ||
| google.golang.org/genproto/googleapis/api v0.0.0-20250219182151-9fdb1cabc7b2 // indirect | ||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b // indirect | ||
| gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect | ||
| gopkg.in/inf.v0 v0.9.1 // indirect | ||
| gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect | ||
|
|
@@ -426,8 +426,7 @@ require ( | |
| ) | ||
|
|
||
| require ( | ||
| cloud.google.com/go/compute v1.23.3 // indirect | ||
| cloud.google.com/go/iam v1.1.5 // indirect | ||
| cloud.google.com/go/iam v1.4.0 // indirect | ||
| filippo.io/age v1.1.1 // @grafana/grafana-authnz-team | ||
| github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0 // indirect | ||
| github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.0 // indirect | ||
|
|
@@ -451,7 +450,7 @@ require ( | |
| github.com/docker/docker v23.0.4+incompatible // @grafana/grafana-delivery | ||
| github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027 // indirect | ||
| github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect | ||
| github.com/go-logr/logr v1.3.0 // @grafana/grafana-app-platform-squad | ||
| github.com/go-logr/logr v1.4.2 // @grafana/grafana-app-platform-squad | ||
| github.com/go-logr/stdr v1.2.2 // indirect | ||
| github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect | ||
| github.com/hmarr/codeowners v1.1.2 // @grafana/grafana-as-code | ||
|
|
@@ -480,6 +479,21 @@ require ( | |
| github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect | ||
| ) | ||
|
|
||
| require ( | ||
| cel.dev/expr v0.19.0 // indirect | ||
| cloud.google.com/go/auth v0.14.1 // indirect | ||
| cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect | ||
| cloud.google.com/go/longrunning v0.6.4 // indirect | ||
| cloud.google.com/go/monitoring v1.23.0 // indirect | ||
| github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect | ||
| github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.49.0 // indirect | ||
| github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0 // indirect | ||
| github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect | ||
| github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect | ||
| go.opentelemetry.io/contrib/detectors/gcp v1.33.0 // indirect | ||
| go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect | ||
| ) | ||
|
|
||
| // Use fork of crewjam/saml with fixes for some issues until changes get merged into upstream | ||
| replace github.com/crewjam/saml => github.com/grafana/saml v0.4.15-0.20231025143828-a6c0e9b86a4c | ||
|
|
||
|
|
||
Oops, something went wrong.