Merge pull request #390 from crazy-max/build-metadata

bake: align build metadata
docker · Jun 29, 2024 · fe9937d · fe9937d
2 parents 7bd4fed + 8785275
commit fe9937d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/__tests__/buildx/bake.test.ts b/__tests__/buildx/bake.test.ts
@@ -23,13 +23,14 @@ import {Bake} from '../../src/buildx/bake';
 import {Context} from '../../src/context';
 
 import {ExecOptions} from '@actions/exec';
-import {BakeDefinition, BakeMetadata} from '../../src/types/buildx/bake';
+import {BakeDefinition} from '../../src/types/buildx/bake';
+import {BuildMetadata} from '../../src/types/buildx/build';
 
 const fixturesDir = path.join(__dirname, '..', 'fixtures');
 // prettier-ignore
 const tmpDir = path.join(process.env.TEMP || '/tmp', 'buildx-inputs-jest');
 const tmpName = path.join(tmpDir, '.tmpname-jest');
-const metadata: BakeMetadata = {
+const metadata: BuildMetadata = {
   app: {
     'buildx.build.ref': 'default/default/7frbdw1fmfozgtqavghowsepk'
   },
@@ -57,7 +58,7 @@ describe('resolveMetadata', () => {
   it('matches', async () => {
     const bake = new Bake();
     fs.writeFileSync(bake.getMetadataFilePath(), JSON.stringify(metadata));
-    expect(bake.resolveMetadata()).toEqual(metadata as BakeMetadata);
+    expect(bake.resolveMetadata()).toEqual(metadata as BuildMetadata);
   });
 });
 

diff --git a/src/buildx/bake.ts b/src/buildx/bake.ts
@@ -24,7 +24,8 @@ import {Exec} from '../exec';
 import {Util} from '../util';
 
 import {ExecOptions} from '@actions/exec';
-import {BakeDefinition, BakeMetadata} from '../types/buildx/bake';
+import {BakeDefinition} from '../types/buildx/bake';
+import {BuildMetadata} from '../types/buildx/build';
 
 export interface BakeOpts {
   buildx?: Buildx;
@@ -57,7 +58,7 @@ export class Bake {
     return path.join(Context.tmpDir(), this.metadataFilename);
   }
 
-  public resolveMetadata(): BakeMetadata | undefined {
+  public resolveMetadata(): BuildMetadata | undefined {
     const metadataFile = this.getMetadataFilePath();
     if (!fs.existsSync(metadataFile)) {
       return undefined;
@@ -66,10 +67,10 @@ export class Bake {
     if (content === 'null') {
       return undefined;
     }
-    return <BakeMetadata>JSON.parse(content);
+    return <BuildMetadata>JSON.parse(content);
   }
 
-  public resolveRefs(metadata?: BakeMetadata): Array<string> | undefined {
+  public resolveRefs(metadata?: BuildMetadata): Array<string> | undefined {
     if (!metadata) {
       metadata = this.resolveMetadata();
       if (!metadata) {

diff --git a/src/types/buildx/bake.ts b/src/types/buildx/bake.ts
@@ -19,10 +19,6 @@ export interface BakeDefinition {
   target: Record<string, Target>;
 }
 
-export interface BakeMetadata {
-  [target: string]: Record<string, string>;
-}
-
 export interface Group {
   targets: Array<string>;
 }