@docker/actions-toolkit 0.49.0 → 0.51.0

package/lib/buildx/bake.d.ts

@@ -15,7 +15,7 @@
  */
 import { Buildx } from './buildx';
 import { ExecOptions } from '@actions/exec';
-import { BakeDefinition } from '../types/buildx/bake';
+import { BakeDefinition, ExportEntry } from '../types/buildx/bake';
 import { BuildMetadata } from '../types/buildx/build';
 import { VertexWarning } from '../types/buildkit/client';
 export interface BakeOpts {
@@ -45,8 +45,15 @@ export declare class Bake {
     resolveWarnings(metadata?: BuildMetadata): Array<VertexWarning> | undefined;
     getDefinition(cmdOpts: BakeCmdOpts, execOptions?: ExecOptions): Promise<BakeDefinition>;
     static parseDefinition(dt: string): BakeDefinition;
+    private static parseAttestEntry;
+    private static parseCacheEntry;
+    private static parseExportEntry;
+    private static parseSecretEntry;
+    private static parseSSHEntry;
     static hasLocalExporter(def: BakeDefinition): boolean;
     static hasTarExporter(def: BakeDefinition): boolean;
     static hasDockerExporter(def: BakeDefinition, load?: boolean): boolean;
+    static hasExporterType(name: string, exporters: Array<ExportEntry>): boolean;
     private static exporters;
+    static hasGitAuthTokenSecret(def: BakeDefinition): boolean;
 }

package/lib/buildx/bake.js

@@ -30,7 +30,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Bake = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const build_1 = require("./build");
+const sync_1 = require("csv-parse/sync");
 const buildx_1 = require("./buildx");
 const context_1 = require("../context");
 const exec_1 = require("../exec");
@@ -154,27 +154,221 @@ class Bake {
         });
     }
     static parseDefinition(dt) {
-        return JSON.parse(dt);
+        const definition = JSON.parse(dt);
+        // convert to composable attributes: https://github.com/docker/buildx/pull/2758
+        for (const name in definition.target) {
+            const target = definition.target[name];
+            if (target['attest'] && Array.isArray(target['attest'])) {
+                target['attest'] = target['attest'].map((item) => {
+                    return Bake.parseAttestEntry(item);
+                });
+            }
+            if (target['cache-from'] && Array.isArray(target['cache-from'])) {
+                target['cache-from'] = target['cache-from'].map((item) => {
+                    return Bake.parseCacheEntry(item);
+                });
+            }
+            if (target['cache-to'] && Array.isArray(target['cache-to'])) {
+                target['cache-to'] = target['cache-to'].map((item) => {
+                    return Bake.parseCacheEntry(item);
+                });
+            }
+            if (target['output'] && Array.isArray(target['output'])) {
+                target['output'] = target['output'].map((item) => {
+                    return Bake.parseExportEntry(item);
+                });
+            }
+            if (target['secret'] && Array.isArray(target['secret'])) {
+                target['secret'] = target['secret'].map((item) => {
+                    return Bake.parseSecretEntry(item);
+                });
+            }
+            if (target['ssh'] && Array.isArray(target['ssh'])) {
+                target['ssh'] = target['ssh'].map((item) => {
+                    return Bake.parseSSHEntry(item);
+                });
+            }
+        }
+        return definition;
+    }
+    static parseAttestEntry(item) {
+        if (typeof item !== 'string') {
+            return item;
+        }
+        const attestEntry = { type: '' };
+        const fields = (0, sync_1.parse)(item, {
+            relaxColumnCount: true,
+            skipEmptyLines: true
+        })[0];
+        for (const field of fields) {
+            const [key, value] = field
+                .toString()
+                .split(/(?<=^[^=]+?)=/)
+                .map((item) => item.trim());
+            switch (key) {
+                case 'type':
+                    attestEntry.type = value;
+                    break;
+                default:
+                    attestEntry[key] = value;
+            }
+        }
+        return attestEntry;
+    }
+    static parseCacheEntry(item) {
+        if (typeof item !== 'string') {
+            return item;
+        }
+        const cacheEntry = { type: '' };
+        const fields = (0, sync_1.parse)(item, {
+            relaxColumnCount: true,
+            skipEmptyLines: true
+        })[0];
+        if (fields.length === 1 && !fields[0].includes('=')) {
+            cacheEntry.type = 'registry';
+            cacheEntry.ref = fields[0];
+            return cacheEntry;
+        }
+        for (const field of fields) {
+            const [key, value] = field
+                .toString()
+                .split(/(?<=^[^=]+?)=/)
+                .map((item) => item.trim());
+            switch (key) {
+                case 'type':
+                    cacheEntry.type = value;
+                    break;
+                default:
+                    cacheEntry[key] = value;
+            }
+        }
+        return cacheEntry;
+    }
+    static parseExportEntry(item) {
+        if (typeof item !== 'string') {
+            return item;
+        }
+        const exportEntry = { type: '' };
+        const fields = (0, sync_1.parse)(item, {
+            relaxColumnCount: true,
+            skipEmptyLines: true
+        })[0];
+        if (fields.length === 1 && fields[0] === item && !item.startsWith('type=')) {
+            if (item !== '-') {
+                exportEntry.type = 'local';
+                exportEntry.dest = item;
+                return exportEntry;
+            }
+            exportEntry.type = 'tar';
+            exportEntry.dest = item;
+            return exportEntry;
+        }
+        for (const field of fields) {
+            const [key, value] = field
+                .toString()
+                .split(/(?<=^[^=]+?)=/)
+                .map((item) => item.trim());
+            switch (key) {
+                case 'type':
+                    exportEntry.type = value;
+                    break;
+                default:
+                    exportEntry[key] = value;
+            }
+        }
+        return exportEntry;
+    }
+    static parseSecretEntry(item) {
+        if (typeof item !== 'string') {
+            return item;
+        }
+        const secretEntry = {};
+        const fields = (0, sync_1.parse)(item, {
+            relaxColumnCount: true,
+            skipEmptyLines: true
+        })[0];
+        let typ = '';
+        for (const field of fields) {
+            const [key, value] = field
+                .toString()
+                .split(/(?<=^[^=]+?)=/)
+                .map((item) => item.trim());
+            switch (key) {
+                case 'type':
+                    typ = value;
+                    break;
+                case 'id':
+                    secretEntry.id = value;
+                    break;
+                case 'source':
+                case 'src':
+                    secretEntry.src = value;
+                    break;
+                case 'env':
+                    secretEntry.env = value;
+                    break;
+            }
+        }
+        if (typ === 'env' && !secretEntry.env) {
+            secretEntry.env = secretEntry.src;
+            secretEntry.src = undefined;
+        }
+        return secretEntry;
+    }
+    static parseSSHEntry(item) {
+        if (typeof item !== 'string') {
+            return item;
+        }
+        const sshEntry = {};
+        const [key, value] = item.split('=', 2);
+        sshEntry.id = key;
+        if (value) {
+            sshEntry.paths = value.split(',');
+        }
+        return sshEntry;
     }
     static hasLocalExporter(def) {
-        return build_1.Build.hasExporterType('local', Bake.exporters(def));
+        return Bake.hasExporterType('local', Bake.exporters(def));
     }
     static hasTarExporter(def) {
-        return build_1.Build.hasExporterType('tar', Bake.exporters(def));
+        return Bake.hasExporterType('tar', Bake.exporters(def));
     }
     static hasDockerExporter(def, load) {
-        return load || build_1.Build.hasExporterType('docker', Bake.exporters(def));
+        return load || Bake.hasExporterType('docker', Bake.exporters(def));
+    }
+    static hasExporterType(name, exporters) {
+        for (const exporter of exporters) {
+            if (exporter.type == name) {
+                return true;
+            }
+        }
+        return false;
     }
     static exporters(def) {
         const exporters = new Array();
         for (const key in def.target) {
             const target = def.target[key];
             if (target.output) {
-                exporters.push(...target.output);
+                for (const output of target.output) {
+                    exporters.push(Bake.parseExportEntry(output));
+                }
             }
         }
         return exporters;
     }
+    static hasGitAuthTokenSecret(def) {
+        for (const key in def.target) {
+            const target = def.target[key];
+            if (target.secret) {
+                for (const secret of target.secret) {
+                    if (Bake.parseSecretEntry(secret).id === 'GIT_AUTH_TOKEN') {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
 }
 exports.Bake = Bake;
 //# sourceMappingURL=bake.js.map

package/lib/buildx/bake.js.map

@@ -1 +1 @@
-{"version":3,"file":"bake.js","sourceRoot":"","sources":["../../src/buildx/bake.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bake.js","sourceRoot":"","sources":["../../src/buildx/bake.ts"],"names":[],"mappings":"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"}

package/lib/context.d.ts

@@ -20,6 +20,6 @@ export declare class Context {
     static tmpDir(): string;
     static tmpName(options?: tmp.TmpNameOptions): string;
     static gitRef(): string;
+    static parseGitRef(ref: string, sha: string): string;
     static gitContext(): string;
-    static provenanceBuilderID(): string;
 }

package/lib/context.js

@@ -60,24 +60,24 @@ class Context {
         return tmp.tmpNameSync(options);
     }
     static gitRef() {
-        let gitRef = github.context.ref;
-        if (github.context.sha && gitRef && !gitRef.startsWith('refs/')) {
-            gitRef = `refs/heads/${github.context.ref}`;
+        return Context.parseGitRef(github.context.ref, github.context.sha);
+    }
+    static parseGitRef(ref, sha) {
+        const setPullRequestHeadRef = !!(process.env.DOCKER_DEFAULT_GIT_CONTEXT_PR_HEAD_REF && process.env.DOCKER_DEFAULT_GIT_CONTEXT_PR_HEAD_REF === 'true');
+        if (sha && ref && !ref.startsWith('refs/')) {
+            ref = `refs/heads/${ref}`;
         }
-        if (github.context.sha && !gitRef.startsWith(`refs/pull/`)) {
-            gitRef = github.context.sha;
+        if (sha && !ref.startsWith(`refs/pull/`)) {
+            ref = sha;
         }
-        else if (gitRef.startsWith(`refs/pull/`)) {
-            gitRef = gitRef.replace(/\/merge$/g, '/head');
+        else if (ref.startsWith(`refs/pull/`) && setPullRequestHeadRef) {
+            ref = ref.replace(/\/merge$/g, '/head');
         }
-        return gitRef;
+        return ref;
     }
     static gitContext() {
         return `${github_1.GitHub.serverURL}/${github.context.repo.owner}/${github.context.repo.repo}.git#${Context.gitRef()}`;
     }
-    static provenanceBuilderID() {
-        return `${github_1.GitHub.serverURL}/${github.context.repo.owner}/${github.context.repo.repo}/actions/runs/${github.context.runId}`;
-    }
 }
 exports.Context = Context;
 Context._tmpDir = fs_1.default.mkdtempSync(path_1.default.join(Context.ensureDirExists(process.env.RUNNER_TEMP || os_1.default.tmpdir()), 'docker-actions-toolkit-'));

package/lib/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,4CAAoB;AACpB,4CAAoB;AACpB,gDAAwB;AACxB,yCAA2B;AAC3B,wDAA0C;AAE1C,qCAAgC;AAEhC,MAAa,OAAO;IAGV,MAAM,CAAC,eAAe,CAAC,GAAW;QACxC,YAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;QACrC,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,MAAM,CAAC,MAAM;QAClB,OAAO,OAAO,CAAC,OAAO,CAAC;IACzB,CAAC;IAEM,MAAM,CAAC,OAAO,CAAC,OAA4B;QAChD,OAAO,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAEM,MAAM,CAAC,MAAM;QAClB,IAAI,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;QAChC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAChE,MAAM,GAAG,cAAc,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QAC9C,CAAC;QACD,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YAC3D,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;QAC9B,CAAC;aAAM,IAAI,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YAC3C,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,MAAM,CAAC,UAAU;QACtB,OAAO,GAAG,eAAM,CAAC,SAAS,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,QAAQ,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;IAChH,CAAC;IAEM,MAAM,CAAC,mBAAmB;QAC/B,OAAO,GAAG,eAAM,CAAC,SAAS,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,iBAAiB,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IAC7H,CAAC;;AAnCH,0BAoCC;AAnCyB,eAAO,GAAG,YAAE,CAAC,WAAW,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,YAAE,CAAC,MAAM,EAAE,CAAC,EAAE,yBAAyB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,4CAAoB;AACpB,4CAAoB;AACpB,gDAAwB;AACxB,yCAA2B;AAC3B,wDAA0C;AAE1C,qCAAgC;AAEhC,MAAa,OAAO;IAGV,MAAM,CAAC,eAAe,CAAC,GAAW;QACxC,YAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;QACrC,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,MAAM,CAAC,MAAM;QAClB,OAAO,OAAO,CAAC,OAAO,CAAC;IACzB,CAAC;IAEM,MAAM,CAAC,OAAO,CAAC,OAA4B;QAChD,OAAO,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAEM,MAAM,CAAC,MAAM;QAClB,OAAO,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACrE,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,GAAW,EAAE,GAAW;QAChD,MAAM,qBAAqB,GAAY,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,sCAAsC,IAAI,OAAO,CAAC,GAAG,CAAC,sCAAsC,KAAK,MAAM,CAAC,CAAC;QAC/J,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3C,GAAG,GAAG,cAAc,GAAG,EAAE,CAAC;QAC5B,CAAC;QACD,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YACzC,GAAG,GAAG,GAAG,CAAC;QACZ,CAAC;aAAM,IAAI,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,qBAAqB,EAAE,CAAC;YACjE,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,MAAM,CAAC,UAAU;QACtB,OAAO,GAAG,eAAM,CAAC,SAAS,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,QAAQ,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;IAChH,CAAC;;AAnCH,0BAoCC;AAnCyB,eAAO,GAAG,YAAE,CAAC,WAAW,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,YAAE,CAAC,MAAM,EAAE,CAAC,EAAE,yBAAyB,CAAC,CAAC,CAAC"}

package/lib/types/buildx/bake.d.ts

@@ -24,9 +24,9 @@ export interface Group {
 export interface Target {
     description?: string;
     args?: Record<string, string>;
-    attest?: Array<string>;
-    'cache-from'?: Array<string>;
-    'cache-to'?: Array<string>;
+    attest?: Array<AttestEntry> | Array<string>;
+    'cache-from'?: Array<CacheEntry> | Array<string>;
+    'cache-to'?: Array<CacheEntry> | Array<string>;
     call?: string;
     context: string;
     contexts?: Record<string, string>;
@@ -36,13 +36,34 @@ export interface Target {
     labels?: Record<string, string>;
     'no-cache'?: boolean;
     'no-cache-filter'?: Array<string>;
-    output?: Array<string>;
+    output?: Array<ExportEntry> | Array<string>;
     platforms?: Array<string>;
     pull?: boolean;
-    secret?: Array<string>;
+    secret?: Array<SecretEntry> | Array<string>;
     'shm-size'?: string;
-    ssh?: Array<string>;
+    ssh?: Array<SSHEntry> | Array<string>;
     tags?: Array<string>;
     target?: string;
     ulimits?: Array<string>;
 }
+export interface AttestEntry {
+    type: string;
+    [key: string]: string;
+}
+export interface CacheEntry {
+    type: string;
+    [key: string]: string;
+}
+export interface ExportEntry {
+    type: string;
+    [key: string]: string;
+}
+export interface SecretEntry {
+    id?: string;
+    src?: string;
+    env?: string;
+}
+export interface SSHEntry {
+    id?: string;
+    paths?: Array<string>;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docker/actions-toolkit",
-  "version": "0.49.0",
+  "version": "0.51.0",
   "description": "Toolkit for Docker (GitHub) Actions",
   "scripts": {
     "build": "tsc",
@@ -45,7 +45,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@actions/artifact": "^2.1.11",
+    "@actions/artifact": "^2.2.1",
     "@actions/cache": "^3.3.0",
     "@actions/core": "^1.11.1",
     "@actions/exec": "^1.1.1",