From 3aa3371f589293139e00855467879e360367fe2a Mon Sep 17 00:00:00 2001 From: Mariell Hoversholm Date: Tue, 25 Mar 2025 10:20:23 +0100 Subject: [PATCH] Chore: update workspace (#102759) * Chore: update workspace * fix: ignore deprecation warnings --- apps/alerting/notifications/go.mod | 2 +- go.mod | 4 ++-- go.sum | 4 ++-- pkg/services/encryption/provider/cipher_aescfb.go | 1 + pkg/services/encryption/provider/decipher_aes.go | 1 + pkg/storage/unified/apistore/go.mod | 2 +- pkg/storage/unified/resource/go.mod | 2 +- pkg/util/encryption.go | 2 ++ 8 files changed, 11 insertions(+), 7 deletions(-) diff --git a/apps/alerting/notifications/go.mod b/apps/alerting/notifications/go.mod index fec89a07666..1f6db443174 100644 --- a/apps/alerting/notifications/go.mod +++ b/apps/alerting/notifications/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/alerting/notifications -go 1.23.7 +go 1.24.1 replace github.com/grafana/grafana => ../../.. diff --git a/go.mod b/go.mod index 0a347474767..0f06dddb0ac 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.23.7 +go 1.24.1 require ( buf.build/gen/go/parca-dev/parca/connectrpc/go v1.17.0-20240902100956-02fd72488966.1 // @grafana/observability-traces-and-profiling @@ -216,7 +216,7 @@ require ( github.com/grafana/grafana/pkg/aggregator v0.0.0-20250220163425-b4c4b9abbdc8 // @grafana/grafana-app-platform-squad github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250314071911-14e2784e6979 // @grafana/grafana-app-platform-squad github.com/grafana/grafana/pkg/apis/secret v0.0.0-20250319110241-5a004939da2a // @grafana/grafana-operator-experience-squad - github.com/grafana/grafana/pkg/apiserver v0.0.0-20250220154326-6e5de80ef295 // @grafana/grafana-app-platform-squad + github.com/grafana/grafana/pkg/apiserver v0.0.0-20250325075903-77fa2271be7a // @grafana/grafana-app-platform-squad // This needs to be here for other projects that import grafana/grafana // For local development grafana/grafana will always use the local files diff --git a/go.sum b/go.sum index 38ff7f37cb8..6146a2fe000 100644 --- a/go.sum +++ b/go.sum @@ -1615,8 +1615,8 @@ github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250314071911-14e2784e6979 h github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250314071911-14e2784e6979/go.mod h1:A/SJ9CiAWNOdeD/IezNwRaDZusLKq0z6dTfhKDgZw5Y= github.com/grafana/grafana/pkg/apis/secret v0.0.0-20250319110241-5a004939da2a h1:dMllTcE0R1qvV4rWDehQzxNiHaale1yCzXsVkub07D0= github.com/grafana/grafana/pkg/apis/secret v0.0.0-20250319110241-5a004939da2a/go.mod h1:K/fP4kODJmABug5b90PhACUZD6Xh/veEz2b1VRKNyuA= -github.com/grafana/grafana/pkg/apiserver v0.0.0-20250220154326-6e5de80ef295 h1:ivbywO8ZnmzDDkn169qUb9REsCGYAA7H8W6VfqSmCEw= -github.com/grafana/grafana/pkg/apiserver v0.0.0-20250220154326-6e5de80ef295/go.mod h1:OugmKouuvgWeOI8Kghram2Pv8b/1SuXRR8/iW068uLk= +github.com/grafana/grafana/pkg/apiserver v0.0.0-20250325075903-77fa2271be7a h1:NN0j9zdqYpfliR0P+au/PAJ5lqP7IZPNe8tAX5eaQNE= +github.com/grafana/grafana/pkg/apiserver v0.0.0-20250325075903-77fa2271be7a/go.mod h1:3Z958XEs20R6Wf5y4TFD07PGuGld6grB+wZ1qP/iyqg= github.com/grafana/grafana/pkg/promlib v0.0.8 h1:VUWsqttdf0wMI4j9OX9oNrykguQpZcruudDAFpJJVw0= github.com/grafana/grafana/pkg/promlib v0.0.8/go.mod h1:U1ezG/MGaEPoThqsr3lymMPN5yIPdVTJnDZ+wcXT+ao= github.com/grafana/grafana/pkg/semconv v0.0.0-20250220164708-c8d4ff28a450 h1:wSqgLKFwI7fyeqf3djRXGClBLb/UPjZ4XPm/UsKFDB0= diff --git a/pkg/services/encryption/provider/cipher_aescfb.go b/pkg/services/encryption/provider/cipher_aescfb.go index 1712fc66dde..272944074a5 100644 --- a/pkg/services/encryption/provider/cipher_aescfb.go +++ b/pkg/services/encryption/provider/cipher_aescfb.go @@ -38,6 +38,7 @@ func (c aesCfbCipher) Encrypt(_ context.Context, payload []byte, secret string) return nil, err } + //nolint:staticcheck stream := cipher.NewCFBEncrypter(block, iv) stream.XORKeyStream(ciphertext[encryption.SaltLength+aes.BlockSize:], payload) diff --git a/pkg/services/encryption/provider/decipher_aes.go b/pkg/services/encryption/provider/decipher_aes.go index 33cebbfe975..bfbf1911702 100644 --- a/pkg/services/encryption/provider/decipher_aes.go +++ b/pkg/services/encryption/provider/decipher_aes.go @@ -59,6 +59,7 @@ func decryptCFB(block cipher.Block, payload []byte) ([]byte, error) { payload = payload[encryption.SaltLength+aes.BlockSize:] payloadDst := make([]byte, len(payload)) + //nolint:staticcheck stream := cipher.NewCFBDecrypter(block, iv) // XORKeyStream can work in-place if the two arguments are the same. diff --git a/pkg/storage/unified/apistore/go.mod b/pkg/storage/unified/apistore/go.mod index f0b502e45eb..65b2956bf2b 100644 --- a/pkg/storage/unified/apistore/go.mod +++ b/pkg/storage/unified/apistore/go.mod @@ -18,7 +18,7 @@ require ( github.com/grafana/grafana v11.4.0-00010101000000-000000000000+incompatible github.com/grafana/grafana/apps/dashboard v0.0.0-20250317130411-3f270d1de043 github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250314071911-14e2784e6979 - github.com/grafana/grafana/pkg/apiserver v0.0.0-20250220154326-6e5de80ef295 + github.com/grafana/grafana/pkg/apiserver v0.0.0-20250325075903-77fa2271be7a github.com/grafana/grafana/pkg/storage/unified/resource v0.0.0-20250317130411-3f270d1de043 github.com/stretchr/testify v1.10.0 gocloud.dev v0.40.0 diff --git a/pkg/storage/unified/resource/go.mod b/pkg/storage/unified/resource/go.mod index 68ff0c85fd1..67acc7c1389 100644 --- a/pkg/storage/unified/resource/go.mod +++ b/pkg/storage/unified/resource/go.mod @@ -18,7 +18,7 @@ require ( github.com/grafana/grafana-plugin-sdk-go v0.274.1-0.20250318081012-21a7f15619b0 github.com/grafana/grafana/apps/dashboard v0.0.0-20250317130411-3f270d1de043 github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250314071911-14e2784e6979 - github.com/grafana/grafana/pkg/apiserver v0.0.0-20250220154326-6e5de80ef295 // indirect + github.com/grafana/grafana/pkg/apiserver v0.0.0-20250325075903-77fa2271be7a // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1 github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 github.com/hashicorp/golang-lru/v2 v2.0.7 diff --git a/pkg/util/encryption.go b/pkg/util/encryption.go index 9c8c3a4c440..79f4012a1a8 100644 --- a/pkg/util/encryption.go +++ b/pkg/util/encryption.go @@ -102,6 +102,7 @@ func decryptCFB(block cipher.Block, payload []byte) ([]byte, error) { payload = payload[saltLength+aes.BlockSize:] payloadDst := make([]byte, len(payload)) + //nolint:staticcheck stream := cipher.NewCFBDecrypter(block, iv) // XORKeyStream can work in-place if the two arguments are the same. @@ -136,6 +137,7 @@ func Encrypt(payload []byte, secret string) ([]byte, error) { return nil, err } + //nolint:staticcheck stream := cipher.NewCFBEncrypter(block, iv) stream.XORKeyStream(ciphertext[saltLength+aes.BlockSize:], payload)