Refactor configuration keys into protocol-based ConfigKeyKit (#15)

Author: leogdion

Package.swift

@@ -87,6 +87,7 @@ let package = Package(
         .visionOS(.v2)
     ],
     products: [
+        .library(name: "ConfigKeyKit", targets: ["ConfigKeyKit"]),
         .library(name: "BushelCloudKit", targets: ["BushelCloudKit"]),
         .executable(name: "bushel-cloud", targets: ["BushelCloudCLI"])
     ],
@@ -102,9 +103,15 @@ let package = Package(
         )
     ],
     targets: [
+        .target(
+            name: "ConfigKeyKit",
+            dependencies: [],
+            swiftSettings: swiftSettings
+        ),
         .target(
             name: "BushelCloudKit",
             dependencies: [
+                .target(name: "ConfigKeyKit"),
                 .product(name: "MistKit", package: "MistKit"),
                 .product(name: "BushelLogging", package: "BushelKit"),
                 .product(name: "BushelFoundation", package: "BushelKit"),
@@ -123,6 +130,13 @@ let package = Package(
             ],
             swiftSettings: swiftSettings
         ),
+        .testTarget(
+            name: "ConfigKeyKitTests",
+            dependencies: [
+                .target(name: "ConfigKeyKit")
+            ],
+            swiftSettings: swiftSettings
+        ),
         .testTarget(
             name: "BushelCloudKitTests",
             dependencies: [

Sources/BushelCloudKit/Configuration/ConfigurationKeys.swift

@@ -5,76 +5,112 @@
 //  Configuration keys for reading from providers
 //
 
+import ConfigKeyKit
 import Foundation
 
 /// Configuration keys for reading from providers
 internal enum ConfigurationKeys {
+  // MARK: - CloudKit Configuration
+
   /// CloudKit configuration keys
   internal enum CloudKit {
-    internal static let containerID = "cloudkit.container_id"
-    internal static let containerIDEnv = "CLOUDKIT_CONTAINER_ID"
-    internal static let keyID = "cloudkit.key_id"
-    internal static let keyIDEnv = "CLOUDKIT_KEY_ID"
-    internal static let privateKeyPath = "cloudkit.private_key_path"
-    internal static let privateKeyPathEnv = "CLOUDKIT_PRIVATE_KEY_PATH"
+    // Using base key with auto-generation (no prefix for CloudKit ENV vars)
+    internal static let containerID = ConfigKey<String>(
+      "cloudkit.container_id",
+      envPrefix: nil,  // Generates: CLI="cloudkit.container_id", ENV="CLOUDKIT_CONTAINER_ID"
+      default: "iCloud.com.brightdigit.Bushel"
+    )
+
+    internal static let keyID = OptionalConfigKey<String>(
+      "cloudkit.key_id",
+      envPrefix: nil
+    )
+
+    internal static let privateKeyPath = OptionalConfigKey<String>(
+      "cloudkit.private_key_path",
+      envPrefix: nil
+    )
   }
 
+  // MARK: - VirtualBuddy Configuration
+
   /// VirtualBuddy TSS API configuration keys
   internal enum VirtualBuddy {
-    internal static let apiKey = "virtualbuddy.api_key"
-    internal static let apiKeyEnv = "VIRTUALBUDDY_API_KEY"
+    internal static let apiKey = OptionalConfigKey<String>(
+      "virtualbuddy.api_key",
+      envPrefix: nil  // Generates: ENV="VIRTUALBUDDY_API_KEY"
+    )
   }
 
+  // MARK: - Fetch Configuration
+
   /// Fetch throttling configuration keys
   internal enum Fetch {
-    internal static let intervalGlobal = "fetch.interval_global"
-    internal static let intervalGlobalEnv = "BUSHEL_FETCH_INTERVAL_GLOBAL"
+    internal static let intervalGlobal = OptionalConfigKey<Double>(
+      bushelPrefixed: "fetch.interval_global"  // Generates: ENV="BUSHEL_FETCH_INTERVAL_GLOBAL"
+    )
 
-    /// Per-source interval key prefix (e.g., "fetch.interval.appledb_dev")
-    internal static func intervalKey(for source: String) -> String {
-      "fetch.interval.\(source.replacingOccurrences(of: ".", with: "_"))"
+    /// Generate per-source interval key dynamically
+    /// - Parameter source: Data source identifier (e.g., "appledb.dev")
+    /// - Returns: An OptionalConfigKey<Double> for the source-specific interval
+    internal static func intervalKey(for source: String) -> OptionalConfigKey<Double> {
+      let normalized = source.replacingOccurrences(of: ".", with: "_")
+      return OptionalConfigKey<Double>(
+        "fetch.interval.\(normalized)",
+        envPrefix: nil  // CLI: "fetch.interval.appledb_dev", ENV: "FETCH_INTERVAL_APPLEDB_DEV"
+      )
     }
   }
 
-  /// Sync command configuration keys
+  // MARK: - Sync Command Configuration
+
+  /// Sync command configuration keys (using base key with BUSHEL prefix)
   internal enum Sync {
-    internal static let dryRun = "sync.dry_run"
-    internal static let restoreImagesOnly = "sync.restore_images_only"
-    internal static let xcodeOnly = "sync.xcode_only"
-    internal static let swiftOnly = "sync.swift_only"
-    internal static let noBetas = "sync.no_betas"
-    internal static let noAppleWiki = "sync.no_apple_wiki"
-    internal static let verbose = "sync.verbose"
-    internal static let force = "sync.force"
-    internal static let minInterval = "sync.min_interval"
-    internal static let source = "sync.source"
+    internal static let dryRun = ConfigKey<Bool>(bushelPrefixed: "sync.dry_run")
+    internal static let restoreImagesOnly = ConfigKey<Bool>(bushelPrefixed: "sync.restore_images_only")
+    internal static let xcodeOnly = ConfigKey<Bool>(bushelPrefixed: "sync.xcode_only")
+    internal static let swiftOnly = ConfigKey<Bool>(bushelPrefixed: "sync.swift_only")
+    internal static let noBetas = ConfigKey<Bool>(bushelPrefixed: "sync.no_betas")
+    internal static let noAppleWiki = ConfigKey<Bool>(bushelPrefixed: "sync.no_apple_wiki")
+    internal static let verbose = ConfigKey<Bool>(bushelPrefixed: "sync.verbose")
+    internal static let force = ConfigKey<Bool>(bushelPrefixed: "sync.force")
+    internal static let minInterval = OptionalConfigKey<Int>(bushelPrefixed: "sync.min_interval")
+    internal static let source = OptionalConfigKey<String>(bushelPrefixed: "sync.source")
   }
 
+  // MARK: - Export Command Configuration
+
   /// Export command configuration keys
   internal enum Export {
-    internal static let output = "export.output"
-    internal static let pretty = "export.pretty"
-    internal static let signedOnly = "export.signed_only"
-    internal static let noBetas = "export.no_betas"
-    internal static let verbose = "export.verbose"
+    internal static let output = OptionalConfigKey<String>(bushelPrefixed: "export.output")
+    internal static let pretty = ConfigKey<Bool>(bushelPrefixed: "export.pretty")
+    internal static let signedOnly = ConfigKey<Bool>(bushelPrefixed: "export.signed_only")
+    internal static let noBetas = ConfigKey<Bool>(bushelPrefixed: "export.no_betas")
+    internal static let verbose = ConfigKey<Bool>(bushelPrefixed: "export.verbose")
   }
 
+  // MARK: - Status Command Configuration
+
   /// Status command configuration keys
   internal enum Status {
-    internal static let errorsOnly = "status.errors_only"
-    internal static let detailed = "status.detailed"
+    internal static let errorsOnly = ConfigKey<Bool>(bushelPrefixed: "status.errors_only")
+    internal static let detailed = ConfigKey<Bool>(bushelPrefixed: "status.detailed")
   }
 
+  // MARK: - List Command Configuration
+
   /// List command configuration keys
   internal enum List {
-    internal static let restoreImages = "list.restore_images"
-    internal static let xcodeVersions = "list.xcode_versions"
-    internal static let swiftVersions = "list.swift_versions"
+    internal static let restoreImages = ConfigKey<Bool>(bushelPrefixed: "list.restore_images")
+    internal static let xcodeVersions = ConfigKey<Bool>(bushelPrefixed: "list.xcode_versions")
+    internal static let swiftVersions = ConfigKey<Bool>(bushelPrefixed: "list.swift_versions")
   }
 
+  // MARK: - Clear Command Configuration
+
   /// Clear command configuration keys
   internal enum Clear {
-    internal static let yes = "clear.yes"
-    internal static let verbose = "clear.verbose"
+    internal static let yes = ConfigKey<Bool>(bushelPrefixed: "clear.yes")
+    internal static let verbose = ConfigKey<Bool>(bushelPrefixed: "clear.verbose")
   }
 }