From ebaa8fbee18edc5747425e3dfaeb5317a9a90e70 Mon Sep 17 00:00:00 2001 From: Cronus <105345303+ice-cronus@users.noreply.github.com> Date: Wed, 14 Feb 2024 20:13:03 +0700 Subject: [PATCH] CI CD fix: linter, deps, makefile (#33) --- .github/workflows/CICD.yaml | 1 - Makefile | 2 +- analytics/tracking/tracking.go | 11 +- analytics/tracking/tracking_test.go | 2 +- auth/auth.go | 18 +- auth/auth_test.go | 22 +- auth/fixture/fixture.go | 16 +- auth/internal/firebase/auth.go | 22 +- auth/internal/firebase/contract.go | 8 +- auth/internal/ice/auth.go | 7 +- coin/coin_test.go | 8 +- connectors/fixture/connector_setup.go | 2 +- connectors/fixture/contract.go | 4 +- connectors/message_broker/consumer.go | 4 +- connectors/message_broker/contract.go | 4 +- connectors/message_broker/fixture/contract.go | 4 +- connectors/message_broker/message_broker.go | 6 +- connectors/storage/storage.go | 14 +- connectors/storage/v2/api.go | 5 +- connectors/storage/v2/contract.go | 2 +- connectors/storage/v2/storage.go | 4 +- connectors/storage/v2/storage_test.go | 44 +- connectors/storage/v3/proxy.go | 529 ++++++++++++ connectors/storage/v3/storage.go | 19 +- connectors/storage/v3/storage_test.go | 6 +- email/contract.go | 2 +- email/email.go | 7 +- email/email_test.go | 3 +- go.mod | 179 +++-- go.sum | 750 +++++------------- multimedia/picture/fixture/fixture.go | 16 +- multimedia/picture/picture.go | 8 +- multimedia/picture/picture_test.go | 2 +- notifications/inapp/contract.go | 4 +- notifications/inapp/fixture/fixture.go | 9 +- notifications/inapp/inapp.go | 10 +- notifications/inapp/inapp_test.go | 8 +- notifications/push/contract.go | 6 +- notifications/push/push.go | 11 +- notifications/push/push_test.go | 40 +- privacy/contract.go | 4 +- privacy/privacy.go | 4 +- server/contract.go | 8 +- server/fixture/contract.go | 16 +- server/fixture/fixture.go | 7 +- server/fixture/http.go | 6 +- server/router.go | 10 +- server/server.go | 12 +- sms/contract.go | 2 +- sms/internal/internal.go | 13 +- time/contract.go | 4 +- time/time_test.go | 2 +- translations/contract.go | 8 +- translations/translations.go | 6 +- 54 files changed, 1064 insertions(+), 857 deletions(-) diff --git a/.github/workflows/CICD.yaml b/.github/workflows/CICD.yaml index db34ea0..1af730a 100644 --- a/.github/workflows/CICD.yaml +++ b/.github/workflows/CICD.yaml @@ -183,7 +183,6 @@ jobs: - coin - time - privacy - - translations - multimedia/picture - analytics/tracking - email diff --git a/Makefile b/Makefile index 869aaa0..2a485aa 100644 --- a/Makefile +++ b/Makefile @@ -137,7 +137,7 @@ lint: golangci-lint run getAddLicense: - GO111MODULE=off go get -v -u github.com/google/addlicense + go install -v github.com/google/addlicense@latest addLicense: getAddLicense `go env GOPATH`/bin/addlicense -f LICENSE.header * .github/* diff --git a/analytics/tracking/tracking.go b/analytics/tracking/tracking.go index 6cdbd80..de492bf 100644 --- a/analytics/tracking/tracking.go +++ b/analytics/tracking/tracking.go @@ -4,7 +4,6 @@ package tracking import ( "context" - "fmt" "net/http" "os" "strings" @@ -14,7 +13,7 @@ import ( "github.com/imroc/req/v3" "github.com/pkg/errors" - appCfg "github.com/ice-blockchain/wintr/config" + appcfg "github.com/ice-blockchain/wintr/config" "github.com/ice-blockchain/wintr/log" ) @@ -26,18 +25,18 @@ func init() { //nolint:gochecknoinits // It's the only way to tweak the client. func New(applicationYAMLKey string) Client { var cfg config - appCfg.MustLoadFromKey(applicationYAMLKey, &cfg) + appcfg.MustLoadFromKey(applicationYAMLKey, &cfg) if cfg.Tracking.Credentials.AppID == "" { module := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(applicationYAMLKey, "-", "_"), "/", "_")) - cfg.Tracking.Credentials.AppID = os.Getenv(fmt.Sprintf("%s_ANALYTICS_TRACKING_APP_ID", module)) + cfg.Tracking.Credentials.AppID = os.Getenv(module + "_ANALYTICS_TRACKING_APP_ID") if cfg.Tracking.Credentials.AppID == "" { cfg.Tracking.Credentials.AppID = os.Getenv("ANALYTICS_TRACKING_APP_ID") } } if cfg.Tracking.Credentials.APIKey == "" { module := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(applicationYAMLKey, "-", "_"), "/", "_")) - cfg.Tracking.Credentials.APIKey = os.Getenv(fmt.Sprintf("%s_ANALYTICS_TRACKING_API_KEY", module)) + cfg.Tracking.Credentials.APIKey = os.Getenv(module + "_ANALYTICS_TRACKING_API_KEY") if cfg.Tracking.Credentials.APIKey == "" { cfg.Tracking.Credentials.APIKey = os.Getenv("ANALYTICS_TRACKING_API_KEY") } @@ -69,7 +68,7 @@ func (t *tracking) TrackAction(ctx context.Context, userID string, action *Actio } func (t *tracking) SetUserAttributes(ctx context.Context, userID string, attributes map[string]any) error { - url := t.cfg.Tracking.BaseURL + "/v1/customer/" + t.cfg.Tracking.Credentials.AppID + url := t.cfg.Tracking.BaseURL + "/v1/customer/" + t.cfg.Tracking.Credentials.AppID //nolint:goconst // . body := make(map[string]any, 1+1+1) body["type"] = "customer" body["customer_id"] = userID diff --git a/analytics/tracking/tracking_test.go b/analytics/tracking/tracking_test.go index da8f151..50a5b7a 100644 --- a/analytics/tracking/tracking_test.go +++ b/analytics/tracking/tracking_test.go @@ -24,7 +24,7 @@ var ( ) func TestMain(m *testing.M) { - client = New(testApplicationYAMLKey).(*tracking) //nolint:forcetypeassert,errcheck // We know for sure. + client = New(testApplicationYAMLKey).(*tracking) //nolint:forcetypeassert,revive,errcheck // We know for sure. os.Exit(m.Run()) } diff --git a/auth/auth.go b/auth/auth.go index c83dee4..bcb8f96 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -9,21 +9,21 @@ import ( "github.com/pkg/errors" "github.com/ice-blockchain/wintr/auth/internal" - firebaseAuth "github.com/ice-blockchain/wintr/auth/internal/firebase" - iceAuth "github.com/ice-blockchain/wintr/auth/internal/ice" + firebaseauth "github.com/ice-blockchain/wintr/auth/internal/firebase" + iceauth "github.com/ice-blockchain/wintr/auth/internal/ice" "github.com/ice-blockchain/wintr/time" ) func New(ctx context.Context, applicationYAMLKey string) Client { return &auth{ - fb: firebaseAuth.New(ctx, applicationYAMLKey), - ice: iceAuth.New(applicationYAMLKey), + fb: firebaseauth.New(ctx, applicationYAMLKey), + ice: iceauth.New(applicationYAMLKey), } } func (a *auth) VerifyToken(ctx context.Context, token string) (*Token, error) { var authToken *Token - if err := iceAuth.DetectIceToken(token); err != nil { + if err := iceauth.DetectIceToken(token); err != nil { authToken, err = a.fb.VerifyToken(ctx, token) return authToken, errors.Wrapf(err, "can't verify fb token:%v", token) @@ -68,15 +68,15 @@ func (*auth) checkMetadataOwnership(userID string, metadata jwt.MapClaims) error func (*auth) firstRegisteredUserID(metadata map[string]any) string { var userID string if registeredWithProviderInterface, found := metadata[internal.RegisteredWithProviderClaim]; found { - registeredWithProvider := registeredWithProviderInterface.(string) //nolint:errcheck,forcetypeassert // Not needed. + registeredWithProvider := registeredWithProviderInterface.(string) //nolint:errcheck,revive,forcetypeassert // Not needed. switch registeredWithProvider { case internal.ProviderFirebase: if firebaseIDInterface, ok := metadata[internal.FirebaseIDClaim]; ok { - userID, _ = firebaseIDInterface.(string) //nolint:errcheck // Not needed. + userID, _ = firebaseIDInterface.(string) //nolint:errcheck,revive // Not needed. } case internal.ProviderIce: if iceIDInterface, ok := metadata[internal.IceIDClaim]; ok { - userID, _ = iceIDInterface.(string) //nolint:errcheck // Not needed. + userID, _ = iceIDInterface.(string) //nolint:errcheck,revive // Not needed. } } } @@ -106,7 +106,7 @@ func (a *auth) GetUserUIDByEmail(ctx context.Context, email string) (string, err return "", errors.Wrapf(err, "failed to get user by email:%v using firebase auth", email) } - return usr.UID, err + return usr.UID, nil } func (a *auth) GenerateTokens( //nolint:revive // We need to have these parameters. diff --git a/auth/auth_test.go b/auth/auth_test.go index 8190eb3..7cb3a8e 100644 --- a/auth/auth_test.go +++ b/auth/auth_test.go @@ -102,9 +102,9 @@ func TestDeleteUser_Success(t *testing.T) { require.NoError(t, err) require.NotEmpty(t, user.PhoneNumber) require.NoError(t, client.DeleteUser(ctx, uid)) - require.NoError(t, client.DeleteUser(ctx, uuid.NewString()), ErrUserNotFound) + require.NotErrorIs(t, client.DeleteUser(ctx, uuid.NewString()), ErrUserNotFound) _, err = fixture.GetUser(ctx, uid) - require.NotNil(t, err) + require.Error(t, err) require.True(t, strings.HasPrefix(err.Error(), "no user exists with the")) } @@ -132,7 +132,7 @@ func TestVerifyIceToken_ValidToken(t *testing.T) { assert.Equal(t, role, verifiedAccessToken.Claims["role"]) _, err = client.VerifyToken(ctx, refreshToken) - require.Error(t, err, ErrWrongTypeToken) + require.ErrorIs(t, err, ErrWrongTypeToken) } func TestVerifyIceToken_InvalidToken(t *testing.T) { @@ -171,7 +171,7 @@ func TestGenerateIceTokens_Valid(t *testing.T) { assert.Equal(t, role, verifiedAccessToken.Claims["role"]) assert.Equal(t, deviceID, verifiedAccessToken.Claims["deviceUniqueID"]) _, err = client.VerifyToken(ctx, refreshToken) - require.Error(t, err, ErrWrongTypeToken) + require.ErrorIs(t, err, ErrWrongTypeToken) } func TestUpdateCustomClaims_Ice(t *testing.T) { @@ -184,7 +184,7 @@ func TestUpdateCustomClaims_Ice(t *testing.T) { "role": "author", } ) - require.Error(t, client.UpdateCustomClaims(ctx, userID, claims), ErrUserNotFound) + require.ErrorIs(t, client.UpdateCustomClaims(ctx, userID, claims), ErrUserNotFound) } func TestDeleteUser_Ice(t *testing.T) { @@ -193,7 +193,7 @@ func TestDeleteUser_Ice(t *testing.T) { defer cancel() userID := "ice" - assert.Nil(t, client.DeleteUser(ctx, userID)) + require.NoError(t, client.DeleteUser(ctx, userID)) } func TestParseToken_Parse(t *testing.T) { //nolint:funlen // . @@ -258,7 +258,7 @@ func TestMetadata_Empty(t *testing.T) { var decodedMetadata jwt.MapClaims err = client.(*auth).ice.VerifyTokenFields(metadataToken, &decodedMetadata) //nolint:forcetypeassert // . require.NoError(t, err) - assert.Equal(t, 3, len(decodedMetadata)) + assert.Len(t, decodedMetadata, 3) assert.Equal(t, userID, decodedMetadata["sub"]) assert.Equal(t, internal.MetadataIssuer, decodedMetadata["iss"]) assert.Equal(t, now.Unix(), int64(decodedMetadata["iat"].(float64))) //nolint:forcetypeassert // . @@ -268,7 +268,7 @@ func TestMetadata_Empty(t *testing.T) { assert.Equal(t, userID, tok.UserID) err = client.(*auth).ice.VerifyTokenFields(metadataToken, &decodedMetadata) //nolint:forcetypeassert // . require.NoError(t, err) - assert.Equal(t, 3, len(decodedMetadata)) + assert.Len(t, decodedMetadata, 3) assert.Equal(t, userID, decodedMetadata["sub"]) assert.Equal(t, internal.MetadataIssuer, decodedMetadata["iss"]) assert.Equal(t, now.Unix(), int64(decodedMetadata["iat"].(float64))) //nolint:forcetypeassert // . @@ -296,7 +296,7 @@ func TestMetadata_RegisteredBy(t *testing.T) { //nolint:funlen // . var decodedMetadata jwt.MapClaims err = client.(*auth).ice.VerifyTokenFields(metadataToken, &decodedMetadata) //nolint:forcetypeassert // . require.NoError(t, err) - assert.Equal(t, 6, len(decodedMetadata)) + assert.Len(t, decodedMetadata, 6) assert.Equal(t, userID, decodedMetadata["sub"]) assert.Equal(t, internal.MetadataIssuer, decodedMetadata["iss"]) assert.Equal(t, now.Unix(), int64(decodedMetadata["iat"].(float64))) //nolint:forcetypeassert // . @@ -311,7 +311,7 @@ func TestMetadata_RegisteredBy(t *testing.T) { //nolint:funlen // . err = client.(*auth).ice.VerifyTokenFields(metadataToken, &decodedMetadata) //nolint:forcetypeassert // . require.NoError(t, err) - assert.Equal(t, 6, len(decodedMetadata)) + assert.Len(t, decodedMetadata, 6) assert.Equal(t, userID, decodedMetadata["sub"]) assert.Equal(t, internal.MetadataIssuer, decodedMetadata["iss"]) assert.Equal(t, now.Unix(), int64(decodedMetadata["iat"].(float64))) //nolint:forcetypeassert // . @@ -350,5 +350,5 @@ func TestMetadata_MetadataNotOwnedByToken(t *testing.T) { tok := &Token{UserID: uuid.NewString()} // Metadata was issued for token "userID", not random one. _, err = client.ModifyTokenWithMetadata(tok, metadataToken) - require.Error(t, err, ErrInvalidToken) + require.ErrorIs(t, err, ErrWrongTypeToken) } diff --git a/auth/fixture/fixture.go b/auth/fixture/fixture.go index cc681b4..ae18070 100644 --- a/auth/fixture/fixture.go +++ b/auth/fixture/fixture.go @@ -15,7 +15,7 @@ import ( stdlibtime "time" firebase "firebase.google.com/go/v4" - firebaseAuth "firebase.google.com/go/v4/auth" + firebaseauth "firebase.google.com/go/v4/auth" "github.com/goccy/go-json" "github.com/google/uuid" "github.com/pkg/errors" @@ -28,13 +28,13 @@ import ( //nolint:gochecknoglobals // We're using lazy stateless singletons for the whole testing runtime. var ( - globalFirebaseClient *firebaseAuth.Client + globalFirebaseClient *firebaseauth.Client globalIceClient iceauth.Client singletonIce = new(sync.Once) singletonFirebase = new(sync.Once) ) -func clientFirebase() *firebaseAuth.Client { +func clientFirebase() *firebaseauth.Client { singletonFirebase.Do(func() { globalFirebaseClient = newFirebaseClient() }) @@ -63,7 +63,7 @@ func CreateUser(role string) (uid, token string) { }) log.Panic(err) //nolint:revive // Intended. - url := fmt.Sprintf("https://identitytoolkit.googleapis.com/v1/accounts:signInWithPassword?key=%s", os.Getenv("GCP_FIREBASE_AUTH_API_KEY")) + url := "https://identitytoolkit.googleapis.com/v1/accounts:signInWithPassword?key=" + os.Getenv("GCP_FIREBASE_AUTH_API_KEY") respBytes := postRequest(url, req) var respBody struct { @@ -81,7 +81,7 @@ func DeleteUser(uid string) { log.Panic(clientFirebase().DeleteUser(delCtx, uid)) } -func GetUser(ctx context.Context, uid string) (*firebaseAuth.UserRecord, error) { +func GetUser(ctx context.Context, uid string) (*firebaseauth.UserRecord, error) { return clientFirebase().GetUser(ctx, uid) //nolint:wrapcheck // It's a proxy. } @@ -115,7 +115,7 @@ func generateUser(ctx context.Context, role string) (uid, email, password string phoneNumber := fmt.Sprintf("+1%d", randNumber.Uint64()+phoneNumberMin) password = uuid.NewString() - user := new(firebaseAuth.UserToCreate). + user := new(firebaseauth.UserToCreate). Email(fmt.Sprintf("%s@%s-test-user.com", uuid.NewString(), uuid.NewString())). Password(password). PhoneNumber(phoneNumber). @@ -145,7 +145,7 @@ func postRequest(url string, req []byte) []byte { return bodyBytes } -func newFirebaseClient() *firebaseAuth.Client { +func newFirebaseClient() *firebaseauth.Client { ctx := context.Background() fileContent := os.Getenv("GOOGLE_APPLICATION_CREDENTIALS") filePath := os.Getenv("GOOGLE_APPLICATION_CREDENTIALS") @@ -165,7 +165,7 @@ func newFirebaseClient() *firebaseAuth.Client { eagerLoadCtx, cancelEagerLoad := context.WithTimeout(ctx, 5*stdlibtime.Second) //nolint:gomnd // It's a one time call. defer cancelEagerLoad() t, err := client.VerifyIDTokenAndCheckRevoked(eagerLoadCtx, "invalid token") - if t != nil || !firebaseAuth.IsIDTokenInvalid(err) { + if t != nil || !firebaseauth.IsIDTokenInvalid(err) { log.Panic(errors.New("unexpected success")) } diff --git a/auth/internal/firebase/auth.go b/auth/internal/firebase/auth.go index f7223e3..d31b422 100644 --- a/auth/internal/firebase/auth.go +++ b/auth/internal/firebase/auth.go @@ -11,18 +11,18 @@ import ( "dario.cat/mergo" firebase "firebase.google.com/go/v4" - firebaseAuth "firebase.google.com/go/v4/auth" + firebaseauth "firebase.google.com/go/v4/auth" "github.com/pkg/errors" firebaseoption "google.golang.org/api/option" "github.com/ice-blockchain/wintr/auth/internal" - appCfg "github.com/ice-blockchain/wintr/config" + appcfg "github.com/ice-blockchain/wintr/config" "github.com/ice-blockchain/wintr/log" ) func New(ctx context.Context, applicationYAMLKey string) Client { cfg := new(config) - appCfg.MustLoadFromKey(applicationYAMLKey, cfg) + appcfg.MustLoadFromKey(applicationYAMLKey, cfg) cfg.setWintrAuthFirebaseCredentialsFileContent(applicationYAMLKey) cfg.setWintrAuthFirebaseCredentialsFilePath(applicationYAMLKey) @@ -41,7 +41,7 @@ func New(ctx context.Context, applicationYAMLKey string) Client { eagerLoadCtx, cancelEagerLoad := context.WithTimeout(ctx, 30*stdlibtime.Second) //nolint:gomnd // It's a one time call. defer cancelEagerLoad() t, err := client.VerifyIDTokenAndCheckRevoked(eagerLoadCtx, "invalid token") - if t != nil || !firebaseAuth.IsIDTokenInvalid(err) { + if t != nil || !firebaseauth.IsIDTokenInvalid(err) { log.Panic(errors.New("unexpected success")) } @@ -63,10 +63,10 @@ func (a *auth) VerifyToken(ctx context.Context, token string) (*internal.Token, userID := firebaseToken.UID if len(firebaseToken.Claims) > 0 { if emailInterface, found := firebaseToken.Claims["email"]; found { - email, _ = emailInterface.(string) //nolint:errcheck // Not needed. + email, _ = emailInterface.(string) //nolint:errcheck,revive // Not needed. } if roleInterface, found := firebaseToken.Claims["role"]; found { - role, _ = roleInterface.(string) //nolint:errcheck // Not needed. + role, _ = roleInterface.(string) //nolint:errcheck,revive // Not needed. } } @@ -109,7 +109,7 @@ func (a *auth) UpdateEmail(ctx context.Context, userID, email string) error { if ctx.Err() != nil { return errors.Wrap(ctx.Err(), "context failed") } - if _, err := a.client.UpdateUser(ctx, userID, new(firebaseAuth.UserToUpdate).Email(email).EmailVerified(true)); err != nil { + if _, err := a.client.UpdateUser(ctx, userID, new(firebaseauth.UserToUpdate).Email(email).EmailVerified(true)); err != nil { if strings.HasSuffix(err.Error(), "user with the provided email already exists") { return ErrConflict } @@ -138,13 +138,13 @@ func (a *auth) DeleteUser(ctx context.Context, userID string) error { return nil } -func (a *auth) GetUser(ctx context.Context, userID string) (*firebaseAuth.UserRecord, error) { +func (a *auth) GetUser(ctx context.Context, userID string) (*firebaseauth.UserRecord, error) { usr, err := a.client.GetUser(ctx, userID) return usr, errors.Wrapf(err, "can't get firebase user data for:%v", userID) } -func (a *auth) GetUserByEmail(ctx context.Context, email string) (*firebaseAuth.UserRecord, error) { +func (a *auth) GetUserByEmail(ctx context.Context, email string) (*firebaseauth.UserRecord, error) { usr, err := a.client.GetUserByEmail(ctx, email) if err != nil { if strings.HasSuffix(err.Error(), fmt.Sprintf("no user exists with the email: \"%v\"", email)) { @@ -160,7 +160,7 @@ func (a *auth) GetUserByEmail(ctx context.Context, email string) (*firebaseAuth. func (cfg *config) setWintrAuthFirebaseCredentialsFileContent(applicationYAMLKey string) { if cfg.WintrAuthFirebase.Credentials.FileContent == "" { module := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(applicationYAMLKey, "-", "_"), "/", "_")) - cfg.WintrAuthFirebase.Credentials.FileContent = os.Getenv(fmt.Sprintf("%s_AUTH_CREDENTIALS_FILE_CONTENT", module)) + cfg.WintrAuthFirebase.Credentials.FileContent = os.Getenv(module + "_AUTH_CREDENTIALS_FILE_CONTENT") if cfg.WintrAuthFirebase.Credentials.FileContent == "" { cfg.WintrAuthFirebase.Credentials.FileContent = os.Getenv("AUTH_CREDENTIALS_FILE_CONTENT") } @@ -176,7 +176,7 @@ func (cfg *config) setWintrAuthFirebaseCredentialsFileContent(applicationYAMLKey func (cfg *config) setWintrAuthFirebaseCredentialsFilePath(applicationYAMLKey string) { if cfg.WintrAuthFirebase.Credentials.FilePath == "" { module := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(applicationYAMLKey, "-", "_"), "/", "_")) - cfg.WintrAuthFirebase.Credentials.FilePath = os.Getenv(fmt.Sprintf("%s_AUTH_CREDENTIALS_FILE_PATH", module)) + cfg.WintrAuthFirebase.Credentials.FilePath = os.Getenv(module + "_AUTH_CREDENTIALS_FILE_PATH") if cfg.WintrAuthFirebase.Credentials.FilePath == "" { cfg.WintrAuthFirebase.Credentials.FilePath = os.Getenv("AUTH_CREDENTIALS_FILE_PATH") } diff --git a/auth/internal/firebase/contract.go b/auth/internal/firebase/contract.go index 87d5aa8..a5fc3c7 100644 --- a/auth/internal/firebase/contract.go +++ b/auth/internal/firebase/contract.go @@ -5,7 +5,7 @@ package firebaseauth import ( "context" - firebaseAuth "firebase.google.com/go/v4/auth" + firebaseauth "firebase.google.com/go/v4/auth" "github.com/pkg/errors" "github.com/ice-blockchain/wintr/auth/internal" @@ -25,8 +25,8 @@ type ( UpdateCustomClaims(ctx context.Context, userID string, customClaims map[string]any) error DeleteUser(ctx context.Context, userID string) error UpdateEmail(ctx context.Context, userID, email string) error - GetUser(ctx context.Context, userID string) (*firebaseAuth.UserRecord, error) - GetUserByEmail(ctx context.Context, email string) (*firebaseAuth.UserRecord, error) + GetUser(ctx context.Context, userID string) (*firebaseauth.UserRecord, error) + GetUserByEmail(ctx context.Context, email string) (*firebaseauth.UserRecord, error) } ) @@ -37,7 +37,7 @@ const ( type ( auth struct { - client *firebaseAuth.Client + client *firebaseauth.Client allowEmailPassword bool } diff --git a/auth/internal/ice/auth.go b/auth/internal/ice/auth.go index e75c4ef..ae86f6f 100644 --- a/auth/internal/ice/auth.go +++ b/auth/internal/ice/auth.go @@ -3,7 +3,6 @@ package iceauth import ( - "fmt" "os" "strings" @@ -11,12 +10,12 @@ import ( "github.com/pkg/errors" "github.com/ice-blockchain/wintr/auth/internal" - appCfg "github.com/ice-blockchain/wintr/config" + appcfg "github.com/ice-blockchain/wintr/config" ) func New(applicationYAMLKey string) Client { var cfg config - appCfg.MustLoadFromKey(applicationYAMLKey, &cfg) + appcfg.MustLoadFromKey(applicationYAMLKey, &cfg) cfg.loadSecretForJWT(applicationYAMLKey) return &auth{ @@ -102,7 +101,7 @@ func (a *auth) verify() func(token *jwt.Token) (any, error) { func (cfg *config) loadSecretForJWT(applicationYAMLKey string) { if cfg.WintrAuthIce.JWTSecret == "" { module := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(applicationYAMLKey, "-", "_"), "/", "_")) - cfg.WintrAuthIce.JWTSecret = os.Getenv(fmt.Sprintf("%s_JWT_SECRET", module)) + cfg.WintrAuthIce.JWTSecret = os.Getenv(module + "_JWT_SECRET") if cfg.WintrAuthIce.JWTSecret == "" { cfg.WintrAuthIce.JWTSecret = os.Getenv("JWT_SECRET") } diff --git a/coin/coin_test.go b/coin/coin_test.go index d822bf8..56b9ecc 100644 --- a/coin/coin_test.go +++ b/coin/coin_test.go @@ -286,13 +286,13 @@ func TestICEJSONSerialization(t *testing.T) { func TestICEUnmarshalJSON(t *testing.T) { t.Parallel() ice1 := new(ICE) - assert.NoError(t, ice1.UnmarshalJSON(context.Background(), []byte(""))) + require.NoError(t, ice1.UnmarshalJSON(context.Background(), []byte(""))) ice2 := new(ICE) - assert.NoError(t, ice2.UnmarshalJSON(context.Background(), []byte(" .0"))) + require.NoError(t, ice2.UnmarshalJSON(context.Background(), []byte(" .0"))) ice3 := new(ICE) - assert.NoError(t, ice3.UnmarshalJSON(context.Background(), []byte("0"))) + require.NoError(t, ice3.UnmarshalJSON(context.Background(), []byte("0"))) ice4 := new(ICE) - assert.NoError(t, ice4.UnmarshalJSON(context.Background(), []byte("1123123123.01"))) + require.NoError(t, ice4.UnmarshalJSON(context.Background(), []byte("1123123123.01"))) assert.Equal(t, ICE("0.0"), *ice1) assert.Equal(t, ICE("0.0"), *ice2) assert.Equal(t, ICE("1123123123.01"), *ice4) diff --git a/connectors/fixture/connector_setup.go b/connectors/fixture/connector_setup.go index 77db4ee..d4d3149 100644 --- a/connectors/fixture/connector_setup.go +++ b/connectors/fixture/connector_setup.go @@ -39,7 +39,7 @@ func (c *testConnector) Order() int { func (c *testConnector) Setup(ctx context.Context) ContextErrClose { containerID := strings.ToLower(uuid.New().String()) - tmpFolder := fmt.Sprintf(".tmp-%s", containerID) + tmpFolder := ".tmp-" + containerID applicationYAMLKey, ok := ctx.Value(applicationYAMLKeyContextValueKey).(string) if !ok { log.Panic("no package name provided in context") diff --git a/connectors/fixture/contract.go b/connectors/fixture/contract.go index e29b0a5..f229657 100644 --- a/connectors/fixture/contract.go +++ b/connectors/fixture/contract.go @@ -14,11 +14,11 @@ type ( ContextErrClose = func(context.Context) error TestRunner interface { - RunTests(*testing.M) + RunTests(m *testing.M) StartConnectorsIndefinitely() } TestConnector interface { - Setup(context.Context) ContextErrClose + Setup(ctx context.Context) ContextErrClose Order() int } ConnectorLifecycleHooks struct { diff --git a/connectors/message_broker/consumer.go b/connectors/message_broker/consumer.go index 3be16ee..97c89bd 100644 --- a/connectors/message_broker/consumer.go +++ b/connectors/message_broker/consumer.go @@ -73,7 +73,7 @@ func (mb *messageBroker) partitionConsumers(fetchedTopic *kgo.FetchTopic) *sync. } } - return topicConsumers.(*sync.Map) //nolint:forcetypeassert // We know for sure. + return topicConsumers.(*sync.Map) //nolint:forcetypeassert,revive // We know for sure. } func (mb *messageBroker) partitionConsumer( @@ -106,7 +106,7 @@ func (mb *messageBroker) partitionConsumer( return nil } - return pc.(*partitionConsumer) //nolint:forcetypeassert // We know for sure. + return pc.(*partitionConsumer) //nolint:forcetypeassert,revive // We know for sure. } func (mb *messageBroker) processNotFoundPartitions(fetchedTopic *kgo.FetchTopic, fetchPartitions ...kgo.FetchPartition) { diff --git a/connectors/message_broker/contract.go b/connectors/message_broker/contract.go index 82bd5e8..c616738 100644 --- a/connectors/message_broker/contract.go +++ b/connectors/message_broker/contract.go @@ -29,10 +29,10 @@ type ( } Client interface { io.Closer - SendMessage(context.Context, *Message, chan<- error) + SendMessage(ctx context.Context, m *Message, e chan<- error) } Processor interface { - Process(context.Context, *Message) error + Process(ctx context.Context, message *Message) error } // Config holds the configuration of this package mounted from `application.yaml`. diff --git a/connectors/message_broker/fixture/contract.go b/connectors/message_broker/fixture/contract.go index 762f586..20c9244 100644 --- a/connectors/message_broker/fixture/contract.go +++ b/connectors/message_broker/fixture/contract.go @@ -22,8 +22,8 @@ type ( messagebroker.Client - VerifyMessages(context.Context, ...RawMessage) error - VerifyNoMessages(context.Context, ...RawMessage) error + VerifyMessages(ctx context.Context, msgs ...RawMessage) error + VerifyNoMessages(ctx context.Context, msgs ...RawMessage) error } ) diff --git a/connectors/message_broker/message_broker.go b/connectors/message_broker/message_broker.go index fbb35c1..35fc8ae 100644 --- a/connectors/message_broker/message_broker.go +++ b/connectors/message_broker/message_broker.go @@ -16,13 +16,13 @@ import ( "github.com/twmb/franz-go/pkg/kerr" "github.com/twmb/franz-go/pkg/kgo" - appCfg "github.com/ice-blockchain/wintr/config" + appcfg "github.com/ice-blockchain/wintr/config" "github.com/ice-blockchain/wintr/log" ) func MustConnect(ctx context.Context, applicationYAMLKey string) Client { var cfg Config - appCfg.MustLoadFromKey(applicationYAMLKey, &cfg) + appcfg.MustLoadFromKey(applicationYAMLKey, &cfg) mb := &messageBroker{cfg: &cfg} mb.connectCreateAndValidateTopics(ctx) @@ -32,7 +32,7 @@ func MustConnect(ctx context.Context, applicationYAMLKey string) Client { func MustConnectAndStartConsuming(ctx context.Context, cancel context.CancelFunc, applicationYAMLKey string, processors ...Processor) Client { var cfg Config - appCfg.MustLoadFromKey(applicationYAMLKey, &cfg) + appcfg.MustLoadFromKey(applicationYAMLKey, &cfg) if len(processors) == 0 { log.Panic(errors.New("at least one processor required if you want to start consuming")) } diff --git a/connectors/storage/storage.go b/connectors/storage/storage.go index b58ff87..88281ee 100644 --- a/connectors/storage/storage.go +++ b/connectors/storage/storage.go @@ -11,14 +11,14 @@ import ( "github.com/pkg/errors" "github.com/ice-blockchain/go-tarantool-client" - tntMulti "github.com/ice-blockchain/go-tarantool-client/multi" - appCfg "github.com/ice-blockchain/wintr/config" + tntmulti "github.com/ice-blockchain/go-tarantool-client/multi" + appcfg "github.com/ice-blockchain/wintr/config" "github.com/ice-blockchain/wintr/log" "github.com/ice-blockchain/wintr/terror" ) func MustConnect(ctx context.Context, cancel context.CancelFunc, ddl, applicationYAMLKey string) (db tarantool.Connector) { - appCfg.MustLoadFromKey(applicationYAMLKey, &cfg) + appcfg.MustLoadFromKey(applicationYAMLKey, &cfg) var err error schemaInitCtx, schemaInitCancel := ctx, cancel if !cfg.DB.ReadOnly && !cfg.DB.SkipSchemaCreation { @@ -49,13 +49,13 @@ func MustConnect(ctx context.Context, cancel context.CancelFunc, ddl, applicatio } func connectDB(ctx context.Context, cancel context.CancelFunc) (db tarantool.Connector, err error) { - auth := tntMulti.BasicAuth{ + auth := tntmulti.BasicAuth{ User: cfg.DB.User, Pass: cfg.DB.Password, } log.Info("connecting to DB...", "URLs", cfg.DB.URLs, "readOnly", cfg.DB.ReadOnly) - if db, err = tntMulti.ConnectWithWritableAwareDefaults(ctx, cancel, !cfg.DB.ReadOnly, auth, cfg.DB.URLs...); err != nil { + if db, err = tntmulti.ConnectWithWritableAwareDefaults(ctx, cancel, !cfg.DB.ReadOnly, auth, cfg.DB.URLs...); err != nil { return nil, errors.Wrapf(err, "could not connect to tarantool instances: %v", cfg.DB.URLs) } @@ -147,7 +147,7 @@ func detectRangedSpaces(expectedSpace, markedDDL string) []string { } expectedSpaces := make([]string, 0, rightRange+1) for i := 0; i <= rightRange; i++ { - expectedSpaces = append(expectedSpaces, strings.Replace(expectedSpace, "]]", fmt.Sprint(i), 1)) + expectedSpaces = append(expectedSpaces, strings.Replace(expectedSpace, "]]", strconv.Itoa(i), 1)) } return expectedSpaces @@ -157,7 +157,7 @@ func getAllUserSpaces(db tarantool.Connector) (map[string]any, error) { var spacesR []map[string]any getAllSpacesFuncName := getAllUserSpacesFunctionName if cfg.DB.ReadOnly { - getAllSpacesFuncName = fmt.Sprintf("{{non-writable}}%s", getAllUserSpacesFunctionName) + getAllSpacesFuncName = "{{non-writable}}" + getAllUserSpacesFunctionName } if err := db.Call17Typed(getAllSpacesFuncName, []any{}, &spacesR); err != nil || len(spacesR) != 1 { return nil, errors.Wrapf(err, "calling %s failed", getAllSpacesFuncName) diff --git a/connectors/storage/v2/api.go b/connectors/storage/v2/api.go index b382b93..937e05a 100644 --- a/connectors/storage/v2/api.go +++ b/connectors/storage/v2/api.go @@ -33,7 +33,6 @@ type ( func DoInTransaction(ctx context.Context, db *DB, fn func(conn QueryExecer) error) error { txOptions := pgx.TxOptions{IsoLevel: pgx.Serializable, AccessMode: pgx.ReadWrite, DeferrableMode: pgx.NotDeferrable} _, err := retry[any](ctx, func() (any, error) { - //nolint:wrapcheck // We have nothing relevant to wrap. if err := parseDBError(pgx.BeginTxFunc(ctx, db.primary(), txOptions, func(tx pgx.Tx) error { return fn(tx) })); err != nil && IsUnexpected(err) { return nil, err } else { //nolint:revive // Nope. @@ -41,7 +40,7 @@ func DoInTransaction(ctx context.Context, db *DB, fn func(conn QueryExecer) erro } }) if err != nil && (errors.Is(err, ErrSerializationFailure) || errors.Is(err, ErrTxAborted)) { - stdlibtime.Sleep(10 * stdlibtime.Millisecond) + stdlibtime.Sleep(10 * stdlibtime.Millisecond) //nolint:gomnd // Not a magic number. return DoInTransaction(ctx, db, fn) } @@ -181,7 +180,7 @@ func IsUnexpected(err error) bool { return errors.As(err, &pgConnErr) || errors.As(err, &netOpErr) } -func parseDBError(err error) error { //nolint:funlen // . +func parseDBError(err error) error { //nolint:funlen,gocognit,revive // . var dbErr *pgconn.PgError if errors.As(err, &dbErr) { //nolint:nestif // . if dbErr.SQLState() == "23505" { diff --git a/connectors/storage/v2/contract.go b/connectors/storage/v2/contract.go index e9f3bd5..b015578 100644 --- a/connectors/storage/v2/contract.go +++ b/connectors/storage/v2/contract.go @@ -40,7 +40,7 @@ type ( User string `yaml:"user"` Password string `yaml:"password"` } `yaml:"credentials" mapstructure:"credentials"` - Timeout string `yaml:"timeout" mapstructure:"timeout"` //nolint:tagliatelle // Nope. + Timeout string `yaml:"timeout" mapstructure:"timeout"` PrimaryURL string `yaml:"primaryURL" mapstructure:"primaryURL"` //nolint:tagliatelle // Nope. ReplicaURLs []string `yaml:"replicaURLs" mapstructure:"replicaURLs"` //nolint:tagliatelle // Nope. RunDDL bool `yaml:"runDDL" mapstructure:"runDDL"` //nolint:tagliatelle // Nope. diff --git a/connectors/storage/v2/storage.go b/connectors/storage/v2/storage.go index cbb105a..3c84021 100644 --- a/connectors/storage/v2/storage.go +++ b/connectors/storage/v2/storage.go @@ -19,13 +19,13 @@ import ( "github.com/jackc/pgx/v5/pgxpool" "github.com/pkg/errors" - appCfg "github.com/ice-blockchain/wintr/config" + appcfg "github.com/ice-blockchain/wintr/config" "github.com/ice-blockchain/wintr/log" ) func MustConnect(ctx context.Context, ddl, applicationYAMLKey string) *DB { var cfg config - appCfg.MustLoadFromKey(applicationYAMLKey, &cfg) + appcfg.MustLoadFromKey(applicationYAMLKey, &cfg) var replicas []*pgxpool.Pool var master *pgxpool.Pool if cfg.WintrStorage.PrimaryURL != "" { diff --git a/connectors/storage/v2/storage_test.go b/connectors/storage/v2/storage_test.go index 8c982ca..c6fa09d 100644 --- a/connectors/storage/v2/storage_test.go +++ b/connectors/storage/v2/storage_test.go @@ -57,82 +57,82 @@ $$ LANGUAGE plpgsql;` db := MustConnect(context.Background(), ddl, "self") defer func() { _, err := Exec(context.Background(), db, `DROP TABLE bogus2`) - assert.NoError(t, err) + require.NoError(t, err) _, err = Exec(context.Background(), db, `DROP TABLE bogus`) - assert.NoError(t, err) + require.NoError(t, err) _, err = Exec(context.Background(), db, `DROP function doSomething`) - assert.NoError(t, err) - assert.NoError(t, db.Close()) + require.NoError(t, err) + require.NoError(t, db.Close()) }() - assert.NoError(t, db.Ping(context.Background())) + require.NoError(t, db.Ping(context.Background())) rowsAffected, err := Exec(context.Background(), db, `INSERT INTO bogus(a,b,c) VALUES ($1,$2,$3)`, "a1", 1, true) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, 1, rowsAffected) rowsAffected, err = Exec(context.Background(), db, `INSERT INTO bogus(a,b,c) VALUES ($1,$2,$3)`, "a1", 1, true) - assert.ErrorIs(t, err, ErrDuplicate) + require.ErrorIs(t, err, ErrDuplicate) assert.EqualValues(t, terror.New(ErrDuplicate, map[string]any{"column": "pk"}), err) assert.True(t, IsErr(err, ErrDuplicate, "pk")) assert.EqualValues(t, 0, rowsAffected) rowsAffected, err = Exec(context.Background(), db, `INSERT INTO bogus2(a,b,c) VALUES ($1,$2,$3)`, "a1", 1, true) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, 1, rowsAffected) rowsAffected, err = Exec(context.Background(), db, `INSERT INTO bogus2(a,b,c) VALUES ($1,$2,$3)`, "a1", 2, true) - assert.ErrorIs(t, err, ErrDuplicate) + require.ErrorIs(t, err, ErrDuplicate) assert.EqualValues(t, terror.New(ErrDuplicate, map[string]any{"column": "a"}), err) assert.True(t, IsErr(err, ErrDuplicate, "a")) assert.EqualValues(t, 0, rowsAffected) rowsAffected, err = Exec(context.Background(), db, `INSERT INTO bogus2(a,b,c) VALUES ($1,$2,$3)`, "a2", 1, true) - assert.ErrorIs(t, err, ErrDuplicate) + require.ErrorIs(t, err, ErrDuplicate) assert.EqualValues(t, terror.New(ErrDuplicate, map[string]any{"column": "pk"}), err) assert.EqualValues(t, 0, rowsAffected) rowsAffected, err = Exec(context.Background(), db, `INSERT INTO bogus2(a,b,c) VALUES ($1,$2,$3)`, "axx", 33, true) - assert.ErrorIs(t, err, ErrRelationNotFound) + require.ErrorIs(t, err, ErrRelationNotFound) assert.EqualValues(t, terror.New(ErrRelationNotFound, map[string]any{"column": "a"}), err) assert.True(t, IsErr(err, ErrRelationNotFound, "a")) assert.EqualValues(t, 0, rowsAffected) res1, err := ExecOne[Bogus](context.Background(), db, `INSERT INTO bogus(a,b,c) VALUES ($1,$2,$3) RETURNING *`, "a2", 2, true) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, &Bogus{A: "a2", B: 2, C: true}, res1) res2, err := ExecMany[Bogus](context.Background(), db, `INSERT INTO bogus(a,b,c) VALUES ($1,$2,$3),($4,$5,$6) RETURNING *`, "a3", 3, true, "a4", 4, false) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []*Bogus{{A: "a3", B: 3, C: true}, {A: "a4", B: 4, C: false}}, res2) res3, err := Get[Bogus](context.Background(), db, `SELECT * FROM bogus WHERE a = $1`, "a1") - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, &Bogus{A: "a1", B: 1, C: true}, res3) resX, err := Get[Bogus](context.Background(), db, `SELECT * FROM bogus WHERE a = $1`, "axxx") - assert.ErrorIs(t, err, ErrNotFound) + require.ErrorIs(t, err, ErrNotFound) assert.True(t, IsErr(err, ErrNotFound)) assert.Nil(t, resX) res4, err := Select[Bogus](context.Background(), db, `SELECT * FROM bogus WHERE a != $1 ORDER BY b`, "b") - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []*Bogus{{A: "a1", B: 1, C: true}, {A: "a2", B: 2, C: true}, {A: "a3", B: 3, C: true}, {A: "a4", B: 4, C: false}}, res4) - assert.NoError(t, DoInTransaction(context.Background(), db, func(conn QueryExecer) error { + require.NoError(t, DoInTransaction(context.Background(), db, func(conn QueryExecer) error { rowsAffected, err = Exec(context.Background(), conn, `INSERT INTO bogus(a,b,c) VALUES ($1,$2,$3)`, "a5", 5, true) - assert.NoError(t, err) + require.NoError(t, err) if err != nil { return err } assert.EqualValues(t, 1, rowsAffected) res1, err = ExecOne[Bogus](context.Background(), conn, `INSERT INTO bogus(a,b,c) VALUES ($1,$2,$3) RETURNING *`, "a6", 6, true) - assert.NoError(t, err) + require.NoError(t, err) if err != nil { return err } assert.EqualValues(t, &Bogus{A: "a6", B: 6, C: true}, res1) res2, err = ExecMany[Bogus](context.Background(), conn, `INSERT INTO bogus(a,b,c) VALUES ($1,$2,$3),($4,$5,$6) RETURNING *`, "a7", 7, true, "a8", 8, false) - assert.NoError(t, err) + require.NoError(t, err) if err != nil { return err } assert.EqualValues(t, []*Bogus{{A: "a7", B: 7, C: true}, {A: "a8", B: 8, C: false}}, res2) res3, err = Get[Bogus](context.Background(), conn, `SELECT * FROM bogus WHERE a = $1`, "a5") - assert.NoError(t, err) + require.NoError(t, err) if err != nil { return err } assert.EqualValues(t, &Bogus{A: "a5", B: 5, C: true}, res3) res4, err = Select[Bogus](context.Background(), conn, `SELECT * FROM bogus WHERE a != $1 ORDER BY b`, "bb") - assert.NoError(t, err) + require.NoError(t, err) if err != nil { return err } diff --git a/connectors/storage/v3/proxy.go b/connectors/storage/v3/proxy.go index c7eea5f..4bc9a0a 100644 --- a/connectors/storage/v3/proxy.go +++ b/connectors/storage/v3/proxy.go @@ -1348,6 +1348,535 @@ func (l *lb) ModuleLoadex(ctx context.Context, conf *redis.ModuleLoadexConfig) * return l.instance().ModuleLoadex(ctx, conf) } +func (l *lb) BFAdd(ctx context.Context, key string, element any) *redis.BoolCmd { + return l.instance().BFAdd(ctx, key, element) +} + +func (l *lb) BFCard(ctx context.Context, key string) *redis.IntCmd { + return l.instance().BFCard(ctx, key) +} + +func (l *lb) BFExists(ctx context.Context, key string, element any) *redis.BoolCmd { + return l.instance().BFExists(ctx, key, element) +} + +func (l *lb) BFInfo(ctx context.Context, key string) *redis.BFInfoCmd { + return l.instance().BFInfo(ctx, key) +} + +func (l *lb) BFInfoArg(ctx context.Context, key, option string) *redis.BFInfoCmd { + return l.instance().BFInfoArg(ctx, key, option) +} + +func (l *lb) BFInfoCapacity(ctx context.Context, key string) *redis.BFInfoCmd { + return l.instance().BFInfoCapacity(ctx, key) +} + +func (l *lb) BFInfoSize(ctx context.Context, key string) *redis.BFInfoCmd { + return l.instance().BFInfoSize(ctx, key) +} + +func (l *lb) BFInfoFilters(ctx context.Context, key string) *redis.BFInfoCmd { + return l.instance().BFInfoFilters(ctx, key) +} + +func (l *lb) BFInfoItems(ctx context.Context, key string) *redis.BFInfoCmd { + return l.instance().BFInfoItems(ctx, key) +} + +func (l *lb) BFInfoExpansion(ctx context.Context, key string) *redis.BFInfoCmd { + return l.instance().BFInfoExpansion(ctx, key) +} + +func (l *lb) BFInsert(ctx context.Context, key string, options *redis.BFInsertOptions, elements ...any) *redis.BoolSliceCmd { + return l.instance().BFInsert(ctx, key, options, elements...) +} + +func (l *lb) BFMAdd(ctx context.Context, key string, elements ...any) *redis.BoolSliceCmd { + return l.instance().BFMAdd(ctx, key, elements...) +} + +func (l *lb) BFMExists(ctx context.Context, key string, elements ...any) *redis.BoolSliceCmd { + return l.instance().BFMExists(ctx, key, elements...) +} + +func (l *lb) BFReserve(ctx context.Context, key string, errorRate float64, capacity int64) *redis.StatusCmd { + return l.instance().BFReserve(ctx, key, errorRate, capacity) +} + +func (l *lb) BFReserveExpansion(ctx context.Context, key string, errorRate float64, capacity, expansion int64) *redis.StatusCmd { + return l.instance().BFReserveExpansion(ctx, key, errorRate, capacity, expansion) +} + +func (l *lb) BFReserveNonScaling(ctx context.Context, key string, errorRate float64, capacity int64) *redis.StatusCmd { + return l.instance().BFReserveNonScaling(ctx, key, errorRate, capacity) +} + +func (l *lb) BFReserveWithArgs(ctx context.Context, key string, options *redis.BFReserveOptions) *redis.StatusCmd { + return l.instance().BFReserveWithArgs(ctx, key, options) +} + +func (l *lb) BFScanDump(ctx context.Context, key string, iterator int64) *redis.ScanDumpCmd { + return l.instance().BFScanDump(ctx, key, iterator) +} + +func (l *lb) BFLoadChunk(ctx context.Context, key string, iterator int64, data any) *redis.StatusCmd { + return l.instance().BFLoadChunk(ctx, key, iterator, data) +} + +func (l *lb) CFAdd(ctx context.Context, key string, element any) *redis.BoolCmd { + return l.instance().CFAdd(ctx, key, element) +} + +func (l *lb) CFAddNX(ctx context.Context, key string, element any) *redis.BoolCmd { + return l.instance().CFAddNX(ctx, key, element) +} + +func (l *lb) CFCount(ctx context.Context, key string, element any) *redis.IntCmd { + return l.instance().CFCount(ctx, key, element) +} + +func (l *lb) CFDel(ctx context.Context, key string, element any) *redis.BoolCmd { + return l.instance().CFDel(ctx, key, element) +} + +func (l *lb) CFExists(ctx context.Context, key string, element any) *redis.BoolCmd { + return l.instance().CFExists(ctx, key, element) +} + +func (l *lb) CFInfo(ctx context.Context, key string) *redis.CFInfoCmd { + return l.instance().CFInfo(ctx, key) +} + +func (l *lb) CFInsert(ctx context.Context, key string, options *redis.CFInsertOptions, elements ...any) *redis.BoolSliceCmd { + return l.instance().CFInsert(ctx, key, options, elements...) +} + +func (l *lb) CFInsertNX(ctx context.Context, key string, options *redis.CFInsertOptions, elements ...any) *redis.IntSliceCmd { + return l.instance().CFInsertNX(ctx, key, options, elements...) +} + +func (l *lb) CFMExists(ctx context.Context, key string, elements ...any) *redis.BoolSliceCmd { + return l.instance().CFMExists(ctx, key, elements...) +} + +func (l *lb) CFReserve(ctx context.Context, key string, capacity int64) *redis.StatusCmd { + return l.instance().CFReserve(ctx, key, capacity) +} + +func (l *lb) CFReserveWithArgs(ctx context.Context, key string, options *redis.CFReserveOptions) *redis.StatusCmd { + return l.instance().CFReserveWithArgs(ctx, key, options) +} + +func (l *lb) CFReserveExpansion(ctx context.Context, key string, capacity, expansion int64) *redis.StatusCmd { + return l.instance().CFReserveExpansion(ctx, key, capacity, expansion) +} + +func (l *lb) CFReserveBucketSize(ctx context.Context, key string, capacity, bucketsize int64) *redis.StatusCmd { + return l.instance().CFReserveBucketSize(ctx, key, capacity, bucketsize) +} + +func (l *lb) CFReserveMaxIterations(ctx context.Context, key string, capacity, maxiterations int64) *redis.StatusCmd { + return l.instance().CFReserveMaxIterations(ctx, key, capacity, maxiterations) +} + +func (l *lb) CFScanDump(ctx context.Context, key string, iterator int64) *redis.ScanDumpCmd { + return l.instance().CFScanDump(ctx, key, iterator) +} + +func (l *lb) CFLoadChunk(ctx context.Context, key string, iterator int64, data any) *redis.StatusCmd { + return l.instance().CFLoadChunk(ctx, key, iterator, data) +} + +func (l *lb) CMSIncrBy(ctx context.Context, key string, elements ...any) *redis.IntSliceCmd { + return l.instance().CMSIncrBy(ctx, key, elements...) +} + +func (l *lb) CMSInfo(ctx context.Context, key string) *redis.CMSInfoCmd { + return l.instance().CMSInfo(ctx, key) +} + +func (l *lb) CMSInitByDim(ctx context.Context, key string, width, height int64) *redis.StatusCmd { + return l.instance().CMSInitByDim(ctx, key, width, height) +} + +func (l *lb) CMSInitByProb(ctx context.Context, key string, errorRate, probability float64) *redis.StatusCmd { + return l.instance().CMSInitByProb(ctx, key, errorRate, probability) +} + +func (l *lb) CMSMerge(ctx context.Context, destKey string, sourceKeys ...string) *redis.StatusCmd { + return l.instance().CMSMerge(ctx, destKey, sourceKeys...) +} + +func (l *lb) CMSMergeWithWeight(ctx context.Context, destKey string, sourceKeys map[string]int64) *redis.StatusCmd { + return l.instance().CMSMergeWithWeight(ctx, destKey, sourceKeys) +} + +func (l *lb) CMSQuery(ctx context.Context, key string, elements ...any) *redis.IntSliceCmd { + return l.instance().CMSQuery(ctx, key, elements...) +} + +func (l *lb) TopKAdd(ctx context.Context, key string, elements ...any) *redis.StringSliceCmd { + return l.instance().TopKAdd(ctx, key, elements...) +} + +func (l *lb) TopKCount(ctx context.Context, key string, elements ...any) *redis.IntSliceCmd { + return l.instance().TopKCount(ctx, key, elements...) +} + +func (l *lb) TopKIncrBy(ctx context.Context, key string, elements ...any) *redis.StringSliceCmd { + return l.instance().TopKIncrBy(ctx, key, elements...) +} + +func (l *lb) TopKInfo(ctx context.Context, key string) *redis.TopKInfoCmd { + return l.instance().TopKInfo(ctx, key) +} + +func (l *lb) TopKList(ctx context.Context, key string) *redis.StringSliceCmd { + return l.instance().TopKList(ctx, key) +} + +func (l *lb) TopKListWithCount(ctx context.Context, key string) *redis.MapStringIntCmd { + return l.instance().TopKListWithCount(ctx, key) +} + +func (l *lb) TopKQuery(ctx context.Context, key string, elements ...any) *redis.BoolSliceCmd { + return l.instance().TopKQuery(ctx, key, elements...) +} + +func (l *lb) TopKReserve(ctx context.Context, key string, k int64) *redis.StatusCmd { + return l.instance().TopKReserve(ctx, key, k) +} + +//nolint:revive // API. +func (l *lb) TopKReserveWithOptions(ctx context.Context, key string, k, width, depth int64, decay float64) *redis.StatusCmd { + return l.instance().TopKReserveWithOptions(ctx, key, k, width, depth, decay) +} + +func (l *lb) TDigestAdd(ctx context.Context, key string, elements ...float64) *redis.StatusCmd { + return l.instance().TDigestAdd(ctx, key, elements...) +} + +func (l *lb) TDigestByRank(ctx context.Context, key string, rank ...uint64) *redis.FloatSliceCmd { + return l.instance().TDigestByRank(ctx, key, rank...) +} + +func (l *lb) TDigestByRevRank(ctx context.Context, key string, rank ...uint64) *redis.FloatSliceCmd { + return l.instance().TDigestByRevRank(ctx, key, rank...) +} + +func (l *lb) TDigestCDF(ctx context.Context, key string, elements ...float64) *redis.FloatSliceCmd { + return l.instance().TDigestCDF(ctx, key, elements...) +} + +func (l *lb) TDigestCreate(ctx context.Context, key string) *redis.StatusCmd { + return l.instance().TDigestCreate(ctx, key) +} + +func (l *lb) TDigestCreateWithCompression(ctx context.Context, key string, compression int64) *redis.StatusCmd { + return l.instance().TDigestCreateWithCompression(ctx, key, compression) +} + +func (l *lb) TDigestInfo(ctx context.Context, key string) *redis.TDigestInfoCmd { + return l.instance().TDigestInfo(ctx, key) +} + +func (l *lb) TDigestMax(ctx context.Context, key string) *redis.FloatCmd { + return l.instance().TDigestMax(ctx, key) +} + +func (l *lb) TDigestMin(ctx context.Context, key string) *redis.FloatCmd { + return l.instance().TDigestMin(ctx, key) +} + +func (l *lb) TDigestMerge(ctx context.Context, destKey string, options *redis.TDigestMergeOptions, sourceKeys ...string) *redis.StatusCmd { + return l.instance().TDigestMerge(ctx, destKey, options, sourceKeys...) +} + +func (l *lb) TDigestQuantile(ctx context.Context, key string, elements ...float64) *redis.FloatSliceCmd { + return l.instance().TDigestQuantile(ctx, key, elements...) +} + +func (l *lb) TDigestRank(ctx context.Context, key string, values ...float64) *redis.IntSliceCmd { + return l.instance().TDigestRank(ctx, key, values...) +} + +func (l *lb) TDigestReset(ctx context.Context, key string) *redis.StatusCmd { + return l.instance().TDigestReset(ctx, key) +} + +func (l *lb) TDigestRevRank(ctx context.Context, key string, values ...float64) *redis.IntSliceCmd { + return l.instance().TDigestRevRank(ctx, key, values...) +} + +func (l *lb) TDigestTrimmedMean(ctx context.Context, key string, lowCutQuantile, highCutQuantile float64) *redis.FloatCmd { + return l.instance().TDigestTrimmedMean(ctx, key, lowCutQuantile, highCutQuantile) +} + +func (l *lb) JSONArrAppend(ctx context.Context, key, path string, values ...any) *redis.IntSliceCmd { + return l.instance().JSONArrAppend(ctx, key, path, values...) +} + +func (l *lb) JSONArrIndex(ctx context.Context, key, path string, values ...any) *redis.IntSliceCmd { + return l.instance().JSONArrIndex(ctx, key, path, values...) +} + +func (l *lb) JSONArrInsert(ctx context.Context, key, path string, index int64, values ...any) *redis.IntSliceCmd { + return l.instance().JSONArrInsert(ctx, key, path, index, values...) +} + +func (l *lb) JSONArrLen(ctx context.Context, key, path string) *redis.IntSliceCmd { + return l.instance().JSONArrLen(ctx, key, path) +} + +func (l *lb) JSONGet(ctx context.Context, key string, paths ...string) *redis.JSONCmd { + return l.instance().JSONGet(ctx, key, paths...) +} + +func (l *lb) JSONSet(ctx context.Context, key, path string, value any) *redis.StatusCmd { + return l.instance().JSONSet(ctx, key, path, value) +} + +func (l *lb) JSONDel(ctx context.Context, key, path string) *redis.IntCmd { + return l.instance().JSONDel(ctx, key, path) +} + +func (l *lb) JSONMGet(ctx context.Context, path string, keys ...string) *redis.JSONSliceCmd { + return l.instance().JSONMGet(ctx, path, keys...) +} + +func (l *lb) JSONMSet(ctx context.Context, values ...any) *redis.StatusCmd { + return l.instance().JSONMSet(ctx, values...) +} + +func (l *lb) JSONArrIndexWithArgs(ctx context.Context, key, path string, options *redis.JSONArrIndexArgs, value ...any) *redis.IntSliceCmd { + return l.instance().JSONArrIndexWithArgs(ctx, key, path, options, value...) +} + +func (l *lb) JSONArrPop(ctx context.Context, key, path string, index int) *redis.StringSliceCmd { + return l.instance().JSONArrPop(ctx, key, path, index) +} + +func (l *lb) JSONArrTrim(ctx context.Context, key, path string) *redis.IntSliceCmd { + return l.instance().JSONArrTrim(ctx, key, path) +} + +func (l *lb) JSONArrTrimWithArgs(ctx context.Context, key, path string, options *redis.JSONArrTrimArgs) *redis.IntSliceCmd { + return l.instance().JSONArrTrimWithArgs(ctx, key, path, options) +} + +func (l *lb) JSONClear(ctx context.Context, key, path string) *redis.IntCmd { + return l.instance().JSONClear(ctx, key, path) +} + +func (l *lb) JSONDebugMemory(ctx context.Context, key, path string) *redis.IntCmd { + return l.instance().JSONDebugMemory(ctx, key, path) +} + +func (l *lb) JSONForget(ctx context.Context, key, path string) *redis.IntCmd { + return l.instance().JSONForget(ctx, key, path) +} + +func (l *lb) JSONGetWithArgs(ctx context.Context, key string, options *redis.JSONGetArgs, paths ...string) *redis.JSONCmd { + return l.instance().JSONGetWithArgs(ctx, key, options, paths...) +} + +func (l *lb) JSONMerge(ctx context.Context, key, path, value string) *redis.StatusCmd { + return l.instance().JSONMerge(ctx, key, path, value) +} + +func (l *lb) JSONMSetArgs(ctx context.Context, docs []redis.JSONSetArgs) *redis.StatusCmd { + return l.instance().JSONMSetArgs(ctx, docs) +} + +func (l *lb) JSONNumIncrBy(ctx context.Context, key, path string, value float64) *redis.JSONCmd { + return l.instance().JSONNumIncrBy(ctx, key, path, value) +} + +func (l *lb) JSONObjKeys(ctx context.Context, key, path string) *redis.SliceCmd { + return l.instance().JSONObjKeys(ctx, key, path) +} + +func (l *lb) JSONObjLen(ctx context.Context, key, path string) *redis.IntPointerSliceCmd { + return l.instance().JSONObjLen(ctx, key, path) +} + +func (l *lb) JSONSetMode(ctx context.Context, key, path string, value any, mode string) *redis.StatusCmd { + return l.instance().JSONSetMode(ctx, key, path, value, mode) +} + +func (l *lb) JSONStrAppend(ctx context.Context, key, path, value string) *redis.IntPointerSliceCmd { + return l.instance().JSONStrAppend(ctx, key, path, value) +} + +func (l *lb) JSONStrLen(ctx context.Context, key, path string) *redis.IntPointerSliceCmd { + return l.instance().JSONStrLen(ctx, key, path) +} + +func (l *lb) JSONToggle(ctx context.Context, key, path string) *redis.IntPointerSliceCmd { + return l.instance().JSONToggle(ctx, key, path) +} + +func (l *lb) JSONType(ctx context.Context, key, path string) *redis.JSONSliceCmd { + return l.instance().JSONType(ctx, key, path) +} + +func (l *lb) TFunctionLoad(ctx context.Context, lib string) *redis.StatusCmd { + return l.instance().TFunctionLoad(ctx, lib) +} + +func (l *lb) TFunctionLoadArgs(ctx context.Context, lib string, options *redis.TFunctionLoadOptions) *redis.StatusCmd { + return l.instance().TFunctionLoadArgs(ctx, lib, options) +} + +func (l *lb) TFunctionDelete(ctx context.Context, libName string) *redis.StatusCmd { + return l.instance().TFunctionDelete(ctx, libName) +} + +func (l *lb) TFunctionList(ctx context.Context) *redis.MapStringInterfaceSliceCmd { + return l.instance().TFunctionList(ctx) +} + +func (l *lb) TFunctionListArgs(ctx context.Context, options *redis.TFunctionListOptions) *redis.MapStringInterfaceSliceCmd { + return l.instance().TFunctionListArgs(ctx, options) +} + +func (l *lb) TFCall(ctx context.Context, libName, funcName string, numKeys int) *redis.Cmd { + return l.instance().TFCall(ctx, libName, funcName, numKeys) +} + +func (l *lb) TFCallArgs(ctx context.Context, libName, funcName string, numKeys int, options *redis.TFCallOptions) *redis.Cmd { + return l.instance().TFCallArgs(ctx, libName, funcName, numKeys, options) +} + +func (l *lb) TFCallASYNC(ctx context.Context, libName, funcName string, numKeys int) *redis.Cmd { + return l.instance().TFCallASYNC(ctx, libName, funcName, numKeys) +} + +func (l *lb) TFCallASYNCArgs(ctx context.Context, libName, funcName string, numKeys int, options *redis.TFCallOptions) *redis.Cmd { + return l.instance().TFCallASYNCArgs(ctx, libName, funcName, numKeys, options) +} + +func (l *lb) TSAdd(ctx context.Context, key string, timestamp any, value float64) *redis.IntCmd { + return l.instance().TSAdd(ctx, key, timestamp, value) +} + +func (l *lb) TSAddWithArgs(ctx context.Context, key string, timestamp any, value float64, options *redis.TSOptions) *redis.IntCmd { + return l.instance().TSAddWithArgs(ctx, key, timestamp, value, options) +} + +func (l *lb) TSCreate(ctx context.Context, key string) *redis.StatusCmd { + return l.instance().TSCreate(ctx, key) +} + +func (l *lb) TSCreateWithArgs(ctx context.Context, key string, options *redis.TSOptions) *redis.StatusCmd { + return l.instance().TSCreateWithArgs(ctx, key, options) +} + +func (l *lb) TSAlter(ctx context.Context, key string, options *redis.TSAlterOptions) *redis.StatusCmd { + return l.instance().TSAlter(ctx, key, options) +} + +func (l *lb) TSCreateRule(ctx context.Context, sourceKey, destKey string, aggregator redis.Aggregator, bucketDuration int) *redis.StatusCmd { + return l.instance().TSCreateRule(ctx, sourceKey, destKey, aggregator, bucketDuration) +} + +//nolint:lll,revive // API. +func (l *lb) TSCreateRuleWithArgs(ctx context.Context, sourceKey, destKey string, aggregator redis.Aggregator, bucketDuration int, options *redis.TSCreateRuleOptions) *redis.StatusCmd { + return l.instance().TSCreateRuleWithArgs(ctx, sourceKey, destKey, aggregator, bucketDuration, options) +} + +func (l *lb) TSIncrBy(ctx context.Context, key string, timestamp float64) *redis.IntCmd { + return l.instance().TSIncrBy(ctx, key, timestamp) +} + +func (l *lb) TSIncrByWithArgs(ctx context.Context, key string, timestamp float64, options *redis.TSIncrDecrOptions) *redis.IntCmd { + return l.instance().TSIncrByWithArgs(ctx, key, timestamp, options) +} + +func (l *lb) TSDecrBy(ctx context.Context, key string, timestamp float64) *redis.IntCmd { + return l.instance().TSDecrBy(ctx, key, timestamp) +} + +func (l *lb) TSDecrByWithArgs(ctx context.Context, key string, timestamp float64, options *redis.TSIncrDecrOptions) *redis.IntCmd { + return l.instance().TSDecrByWithArgs(ctx, key, timestamp, options) +} + +func (l *lb) TSDel(ctx context.Context, key string, fromTimestamp, toTimestamp int) *redis.IntCmd { + return l.instance().TSDel(ctx, key, fromTimestamp, toTimestamp) +} + +func (l *lb) TSDeleteRule(ctx context.Context, sourceKey, destKey string) *redis.StatusCmd { + return l.instance().TSDeleteRule(ctx, sourceKey, destKey) +} + +func (l *lb) TSGet(ctx context.Context, key string) *redis.TSTimestampValueCmd { + return l.instance().TSGet(ctx, key) +} + +func (l *lb) TSGetWithArgs(ctx context.Context, key string, options *redis.TSGetOptions) *redis.TSTimestampValueCmd { + return l.instance().TSGetWithArgs(ctx, key, options) +} + +func (l *lb) TSInfo(ctx context.Context, key string) *redis.MapStringInterfaceCmd { + return l.instance().TSInfo(ctx, key) +} + +func (l *lb) TSInfoWithArgs(ctx context.Context, key string, options *redis.TSInfoOptions) *redis.MapStringInterfaceCmd { + return l.instance().TSInfoWithArgs(ctx, key, options) +} + +func (l *lb) TSMAdd(ctx context.Context, ktvSlices [][]any) *redis.IntSliceCmd { + return l.instance().TSMAdd(ctx, ktvSlices) +} + +func (l *lb) TSQueryIndex(ctx context.Context, filterExpr []string) *redis.StringSliceCmd { + return l.instance().TSQueryIndex(ctx, filterExpr) +} + +func (l *lb) TSRevRange(ctx context.Context, key string, fromTimestamp, toTimestamp int) *redis.TSTimestampValueSliceCmd { + return l.instance().TSRevRange(ctx, key, fromTimestamp, toTimestamp) +} + +//nolint:lll // . +func (l *lb) TSRevRangeWithArgs(ctx context.Context, key string, fromTimestamp, toTimestamp int, options *redis.TSRevRangeOptions) *redis.TSTimestampValueSliceCmd { + return l.instance().TSRevRangeWithArgs(ctx, key, fromTimestamp, toTimestamp, options) +} + +func (l *lb) TSRange(ctx context.Context, key string, fromTimestamp, toTimestamp int) *redis.TSTimestampValueSliceCmd { + return l.instance().TSRange(ctx, key, fromTimestamp, toTimestamp) +} + +func (l *lb) TSRangeWithArgs(ctx context.Context, key string, fromTimestamp, toTimestamp int, options *redis.TSRangeOptions) *redis.TSTimestampValueSliceCmd { + return l.instance().TSRangeWithArgs(ctx, key, fromTimestamp, toTimestamp, options) +} + +func (l *lb) TSMRange(ctx context.Context, fromTimestamp, toTimestamp int, filterExpr []string) *redis.MapStringSliceInterfaceCmd { + return l.instance().TSMRange(ctx, fromTimestamp, toTimestamp, filterExpr) +} + +//nolint:lll // . +func (l *lb) TSMRangeWithArgs(ctx context.Context, fromTimestamp, toTimestamp int, filterExpr []string, options *redis.TSMRangeOptions) *redis.MapStringSliceInterfaceCmd { + return l.instance().TSMRangeWithArgs(ctx, fromTimestamp, toTimestamp, filterExpr, options) +} + +func (l *lb) TSMRevRange(ctx context.Context, fromTimestamp, toTimestamp int, filterExpr []string) *redis.MapStringSliceInterfaceCmd { + return l.instance().TSMRevRange(ctx, fromTimestamp, toTimestamp, filterExpr) +} + +//nolint:lll // . +func (l *lb) TSMRevRangeWithArgs(ctx context.Context, fromTimestamp, toTimestamp int, filterExpr []string, options *redis.TSMRevRangeOptions) *redis.MapStringSliceInterfaceCmd { + return l.instance().TSMRevRangeWithArgs(ctx, fromTimestamp, toTimestamp, filterExpr, options) +} + +func (l *lb) TSMGet(ctx context.Context, filters []string) *redis.MapStringSliceInterfaceCmd { + return l.instance().TSMGet(ctx, filters) +} + +func (l *lb) TSMGetWithArgs(ctx context.Context, filters []string, options *redis.TSMGetOptions) *redis.MapStringSliceInterfaceCmd { + return l.instance().TSMGetWithArgs(ctx, filters, options) +} + func (l *lb) Close() error { wg := new(sync.WaitGroup) wg.Add(len(l.instances)) diff --git a/connectors/storage/v3/storage.go b/connectors/storage/v3/storage.go index fcef2bd..9380822 100644 --- a/connectors/storage/v3/storage.go +++ b/connectors/storage/v3/storage.go @@ -7,6 +7,7 @@ import ( "encoding" "fmt" "runtime" + "strconv" "strings" "sync" stdlibtime "time" @@ -16,14 +17,14 @@ import ( "github.com/pkg/errors" "github.com/redis/go-redis/v9" - appCfg "github.com/ice-blockchain/wintr/config" + appcfg "github.com/ice-blockchain/wintr/config" "github.com/ice-blockchain/wintr/log" ) //nolint:gomnd,gocognit,gocyclo,revive,cyclop // Configs. func MustConnect(ctx context.Context, applicationYAMLKey string, overriddenPoolSize ...int) DB { //nolint:funlen // . var cfg config - appCfg.MustLoadFromKey(applicationYAMLKey, &cfg) + appcfg.MustLoadFromKey(applicationYAMLKey, &cfg) if cfg.WintrStorage.ConnectionsPerCore == 0 { cfg.WintrStorage.ConnectionsPerCore = 10 } @@ -145,7 +146,7 @@ func Get[T any](ctx context.Context, db DB, keys ...string) ([]*T, error) { //no } } if anyNonNil { - if intf, ok := resp.(interface{ SetKey(string) }); ok { + if intf, ok := resp.(interface{ SetKey(key string) }); ok { intf.SetKey(sliceResult.Args()[1].(string)) //nolint:forcetypeassert // We know for sure. } @@ -168,7 +169,7 @@ func Get[T any](ctx context.Context, db DB, keys ...string) ([]*T, error) { //no } else { //nolint:revive // Nope. results := make([]*T, 0, len(cmdResults)) for _, cmdResult := range cmdResults { - sliceResult := cmdResult.(*redis.SliceCmd) //nolint:errcheck,forcetypeassert // Scan checks it. + sliceResult := cmdResult.(*redis.SliceCmd) //nolint:errcheck,forcetypeassert,revive // Scan checks it. var resp any = new(T) if sErr := DeserializeValue(resp, sliceResult.Scan); sErr != nil { return nil, sErr @@ -182,7 +183,7 @@ func Get[T any](ctx context.Context, db DB, keys ...string) ([]*T, error) { //no } } if anyNonNil { - if intf, ok := resp.(interface{ SetKey(string) }); ok { + if intf, ok := resp.(interface{ SetKey(key string) }); ok { intf.SetKey(sliceResult.Args()[1].(string)) //nolint:forcetypeassert // We know for sure. } results = append(results, resp.(*T)) //nolint:forcetypeassert // We know for sure. @@ -208,7 +209,7 @@ func Bind[TT any](ctx context.Context, db DB, keys []string, results *[]*TT) err } else { //nolint:revive // Nope. res := *results for _, cmdResult := range cmdResults { - sliceResult := cmdResult.(*redis.SliceCmd) //nolint:errcheck,forcetypeassert // Scan checks it. + sliceResult := cmdResult.(*redis.SliceCmd) //nolint:errcheck,forcetypeassert,revive // Scan checks it. var resp any = new(TT) if sErr := DeserializeValue(resp, sliceResult.Scan); sErr != nil { return sErr @@ -222,7 +223,7 @@ func Bind[TT any](ctx context.Context, db DB, keys []string, results *[]*TT) err } } if anyNonNil { - if intf, ok := resp.(interface{ SetKey(string) }); ok { + if intf, ok := resp.(interface{ SetKey(key string) }); ok { intf.SetKey(sliceResult.Args()[1].(string)) //nolint:forcetypeassert // We know for sure. } res = append(res, resp.(*TT)) //nolint:forcetypeassert // We know for sure. @@ -246,7 +247,7 @@ func processRedisFieldTags[TT any]() []string { val := new(TT) fieldNames, _ = typeCache.LoadOrStore(*val, collectFields(reflect.TypeOf(val).Elem())) } - fields := fieldNames.([]string) //nolint:forcetypeassert,errcheck // We know for sure. + fields := fieldNames.([]string) //nolint:forcetypeassert,errcheck,revive // We know for sure. if len(fields) == 0 { log.Panic(fmt.Sprintf("%#v has no redis tags", new(TT))) } @@ -356,7 +357,7 @@ func serializeStructFields(value reflect.Value) (resp []any) { //nolint:funlen,g log.Panic(err) resp = append(resp, name, string(data)) case stdlibtime.Duration: - resp = append(resp, name, fmt.Sprint(typedVal.Nanoseconds())) + resp = append(resp, name, strconv.FormatInt(typedVal.Nanoseconds(), 10)) case string: resp = append(resp, name, typedVal) default: diff --git a/connectors/storage/v3/storage_test.go b/connectors/storage/v3/storage_test.go index 951b45c..1408b6a 100644 --- a/connectors/storage/v3/storage_test.go +++ b/connectors/storage/v3/storage_test.go @@ -40,11 +40,11 @@ func TestStorage(t *testing.T) { t.Parallel() db := MustConnect(context.Background(), "self") result, err := db.Ping(context.Background()).Result() - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "PONG", result) assert.True(t, db.IsRW(context.Background())) result, eerr := db.FlushAll(context.Background()).Result() - assert.NoError(t, eerr) + require.NoError(t, eerr) assert.Equal(t, "OK", result) res, err := db.Del(context.Background(), "x1", "x2", "x3", "x4", "x5", "x6").Result() require.NoError(t, err) @@ -118,7 +118,7 @@ func BenchmarkDeserializeValue(b *testing.B) { XXX } scans := 0 - if err := DeserializeValue(&xxx, func(val any) error { + if err := DeserializeValue(&xxx, func(_ any) error { scans++ return nil diff --git a/email/contract.go b/email/contract.go index afa9ba2..7b31d36 100644 --- a/email/contract.go +++ b/email/contract.go @@ -45,7 +45,7 @@ type ( } Client interface { - Send(context.Context, *Parcel, ...Participant) error + Send(ctx context.Context, parcel *Parcel, participants ...Participant) error } ) diff --git a/email/email.go b/email/email.go index 2b54889..64a13d9 100644 --- a/email/email.go +++ b/email/email.go @@ -4,7 +4,6 @@ package email import ( "context" - "fmt" "net/http" "os" "strings" @@ -16,7 +15,7 @@ import ( "github.com/sendgrid/sendgrid-go" "github.com/sendgrid/sendgrid-go/helpers/mail" - appCfg "github.com/ice-blockchain/wintr/config" + appcfg "github.com/ice-blockchain/wintr/config" "github.com/ice-blockchain/wintr/log" ) @@ -27,11 +26,11 @@ func init() { //nolint:gochecknoinits // It's the only way to tweak the client. } func New(applicationYAMLKey string) Client { - appCfg.MustLoadFromKey(applicationYAMLKey, &cfg) + appcfg.MustLoadFromKey(applicationYAMLKey, &cfg) if cfg.WintrEmail.Credentials.APIKey == "" { module := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(applicationYAMLKey, "-", "_"), "/", "_")) - cfg.WintrEmail.Credentials.APIKey = os.Getenv(fmt.Sprintf("%s_EMAIL_CLIENT_APIKEY", module)) + cfg.WintrEmail.Credentials.APIKey = os.Getenv(module + "_EMAIL_CLIENT_APIKEY") if cfg.WintrEmail.Credentials.APIKey == "" { cfg.WintrEmail.Credentials.APIKey = os.Getenv("EMAIL_CLIENT_APIKEY") } diff --git a/email/email_test.go b/email/email_test.go index 8f3fa4f..d25cbed 100644 --- a/email/email_test.go +++ b/email/email_test.go @@ -10,6 +10,7 @@ import ( "testing" stdlibtime "time" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/ice-blockchain/wintr/email/fixture" @@ -102,5 +103,5 @@ func requireSend(t *testing.T, wg *sync.WaitGroup) { Email: fmt.Sprintf("foo%v@baz", i), }) } - require.NoError(t, client.Send(ctx, p1, destinations...)) + assert.NoError(t, client.Send(ctx, p1, destinations...)) } diff --git a/go.mod b/go.mod index 0b356ba..24c1073 100644 --- a/go.mod +++ b/go.mod @@ -1,158 +1,167 @@ module github.com/ice-blockchain/wintr -go 1.21 +go 1.22 require ( - cosmossdk.io/math v1.0.1 + cosmossdk.io/math v1.2.0 dario.cat/mergo v1.0.0 - firebase.google.com/go/v4 v4.12.0 + firebase.google.com/go/v4 v4.13.0 github.com/GetStream/stream-go2/v7 v7.1.0 github.com/cenkalti/backoff/v4 v4.2.1 - github.com/docker/go-connections v0.4.0 + github.com/docker/go-connections v0.5.0 github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 - github.com/georgysavva/scany/v2 v2.0.0 + github.com/georgysavva/scany/v2 v2.1.0 github.com/gin-gonic/gin v1.9.1 github.com/goccy/go-json v0.10.2 github.com/goccy/go-reflect v1.2.0 - github.com/golang-jwt/jwt/v5 v5.0.0 - github.com/google/uuid v1.3.0 + github.com/golang-jwt/jwt/v5 v5.2.0 + github.com/google/uuid v1.6.0 github.com/hashicorp/go-multierror v1.1.1 github.com/ice-blockchain/go-tarantool-client v0.0.0-20230327200757-4fc71fa3f7bb - github.com/imroc/req/v3 v3.41.4 - github.com/jackc/pgx/v5 v5.4.3 + github.com/imroc/req/v3 v3.42.3 + github.com/jackc/pgx/v5 v5.5.3 github.com/joho/godotenv v1.5.1 github.com/pkg/errors v0.9.1 - github.com/redis/go-redis/v9 v9.0.5 - github.com/rs/zerolog v1.30.0 + github.com/redis/go-redis/v9 v9.4.0 + github.com/rs/zerolog v1.32.0 github.com/sendgrid/rest v2.6.9+incompatible - github.com/sendgrid/sendgrid-go v3.13.0+incompatible - github.com/spf13/viper v1.16.0 + github.com/sendgrid/sendgrid-go v3.14.0+incompatible + github.com/spf13/viper v1.18.2 github.com/stretchr/testify v1.8.4 github.com/swaggo/files v1.0.1 github.com/swaggo/gin-swagger v1.6.0 github.com/testcontainers/testcontainers-go v0.22.0 - github.com/twilio/twilio-go v1.11.0 - github.com/twmb/franz-go v1.14.3 - github.com/twmb/franz-go/pkg/kadm v1.9.0 - github.com/vmihailenco/msgpack/v5 v5.3.5 - golang.org/x/net v0.14.0 - google.golang.org/api v0.137.0 + github.com/twilio/twilio-go v1.18.0 + github.com/twmb/franz-go v1.16.1 + github.com/twmb/franz-go/pkg/kadm v1.11.0 + github.com/vmihailenco/msgpack/v5 v5.4.1 + golang.org/x/net v0.21.0 + google.golang.org/api v0.164.0 ) require ( - cloud.google.com/go v0.110.7 // indirect - cloud.google.com/go/compute v1.23.0 // indirect + cloud.google.com/go v0.112.0 // indirect + cloud.google.com/go/compute v1.24.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/firestore v1.12.0 // indirect - cloud.google.com/go/iam v1.1.2 // indirect - cloud.google.com/go/longrunning v0.5.1 // indirect - cloud.google.com/go/storage v1.32.0 // indirect + cloud.google.com/go/firestore v1.14.0 // indirect + cloud.google.com/go/iam v1.1.6 // indirect + cloud.google.com/go/longrunning v0.5.5 // indirect + cloud.google.com/go/storage v1.38.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect github.com/KyleBanks/depth v1.2.1 // indirect github.com/MicahParks/keyfunc v1.9.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect - github.com/Microsoft/hcsshim v0.10.0 // indirect - github.com/andybalholm/brotli v1.0.5 // indirect - github.com/bytedance/sonic v1.10.0 // indirect + github.com/Microsoft/hcsshim v0.11.4 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect + github.com/bytedance/sonic v1.10.2 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect - github.com/chenzhuoyu/iasm v0.9.0 // indirect - github.com/containerd/cgroups/v3 v3.0.2 // indirect + github.com/chenzhuoyu/iasm v0.9.1 // indirect + github.com/cloudflare/circl v1.3.7 // indirect + github.com/containerd/cgroups v1.1.0 // indirect github.com/containerd/containerd v1.7.3 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect - github.com/docker/distribution v2.8.2+incompatible // indirect + github.com/distribution/reference v0.5.0 // indirect + github.com/docker/distribution v2.8.3+incompatible // indirect github.com/docker/docker v24.0.5+incompatible // indirect github.com/docker/go-units v0.5.0 // indirect github.com/ericlagergren/polyval v0.0.0-20230805202542-18692a1b76f9 // indirect github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect github.com/fatih/structs v1.1.0 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/gabriel-vasile/mimetype v1.4.2 // indirect - github.com/gaukas/godicttls v0.0.4 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gin-contrib/sse v0.1.0 // indirect - github.com/go-openapi/jsonpointer v0.20.0 // indirect - github.com/go-openapi/jsonreference v0.20.2 // indirect - github.com/go-openapi/spec v0.20.9 // indirect - github.com/go-openapi/swag v0.22.4 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-openapi/jsonpointer v0.20.2 // indirect + github.com/go-openapi/jsonreference v0.20.4 // indirect + github.com/go-openapi/spec v0.20.14 // indirect + github.com/go-openapi/swag v0.22.9 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.15.0 // indirect + github.com/go-playground/validator/v10 v10.18.0 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.5.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/go-cmp v0.5.9 // indirect - github.com/google/pprof v0.0.0-20230816055901-76846d4d6a3b // indirect - github.com/google/s2a-go v0.1.5 // indirect + github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5 // indirect + github.com/google/s2a-go v0.1.7 // indirect github.com/google/tink/go v1.7.0 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect - github.com/googleapis/gax-go/v2 v2.12.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect + github.com/googleapis/gax-go/v2 v2.12.1 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect + github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect github.com/jackc/puddle/v2 v2.2.1 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.16.7 // indirect - github.com/klauspost/cpuid/v2 v2.2.5 // indirect - github.com/leodido/go-urn v1.2.4 // indirect + github.com/klauspost/compress v1.17.6 // indirect + github.com/klauspost/cpuid/v2 v2.2.6 // indirect + github.com/leodido/go-urn v1.4.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/moby/sys/mount v0.3.3 // indirect - github.com/moby/sys/mountinfo v0.6.2 // indirect + github.com/moby/sys/mountinfo v0.7.1 // indirect github.com/moby/term v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/morikuni/aec v1.0.0 // indirect - github.com/onsi/ginkgo/v2 v2.11.0 // indirect + github.com/onsi/ginkgo/v2 v2.15.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/image-spec v1.1.0-rc4 // indirect - github.com/opencontainers/runc v1.1.9 // indirect - github.com/pelletier/go-toml/v2 v2.0.9 // indirect - github.com/pierrec/lz4/v4 v4.1.18 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/opencontainers/image-spec v1.1.0-rc6 // indirect + github.com/opencontainers/runc v1.1.12 // indirect + github.com/pelletier/go-toml/v2 v2.1.1 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/quic-go/qpack v0.4.0 // indirect - github.com/quic-go/qtls-go1-20 v0.3.2 // indirect - github.com/quic-go/quic-go v0.37.4 // indirect - github.com/refraction-networking/utls v1.4.3 // indirect - github.com/rogpeppe/go-internal v1.10.0 // indirect + github.com/quic-go/quic-go v0.41.0 // indirect + github.com/refraction-networking/utls v1.6.2 // indirect + github.com/sagikazarmark/locafero v0.4.0 // indirect + github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect - github.com/spf13/afero v1.9.5 // indirect - github.com/spf13/cast v1.5.1 // indirect - github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/sourcegraph/conc v0.3.0 // indirect + github.com/spf13/afero v1.11.0 // indirect + github.com/spf13/cast v1.6.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.6.0 // indirect - github.com/swaggo/swag v1.16.1 // indirect + github.com/swaggo/swag v1.16.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect - github.com/twmb/franz-go/pkg/kmsg v1.6.1 // indirect - github.com/ugorji/go/codec v1.2.11 // indirect + github.com/twmb/franz-go/pkg/kmsg v1.7.0 // indirect + github.com/ugorji/go/codec v1.2.12 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect go.opencensus.io v0.24.0 // indirect - golang.org/x/arch v0.4.0 // indirect - golang.org/x/crypto v0.12.0 // indirect - golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb // indirect - golang.org/x/mod v0.12.0 // indirect - golang.org/x/oauth2 v0.11.0 // indirect - golang.org/x/sync v0.3.0 // indirect - golang.org/x/sys v0.11.0 // indirect - golang.org/x/text v0.12.0 // indirect - golang.org/x/time v0.3.0 // indirect - golang.org/x/tools v0.12.0 // indirect - golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/appengine/v2 v2.0.4 // indirect - google.golang.org/genproto v0.0.0-20230815205213-6bfd019c3878 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20230815205213-6bfd019c3878 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 // indirect - google.golang.org/grpc v1.57.0 // indirect - google.golang.org/protobuf v1.31.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect + go.opentelemetry.io/otel v1.23.1 // indirect + go.opentelemetry.io/otel/metric v1.23.1 // indirect + go.opentelemetry.io/otel/trace v1.23.1 // indirect + go.uber.org/mock v0.4.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/arch v0.7.0 // indirect + golang.org/x/crypto v0.19.0 // indirect + golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect + golang.org/x/mod v0.15.0 // indirect + golang.org/x/oauth2 v0.17.0 // indirect + golang.org/x/sync v0.6.0 // indirect + golang.org/x/sys v0.17.0 // indirect + golang.org/x/text v0.14.0 // indirect + golang.org/x/time v0.5.0 // indirect + golang.org/x/tools v0.18.0 // indirect + google.golang.org/appengine v1.6.8 // indirect + google.golang.org/appengine/v2 v2.0.5 // indirect + google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect + google.golang.org/grpc v1.61.1 // indirect + google.golang.org/protobuf v1.32.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 8caa48a..11d3834 100644 --- a/go.sum +++ b/go.sum @@ -1,65 +1,27 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= -cloud.google.com/go v0.110.7 h1:rJyC7nWRg2jWGZ4wSJ5nY65GTdYJkg0cd/uXb+ACI6o= -cloud.google.com/go v0.110.7/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= -cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= +cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM= +cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4= +cloud.google.com/go/compute v1.24.0 h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg= +cloud.google.com/go/compute v1.24.0/go.mod h1:kw1/T+h/+tK2LJK0wiPPx1intgdAM3j/g3hFDlscY40= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.12.0 h1:aeEA/N7DW7+l2u5jtkO8I0qv0D95YwjggD8kUHrTHO4= -cloud.google.com/go/firestore v1.12.0/go.mod h1:b38dKhgzlmNNGTNZZwe7ZRFEuRab1Hay3/DBsIGKKy4= -cloud.google.com/go/iam v1.1.2 h1:gacbrBdWcoVmGLozRuStX45YKvJtzIjJdAolzUs1sm4= -cloud.google.com/go/iam v1.1.2/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= -cloud.google.com/go/longrunning v0.5.1 h1:Fr7TXftcqTudoyRJa113hyaqlGdiBQkp0Gq7tErFDWI= -cloud.google.com/go/longrunning v0.5.1/go.mod h1:spvimkwdz6SPWKEt/XBij79E9fiTkHSQl/fRUUQJYJc= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= -cloud.google.com/go/storage v1.32.0 h1:5w6DxEGOnktmJHarxAOUywxVW9lbNWIzlzzUltG/3+o= -cloud.google.com/go/storage v1.32.0/go.mod h1:Hhh/dogNRGca7IWv1RC2YqEn0c0G77ctA/OxflYkiD8= -cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg= -cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= +cloud.google.com/go/firestore v1.14.0 h1:8aLcKnMPoldYU3YHgu4t2exrKhLQkqaXAGqT0ljrFVw= +cloud.google.com/go/firestore v1.14.0/go.mod h1:96MVaHLsEhbvkBEdZgfN+AS/GIkco1LRpH9Xp9YZfzQ= +cloud.google.com/go/iam v1.1.6 h1:bEa06k05IO4f4uJonbB5iAgKTPpABy1ayxaIZV/GHVc= +cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWOGTwI= +cloud.google.com/go/longrunning v0.5.5 h1:GOE6pZFdSrTb4KAiKnXsJBtlE6mEyaW44oKyMILWnOg= +cloud.google.com/go/longrunning v0.5.5/go.mod h1:WV2LAxD8/rg5Z1cNW6FJ/ZpX4E4VnDnoTk0yawPBB7s= +cloud.google.com/go/storage v1.38.0 h1:Az68ZRGlnNTpIBbLjSMIV2BDcwwXYlRlQzis0llkpJg= +cloud.google.com/go/storage v1.38.0/go.mod h1:tlUADB0mAb9BgYls9lq+8MGkfzOXuLrnHXlpHmvFJoY= +cosmossdk.io/math v1.2.0 h1:8gudhTkkD3NxOP2YyyJIYYmt6dQ55ZfJkDOaxXpy7Ig= +cosmossdk.io/math v1.2.0/go.mod h1:l2Gnda87F0su8a/7FEKJfFdJrM0JZRXQaohlgJeyQh0= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -firebase.google.com/go/v4 v4.12.0 h1:I6dCkcWUMFNkFdWgzlf8SLWecQnKdFgJhMv5fT9l1qI= -firebase.google.com/go/v4 v4.12.0/go.mod h1:60c36dWLK4+j05Vw5XMllek3b3PCynU3BfI46OSwsUE= +firebase.google.com/go/v4 v4.13.0 h1:meFz9nvDNh/FDyrEykoAzSfComcQbmnQSjoHrePRqeI= +firebase.google.com/go/v4 v4.13.0/go.mod h1:e1/gaR6EnbQfsmTnAMx1hnz+ninJIrrr/RAh59Tpfn8= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/GetStream/stream-go2/v7 v7.1.0 h1:05o+xBJmVRZ/O1rEjK+enTzmH69RQuKZJkh5EbYDBmQ= github.com/GetStream/stream-go2/v7 v7.1.0/go.mod h1:U4y2mXYeWVAnQ8qDPPbePROInTS61QBUJcnMJIvMoIA= github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= @@ -68,75 +30,71 @@ github.com/MicahParks/keyfunc v1.9.0 h1:lhKd5xrFHLNOWrDc4Tyb/Q1AJ4LCzQ48GVJyVIID github.com/MicahParks/keyfunc v1.9.0/go.mod h1:IdnCilugA0O/99dW+/MkvlyrsX8+L8+x95xuVNtM5jw= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= -github.com/Microsoft/hcsshim v0.10.0 h1:PbvoxdUGgXxyirmN5Oncp3POLkxEG5LbWCEBfWmHTGA= -github.com/Microsoft/hcsshim v0.10.0/go.mod h1:3j1trOamcUdi86J5Tr5+1BpqMjSv/QeRWkX2whBF6dY= -github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= -github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8= +github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYxPRqGcpAD9w= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= -github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao= -github.com/bsm/ginkgo/v2 v2.7.0/go.mod h1:AiKlXPm7ItEHNc/2+OkrNG4E0ITzojb9/xWzvQ9XZ9w= -github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y= -github.com/bsm/gomega v1.26.0/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= +github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= +github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= +github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= +github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM= -github.com/bytedance/sonic v1.10.0 h1:qtNZduETEIWJVIyDl01BeNxur2rW9OwTQ/yBqFRkKEk= -github.com/bytedance/sonic v1.10.0/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4= +github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE= +github.com/bytedance/sonic v1.10.2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4= github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0= github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA= -github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo= github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= +github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= +github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20231109132714-523115ebc101 h1:7To3pQ+pZo0i3dsWEbinPNFs5gPSBOsJtx3wTT94VBY= +github.com/cncf/xds/go v0.0.0-20231109132714-523115ebc101/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/cockroach-go/v2 v2.2.0 h1:/5znzg5n373N/3ESjHF5SMLxiW4RKB05Ql//KWfeTFs= github.com/cockroachdb/cockroach-go/v2 v2.2.0/go.mod h1:u3MiKYGupPPjkn3ozknpMUpxPaNLTFWAya419/zv6eI= -github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKkymb9L0= -github.com/containerd/cgroups/v3 v3.0.2/go.mod h1:JUgITrzdFqp42uI2ryGA+ge0ap/nxzYgkGmIcetmErE= +github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= +github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= github.com/containerd/containerd v1.6.19 h1:F0qgQPrG0P2JPgwpxWxYavrVeXAG0ezUIB9Z/4FTUAU= github.com/containerd/containerd v1.6.19/go.mod h1:HZCDMn4v/Xl2579/MvtOC2M206i+JJ6VxFWU/NetrGY= -github.com/containerd/continuity v0.4.1 h1:wQnVrjIyQ8vhU2sgOiL5T07jo+ouqc2bnKsv5/EqGhU= -github.com/containerd/continuity v0.4.1/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= +github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= +github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= -github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= -github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= +github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= +github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v20.10.22+incompatible h1:6jX4yB+NtcbldT90k7vBSaWJDB3i+zkVJT9BEK8kQkk= github.com/docker/docker v20.10.22+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= -github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= +github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= +github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= github.com/ericlagergren/polyval v0.0.0-20230805202542-18692a1b76f9 h1:NUmyvuwVoDsIFzOGFKW4zpCtQTbX2T4JpSn1jal64gM= github.com/ericlagergren/polyval v0.0.0-20230805202542-18692a1b76f9/go.mod h1:aXxf//HFNaacVV7/YZ8qevpNZAEoxSCpoBjscNhjrCI= github.com/ericlagergren/saferand v0.0.0-20220206064634-960a4dd2bc5c h1:RUzBDdZ+e/HEe2Nh8lYsduiPAZygUfVXJn0Ncj5sHMg= @@ -149,51 +107,43 @@ github.com/ericlagergren/testutil v0.0.0-20220814024112-d21c9429edc2 h1:j9adob+s github.com/ericlagergren/testutil v0.0.0-20220814024112-d21c9429edc2/go.mod h1:E4aJHbNMb6zjyVd1Mrpf3FIJ6kAtnVUq2yl0T6DHZ/I= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= -github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= -github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= -github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= -github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk= -github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI= -github.com/georgysavva/scany/v2 v2.0.0 h1:RGXqxDv4row7/FYoK8MRXAZXqoWF/NM+NP0q50k3DKU= -github.com/georgysavva/scany/v2 v2.0.0/go.mod h1:sigOdh+0qb/+aOs3TVhehVT10p8qJL7K/Zhyz8vWo38= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= +github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= +github.com/georgysavva/scany/v2 v2.1.0 h1:jEAX+yPQ2AAtnv0WJzAYlgsM/KzvwbD6BjSjLIyDxfc= +github.com/georgysavva/scany/v2 v2.1.0/go.mod h1:fqp9yHZzM/PFVa3/rYEC57VmDx+KDch0LoqrJzkvtos= github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d4= github.com/gin-contrib/gzip v0.0.6/go.mod h1:QOJlmV2xmayAjkNS2Y8NQsMneuRShOU/kjovCXNuzzk= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= -github.com/go-openapi/jsonpointer v0.20.0 h1:ESKJdU9ASRfaPNOPRx12IUyA1vn3R9GiE3KYD14BXdQ= -github.com/go-openapi/jsonpointer v0.20.0/go.mod h1:6PGzBjjIIumbLYysB73Klnms1mwnU4G3YHOECG3CedA= -github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= -github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= -github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= -github.com/go-openapi/spec v0.20.9 h1:xnlYNQAwKd2VQRRfwTEI0DcK+2cbuvI/0c7jx3gA8/8= -github.com/go-openapi/spec v0.20.9/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= -github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= -github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q= +github.com/go-openapi/jsonpointer v0.20.2/go.mod h1:bHen+N0u1KEO3YlmqOjTT9Adn1RfD91Ar825/PuiRVs= +github.com/go-openapi/jsonreference v0.20.4 h1:bKlDxQxQJgwpUSgOENiMPzCTBVuc7vTdXSSgNeAhojU= +github.com/go-openapi/jsonreference v0.20.4/go.mod h1:5pZJyJP2MnYCpoeoMAql78cCHauHj0V9Lhc506VOpw4= +github.com/go-openapi/spec v0.20.14 h1:7CBlRnw+mtjFGlPDRZmAMnq35cRzI91xj03HVyUi/Do= +github.com/go-openapi/spec v0.20.14/go.mod h1:8EOhTpBoFiask8rrgwbLC3zmJfz4zsCUueRuPM6GNkw= +github.com/go-openapi/swag v0.22.9 h1:XX2DssF+mQKM2DHsbgZK74y/zj4mo9I99+89xUmuZCE= +github.com/go-openapi/swag v0.22.9/go.mod h1:3/OXnFfnMAwBD099SwYRk7GD3xOrr1iL7d/XNLXVVwE= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.15.0 h1:nDU5XeOKtB3GEa+uB7GNYwhVKsgjAR7VgKoNB6ryXfw= -github.com/go-playground/validator/v10 v10.15.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= +github.com/go-playground/validator/v10 v10.18.0 h1:BvolUXjp4zuvkZ5YN5t7ebzbhlUtPsPm2S9NAZ5nl9U= +github.com/go-playground/validator/v10 v10.18.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= @@ -213,112 +163,70 @@ github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzq github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= -github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE= -github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw= +github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20230816055901-76846d4d6a3b h1:ZUEdbUOOhWGpraX/m58S9paRt9iUGrabIS9kauan88w= -github.com/google/pprof v0.0.0-20230816055901-76846d4d6a3b/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/s2a-go v0.1.5 h1:8IYp3w9nysqv3JH+NJgXJzGbDHzLOTj43BmSkp+O7qg= -github.com/google/s2a-go v0.1.5/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5 h1:E/LAvt58di64hlYjx7AsNS6C/ysHWYo+2qPCZKTQhRo= +github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= +github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= +github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= github.com/google/tink/go v1.7.0 h1:6Eox8zONGebBFcCBqkVmt60LaWZa6xg1cl/DwAh/J1w= github.com/google/tink/go v1.7.0/go.mod h1:GAUOd+QE3pgj9q8VKIGTCP33c/B7eb4NhxLcgTJZStM= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= -github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= -github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= -github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= +github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= +github.com/googleapis/gax-go/v2 v2.12.1 h1:9F8GV9r9ztXyAi00gsMQHNoF51xPZm8uj1dpYt2ZETM= +github.com/googleapis/gax-go/v2 v2.12.1/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ice-blockchain/go-tarantool-client v0.0.0-20230327200757-4fc71fa3f7bb h1:8TnFP3mc7O+tc44kv2e0/TpZKnEVUaKH+UstwfBwRkk= github.com/ice-blockchain/go-tarantool-client v0.0.0-20230327200757-4fc71fa3f7bb/go.mod h1:ZsQU7i3mxhgBBu43Oev7WPFbIjP4TniN/b1UPNGbrq8= -github.com/imroc/req/v3 v3.41.4 h1:FE82yJrRjpFfDLbabU3rUMEXzJVkp1Xcqf6oyFHC1Bo= -github.com/imroc/req/v3 v3.41.4/go.mod h1:JxpRRITYTOcuqQJxHSPVvEKhAL9ayo7BpUXHbL2T5IE= +github.com/imroc/req/v3 v3.42.3 h1:ryPG2AiwouutAopwPxKpWKyxgvO8fB3hts4JXlh3PaE= +github.com/imroc/req/v3 v3.42.3/go.mod h1:Axz9Y/a2b++w5/Jht3IhQsdBzrG1ftJd1OJhu21bB2Q= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= -github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= -github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= -github.com/jackc/pgx/v5 v5.4.3 h1:cxFyXhxlvAifxnkKKdlxv8XqUf59tDlYjnV5YYfsJJY= -github.com/jackc/pgx/v5 v5.4.3/go.mod h1:Ig06C2Vu0t5qXC60W8sqIthScaEnFvojjj9dSljmHRA= +github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 h1:L0QtFUgDarD7Fpv9jeVMgy/+Ec0mtnmYuImjTz6dtDA= +github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgx/v5 v5.5.3 h1:Ces6/M3wbDXYpM8JyyPD57ivTtJACFZJd885pdIaV2s= +github.com/jackc/pgx/v5 v5.5.3/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A= github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk= github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= @@ -327,51 +235,43 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= -github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI= +github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= -github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= +github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= -github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= -github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/lib/pq v1.10.0 h1:Zx5DJFEYQXio93kgXnQ09fXNiUKsqv4OUEu2UtGcB1E= github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/localtunnel/go-localtunnel v0.0.0-20170326223115-8a804488f275 h1:IZycmTpoUtQK3PD60UYBwjaCUHUP7cML494ao9/O8+Q= github.com/localtunnel/go-localtunnel v0.0.0-20170326223115-8a804488f275/go.mod h1:zt6UU74K6Z6oMOYJbJzYpYucqdcQwSMPBEdSvGiaUMw= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= -github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/moby/sys/mount v0.3.3 h1:fX1SVkXFJ47XWDoeFW4Sq7PdQJnV2QIDZAqjNqgEjUs= github.com/moby/sys/mount v0.3.3/go.mod h1:PBaEorSNTLG5t/+4EgukEQVlAvVEc6ZjTySwKdqp5K0= -github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78= github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= +github.com/moby/sys/mountinfo v0.7.1 h1:/tTvQaSJRr2FshkhXiIpux6fQ2Zvc4j7tAhMTStAG2g= +github.com/moby/sys/mountinfo v0.7.1/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -382,73 +282,69 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= -github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM= -github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc= -github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ= +github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY= +github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM= +github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= +github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.1.0-rc4 h1:oOxKUJWnFC4YGHCCMNql1x4YaDfYBTS5Y4x/Cgeo1E0= -github.com/opencontainers/image-spec v1.1.0-rc4/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8= -github.com/opencontainers/runc v1.1.9 h1:XR0VIHTGce5eWPkaPesqTBrhW2yAcaraWfsEalNwQLM= -github.com/opencontainers/runc v1.1.9/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50= -github.com/pelletier/go-toml/v2 v2.0.9 h1:uH2qQXheeefCCkuBBSLi7jCiSmj3VRh2+Goq2N7Xxu0= -github.com/pelletier/go-toml/v2 v2.0.9/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= -github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/opencontainers/image-spec v1.1.0-rc6 h1:XDqvyKsJEbRtATzkgItUqBA7QHk58yxX1Ov9HERHNqU= +github.com/opencontainers/image-spec v1.1.0-rc6/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= +github.com/opencontainers/runc v1.1.12 h1:BOIssBaW1La0/qbNZHXOOa71dZfZEQOzW7dqQf3phss= +github.com/opencontainers/runc v1.1.12/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8= +github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= +github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= -github.com/quic-go/qtls-go1-20 v0.3.2 h1:rRgN3WfnKbyik4dBV8A6girlJVxGand/d+jVKbQq5GI= -github.com/quic-go/qtls-go1-20 v0.3.2/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= -github.com/quic-go/quic-go v0.37.4 h1:ke8B73yMCWGq9MfrCCAw0Uzdm7GaViC3i39dsIdDlH4= -github.com/quic-go/quic-go v0.37.4/go.mod h1:YsbH1r4mSHPJcLF4k4zruUkLBqctEMBDR6VPvcYjIsU= -github.com/redis/go-redis/v9 v9.0.5 h1:CuQcn5HIEeK7BgElubPP8CGtE0KakrnbBSTLjathl5o= -github.com/redis/go-redis/v9 v9.0.5/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk= -github.com/refraction-networking/utls v1.4.3 h1:BdWS3BSzCwWCFfMIXP3mjLAyQkdmog7diaD/OqFbAzM= -github.com/refraction-networking/utls v1.4.3/go.mod h1:4u9V/awOSBrRw6+federGmVJQfPtemEqLBXkML1b0bo= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/quic-go/quic-go v0.41.0 h1:aD8MmHfgqTURWNJy48IYFg2OnxwHT3JL7ahGs73lb4k= +github.com/quic-go/quic-go v0.41.0/go.mod h1:qCkNjqczPEvgsOnxZ0eCD14lv+B2LHlFAB++CNOh9hA= +github.com/redis/go-redis/v9 v9.4.0 h1:Yzoz33UZw9I/mFhx4MNrB6Fk+XHO1VukNcCa1+lwyKk= +github.com/redis/go-redis/v9 v9.4.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= +github.com/refraction-networking/utls v1.6.2 h1:iTeeGY0o6nMNcGyirxkD5bFIsVctP5InGZ3E0HrzS7k= +github.com/refraction-networking/utls v1.6.2/go.mod h1:yil9+7qSl+gBwJqztoQseO6Pr3h62pQoY1lXiNR/FPs= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.30.0 h1:SymVODrcRsaRaSInD9yQtKbtWqwsfoPcRff/oRXLj4c= -github.com/rs/zerolog v1.30.0/go.mod h1:/tk+P47gFdPXq4QYjvCmT5/Gsug2nagsFWBWhAiSi1w= +github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0= +github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= +github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= +github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= +github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= +github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/sendgrid/rest v2.6.9+incompatible h1:1EyIcsNdn9KIisLW50MKwmSRSK+ekueiEMJ7NEoxJo0= github.com/sendgrid/rest v2.6.9+incompatible/go.mod h1:kXX7q3jZtJXK5c5qK83bSGMdV6tsOE70KbHoqJls4lE= -github.com/sendgrid/sendgrid-go v3.13.0+incompatible h1:HZrzc06/QfBGesY9o3n1lvBrRONA+57rbDRKet7plos= -github.com/sendgrid/sendgrid-go v3.13.0+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8= +github.com/sendgrid/sendgrid-go v3.14.0+incompatible h1:KDSasSTktAqMJCYClHVE94Fcif2i7P7wzISv1sU6DUA= +github.com/sendgrid/sendgrid-go v3.14.0+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= -github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= -github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= -github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= -github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= -github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= +github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= +github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= +github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= +github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= +github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= -github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= +github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ= +github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= @@ -457,380 +353,168 @@ github.com/swaggo/files v1.0.1 h1:J1bVJ4XHZNq0I46UU90611i9/YzdrF7x92oX1ig5IdE= github.com/swaggo/files v1.0.1/go.mod h1:0qXmMNH6sXNf+73t65aKeB+ApmgxdnkQzVTAj2uaMUg= github.com/swaggo/gin-swagger v1.6.0 h1:y8sxvQ3E20/RCyrXeFfg60r6H0Z+SwpTjMYsMm+zy8M= github.com/swaggo/gin-swagger v1.6.0/go.mod h1:BG00cCEy294xtVpyIAHG6+e2Qzj/xKlRdOqDkvq0uzo= -github.com/swaggo/swag v1.16.1 h1:fTNRhKstPKxcnoKsytm4sahr8FaYzUcT7i1/3nd/fBg= -github.com/swaggo/swag v1.16.1/go.mod h1:9/LMvHycG3NFHfR6LwvikHv5iFvmPADQ359cKikGxto= +github.com/swaggo/swag v1.16.3 h1:PnCYjPCah8FK4I26l2F/KQ4yz3sILcVUN3cTlBFA9Pg= +github.com/swaggo/swag v1.16.3/go.mod h1:DImHIuOFXKpMFAQjcC7FG4m3Dg4+QuUgUzJmKjI/gRk= github.com/testcontainers/testcontainers-go v0.15.0 h1:3Ex7PUGFv0b2bBsdOv6R42+SK2qoZnWBd21LvZYhUtQ= github.com/testcontainers/testcontainers-go v0.15.0/go.mod h1:PkohMRH2X8Hib0IWtifVexDfLPVT+tb5E9hsf7cW12w= -github.com/twilio/twilio-go v1.11.0 h1:ixO2DfAV4c0Yza0Tom5F5ZZB8WUbigiFc9wD84vbYnc= -github.com/twilio/twilio-go v1.11.0/go.mod h1:tdnfQ5TjbewoAu4lf9bMsGvfuJ/QU9gYuv9yx3TSIXU= +github.com/twilio/twilio-go v1.18.0 h1:UJ9hg7LbztjGeGoE95Zn9RAbZHZ0kErQFPK34oHluv8= +github.com/twilio/twilio-go v1.18.0/go.mod h1:tdnfQ5TjbewoAu4lf9bMsGvfuJ/QU9gYuv9yx3TSIXU= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= -github.com/twmb/franz-go v1.14.3 h1:cq8rxAnVYU1uF3SRVn8eEaUf+AaXKWlB0Cl3Ca7JSa4= -github.com/twmb/franz-go v1.14.3/go.mod h1:nMAvTC2kHtK+ceaSHeHm4dlxC78389M/1DjpOswEgu4= -github.com/twmb/franz-go/pkg/kadm v1.9.0 h1:UgwBu0YCd6P8HLdg6ZRA4v9W6/zoI1042fOd2CvvLBE= -github.com/twmb/franz-go/pkg/kadm v1.9.0/go.mod h1:eG3f+GHUndq1CUSVvjp+WdNq5zePeJi3tEHzyTkao6g= -github.com/twmb/franz-go/pkg/kmsg v1.6.1 h1:tm6hXPv5antMHLasTfKv9R+X03AjHSkSkXhQo2c5ALM= -github.com/twmb/franz-go/pkg/kmsg v1.6.1/go.mod h1:se9Mjdt0Nwzc9lnjJ0HyDtLyBnaBDAd7pCje47OhSyw= -github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= -github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= -github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= -github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= +github.com/twmb/franz-go v1.16.1 h1:rpWc7fB9jd7TgmCyfxzenBI+QbgS8ZfJOUQE+tzPtbE= +github.com/twmb/franz-go v1.16.1/go.mod h1:/pER254UPPGp/4WfGqRi+SIRGE50RSQzVubQp6+N4FA= +github.com/twmb/franz-go/pkg/kadm v1.11.0 h1:FfeWJ0qadntFpAcQt8JzNXW4dijjytZNLrzJuzzzuxA= +github.com/twmb/franz-go/pkg/kadm v1.11.0/go.mod h1:qrhkdH+SWS3ivmbqOgHbpgVHamhaKcjH0UM+uOp0M1A= +github.com/twmb/franz-go/pkg/kmsg v1.7.0 h1:a457IbvezYfA5UkiBvyV3zj0Is3y1i8EJgqjJYoij2E= +github.com/twmb/franz-go/pkg/kmsg v1.7.0/go.mod h1:se9Mjdt0Nwzc9lnjJ0HyDtLyBnaBDAd7pCje47OhSyw= +github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= +github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8= +github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 h1:P+/g8GpuJGYbOp2tAdKrIPUX9JO02q8Q0YNlHolpibA= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0/go.mod h1:tIKj3DbO8N9Y2xo52og3irLsPI4GW02DSMtrVgNMgxg= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 h1:doUP+ExOpH3spVTLS0FcWGLnQrPct/hD/bCPbDRUEAU= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0/go.mod h1:rdENBZMT2OE6Ne/KLwpiXudnAsbdrdBaqBvTN8M8BgA= +go.opentelemetry.io/otel v1.23.1 h1:Za4UzOqJYS+MUczKI320AtqZHZb7EqxO00jAHE0jmQY= +go.opentelemetry.io/otel v1.23.1/go.mod h1:Td0134eafDLcTS4y+zQ26GE8u3dEuRBiBCTUIRHaikA= +go.opentelemetry.io/otel/metric v1.23.1 h1:PQJmqJ9u2QaJLBOELl1cxIdPcpbwzbkjfEyelTl2rlo= +go.opentelemetry.io/otel/metric v1.23.1/go.mod h1:mpG2QPlAfnK8yNhNJAxDZruU9Y1/HubbC+KyH8FaCWI= +go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= +go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= +go.opentelemetry.io/otel/trace v1.23.1 h1:4LrmmEd8AU2rFvU1zegmvqW7+kWarxtNOPyeL6HmYY8= +go.opentelemetry.io/otel/trace v1.23.1/go.mod h1:4IpnpJFwr1mo/6HL8XIPJaE9y0+u1KcVmuW7dwFSVrI= +go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= +go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/arch v0.4.0 h1:A8WCeEWhLwPBKNbFi5Wv5UTCBx5zzubnXDlMOFAzFMc= -golang.org/x/arch v0.4.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc= +golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= +golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb h1:mIKbk8weKhSeLH2GmUTrvx8CjkyJmnU1wFmg59CUjFA= -golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE= +golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= -golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.11.0 h1:vPL4xzxBM4niKCW6g9whtaWVXTJf1U5e4aZxxFx/gbU= -golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk= +golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= +golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= -golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= -golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= +golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ= +golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= -golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.137.0 h1:QrKX6uNvzJLr0Fd3vWVqcyrcmFoYi036VUAsZbiF4+s= -google.golang.org/api v0.137.0/go.mod h1:4xyob8CxC+0GChNBvEUAk8VBKNvYOTWM9T3v3UfRxuY= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= +google.golang.org/api v0.164.0 h1:of5G3oE2WRMVb2yoWKME4ZP8y8zpUKC6bMhxDr8ifyk= +google.golang.org/api v0.164.0/go.mod h1:2OatzO7ZDQsoS7IFf3rvsE17/TldiU3F/zxFHeqUB5o= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine/v2 v2.0.4 h1:aAAPYixP9EfTJjNO6F46afaxp+jfzb0VgwVjMeLBtF4= -google.golang.org/appengine/v2 v2.0.4/go.mod h1:WoEXGoXNfa0mLvaH5sV3ZSGXwVmy8yf7Z1JKf3J3wLI= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= +google.golang.org/appengine/v2 v2.0.5 h1:4C+F3Cd3L2nWEfSmFEZDPjQvDwL8T0YCeZBysZifP3k= +google.golang.org/appengine/v2 v2.0.5/go.mod h1:WoEXGoXNfa0mLvaH5sV3ZSGXwVmy8yf7Z1JKf3J3wLI= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20230815205213-6bfd019c3878 h1:Iveh6tGCJkHAjJgEqUQYGDGgbwmhjoAOz8kO/ajxefY= -google.golang.org/genproto v0.0.0-20230815205213-6bfd019c3878/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= -google.golang.org/genproto/googleapis/api v0.0.0-20230815205213-6bfd019c3878 h1:WGq4lvB/mlicysM/dUT3SBvijH4D3sm/Ny1A4wmt2CI= -google.golang.org/genproto/googleapis/api v0.0.0-20230815205213-6bfd019c3878/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 h1:lv6/DhyiFFGsmzxbsUUTOkN29II+zeWHxvT8Lpdxsv0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= +google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 h1:4++qSzdWBUy9/2x8L5KZgwZw+mjJZ2yDSCGMVM0YzRs= +google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:PVreiBMirk8ypES6aw9d4p6iiBNSIfZEBqr3UGoAi2E= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 h1:hZB7eLIaYlW9qXRfCq/qDaPdbeY3757uARz5Vvfv+cY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:YUWgXUFRPfoYK1IHMuxH5K6nPEXSCzIMljnQ59lLRCk= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= -google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= -google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= +google.golang.org/grpc v1.61.1 h1:kLAiWrZs7YeDM6MumDe7m3y4aM6wacLzM1Y/wiLP9XY= +google.golang.org/grpc v1.61.1/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -839,42 +523,28 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= diff --git a/multimedia/picture/fixture/fixture.go b/multimedia/picture/fixture/fixture.go index c1af70b..06f40af 100644 --- a/multimedia/picture/fixture/fixture.go +++ b/multimedia/picture/fixture/fixture.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/http2" - appCfg "github.com/ice-blockchain/wintr/config" + appcfg "github.com/ice-blockchain/wintr/config" ) func MultipartFileHeader(tb testing.TB, fs embed.FS, filename, multiPartKey, multiPartFileName string) *multipart.FileHeader { @@ -38,7 +38,7 @@ func MultipartFileHeader(tb testing.TB, fs embed.FS, filename, multiPartKey, mul require.NoError(tb, writer.Close()) form, err := multipart.NewReader(body, writer.Boundary()).ReadForm(stat.Size()) require.NoError(tb, err) - require.Greater(tb, len(form.File[multiPartKey]), 0) + require.NotEmpty(tb, form.File[multiPartKey]) return form.File[multiPartKey][0] } @@ -54,10 +54,10 @@ func AssertPictureUploaded(ctx context.Context, tb testing.TB, applicationYAMLKe URLDownload string `yaml:"urlDownload"` } `yaml:"wintr/multimedia/picture" mapstructure:"wintr/multimedia/picture"` //nolint:tagliatelle // Nope. } - appCfg.MustLoadFromKey(applicationYAMLKey, &cfg) + appcfg.MustLoadFromKey(applicationYAMLKey, &cfg) if cfg.WintrMultimediaPicture.Credentials.AccessKey == "" { module := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(applicationYAMLKey, "-", "_"), "/", "_")) - cfg.WintrMultimediaPicture.Credentials.AccessKey = os.Getenv(fmt.Sprintf("%s_PICTURE_STORAGE_ACCESS_KEY", module)) + cfg.WintrMultimediaPicture.Credentials.AccessKey = os.Getenv(module + "_PICTURE_STORAGE_ACCESS_KEY") //nolint:goconst // . if cfg.WintrMultimediaPicture.Credentials.AccessKey == "" { cfg.WintrMultimediaPicture.Credentials.AccessKey = os.Getenv("PICTURE_STORAGE_ACCESS_KEY") } @@ -76,7 +76,7 @@ func AssertPictureUploaded(ctx context.Context, tb testing.TB, applicationYAMLKe assert.Equal(tb, http.StatusOK, resp.StatusCode) bodyBytes, err := io.ReadAll(resp.Body) require.NoError(tb, err) - assert.Greater(tb, len(bodyBytes), 0) + assert.NotEmpty(tb, bodyBytes) url = fmt.Sprintf("%s/%s", cfg.WintrMultimediaPicture.URLDownload, fileName) req, err = http.NewRequestWithContext(ctx, http.MethodGet, url, http.NoBody) @@ -89,7 +89,7 @@ func AssertPictureUploaded(ctx context.Context, tb testing.TB, applicationYAMLKe assert.Equal(tb, http.StatusOK, resp.StatusCode) bodyBytes, err = io.ReadAll(resp.Body) require.NoError(tb, err) - assert.Greater(tb, len(bodyBytes), 0) + assert.NotEmpty(tb, bodyBytes) } func AssertPictureDeleted(ctx context.Context, tb testing.TB, applicationYAMLKey, fileName string) { //nolint:funlen // . @@ -103,10 +103,10 @@ func AssertPictureDeleted(ctx context.Context, tb testing.TB, applicationYAMLKey URLDownload string `yaml:"urlDownload"` } `yaml:"wintr/multimedia/picture" mapstructure:"wintr/multimedia/picture"` //nolint:tagliatelle // Nope. } - appCfg.MustLoadFromKey(applicationYAMLKey, &cfg) + appcfg.MustLoadFromKey(applicationYAMLKey, &cfg) if cfg.WintrMultimediaPicture.Credentials.AccessKey == "" { module := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(applicationYAMLKey, "-", "_"), "/", "_")) - cfg.WintrMultimediaPicture.Credentials.AccessKey = os.Getenv(fmt.Sprintf("%s_PICTURE_STORAGE_ACCESS_KEY", module)) + cfg.WintrMultimediaPicture.Credentials.AccessKey = os.Getenv(module + "_PICTURE_STORAGE_ACCESS_KEY") if cfg.WintrMultimediaPicture.Credentials.AccessKey == "" { cfg.WintrMultimediaPicture.Credentials.AccessKey = os.Getenv("PICTURE_STORAGE_ACCESS_KEY") } diff --git a/multimedia/picture/picture.go b/multimedia/picture/picture.go index 055787c..6de887d 100644 --- a/multimedia/picture/picture.go +++ b/multimedia/picture/picture.go @@ -18,7 +18,7 @@ import ( "github.com/imroc/req/v3" "github.com/pkg/errors" - appCfg "github.com/ice-blockchain/wintr/config" + appcfg "github.com/ice-blockchain/wintr/config" "github.com/ice-blockchain/wintr/log" ) @@ -30,11 +30,11 @@ func init() { //nolint:gochecknoinits // It's the only way to tweak the client. func New(applicationYAMLKey string, ignoreFilesRegex ...string) Client { var cfg config - appCfg.MustLoadFromKey(applicationYAMLKey, &cfg) + appcfg.MustLoadFromKey(applicationYAMLKey, &cfg) if cfg.WintrMultimediaPicture.Credentials.AccessKey == "" { module := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(applicationYAMLKey, "-", "_"), "/", "_")) - cfg.WintrMultimediaPicture.Credentials.AccessKey = os.Getenv(fmt.Sprintf("%s_PICTURE_STORAGE_ACCESS_KEY", module)) + cfg.WintrMultimediaPicture.Credentials.AccessKey = os.Getenv(module + "_PICTURE_STORAGE_ACCESS_KEY") if cfg.WintrMultimediaPicture.Credentials.AccessKey == "" { cfg.WintrMultimediaPicture.Credentials.AccessKey = os.Getenv("PICTURE_STORAGE_ACCESS_KEY") } @@ -78,7 +78,7 @@ func (p *picture) StripDownloadURL(url string) string { return url } - return strings.Replace(url, fmt.Sprintf("%s/", p.cfg.WintrMultimediaPicture.URLDownload), "", 1) + return strings.Replace(url, p.cfg.WintrMultimediaPicture.URLDownload+"/", "", 1) } func (p *picture) SQLAliasDownloadURL(name string) string { diff --git a/multimedia/picture/picture_test.go b/multimedia/picture/picture_test.go index a535bc5..d40e917 100644 --- a/multimedia/picture/picture_test.go +++ b/multimedia/picture/picture_test.go @@ -92,7 +92,7 @@ func TestClientUploadNoDelete(t *testing.T) { //nolint:funlen // . for _, picName := range &cleanupFilenames { go func(filename string) { defer wg.Done() - require.NoError(t, client.UploadPicture(ctx, nil, filename)) + assert.NoError(t, client.UploadPicture(ctx, nil, filename)) fixture.AssertPictureDeleted(ctx, t, testWriteApplicationYAMLKey, filename) }(picName) } diff --git a/notifications/inapp/contract.go b/notifications/inapp/contract.go index f93d765..31fde57 100644 --- a/notifications/inapp/contract.go +++ b/notifications/inapp/contract.go @@ -26,9 +26,9 @@ type ( AppID string `json:"appId,omitempty"` } Client interface { - CreateUserToken(context.Context, UserID) (*Token, error) + CreateUserToken(ctx context.Context, userID UserID) (*Token, error) - Send(context.Context, *Parcel, ...UserID) error + Send(ctx context.Context, p *Parcel, userIDs ...UserID) error } Parcel = internal.Parcel diff --git a/notifications/inapp/fixture/fixture.go b/notifications/inapp/fixture/fixture.go index 92cc811..9a3abeb 100644 --- a/notifications/inapp/fixture/fixture.go +++ b/notifications/inapp/fixture/fixture.go @@ -4,14 +4,13 @@ package fixture import ( "context" - "fmt" "os" "strings" getstreamio "github.com/GetStream/stream-go2/v7" "github.com/pkg/errors" - appCfg "github.com/ice-blockchain/wintr/config" + appcfg "github.com/ice-blockchain/wintr/config" "github.com/ice-blockchain/wintr/log" "github.com/ice-blockchain/wintr/notifications/inapp/internal" "github.com/ice-blockchain/wintr/time" @@ -109,17 +108,17 @@ func newGetStreamIOClient(applicationYAMLKey string) *getstreamio.Client { } `yaml:"credentials" mapstructure:"credentials"` } `yaml:"wintr/notifications/inapp" mapstructure:"wintr/notifications/inapp"` //nolint:tagliatelle // Nope. } - appCfg.MustLoadFromKey(applicationYAMLKey, &cfg) + appcfg.MustLoadFromKey(applicationYAMLKey, &cfg) if cfg.WintrInAppNotifications.Credentials.Key == "" { module := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(applicationYAMLKey, "-", "_"), "/", "_")) - cfg.WintrInAppNotifications.Credentials.Key = os.Getenv(fmt.Sprintf("%s_INAPP_NOTIFICATIONS_CLIENT_KEY", module)) + cfg.WintrInAppNotifications.Credentials.Key = os.Getenv(module + "_INAPP_NOTIFICATIONS_CLIENT_KEY") if cfg.WintrInAppNotifications.Credentials.Key == "" { cfg.WintrInAppNotifications.Credentials.Key = os.Getenv("INAPP_NOTIFICATIONS_CLIENT_KEY") } } if cfg.WintrInAppNotifications.Credentials.Secret == "" { module := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(applicationYAMLKey, "-", "_"), "/", "_")) - cfg.WintrInAppNotifications.Credentials.Secret = os.Getenv(fmt.Sprintf("%s_INAPP_NOTIFICATIONS_CLIENT_SECRET", module)) + cfg.WintrInAppNotifications.Credentials.Secret = os.Getenv(module + "_INAPP_NOTIFICATIONS_CLIENT_SECRET") if cfg.WintrInAppNotifications.Credentials.Secret == "" { cfg.WintrInAppNotifications.Credentials.Secret = os.Getenv("INAPP_NOTIFICATIONS_CLIENT_SECRET") } diff --git a/notifications/inapp/inapp.go b/notifications/inapp/inapp.go index eaf7e7d..9113727 100644 --- a/notifications/inapp/inapp.go +++ b/notifications/inapp/inapp.go @@ -15,7 +15,7 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - appCfg "github.com/ice-blockchain/wintr/config" + appcfg "github.com/ice-blockchain/wintr/config" "github.com/ice-blockchain/wintr/log" "github.com/ice-blockchain/wintr/notifications/inapp/internal" "github.com/ice-blockchain/wintr/time" @@ -23,25 +23,25 @@ import ( func New(applicationYAMLKey, feedName string) Client { //nolint:funlen // . var cfg config - appCfg.MustLoadFromKey(applicationYAMLKey, &cfg) + appcfg.MustLoadFromKey(applicationYAMLKey, &cfg) if cfg.WintrInAppNotifications.Credentials.Key == "" { module := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(applicationYAMLKey, "-", "_"), "/", "_")) - cfg.WintrInAppNotifications.Credentials.Key = os.Getenv(fmt.Sprintf("%s_INAPP_NOTIFICATIONS_CLIENT_KEY", module)) + cfg.WintrInAppNotifications.Credentials.Key = os.Getenv(module + "_INAPP_NOTIFICATIONS_CLIENT_KEY") if cfg.WintrInAppNotifications.Credentials.Key == "" { cfg.WintrInAppNotifications.Credentials.Key = os.Getenv("INAPP_NOTIFICATIONS_CLIENT_KEY") } } if cfg.WintrInAppNotifications.Credentials.Secret == "" { module := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(applicationYAMLKey, "-", "_"), "/", "_")) - cfg.WintrInAppNotifications.Credentials.Secret = os.Getenv(fmt.Sprintf("%s_INAPP_NOTIFICATIONS_CLIENT_SECRET", module)) + cfg.WintrInAppNotifications.Credentials.Secret = os.Getenv(module + "_INAPP_NOTIFICATIONS_CLIENT_SECRET") if cfg.WintrInAppNotifications.Credentials.Secret == "" { cfg.WintrInAppNotifications.Credentials.Secret = os.Getenv("INAPP_NOTIFICATIONS_CLIENT_SECRET") } } if cfg.WintrInAppNotifications.Credentials.AppID == "" { module := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(applicationYAMLKey, "-", "_"), "/", "_")) - cfg.WintrInAppNotifications.Credentials.AppID = os.Getenv(fmt.Sprintf("%s_INAPP_NOTIFICATIONS_CLIENT_APP_ID", module)) + cfg.WintrInAppNotifications.Credentials.AppID = os.Getenv(module + "_INAPP_NOTIFICATIONS_CLIENT_APP_ID") if cfg.WintrInAppNotifications.Credentials.AppID == "" { cfg.WintrInAppNotifications.Credentials.AppID = os.Getenv("INAPP_NOTIFICATIONS_CLIENT_APP_ID") } diff --git a/notifications/inapp/inapp_test.go b/notifications/inapp/inapp_test.go index 4d5d68b..1238618 100644 --- a/notifications/inapp/inapp_test.go +++ b/notifications/inapp/inapp_test.go @@ -193,7 +193,7 @@ func requireBroadcast(t *testing.T, wg *sync.WaitGroup) { for i := range userIDs { userIDs[i] = uuid.NewString() } - require.NoError(t, notificationFeedClient.Send(ctx, p1, userIDs...)) + assert.NoError(t, notificationFeedClient.Send(ctx, p1, userIDs...)) } func TestClientSendRetry(t *testing.T) { //nolint:paralleltest // We're testing ratelimit, we have 2 tests that need to not run in parallel. @@ -234,12 +234,12 @@ func requireSend(t *testing.T, wg *sync.WaitGroup) { Value: userID, }, } - require.NoError(t, notificationFeedClient.Send(ctx, p1, userID)) + assert.NoError(t, notificationFeedClient.Send(ctx, p1, userID)) } func assertInDelta(tb testing.TB, expected, actual, delta int64) { //nolint:unparam // Not a problem. tb.Helper() diff := expected - actual - assert.True(tb, diff <= delta, "diff is %v", diff) - assert.True(tb, diff >= 0, "diff is %v", diff) + assert.LessOrEqual(tb, diff, delta, "diff is %v", diff) + assert.GreaterOrEqual(tb, diff, 0, "diff is %v", diff) } diff --git a/notifications/push/contract.go b/notifications/push/contract.go index 7d8e16e..b701683 100644 --- a/notifications/push/contract.go +++ b/notifications/push/contract.go @@ -39,9 +39,9 @@ type ( Client interface { io.Closer - Send(context.Context, *Notification[DeviceToken], chan<- error) - Broadcast(context.Context, *Notification[SubscriptionTopic]) error - BroadcastDelayed(context.Context, *DelayedNotification) error + Send(ctx context.Context, notif *Notification[DeviceToken], errs chan<- error) + Broadcast(ctx context.Context, notif *Notification[SubscriptionTopic]) error + BroadcastDelayed(ctx context.Context, notif *DelayedNotification) error } ) diff --git a/notifications/push/push.go b/notifications/push/push.go index 79ee0e9..da44296 100644 --- a/notifications/push/push.go +++ b/notifications/push/push.go @@ -4,7 +4,6 @@ package push import ( "context" - "fmt" "os" "runtime" "strconv" @@ -19,16 +18,16 @@ import ( "github.com/pkg/errors" firebaseoption "google.golang.org/api/option" - appCfg "github.com/ice-blockchain/wintr/config" + appcfg "github.com/ice-blockchain/wintr/config" "github.com/ice-blockchain/wintr/log" ) func New(applicationYAMLKey string) Client { //nolint:funlen,gocognit,revive // . var cfg config - appCfg.MustLoadFromKey(applicationYAMLKey, &cfg) + appcfg.MustLoadFromKey(applicationYAMLKey, &cfg) if cfg.WintrPushNotifications.Credentials.FileContent == "" { module := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(applicationYAMLKey, "-", "_"), "/", "_")) - cfg.WintrPushNotifications.Credentials.FileContent = os.Getenv(fmt.Sprintf("%s_PUSH_NOTIFICATIONS_CREDENTIALS_FILE_CONTENT", module)) + cfg.WintrPushNotifications.Credentials.FileContent = os.Getenv(module + "_PUSH_NOTIFICATIONS_CREDENTIALS_FILE_CONTENT") if cfg.WintrPushNotifications.Credentials.FileContent == "" { cfg.WintrPushNotifications.Credentials.FileContent = os.Getenv("PUSH_NOTIFICATIONS_CREDENTIALS_FILE_CONTENT") } @@ -41,7 +40,7 @@ func New(applicationYAMLKey string) Client { //nolint:funlen,gocognit,revive // } if cfg.WintrPushNotifications.Credentials.FilePath == "" { module := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(applicationYAMLKey, "-", "_"), "/", "_")) - cfg.WintrPushNotifications.Credentials.FilePath = os.Getenv(fmt.Sprintf("%s_PUSH_NOTIFICATIONS_CREDENTIALS_FILE_PATH", module)) + cfg.WintrPushNotifications.Credentials.FilePath = os.Getenv(module + "_PUSH_NOTIFICATIONS_CREDENTIALS_FILE_PATH") if cfg.WintrPushNotifications.Credentials.FilePath == "" { cfg.WintrPushNotifications.Credentials.FilePath = os.Getenv("PUSH_NOTIFICATIONS_CREDENTIALS_FILE_PATH") } @@ -152,7 +151,7 @@ func (p *push) BroadcastDelayed(ctx context.Context, notification *DelayedNotifi } func buildAndroidDataOnlyNotification(notification *DelayedNotification) *fcm.AndroidConfig { - dataOnlyNotification := make(map[string]string, len(notification.Data)+3) + dataOnlyNotification := make(map[string]string, len(notification.Data)+6) //nolint:gomnd // Extra fields. for k, v := range notification.Data { dataOnlyNotification[k] = v } diff --git a/notifications/push/push_test.go b/notifications/push/push_test.go index 1c6199e..48bccd8 100644 --- a/notifications/push/push_test.go +++ b/notifications/push/push_test.go @@ -27,6 +27,12 @@ var ( client Client ) +const ( + testToken = "bogusToken" //nolint:gosec // Not a teal token. + testTitle = "ice.io Test simple notification" + testBody = "This is a ice.io simple push notification from wintr/notifications/push tests " +) + func TestMain(m *testing.M) { client = New(testApplicationYAMLKey) os.Exit(m.Run()) @@ -38,9 +44,9 @@ func TestClientSend(t *testing.T) { defer cancel() n1 := &Notification[DeviceToken]{ Data: map[string]string{"deeplink": fmt.Sprintf("ice.app/something/%v", uuid.NewString())}, - Target: DeviceToken("bogusToken" + uuid.NewString()), - Title: "ice.io Test simple notification", - Body: "This is a ice.io simple push notification from wintr/notifications/push tests " + uuid.NewString(), + Target: DeviceToken(testToken + uuid.NewString()), + Title: testTitle, + Body: testBody + uuid.NewString(), ImageURL: "https://miro.medium.com/max/1400/0*S1zFXEm7Cr9cdoKk", } responder := make(chan error) @@ -54,9 +60,9 @@ func TestClientSendClosedResponder(t *testing.T) { defer cancel() n1 := &Notification[DeviceToken]{ Data: map[string]string{"deeplink": fmt.Sprintf("ice.app/something/%v", uuid.NewString())}, - Target: DeviceToken("bogusToken" + uuid.NewString()), - Title: "ice.io Test simple notification", - Body: "This is a ice.io simple push notification from wintr/notifications/push tests " + uuid.NewString(), + Target: DeviceToken(testToken + uuid.NewString()), + Title: testTitle, + Body: testBody + uuid.NewString(), ImageURL: "https://miro.medium.com/max/1400/0*S1zFXEm7Cr9cdoKk", } responder := make(chan error) @@ -72,9 +78,9 @@ func TestClientSendNoResponder(t *testing.T) { defer cancel() n1 := &Notification[DeviceToken]{ Data: map[string]string{"deeplink": fmt.Sprintf("ice.app/something/%v", uuid.NewString())}, - Target: DeviceToken("bogusToken" + uuid.NewString()), - Title: "ice.io Test simple notification", - Body: "This is a ice.io simple push notification from wintr/notifications/push tests " + uuid.NewString(), + Target: DeviceToken(testToken + uuid.NewString()), + Title: testTitle, + Body: testBody + uuid.NewString(), ImageURL: "https://miro.medium.com/max/1400/0*S1zFXEm7Cr9cdoKk", } client.Send(ctx, n1, nil) @@ -90,9 +96,9 @@ func TestClientSend_Buffering(t *testing.T) { //nolint:funlen // . }() n1 := &Notification[DeviceToken]{ Data: map[string]string{"deeplink": fmt.Sprintf("ice.app/something/%v", uuid.NewString())}, - Target: DeviceToken("bogusToken" + uuid.NewString()), - Title: "ice.io Test simple notification", - Body: "This is a ice.io simple push notification from wintr/notifications/push tests " + uuid.NewString(), + Target: DeviceToken(testToken + uuid.NewString()), + Title: testTitle, + Body: testBody + uuid.NewString(), ImageURL: "https://miro.medium.com/max/1400/0*S1zFXEm7Cr9cdoKk", } wg := new(sync.WaitGroup) @@ -124,9 +130,9 @@ func TestClientSend_Stability(t *testing.T) { //nolint:funlen // . isolatedClient := New(testApplicationYAMLKey) n1 := &Notification[DeviceToken]{ Data: map[string]string{"deeplink": fmt.Sprintf("ice.app/something/%v", uuid.NewString())}, - Target: DeviceToken("bogusToken" + uuid.NewString()), - Title: "ice.io Test simple notification", - Body: "This is a ice.io simple push notification from wintr/notifications/push tests " + uuid.NewString(), + Target: DeviceToken(testToken + uuid.NewString()), + Title: testTitle, + Body: testBody + uuid.NewString(), ImageURL: "https://miro.medium.com/max/1400/0*S1zFXEm7Cr9cdoKk", } wg := new(sync.WaitGroup) @@ -180,8 +186,8 @@ func BenchmarkClientSend(b *testing.B) { for pb.Next() { n1 := &Notification[DeviceToken]{ Data: map[string]string{"deeplink": fmt.Sprintf("ice.app/something/%v", uuid.NewString())}, - Target: DeviceToken("bogusToken" + uuid.NewString()), - Title: "ice.io Test simple notification", + Target: DeviceToken(testToken + uuid.NewString()), + Title: testTitle, Body: "This is a ice.io simple push notification from wintr/notifications/push benchmarks " + uuid.NewString(), ImageURL: "https://miro.medium.com/max/1400/0*S1zFXEm7Cr9cdoKk", } diff --git a/privacy/contract.go b/privacy/contract.go index ebcb062..7077d7a 100644 --- a/privacy/contract.go +++ b/privacy/contract.go @@ -14,8 +14,8 @@ import ( type ( EncryptDecrypter interface { - Encrypt(string) string - Decrypt(string) (string, error) + Encrypt(input string) string + Decrypt(input string) (string, error) } Sensitive string DBSensitive string diff --git a/privacy/privacy.go b/privacy/privacy.go index 97aae02..3d8fa11 100644 --- a/privacy/privacy.go +++ b/privacy/privacy.go @@ -9,13 +9,13 @@ import ( "github.com/hashicorp/go-multierror" "github.com/pkg/errors" - appCfg "github.com/ice-blockchain/wintr/config" + appcfg "github.com/ice-blockchain/wintr/config" "github.com/ice-blockchain/wintr/log" ) func init() { //nolint:gochecknoinits // We're initializing a global, default one. var cfg config - appCfg.MustLoadFromKey("wintr/privacy", &cfg) + appcfg.MustLoadFromKey("wintr/privacy", &cfg) ed = NewEncryptDecrypter(cfg.Secret) } diff --git a/server/contract.go b/server/contract.go index ac1eb90..fd2453f 100644 --- a/server/contract.go +++ b/server/contract.go @@ -29,10 +29,10 @@ type ( } // State is the actual custom behaviour that has to be implemented by users of this package to customize their http server`s lifecycle. State interface { - Init(context.Context, context.CancelFunc) - Close(context.Context) error - RegisterRoutes(*Router) - CheckHealth(context.Context) error + Init(ctx context.Context, cancel context.CancelFunc) + Close(ctx context.Context) error + RegisterRoutes(r *Router) + CheckHealth(ctx context.Context) error } Request[REQ any, RESP any] struct { Data *REQ `json:"data,omitempty"` diff --git a/server/fixture/contract.go b/server/fixture/contract.go index 2b9cffc..15c5082 100644 --- a/server/fixture/contract.go +++ b/server/fixture/contract.go @@ -26,11 +26,11 @@ type ( ContentType = string HTTPTestClient interface { - Get(context.Context, testing.TB, URL, ...http.Header) (ActualRespBody, RespStatusCode, http.Header) - Delete(context.Context, testing.TB, URL, ...http.Header) (ActualRespBody, RespStatusCode, http.Header) - Patch(context.Context, testing.TB, URL, ReqBody, ...http.Header) (ActualRespBody, RespStatusCode, http.Header) - Put(context.Context, testing.TB, URL, ReqBody, ...http.Header) (ActualRespBody, RespStatusCode, http.Header) - Post(context.Context, testing.TB, URL, ReqBody, ...http.Header) (ActualRespBody, RespStatusCode, http.Header) + Get(ctx context.Context, tb testing.TB, u URL, headers ...http.Header) (ActualRespBody, RespStatusCode, http.Header) + Delete(ctx context.Context, tb testing.TB, u URL, headers ...http.Header) (ActualRespBody, RespStatusCode, http.Header) + Patch(ctx context.Context, tb testing.TB, u URL, body ReqBody, headers ...http.Header) (ActualRespBody, RespStatusCode, http.Header) + Put(ctx context.Context, tb testing.TB, u URL, body ReqBody, headers ...http.Header) (ActualRespBody, RespStatusCode, http.Header) + Post(ctx context.Context, tb testing.TB, u URL, body ReqBody, headers ...http.Header) (ActualRespBody, RespStatusCode, http.Header) } TestConnector interface { connectorsfixture.TestConnector @@ -39,10 +39,10 @@ type ( WrapJSONBody(jsonData string) (ReqBody, ContentType) WrapMultipartBody(tb testing.TB, values map[string]any) (ReqBody, ContentType) - TestSwagger(context.Context, testing.TB) - TestHealthCheck(context.Context, testing.TB) + TestSwagger(ctx context.Context, tb testing.TB) + TestHealthCheck(ctx context.Context, tb testing.TB) - AssertUnauthorized(testing.TB, ExpectedRespBody, ActualRespBody, RespStatusCode, http.Header) + AssertUnauthorized(tb testing.TB, exp ExpectedRespBody, actual ActualRespBody, respCode RespStatusCode, headers http.Header) } ) diff --git a/server/fixture/fixture.go b/server/fixture/fixture.go index 3f94ec8..2bcbe00 100644 --- a/server/fixture/fixture.go +++ b/server/fixture/fixture.go @@ -13,6 +13,7 @@ import ( "os/exec" "path" "runtime" + "strconv" "strings" "syscall" "time" @@ -25,7 +26,7 @@ import ( "github.com/testcontainers/testcontainers-go/wait" "golang.org/x/net/http2" - appCfg "github.com/ice-blockchain/wintr/config" + appcfg "github.com/ice-blockchain/wintr/config" connectorsfixture "github.com/ice-blockchain/wintr/connectors/fixture" "github.com/ice-blockchain/wintr/log" "github.com/ice-blockchain/wintr/server" @@ -37,7 +38,7 @@ func NewTestConnector( additionalContainerMounts ...func(projectRoot string) testcontainers.ContainerMount, ) TestConnector { var cfg server.Config - appCfg.MustLoadFromKey(applicationYAMLKey, &cfg) + appcfg.MustLoadFromKey(applicationYAMLKey, &cfg) return &testConnector{ cfg: &cfg, @@ -146,7 +147,7 @@ func (tc *testConnector) buildContainerRequest(ctx context.Context) testcontaine osName = "linux" goarch = runtime.GOARCH ) - port := fmt.Sprintf("%v", tc.cfg.HTTPServer.Port) + port := strconv.FormatUint(uint64(tc.cfg.HTTPServer.Port), 10) return testcontainers.ContainerRequest{ FromDockerfile: testcontainers.FromDockerfile{ diff --git a/server/fixture/http.go b/server/fixture/http.go index 81da45a..97e61ca 100644 --- a/server/fixture/http.go +++ b/server/fixture/http.go @@ -123,7 +123,7 @@ func (tc *httpTestClient) testSwaggerRoot(ctx context.Context, tb testing.TB) { tb.Helper() body, status, headers := tc.Get(ctx, tb, tc.swaggerRoot) - assert.Greater(tb, len(body), 0) + assert.NotEmpty(tb, len(body)) assert.Equal(tb, http.StatusOK, status) l, err := strconv.Atoi(headers.Get("Content-Length")) require.NoError(tb, err) @@ -137,7 +137,7 @@ func (tc *httpTestClient) testSwaggerIndex(ctx context.Context, tb testing.TB) { tb.Helper() body, status, headers := tc.Get(ctx, tb, fmt.Sprintf("%v/swagger/index.html", tc.swaggerRoot)) - assert.Greater(tb, len(body), 0) + assert.NotEmpty(tb, len(body)) assert.Equal(tb, http.StatusOK, status) l, err := strconv.Atoi(headers.Get("Content-Length")) require.True(tb, err == nil && l > 0) @@ -187,7 +187,7 @@ func (*httpTestClient) AssertUnauthorized(tb testing.TB, expectedBody, body stri assert.Equal(tb, expectedBody, body) assert.Equal(tb, http.StatusUnauthorized, status) l, err := strconv.Atoi(headers.Get("Content-Length")) - assert.NoError(tb, err) + require.NoError(tb, err) assert.Greater(tb, l, 0) headers.Del("Date") headers.Del("Content-Length") diff --git a/server/router.go b/server/router.go index 86fd1ab..c759690 100644 --- a/server/router.go +++ b/server/router.go @@ -162,7 +162,7 @@ func (req *Request[REQ, RESP]) validate() *Response[ErrorResponse] { return UnprocessableEntity(errors.Errorf("properties `%v` are required", strings.Join(requiredFields, ",")), "MISSING_PROPERTIES") } -//nolint:gocyclo,revive,cyclop // . +//nolint:gocyclo,revive,cyclop,gocognit // . func (req *Request[REQ, RESP]) authorize(ctx context.Context) (errResp *Response[ErrorResponse]) { userID := strings.Trim(req.ginCtx.Param("userId"), " ") if req.allowUnauthorized { @@ -172,13 +172,13 @@ func (req *Request[REQ, RESP]) authorize(ctx context.Context) (errResp *Response } }() } - authToken := strings.TrimPrefix(req.ginCtx.GetHeader("Authorization"), "Bearer ") token, err := Auth(ctx).VerifyToken(ctx, authToken) if err != nil { if errors.Is(err, auth.ErrForbidden) { return Forbidden(err) } + return Unauthorized(err) } metadataHeader := req.ginCtx.GetHeader("X-Account-Metadata") @@ -187,9 +187,7 @@ func (req *Request[REQ, RESP]) authorize(ctx context.Context) (errResp *Response } req.AuthenticatedUser.Token = *token req.AuthenticatedUser.Language = req.ginCtx.GetHeader(languageHeader) - if userID != "" && - userID != "-" && - req.AuthenticatedUser.UserID != userID && + if userID != "" && userID != "-" && req.AuthenticatedUser.UserID != userID && ((!req.allowForbiddenWriteOperation && req.ginCtx.Request.Method != http.MethodGet) || (req.ginCtx.Request.Method == http.MethodGet && !req.allowForbiddenGet && !strings.HasSuffix(req.ginCtx.Request.URL.Path, userID))) { return Forbidden(errors.Errorf("operation not allowed. uri>%v!=token>%v", userID, req.AuthenticatedUser.UserID)) @@ -214,5 +212,5 @@ func (req *Request[REQ, RESP]) processErrorResponse(ctx context.Context, failure } func Auth(ctx context.Context) auth.Client { - return ctx.Value(authClientCtxValueKey).(auth.Client) //nolint:forcetypeassert // We know for sure. + return ctx.Value(authClientCtxValueKey).(auth.Client) //nolint:forcetypeassert,revive // We know for sure. } diff --git a/server/server.go b/server/server.go index 92e3634..84c769e 100644 --- a/server/server.go +++ b/server/server.go @@ -15,17 +15,17 @@ import ( "github.com/gin-gonic/gin" "github.com/pkg/errors" - swaggerFiles "github.com/swaggo/files" - ginSwagger "github.com/swaggo/gin-swagger" + swaggerfiles "github.com/swaggo/files" + ginswagger "github.com/swaggo/gin-swagger" "github.com/ice-blockchain/wintr/auth" - appCfg "github.com/ice-blockchain/wintr/config" + appcfg "github.com/ice-blockchain/wintr/config" "github.com/ice-blockchain/wintr/log" ) func New(state State, cfgKey, swaggerRoot string) Server { - appCfg.MustLoadFromKey(cfgKey, &cfg) - appCfg.MustLoadFromKey("development", &development) + appcfg.MustLoadFromKey(cfgKey, &cfg) + appcfg.MustLoadFromKey("development", &development) return &srv{State: state, swaggerRoot: swaggerRoot, applicationYAMLKey: cfgKey} } @@ -84,7 +84,7 @@ func (s *srv) setupSwaggerRoutes() { GET(root, func(c *gin.Context) { c.Redirect(http.StatusFound, (&url.URL{Path: fmt.Sprintf("%v/swagger/index.html", root)}).RequestURI()) }). - GET(fmt.Sprintf("%v/swagger/*any", root), ginSwagger.WrapHandler(swaggerFiles.Handler)) + GET(fmt.Sprintf("%v/swagger/*any", root), ginswagger.WrapHandler(swaggerfiles.Handler)) } func (s *srv) setupServer(ctx context.Context) { diff --git a/sms/contract.go b/sms/contract.go index 05457f5..c472cf3 100644 --- a/sms/contract.go +++ b/sms/contract.go @@ -34,7 +34,7 @@ type ( Client interface { VerifyPhoneNumber(ctx context.Context, number string) error - Send(context.Context, *Parcel) error + Send(ctx context.Context, p *Parcel) error } ) diff --git a/sms/internal/internal.go b/sms/internal/internal.go index df0b5b4..395e77b 100644 --- a/sms/internal/internal.go +++ b/sms/internal/internal.go @@ -3,7 +3,6 @@ package internal import ( - "fmt" "os" "strings" "sync/atomic" @@ -11,26 +10,26 @@ import ( "github.com/pkg/errors" "github.com/twilio/twilio-go" twilioopenapi "github.com/twilio/twilio-go/rest/api/v2010" - twilioopenapiMessagingV1 "github.com/twilio/twilio-go/rest/messaging/v1" + twilioopenapimessagingv1 "github.com/twilio/twilio-go/rest/messaging/v1" - appCfg "github.com/ice-blockchain/wintr/config" + appcfg "github.com/ice-blockchain/wintr/config" "github.com/ice-blockchain/wintr/log" ) func New(applicationYAMLKey string) (*twilio.RestClient, *PhoneNumbersRoundRobinLB) { var cfg config - appCfg.MustLoadFromKey(applicationYAMLKey, &cfg) + appcfg.MustLoadFromKey(applicationYAMLKey, &cfg) if cfg.WintrSMS.Credentials.User == "" { module := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(applicationYAMLKey, "-", "_"), "/", "_")) - cfg.WintrSMS.Credentials.User = os.Getenv(fmt.Sprintf("%s_SMS_CLIENT_USER", module)) + cfg.WintrSMS.Credentials.User = os.Getenv(module + "_SMS_CLIENT_USER") if cfg.WintrSMS.Credentials.User == "" { cfg.WintrSMS.Credentials.User = os.Getenv("SMS_CLIENT_USER") } } if cfg.WintrSMS.Credentials.Password == "" { module := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(applicationYAMLKey, "-", "_"), "/", "_")) - cfg.WintrSMS.Credentials.Password = os.Getenv(fmt.Sprintf("%s_SMS_CLIENT_PASSWORD", module)) + cfg.WintrSMS.Credentials.Password = os.Getenv(module + "_SMS_CLIENT_PASSWORD") if cfg.WintrSMS.Credentials.Password == "" { cfg.WintrSMS.Credentials.Password = os.Getenv("SMS_CLIENT_PASSWORD") } @@ -54,7 +53,7 @@ func (lb *PhoneNumbersRoundRobinLB) init(client *twilio.RestClient) *PhoneNumber for i := range allPhoneNumbersOwned { lb.phoneNumbers = append(lb.phoneNumbers, *(allPhoneNumbersOwned[i].PhoneNumber)) } - services, err := client.MessagingV1.ListService(new(twilioopenapiMessagingV1.ListServiceParams).SetLimit(1)) + services, err := client.MessagingV1.ListService(new(twilioopenapimessagingv1.ListServiceParams).SetLimit(1)) log.Panic(errors.Wrapf(err, "failed to ListMessageServices")) if len(services) > 0 { lb.schedulingMessagingServiceSID = *services[0].Sid diff --git a/time/contract.go b/time/contract.go index 995b4de..2366dab 100644 --- a/time/contract.go +++ b/time/contract.go @@ -28,6 +28,6 @@ var ( _ sql.Scanner = (*Time)(nil) _ interface{ MarshalBinary() ([]byte, error) } = (*Time)(nil) _ interface{ MarshalText() ([]byte, error) } = (*Time)(nil) - _ interface{ UnmarshalBinary([]byte) error } = (*Time)(nil) - _ interface{ UnmarshalText([]byte) error } = (*Time)(nil) + _ interface{ UnmarshalBinary(b []byte) error } = (*Time)(nil) + _ interface{ UnmarshalText(b []byte) error } = (*Time)(nil) ) diff --git a/time/time_test.go b/time/time_test.go index 56f03dc..fb405eb 100644 --- a/time/time_test.go +++ b/time/time_test.go @@ -45,7 +45,7 @@ func TestTime(t *testing.T) { marshalBinary2, err := t111.CreatedAt.MarshalText() require.NoError(t, err) assert.EqualValues(t, marshalBinary1, marshalBinary2) - assert.EqualValues(t, string(marshalBinary1), "") + assert.EqualValues(t, "", string(marshalBinary1)) bytes, err := json.MarshalContext(context.Background(), t1) require.NoError(t, err) assert.Equal(t, `{"createdAt":"2006-01-02T15:04:05.999999999Z"}`, string(bytes)) diff --git a/translations/contract.go b/translations/contract.go index f6e2536..3b04876 100644 --- a/translations/contract.go +++ b/translations/contract.go @@ -18,10 +18,10 @@ type ( TranslationValue = string TranslationArgs = map[string]string Client interface { - Translate(context.Context, Language, TranslationKey, ...TranslationArgs) (TranslationValue, error) - TranslateMultipleKeys(context.Context, Language, []TranslationKey, ...TranslationArgs) (map[TranslationKey]TranslationValue, error) - TranslateAllLanguages(context.Context, TranslationKey, ...TranslationArgs) (map[Language]TranslationValue, error) - TranslateMultipleKeysAllLanguages(context.Context, []TranslationKey, ...TranslationArgs) (map[Language]map[TranslationKey]TranslationValue, error) + Translate(ctx context.Context, lang Language, key TranslationKey, args ...TranslationArgs) (TranslationValue, error) + TranslateMultipleKeys(ctx context.Context, lang Language, keys []TranslationKey, args ...TranslationArgs) (map[TranslationKey]TranslationValue, error) + TranslateAllLanguages(ctx context.Context, key TranslationKey, args ...TranslationArgs) (map[Language]TranslationValue, error) + TranslateMultipleKeysAllLanguages(ctx context.Context, keys []TranslationKey, args ...TranslationArgs) (map[Language]map[TranslationKey]TranslationValue, error) //nolint:lll // . } ) diff --git a/translations/translations.go b/translations/translations.go index a7dddc9..6495684 100644 --- a/translations/translations.go +++ b/translations/translations.go @@ -16,17 +16,17 @@ import ( "github.com/hashicorp/go-multierror" "github.com/pkg/errors" - appCfg "github.com/ice-blockchain/wintr/config" + appcfg "github.com/ice-blockchain/wintr/config" "github.com/ice-blockchain/wintr/log" "github.com/ice-blockchain/wintr/time" ) func New(ctx context.Context, applicationYAMLKey string) Client { var cfg config - appCfg.MustLoadFromKey(applicationYAMLKey, &cfg) + appcfg.MustLoadFromKey(applicationYAMLKey, &cfg) if cfg.WintrTranslations.Credentials.APIKey == "" { module := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(applicationYAMLKey, "-", "_"), "/", "_")) - cfg.WintrTranslations.Credentials.APIKey = os.Getenv(fmt.Sprintf("%s_TRANSLATIONS_CLIENT_APIKEY", module)) + cfg.WintrTranslations.Credentials.APIKey = os.Getenv(module + "_TRANSLATIONS_CLIENT_APIKEY") if cfg.WintrTranslations.Credentials.APIKey == "" { cfg.WintrTranslations.Credentials.APIKey = os.Getenv("TRANSLATIONS_CLIENT_APIKEY") }