|
4 | 4 | "context" |
5 | 5 | goerrors "errors" |
6 | 6 | "fmt" |
| 7 | + "slices" |
7 | 8 |
|
8 | 9 | "github.com/go-crypt/crypt" |
9 | 10 | "github.com/influxdata/influxdb/v2" |
@@ -241,7 +242,7 @@ func (s *Store) autogenerateHasher(ctx context.Context, variantName string) (*Au |
241 | 242 | hasherVariant := influxdb2_algo.NewVariant(variantName) |
242 | 243 | decoderVariants = append(decoderVariants, hasherVariant) |
243 | 244 | delete(foundVariants, hasherVariant) |
244 | | - for variant, _ := range foundVariants { |
| 245 | + for variant := range foundVariants { |
245 | 246 | decoderVariants = append(decoderVariants, variant) |
246 | 247 | } |
247 | 248 |
|
@@ -274,26 +275,13 @@ func (s *Store) hashedTokenMigration(ctx context.Context) error { |
274 | 275 | return err |
275 | 276 | } |
276 | 277 |
|
277 | | - /* |
278 | | - for batch := range slices.Chunk(authsNeedingUpdate, 100) { |
279 | | - err := s.Update(ctx, func(tx kv.Tx) error { |
280 | | - // Now update them. This really seems too simple, but s.UpdateJAuthorization() is magical. |
281 | | - for _, a := range batch { |
282 | | - if _, err := s.UpdateAuthorization(ctx, tx, a.ID, a); err != nil { |
283 | | - return err |
284 | | - } |
| 278 | + for batch := range slices.Chunk(authsNeedingUpdate, 100) { |
| 279 | + err := s.Update(ctx, func(tx kv.Tx) error { |
| 280 | + // Now update them. This really seems too simple, but s.UpdateJAuthorization() is magical. |
| 281 | + for _, a := range batch { |
| 282 | + if _, err := s.UpdateAuthorization(ctx, tx, a.ID, a); err != nil { |
| 283 | + return err |
285 | 284 | } |
286 | | - return nil |
287 | | - }) |
288 | | - if err != nil { |
289 | | - return fmt.Errorf("error migrating hashed tokens: %w", err) |
290 | | - } |
291 | | - } |
292 | | - */ |
293 | | - for _, a := range authsNeedingUpdate { |
294 | | - err = s.Update(ctx, func(tx kv.Tx) error { |
295 | | - if _, err := s.UpdateAuthorization(ctx, tx, a.ID, a); err != nil { |
296 | | - return err |
297 | 285 | } |
298 | 286 | return nil |
299 | 287 | }) |
|
0 commit comments