From 75e96661fab66b5bac43d5d09c3d84c8f0ff8732 Mon Sep 17 00:00:00 2001
From: yylyyl <yangyiliang@gmail.com>
Date: Thu, 19 Oct 2023 02:24:22 -0400
Subject: [PATCH] rename image archive file, and simplify code

---
 badges/coverage.svg |  2 +-
 dist/index.js       | 30 ++++--------------------------
 src/podman.js       | 30 ++++--------------------------
 3 files changed, 9 insertions(+), 53 deletions(-)

diff --git a/badges/coverage.svg b/badges/coverage.svg
index ab19260..ea2368b 100644
--- a/badges/coverage.svg
+++ b/badges/coverage.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="116" height="20" role="img" aria-label="Coverage: 14.14%"><title>Coverage: 14.14%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="116" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="63" height="20" fill="#555"/><rect x="63" width="53" height="20" fill="#e05d44"/><rect width="116" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="325" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="530">Coverage</text><text x="325" y="140" transform="scale(.1)" fill="#fff" textLength="530">Coverage</text><text aria-hidden="true" x="885" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">14.14%</text><text x="885" y="140" transform="scale(.1)" fill="#fff" textLength="430">14.14%</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="116" height="20" role="img" aria-label="Coverage: 14.94%"><title>Coverage: 14.94%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="116" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="63" height="20" fill="#555"/><rect x="63" width="53" height="20" fill="#e05d44"/><rect width="116" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="325" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="530">Coverage</text><text x="325" y="140" transform="scale(.1)" fill="#fff" textLength="530">Coverage</text><text aria-hidden="true" x="885" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">14.94%</text><text x="885" y="140" transform="scale(.1)" fill="#fff" textLength="430">14.94%</text></g></svg>
\ No newline at end of file
diff --git a/dist/index.js b/dist/index.js
index 87d22da..df30816 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -59368,7 +59368,7 @@ class PodmanInPodman {
       return
     }
 
-    await this.createManifest(repoTag)
+    await this.podman.manifestCreate(repoTag)
     for (const platform of platforms) {
       await this.buildSinglePlatform(
         containerfile,
@@ -59391,18 +59391,16 @@ class PodmanInPodman {
   }
 
   async exportAndImportToHost(repoTag, isManifest = false) {
-    const normalizedRepoTag = repoTag.replace('/', '_')
+    const normalizedRepoTag = repoTag.replace('/', '_').replace(':', '_')
     const archiveExport = path.join(mountPoint, `${normalizedRepoTag}.tar`)
     const archiveImport = path.join(await tempDir(), `${normalizedRepoTag}.tar`)
 
-    core.startGroup(`➡️ [PodmanInPodman] Copying image ${repoTag}...`)
     await this.export(repoTag, archiveExport)
     if (!isManifest) {
-      await this.importToHostImage(archiveImport)
+      await this.podman.loadImage(archiveImport)
     } else {
-      await this.importToHostManifest(repoTag, archiveImport)
+      await this.podman.manifestAddArchive(repoTag, archiveImport)
     }
-    core.endGroup()
   }
 
   async export(repoTag, archive) {
@@ -59416,26 +59414,6 @@ class PodmanInPodman {
     core.endGroup()
   }
 
-  async importToHostImage(archive) {
-    core.startGroup(`📦 [PodmanInPodman] Importing image to host...`)
-    await this.podman.loadImage(archive)
-    core.endGroup()
-  }
-
-  async createManifest(manifest) {
-    core.startGroup(`📦 [PodmanInPodman] Create manifest ${manifest}...`)
-    await this.podman.manifestCreate(manifest)
-    core.endGroup()
-  }
-
-  async importToHostManifest(manifest, archive) {
-    core.startGroup(
-      `📦 [PodmanInPodman] Importing image to host manifest ${manifest}...`
-    )
-    await this.podman.manifestAddArchive(manifest, archive)
-    core.endGroup()
-  }
-
   async buildSinglePlatform(
     containerfile,
     workdir,
diff --git a/src/podman.js b/src/podman.js
index 1b1249e..216b5b7 100644
--- a/src/podman.js
+++ b/src/podman.js
@@ -182,7 +182,7 @@ class PodmanInPodman {
       return
     }
 
-    await this.createManifest(repoTag)
+    await this.podman.manifestCreate(repoTag)
     for (const platform of platforms) {
       await this.buildSinglePlatform(
         containerfile,
@@ -205,18 +205,16 @@ class PodmanInPodman {
   }
 
   async exportAndImportToHost(repoTag, isManifest = false) {
-    const normalizedRepoTag = repoTag.replace('/', '_')
+    const normalizedRepoTag = repoTag.replace('/', '_').replace(':', '_')
     const archiveExport = path.join(mountPoint, `${normalizedRepoTag}.tar`)
     const archiveImport = path.join(await tempDir(), `${normalizedRepoTag}.tar`)
 
-    core.startGroup(`➡️ [PodmanInPodman] Copying image ${repoTag}...`)
     await this.export(repoTag, archiveExport)
     if (!isManifest) {
-      await this.importToHostImage(archiveImport)
+      await this.podman.loadImage(archiveImport)
     } else {
-      await this.importToHostManifest(repoTag, archiveImport)
+      await this.podman.manifestAddArchive(repoTag, archiveImport)
     }
-    core.endGroup()
   }
 
   async export(repoTag, archive) {
@@ -230,26 +228,6 @@ class PodmanInPodman {
     core.endGroup()
   }
 
-  async importToHostImage(archive) {
-    core.startGroup(`📦 [PodmanInPodman] Importing image to host...`)
-    await this.podman.loadImage(archive)
-    core.endGroup()
-  }
-
-  async createManifest(manifest) {
-    core.startGroup(`📦 [PodmanInPodman] Create manifest ${manifest}...`)
-    await this.podman.manifestCreate(manifest)
-    core.endGroup()
-  }
-
-  async importToHostManifest(manifest, archive) {
-    core.startGroup(
-      `📦 [PodmanInPodman] Importing image to host manifest ${manifest}...`
-    )
-    await this.podman.manifestAddArchive(manifest, archive)
-    core.endGroup()
-  }
-
   async buildSinglePlatform(
     containerfile,
     workdir,