Add identity token support when authenticate with CredentialProvider

packages/testcontainers/src/container-runtime/auth/auths.ts

@@ -1,4 +1,4 @@
-import { Auth, AuthConfig, ContainerRuntimeConfig } from "./types";
+import { Auth, AuthConfig, AuthCredentialConfig, ContainerRuntimeConfig } from "./types";
 import { RegistryAuthLocator } from "./registry-auth-locator";
 import { registryMatches } from "./registry-matches";
 
@@ -13,7 +13,7 @@ export class Auths implements RegistryAuthLocator {
       return undefined;
     }
 
-    const authConfig: Partial<AuthConfig> = { registryAddress: registry };
+    const authConfig: Partial<AuthCredentialConfig> = { registryAddress: registry };
 
     if (auth.email) {
       authConfig.email = auth.email;

packages/testcontainers/src/container-runtime/auth/credential-provider.ts

@@ -31,6 +31,13 @@ export abstract class CredentialProvider implements RegistryAuthLocator {
 
     const response = await this.runCredentialProvider(registry, programName);
 
+    if (response.Username === "<token>") {
+      return {
+        identityToken: response.Secret,
+        registryAddress: response.ServerURL,
+      };
+    }
+
     return {
       username: response.Username,
       password: response.Secret,

packages/testcontainers/src/container-runtime/auth/types.ts

@@ -15,13 +15,20 @@ export type Auth = {
   password?: string;
 };
 
-export type AuthConfig = {
+export type AuthCredentialConfig = {
   username: string;
   password: string;
   registryAddress: string;
   email?: string;
 };
 
+export type AuthIdentityTokenConfig = {
+  identityToken: string;
+  registryAddress: string;
+};
+
+export type AuthConfig = AuthCredentialConfig | AuthIdentityTokenConfig;
+
 export type RegistryConfig = {
   [registryAddress: string]: {
     username: string;

packages/testcontainers/src/generic-container/generic-container-builder.ts

@@ -68,7 +68,7 @@ export class GenericContainerBuilder {
       buildargs: this.buildArgs,
       pull: this.pullPolicy ? "true" : undefined,
       nocache: !this.cache,
-      registryconfig: registryConfig,
+      registryconfig: registryConfig as any, // @types/dockerode registry config type is wrong
       labels,
       target: this.target,
     });
@@ -95,6 +95,13 @@ export class GenericContainerBuilder {
 
     return authConfigs
       .map((authConfig) => {
+        if ("identityToken" in authConfig) {
+          return {
+            [authConfig.registryAddress]: {
+              identitytoken: authConfig.identityToken,
+            },
+          };
+        }
         return {
           [authConfig.registryAddress]: {
             username: authConfig.username,

packages/testcontainers/src/types.ts

@@ -65,18 +65,27 @@ export type Labels = { [key: string]: string };
 export type HostPortBindings = Array<{ hostIp: string; hostPort: number }>;
 export type Ports = { [containerPort: number]: HostPortBindings };
 
-export type AuthConfig = {
+export type AuthCredentialConfig = {
   username: string;
   password: string;
   registryAddress: string;
   email?: string;
 };
 
+export type AuthIdentityTokenConfig = {
+  identityToken: string;
+  registryAddress: string;
+};
+
+export type AuthConfig = AuthCredentialConfig | AuthIdentityTokenConfig;
+
 export type RegistryConfig = {
-  [registryAddress: string]: {
-    username: string;
-    password: string;
-  };
+  [registryAddress: string]:
+    | {
+        username: string;
+        password: string;
+      }
+    | { identitytoken: string };
 };
 
 export type BuildArgs = { [key in string]: string };