Commit aaa7ec9
Fix CopyBaseImages failure for external source registries (#1975)
Fix the `check-base-image-updates-official` pipeline
caused by `CopyImageService.ImportImageAsync` throwing
`InvalidOperationException` when the source registry is an external
registry like `docker.io`. PR #1945 moved subscription and resource
group lookups into `CopyImageService`, but the new code unconditionally calls `GetRegistryResource()` for the source registry, which throws when the registry isn't in the publish configuration. External registries like `docker.io` use username/password credentials for ACR import (via `RegistryAddress` + `Credentials`), not Azure resource IDs — they are intentionally not in the `RegistryAuthentication` list.
- Check `FindRegistryAuthentication()` before calling
`GetRegistryResource()` in `CopyImageService.ImportImageAsync`, so
external source registries correctly get a null `ResourceId` and use the
`RegistryAddress` code path
- Add test
`ImportImageAsync_ExternalSourceRegistry_DoesNotRequireSourceRegistryInPublishConfig`
to cover the non-dry-run external registry scenario (existing test only
covered the dry-run path)
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>1 parent 22bd4c6 commit aaa7ec9
3 files changed
Lines changed: 73 additions & 5 deletions
File tree
- src
- ImageBuilder.Tests
- ImageBuilder
- Configuration
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
4 | 5 | | |
| 6 | + | |
5 | 7 | | |
6 | 8 | | |
7 | 9 | | |
| |||
35 | 37 | | |
36 | 38 | | |
37 | 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 | + | |
38 | 100 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | | - | |
| 50 | + | |
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
77 | 83 | | |
78 | 84 | | |
79 | 85 | | |
| |||
0 commit comments