From 07f1d60a52b4b922e8c2ca336f0de3021680433c Mon Sep 17 00:00:00 2001
From: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Fri, 19 Sep 2025 09:41:55 -0700
Subject: [PATCH] Use com.apple.container.registry as keychain ID. (#652)

- Closes #644.

## Type of Change
- [ ] Bug fix
- [ ] New feature
- [x] Breaking change
- [ ] Documentation update

## Motivation and Context
Avoids conflicts.

## Testing
- [x] Tested locally
- [ ] Added/updated tests
- [ ] Added/updated docs
---
 Sources/ContainerClient/Core/Constants.swift                  | 2 +-
 .../Services/ContainerImagesService/Server/ImageService.swift | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Sources/ContainerClient/Core/Constants.swift b/Sources/ContainerClient/Core/Constants.swift
index db321d93..ca0710cb 100644
--- a/Sources/ContainerClient/Core/Constants.swift
+++ b/Sources/ContainerClient/Core/Constants.swift
@@ -15,5 +15,5 @@
 //===----------------------------------------------------------------------===//
 
 public enum Constants {
-    public static let keychainID = "com.apple.container"
+    public static let keychainID = "com.apple.container.registry"
 }
diff --git a/Sources/Services/ContainerImagesService/Server/ImageService.swift b/Sources/Services/ContainerImagesService/Server/ImageService.swift
index 59e5ef77..18e5a34b 100644
--- a/Sources/Services/ContainerImagesService/Server/ImageService.swift
+++ b/Sources/Services/ContainerImagesService/Server/ImageService.swift
@@ -26,8 +26,6 @@ import Logging
 import TerminalProgress
 
 public actor ImagesService {
-    public static let keychainID = "com.apple.container"
-
     private let log: Logger
     private let contentStore: ContentStore
     private let imageStore: ImageStore
@@ -165,7 +163,7 @@ extension ImagesService {
         if let authentication {
             return try await body(authentication)
         }
-        let keychain = KeychainHelper(id: Self.keychainID)
+        let keychain = KeychainHelper(id: Constants.keychainID)
         do {
             authentication = try keychain.lookup(domain: host)
         } catch let err as KeychainHelper.Error {