1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
// Copyright (c) 2026 The NORA Authors
// SPDX-License-Identifier: MIT
//! Docker storage key migration — consolidate legacy flat keys into namespaced format.
//!
//! After introducing namespaced storage keys (`docker/{namespace}/{name}/...`),
//! existing installations may have legacy keys (`docker/{name}/...`) alongside
//! new namespaced keys for the same images. This module provides a CLI migration
//! to consolidate them, eliminating double-counting in GC/retention and storage
//! reporting.
//!
//! Algorithm:
//! 1. List all keys under `docker/`
//! 2. Classify each key as namespaced (first segment after `docker/` contains a dot)
//! or legacy (no dot — plain image name)
//! 3. For legacy keys:
//! - If a namespaced equivalent already exists → delete legacy (dedup)
//! - If no namespaced equivalent → copy data to namespaced key, verify, delete legacy (migrate)
//! 4. Already-namespaced keys are skipped
use indicatif::{ProgressBar, ProgressStyle};
use tracing::{info, warn};
use crate::registry::docker::strip_docker_namespace;
use crate::storage::Storage;
/// Migration options
#[derive(Default)]
pub struct MigrateDockerKeysOptions {
/// If true, show what would be done without modifying storage
pub dry_run: bool,
}
/// Migration statistics
#[derive(Debug, Default)]
pub struct MigrateDockerKeysStats {
/// Total docker keys scanned
pub total_keys: usize,
/// Legacy keys copied to namespaced format and deleted
pub migrated: usize,
/// Legacy keys deleted because namespaced equivalent exists
pub deduped: usize,
/// Already-namespaced keys (no action needed)
pub skipped: usize,
/// Keys that failed to migrate
pub failed: usize,
/// Bytes freed by removing legacy duplicates
pub bytes_freed: u64,
}
/// Migrate legacy Docker storage keys to namespaced format.
///
/// `namespace` is the target namespace prefix (e.g., `"docker.io"`), typically
/// derived from `DockerUpstream::resolved_namespace()`.
pub async fn migrate_docker_keys(
storage: &Storage,
namespace: &str,
options: MigrateDockerKeysOptions,
) -> Result<MigrateDockerKeysStats, String> {
println!("Docker key migration: legacy → namespaced (namespace: {namespace})");
if options.dry_run {
println!("DRY RUN — no data will be modified");
}
println!("Scanning docker storage keys...");
let all_keys = storage
.list("docker/")
.await
.map_err(|e| format!("Failed to list docker keys: {}", e))?;
if all_keys.is_empty() {
println!("No docker keys found in storage.");
return Ok(MigrateDockerKeysStats::default());
}
println!("Found {} docker keys to analyze", all_keys.len());
let pb = ProgressBar::new(all_keys.len() as u64);
pb.set_style(
ProgressStyle::default_bar()
.template(
"{spinner:.green} [{elapsed_precise}] [{bar:40.cyan/blue}] {pos}/{len} ({eta})",
)
.expect("Invalid progress bar template")
.progress_chars("#>-"),
);
let mut stats = MigrateDockerKeysStats {
total_keys: all_keys.len(),
..Default::default()
};
for key in &all_keys {
let Some(rest) = key.strip_prefix("docker/") else {
stats.skipped += 1;
pb.inc(1);
continue;
};
// Extract repository name: everything before /manifests/ or /blobs/
let repo_name = if let Some(idx) = rest.find("/manifests/") {
&rest[..idx]
} else if let Some(idx) = rest.find("/blobs/") {
&rest[..idx]
} else {
// Not a manifest or blob key — skip (e.g., metadata or unknown)
stats.skipped += 1;
pb.inc(1);
continue;
};
if repo_name.is_empty() {
stats.skipped += 1;
pb.inc(1);
continue;
}
// Classify: if strip_docker_namespace changes the name, it's already namespaced
let canonical = strip_docker_namespace(repo_name);
if canonical != repo_name {
// Already namespaced — no action needed
stats.skipped += 1;
pb.inc(1);
continue;
}
// This is a legacy key (no namespace prefix).
// Build the target namespaced key by inserting {namespace}/ after "docker/".
let namespaced_key = format!("docker/{namespace}/{rest}");
// Check if the namespaced equivalent already exists
let ns_exists = storage.stat(&namespaced_key).await.is_some();
if ns_exists {
// Namespaced key exists — just remove the legacy duplicate
let freed = storage.stat(key).await.map_or(0, |m| m.size);
if options.dry_run {
info!(
legacy_key = %key,
namespaced_key = %namespaced_key,
bytes = freed,
action = "dedup",
"would delete legacy duplicate"
);
stats.deduped += 1;
stats.bytes_freed += freed;
} else {
match storage.delete(key).await {
Ok(()) => {
info!(
legacy_key = %key,
namespaced_key = %namespaced_key,
bytes = freed,
action = "dedup",
"deleted legacy duplicate"
);
stats.deduped += 1;
stats.bytes_freed += freed;
}
Err(e) => {
warn!(key = %key, error = %e, "failed to delete legacy key");
stats.failed += 1;
}
}
}
} else {
// No namespaced equivalent — copy data then delete legacy
if options.dry_run {
let size = storage.stat(key).await.map_or(0, |m| m.size);
info!(
legacy_key = %key,
namespaced_key = %namespaced_key,
bytes = size,
action = "migrate",
"would copy to namespaced key and delete legacy"
);
stats.migrated += 1;
} else {
match storage.get(key).await {
Ok(data) => {
let data_len = data.len() as u64;
// Write to namespaced location
if let Err(e) = storage.put(&namespaced_key, &data).await {
warn!(
key = %namespaced_key,
error = %e,
"failed to write namespaced key"
);
stats.failed += 1;
pb.inc(1);
continue;
}
// Verify write: check size matches
let written_size =
storage.stat(&namespaced_key).await.map_or(0, |m| m.size);
if written_size != data_len {
warn!(
key = %namespaced_key,
expected = data_len,
actual = written_size,
"size mismatch after write — skipping delete"
);
stats.failed += 1;
pb.inc(1);
continue;
}
// Delete legacy key
match storage.delete(key).await {
Ok(()) => {
info!(
legacy_key = %key,
namespaced_key = %namespaced_key,
bytes = data_len,
action = "migrate",
"migrated to namespaced key"
);
stats.migrated += 1;
stats.bytes_freed += data_len;
}
Err(e) => {
warn!(
key = %key,
error = %e,
"copied to namespaced but failed to delete legacy"
);
// Still counts as partial success — data is not lost
stats.migrated += 1;
}
}
}
Err(e) => {
warn!(key = %key, error = %e, "failed to read legacy key");
stats.failed += 1;
}
}
}
}
pb.inc(1);
}
pb.finish_with_message("Migration complete");
println!();
println!("Docker key migration summary:");
println!(" Total keys scanned: {}", stats.total_keys);
println!(" Migrated (copy+del): {}", stats.migrated);
println!(" Deduped (del legacy): {}", stats.deduped);
println!(" Skipped (already ns): {}", stats.skipped);
println!(" Failed: {}", stats.failed);
println!(" Bytes freed: {} KB", stats.bytes_freed / 1024);
if stats.failed > 0 {
warn!("{} keys failed to migrate", stats.failed);
}
if options.dry_run {
info!("Dry run complete. Re-run without --dry-run to perform actual migration.");
}
Ok(stats)
}
#[cfg(test)]
#[allow(clippy::unwrap_used)]
mod tests {
use super::*;
use tempfile::TempDir;
#[tokio::test]
async fn test_migrate_legacy_to_namespaced() {
let dir = TempDir::new().unwrap();
let storage = Storage::new_local(dir.path().to_str().unwrap());
// Legacy key (no namespace)
storage
.put(
"docker/library/nginx/manifests/latest.json",
b"manifest-data",
)
.await
.unwrap();
let stats = migrate_docker_keys(
&storage,
"docker.io",
MigrateDockerKeysOptions { dry_run: false },
)
.await
.unwrap();
assert_eq!(stats.migrated, 1);
assert_eq!(stats.deduped, 0);
assert_eq!(stats.failed, 0);
// Legacy key should be gone
assert!(storage
.get("docker/library/nginx/manifests/latest.json")
.await
.is_err());
// Namespaced key should exist with same data
let data = storage
.get("docker/docker.io/library/nginx/manifests/latest.json")
.await
.unwrap();
assert_eq!(&*data, b"manifest-data");
}
#[tokio::test]
async fn test_dedup_when_both_exist() {
let dir = TempDir::new().unwrap();
let storage = Storage::new_local(dir.path().to_str().unwrap());
// Both formats exist
storage
.put("docker/library/nginx/manifests/latest.json", b"old-data")
.await
.unwrap();
storage
.put(
"docker/docker.io/library/nginx/manifests/latest.json",
b"new-data",
)
.await
.unwrap();
let stats = migrate_docker_keys(
&storage,
"docker.io",
MigrateDockerKeysOptions { dry_run: false },
)
.await
.unwrap();
assert_eq!(stats.deduped, 1, "legacy duplicate should be deduped");
assert_eq!(stats.skipped, 1, "namespaced key should be skipped");
assert_eq!(stats.migrated, 0);
// Legacy gone, namespaced preserved with its own data
assert!(storage
.get("docker/library/nginx/manifests/latest.json")
.await
.is_err());
let data = storage
.get("docker/docker.io/library/nginx/manifests/latest.json")
.await
.unwrap();
assert_eq!(&*data, b"new-data");
}
#[tokio::test]
async fn test_skip_already_namespaced() {
let dir = TempDir::new().unwrap();
let storage = Storage::new_local(dir.path().to_str().unwrap());
// Only namespaced key
storage
.put(
"docker/docker.io/library/nginx/manifests/latest.json",
b"data",
)
.await
.unwrap();
let stats = migrate_docker_keys(
&storage,
"docker.io",
MigrateDockerKeysOptions { dry_run: false },
)
.await
.unwrap();
assert_eq!(stats.skipped, 1);
assert_eq!(stats.migrated, 0);
assert_eq!(stats.deduped, 0);
}
#[tokio::test]
async fn test_dry_run_does_not_modify() {
let dir = TempDir::new().unwrap();
let storage = Storage::new_local(dir.path().to_str().unwrap());
storage
.put("docker/library/nginx/manifests/latest.json", b"data")
.await
.unwrap();
let stats = migrate_docker_keys(
&storage,
"docker.io",
MigrateDockerKeysOptions { dry_run: true },
)
.await
.unwrap();
assert_eq!(stats.migrated, 1);
// Original key should still exist (dry run)
assert!(storage
.get("docker/library/nginx/manifests/latest.json")
.await
.is_ok());
// Namespaced key should NOT exist
assert!(storage
.get("docker/docker.io/library/nginx/manifests/latest.json")
.await
.is_err());
}
#[tokio::test]
async fn test_empty_storage() {
let dir = TempDir::new().unwrap();
let storage = Storage::new_local(dir.path().to_str().unwrap());
let stats = migrate_docker_keys(
&storage,
"docker.io",
MigrateDockerKeysOptions { dry_run: false },
)
.await
.unwrap();
assert_eq!(stats.total_keys, 0);
assert_eq!(stats.migrated, 0);
}
#[tokio::test]
async fn test_migrate_blobs() {
let dir = TempDir::new().unwrap();
let storage = Storage::new_local(dir.path().to_str().unwrap());
// Legacy blob key
storage
.put("docker/library/nginx/blobs/sha256:abc123", b"blob-data")
.await
.unwrap();
let stats = migrate_docker_keys(
&storage,
"docker.io",
MigrateDockerKeysOptions { dry_run: false },
)
.await
.unwrap();
assert_eq!(stats.migrated, 1);
// Should be at namespaced location
let data = storage
.get("docker/docker.io/library/nginx/blobs/sha256:abc123")
.await
.unwrap();
assert_eq!(&*data, b"blob-data");
}
#[tokio::test]
async fn test_idempotent() {
let dir = TempDir::new().unwrap();
let storage = Storage::new_local(dir.path().to_str().unwrap());
storage
.put("docker/library/nginx/manifests/latest.json", b"data")
.await
.unwrap();
// First run: migrates
let stats1 = migrate_docker_keys(
&storage,
"docker.io",
MigrateDockerKeysOptions { dry_run: false },
)
.await
.unwrap();
assert_eq!(stats1.migrated, 1);
// Second run: nothing to do
let stats2 = migrate_docker_keys(
&storage,
"docker.io",
MigrateDockerKeysOptions { dry_run: false },
)
.await
.unwrap();
assert_eq!(stats2.migrated, 0);
assert_eq!(stats2.skipped, 1);
}
}