Simplify: resolve authconfig once, pass it through directly

Author: firecow

src/context.ts

@@ -4,7 +4,7 @@ import Dockerode from "dockerode";
 import {getCurrent} from "./docker-api.js";
 import {initHashedConfigs} from "./hashed-config.js";
 import {ArgumentsCamelCase} from "yargs";
-import {loadDockerConfig} from "./docker-config.js";
+import {loadAuthConfig} from "./docker-config.js";
 
 
 export async function initContext (args: ArgumentsCamelCase) {
@@ -25,7 +25,7 @@ export async function initContext (args: ArgumentsCamelCase) {
 
     const hashedConfigs = await initHashedConfigs(config);
 
-    const dockerConfig = await loadDockerConfig();
+    const authconfig = await loadAuthConfig();
 
-    return {appName, config, dockerode, current, hashedConfigs, dockerConfig};
+    return {appName, config, dockerode, current, hashedConfigs, authconfig};
 }

src/docker-api.ts

@@ -1,9 +1,8 @@
-import Dockerode, {ConfigInfo, NetworkInspectInfo, Service} from "dockerode";
+import Dockerode, {AuthConfig, ConfigInfo, NetworkInspectInfo, Service} from "dockerode";
 import {initServiceSpec, sortServiceSpec} from "./service-spec.js";
 import {HashedConfigs} from "./hashed-config.js";
 import {assertString} from "./asserts.js";
 import {SwarmAppConfig} from "./swarm-app-config.js";
-import {DockerConfigFile, getAuthForImage} from "./docker-config.js";
 import timers from "timers/promises";
 import assert from "assert";
 
@@ -117,21 +116,19 @@ interface UpsertServicesOpts {
     current: DockerResources;
     appName: string;
     hashedConfigs: HashedConfigs;
-    dockerConfig?: DockerConfigFile;
+    authconfig?: AuthConfig | undefined;
 }
-export async function upsertServices ({dockerode, config, current, appName, hashedConfigs, dockerConfig}: UpsertServicesOpts) {
+export async function upsertServices ({dockerode, config, current, appName, hashedConfigs, authconfig}: UpsertServicesOpts) {
     for (const serviceName of Object.keys(config.service_specs)) {
         const serviceSpec = initServiceSpec({appName, serviceName, config, hashedConfigs, current});
-        const image = config.service_specs[serviceName]?.image;
-        const authconfig = image && dockerConfig ? getAuthForImage(image, dockerConfig) : undefined;
         const foundService = current.services.find((s) => s.Spec?.Name === `${appName}_${serviceName}`);
         if (!foundService) {
             console.log(`Creating service ${appName}_${serviceName}`);
-            await dockerode.createService({...serviceSpec, authconfig});
+            await dockerode.createService({...serviceSpec, authconfig: authconfig});
         } else {
             serviceSpec.version = foundService.Version?.Index ?? 0;
             console.log(`Updating service ${appName}_${serviceName}`);
-            await dockerode.getService(foundService.ID).update({...serviceSpec, authconfig});
+            await dockerode.getService(foundService.ID).update({...serviceSpec, authconfig: authconfig});
         }
     }
 }

src/docker-config.ts

@@ -2,47 +2,30 @@ import fs from "fs";
 import path from "path";
 import {AuthConfig} from "dockerode";
 
-type DockerConfigAuths = Record<string, {auth?: string}>;
-
-export interface DockerConfigFile {
-    auths?: DockerConfigAuths;
-}
+export async function loadAuthConfig (): Promise<AuthConfig | undefined> {
+    const configDir = process.env.DOCKER_CONFIG ?? path.join(process.env.HOME ?? "~", ".docker");
+    const configPath = path.join(configDir, "config.json");
 
-function extractRegistry (image: string): string {
-    const parts = image.split("/");
-    const first = parts[0];
-    if (parts.length >= 2 && first && (first.includes(".") || first.includes(":"))) {
-        return first;
+    let content: string;
+    try {
+        content = await fs.promises.readFile(configPath, "utf-8");
+    } catch {
+        return undefined;
     }
-    return "https://index.docker.io/v1/";
-}
-
-export function getAuthForImage (image: string, dockerConfig: DockerConfigFile): AuthConfig | undefined {
-    if (!dockerConfig.auths) return undefined;
 
-    const registry = extractRegistry(image);
-    const entry = dockerConfig.auths[registry];
-    if (!entry?.auth) return undefined;
+    const config = JSON.parse(content) as {auths?: Record<string, {auth?: string}>};
+    const firstEntry = Object.entries(config.auths ?? {}).find(([, v]) => v.auth);
+    if (!firstEntry) return undefined;
 
+    const [serveraddress, entry] = firstEntry;
+    if (!entry.auth) return undefined;
     const decoded = Buffer.from(entry.auth, "base64").toString("utf-8");
     const separatorIndex = decoded.indexOf(":");
     if (separatorIndex === -1) return undefined;
 
     return {
         username: decoded.substring(0, separatorIndex),
         password: decoded.substring(separatorIndex + 1),
-        serveraddress: registry,
+        serveraddress,
     };
 }
-
-export async function loadDockerConfig (): Promise<DockerConfigFile> {
-    const configDir = process.env.DOCKER_CONFIG ?? path.join(process.env.HOME ?? "~", ".docker");
-    const configPath = path.join(configDir, "config.json");
-
-    try {
-        const content = await fs.promises.readFile(configPath, "utf-8");
-        return JSON.parse(content) as DockerConfigFile;
-    } catch {
-        return {};
-    }
-}