Commit d5507fa
committed
Refactor snapshot retrieval to use ContainerOrchestratorUtility
Simplify the getSnapshotsForPVC function by delegating snapshot retrieval
to the ContainerOrchestratorUtility interface instead of directly using
the snapshot client. This improves testability and maintains consistency
with the existing architecture.
Changes:
- Remove direct dependency on external-snapshotter client in util.go
- Update getSnapshotsForPVC to use ContainerOrchestratorUtility.GetSnapshotsForPVC
- Remove rest.Config parameter from getSnapshotsForPVC function signature
- Add comprehensive unit tests for getSnapshotsForPVC covering:
* Uninitialized ContainerOrchestratorUtility scenario
* PVC with no snapshots
* PVC with multiple snapshots
- Implement GetSnapshotsForPVC in FakeK8SOrchestrator for testing
- Add TODO comment for future refactoring of pvcToSnapshotsMap key type
Benefits:
- Improved testability through dependency injection
- Reduced coupling to external snapshot client
- Consistent error handling
- Better alignment with existing orchestrator abstraction pattern1 parent 205905d commit d5507fa
File tree
4 files changed
+71
-30
lines changed- pkg
- common/unittestcommon
- csi/service/common/commonco/k8sorchestrator
- syncer/cnsoperator/controller/cnsunregistervolume
4 files changed
+71
-30
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
517 | 517 | | |
518 | 518 | | |
519 | 519 | | |
520 | | - | |
521 | | - | |
| 520 | + | |
| 521 | + | |
| 522 | + | |
| 523 | + | |
| 524 | + | |
522 | 525 | | |
523 | 526 | | |
524 | 527 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
251 | 251 | | |
252 | 252 | | |
253 | 253 | | |
| 254 | + | |
254 | 255 | | |
255 | 256 | | |
256 | 257 | | |
| |||
Lines changed: 8 additions & 28 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
25 | 24 | | |
26 | 25 | | |
27 | 26 | | |
| |||
111 | 110 | | |
112 | 111 | | |
113 | 112 | | |
114 | | - | |
| 113 | + | |
115 | 114 | | |
116 | 115 | | |
117 | 116 | | |
| |||
222 | 221 | | |
223 | 222 | | |
224 | 223 | | |
225 | | - | |
226 | | - | |
| 224 | + | |
227 | 225 | | |
228 | | - | |
229 | | - | |
230 | | - | |
231 | | - | |
232 | | - | |
233 | | - | |
234 | | - | |
235 | | - | |
236 | | - | |
237 | | - | |
238 | | - | |
239 | | - | |
240 | | - | |
241 | | - | |
242 | | - | |
243 | | - | |
244 | | - | |
245 | | - | |
246 | | - | |
247 | | - | |
248 | | - | |
249 | | - | |
250 | | - | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
251 | 230 | | |
252 | 231 | | |
253 | | - | |
| 232 | + | |
| 233 | + | |
254 | 234 | | |
255 | 235 | | |
256 | 236 | | |
| |||
Lines changed: 57 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 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 | + | |
0 commit comments