Skip to content

Commit

Permalink
Linter 1.62.0 fix.
Browse files Browse the repository at this point in the history
  • Loading branch information
ice-myles committed Nov 11, 2024
1 parent a2889e0 commit 0144a0b
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions auth/email_link/email_modify.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func (c *client) handleEmailModification(ctx context.Context, els *emailLinkSign
}
if els.Metadata != nil {
if firebaseID, hasFirebaseID := (*els.Metadata)[auth.FirebaseIDClaim]; hasFirebaseID {
if fErr := server.Auth(ctx).UpdateEmail(ctx, firebaseID.(string), newEmail); fErr != nil { //nolint:forcetypeassert // .
if fErr := server.Auth(ctx).UpdateEmail(ctx, firebaseID.(string), newEmail); fErr != nil { //nolint:forcetypeassert,errcheck // .
oldEmailVal := oldEmail
if els.PhoneNumberToEmailMigrationUserID != nil && *els.PhoneNumberToEmailMigrationUserID != "" {
oldEmailVal = usr.ID
Expand Down Expand Up @@ -95,7 +95,7 @@ func (*client) resetFirebaseEmailModification(ctx context.Context, md *users.JSO
if md != nil {
if firebaseID, hasFirebaseID := (*md)[auth.FirebaseIDClaim]; hasFirebaseID {
return errors.Wrapf(
server.Auth(ctx).UpdateEmail(ctx, firebaseID.(string), oldEmail), //nolint:forcetypeassert // .
server.Auth(ctx).UpdateEmail(ctx, firebaseID.(string), oldEmail), //nolint:forcetypeassert,errcheck // .
"failed to change email in firebase to:%v fbUserID:%v", oldEmail, firebaseID,
)
}
Expand Down
2 changes: 1 addition & 1 deletion auth/email_link/link_verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ func (c *client) finishAuthProcess(
}
if _, hasRegisteredWith := (*md)[wintrauth.RegisteredWithProviderClaim]; !hasRegisteredWith {
if firebaseID, hasFirebaseID := (*md)[wintrauth.FirebaseIDClaim]; hasFirebaseID {
if !strings.HasPrefix(firebaseID.(string), iceIDPrefix) && !strings.HasPrefix(userID, iceIDPrefix) { //nolint:forcetypeassert // .
if !strings.HasPrefix(firebaseID.(string), iceIDPrefix) && !strings.HasPrefix(userID, iceIDPrefix) { //nolint:forcetypeassert,errcheck // .
mdToUpdate[wintrauth.RegisteredWithProviderClaim] = wintrauth.ProviderFirebase
}
}
Expand Down
8 changes: 4 additions & 4 deletions auth/email_link/queue.go
Original file line number Diff line number Diff line change
Expand Up @@ -250,14 +250,14 @@ func (c *client) dequeueNextEmails(ctx context.Context) (emailsBatch []string, s
return nil, nil, "", errors.Wrapf(rateErr, "failed to fetch %v email sending rate", pipeRes[1].String())
}
}
batch := pipeRes[0].(*redis.ZSliceCmd).Val() //nolint:forcetypeassert // .
batch := pipeRes[0].(*redis.ZSliceCmd).Val() //nolint:forcetypeassert,errcheck // .
emailsBatch = make([]string, 0, len(batch))
scores = make(map[string]int64, 0)
for _, itemInBatch := range batch {
emailsBatch = append(emailsBatch, itemInBatch.Member.(string)) //nolint:forcetypeassert // .
emailsBatch = append(emailsBatch, itemInBatch.Member.(string)) //nolint:forcetypeassert,errcheck // .
scores[emailsBatch[len(emailsBatch)-1]] = int64(itemInBatch.Score)
}
rate := pipeRes[1].(*redis.StringCmd).Val() //nolint:forcetypeassert // .
rate := pipeRes[1].(*redis.StringCmd).Val() //nolint:forcetypeassert,errcheck // .

return emailsBatch, scores, rate, nil
}
Expand Down Expand Up @@ -290,7 +290,7 @@ func (c *client) filterEmailsWithAliveTTL(ctx context.Context, now *time.Time, e
return nil, errors.Wrapf(remErr, "failed to del ttl %v email ttl", pipeRes[1].String())
}
}
ttlBatch := pipeRes[0].(*redis.FloatSliceCmd).Val() //nolint:forcetypeassert // .
ttlBatch := pipeRes[0].(*redis.FloatSliceCmd).Val() //nolint:forcetypeassert,errcheck // .
if len(ttlBatch) == 0 {
return ttls, nil
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/eskimo-hut/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ func (*service) handleFirebaseEmailMismatch(ctx context.Context, loggedInUser *s

fbClaimInterface, hasFBClaim := loggedInUser.Claims["firebase"]
if hasFBClaim {
signInWithInterface, hasSignInProvider := fbClaimInterface.(map[string]any)["sign_in_provider"]
signInWithInterface, hasSignInProvider := fbClaimInterface.(map[string]any)["sign_in_provider"] //nolint:errcheck // .
if hasSignInProvider {
if signInProvider := signInWithInterface.(string); signInProvider != "password" { //nolint:forcetypeassert,errcheck // .
return nil
Expand Down
2 changes: 1 addition & 1 deletion cmd/fixture/fixture.go
Original file line number Diff line number Diff line change
Expand Up @@ -238,5 +238,5 @@ func (*TestConnectorsBridge) GetAllTestingAuthorizations() (userIDs, tokens []st

func (*TestConnectorsBridge) AssertResponseBody(tb testing.TB, expectedRespBody, actualRespBody string) {
tb.Helper()
assert.Regexp(tb, regexp.MustCompile(strings.ReplaceAll(strings.ReplaceAll(expectedRespBody, "\t", ""), "\n", "")), actualRespBody)
assert.Regexp(tb, regexp.MustCompile(strings.ReplaceAll(strings.ReplaceAll(expectedRespBody, "\t", ""), "\n", "")), actualRespBody) //nolint:testifylint // .
}
6 changes: 3 additions & 3 deletions kyc/social/slack_alerts.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func (r *repository) startUnsuccessfulKYCStepsAlerter(ctx context.Context, kycSt
if !found {
log.Panic(fmt.Sprintf("failed to get alertFrequency for %v", kycStep))
}
ticker := stdlibtime.NewTicker(alertFrequencyDuration.(stdlibtime.Duration)) //nolint:forcetypeassert // .
ticker := stdlibtime.NewTicker(alertFrequencyDuration.(stdlibtime.Duration)) //nolint:forcetypeassert,errcheck // .
defer ticker.Stop()

for {
Expand Down Expand Up @@ -78,10 +78,10 @@ func (r *repository) sendUnsuccessfulKYCStepsAlertToSlack(ctx context.Context, t
if !found {
log.Panic(fmt.Sprintf("failed to get alertFrequency for %v", kycStep))
}
if time.Now().Sub(*alert.LastAlertAt.Time) < stdlibtime.Duration(float64(freq.(stdlibtime.Duration).Nanoseconds())*0.8) { //nolint:gomnd,forcetypeassert,lll // .
if time.Now().Sub(*alert.LastAlertAt.Time) < stdlibtime.Duration(float64(freq.(stdlibtime.Duration).Nanoseconds())*0.8) { //nolint:gomnd,forcetypeassert,lll,errcheck // .
return errRaceCondition
}
if newFrequency := stdlibtime.Duration(alert.FrequencyInSeconds) * stdlibtime.Second; newFrequency != freq.(stdlibtime.Duration) { //nolint:forcetypeassert,gosec,lll // .
if newFrequency := stdlibtime.Duration(alert.FrequencyInSeconds) * stdlibtime.Second; newFrequency != freq.(stdlibtime.Duration) { //nolint:forcetypeassert,gosec,lll,errcheck // .
r.cfg.alertFrequency.Store(kycStep, newFrequency)
ticker.Reset(newFrequency)
}
Expand Down
2 changes: 1 addition & 1 deletion users/user_growth.go
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ func (r *repository) incrementOrDecrementTotalUsers(ctx context.Context, date *t
}
keys := make([]string, 0, len(params))
for _, v := range params {
keys = append(keys, v.(string)) //nolint:forcetypeassert // We know for sure.
keys = append(keys, v.(string)) //nolint:forcetypeassert,errcheck // We know for sure.
}

return errors.Wrapf(r.notifyGlobalValueUpdateMessage(ctx, keys...), "failed to notifyGlobalValueUpdateMessage, keys:%#v", keys)
Expand Down

0 comments on commit 0144a0b

Please sign in to comment.