From ab264abd76947c3e61e9bdc92e1414622ac3d706 Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Tue, 10 Aug 2021 15:11:38 +0200
Subject: [PATCH] distro/rhel85: tar-installer -> image-installer

Renamed tar-installer to image-installer.
This is a more appropriate name:
- It disassociates the image type from the "tar" image type. The two
  should not be perceived to be connected.
- It's more descriptive. The format of the payload (tar) isn't relevant
  to the purpose of the image type.
---
 internal/distro/rhel85/distro.go                          | 2 +-
 internal/distro/rhel85/distro_test.go                     | 8 ++++----
 internal/store/json.go                                    | 2 +-
 test/cases/installers.sh                                  | 2 +-
 ...boot.json => rhel_85-x86_64-image_installer-boot.json} | 2 +-
 tools/test-case-generators/format-request-map.json        | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename test/data/manifests/{rhel_85-x86_64-tar_installer-boot.json => rhel_85-x86_64-image_installer-boot.json} (99%)

diff --git a/internal/distro/rhel85/distro.go b/internal/distro/rhel85/distro.go
index 835e3eeac..092572d4a 100644
--- a/internal/distro/rhel85/distro.go
+++ b/internal/distro/rhel85/distro.go
@@ -761,7 +761,7 @@ func newDistro(name, modulePlatformID, ostreeRef string) distro.Distro {
 		exports:   []string{"root-tar"},
 	}
 	tarInstallerImgTypeX86_64 := imageType{
-		name:     "tar-installer",
+		name:     "image-installer",
 		filename: "installer.iso",
 		mimeType: "application/x-iso9660-image",
 		packageSets: map[string]rpmmd.PackageSet{
diff --git a/internal/distro/rhel85/distro_test.go b/internal/distro/rhel85/distro_test.go
index ae00189ed..fc7daa1ba 100644
--- a/internal/distro/rhel85/distro_test.go
+++ b/internal/distro/rhel85/distro_test.go
@@ -104,8 +104,8 @@ func TestFilenameFromType(t *testing.T) {
 			},
 		},
 		{
-			name: "tar-installer",
-			args: args{"tar-installer"},
+			name: "image-installer",
+			args: args{"image-installer"},
 			want: wantResult{
 				filename: "installer.iso",
 				mimeType: "application/x-iso9660-image",
@@ -264,7 +264,7 @@ func TestImageType_Name(t *testing.T) {
 				"edge-container",
 				"edge-installer",
 				"tar",
-				"tar-installer",
+				"image-installer",
 			},
 		},
 		{
@@ -446,7 +446,7 @@ func TestArchitecture_ListImageTypes(t *testing.T) {
 				"edge-container",
 				"edge-installer",
 				"tar",
-				"tar-installer",
+				"image-installer",
 			},
 		},
 		{
diff --git a/internal/store/json.go b/internal/store/json.go
index 84f93e731..fb97bf213 100644
--- a/internal/store/json.go
+++ b/internal/store/json.go
@@ -356,7 +356,7 @@ var imageTypeCompatMapping = map[string]string{
 	"edge-commit":         "edge-commit",
 	"edge-container":      "edge-container",
 	"edge-installer":      "edge-installer",
-	"tar-installer":       "tar-installer",
+	"image-installer":     "image-installer",
 	"test_type":           "test_type",         // used only in json_test.go
 	"test_type_invalid":   "test_type_invalid", // used only in json_test.go
 	"ec2":                 "ec2",
diff --git a/test/cases/installers.sh b/test/cases/installers.sh
index 1e627252d..23906669e 100755
--- a/test/cases/installers.sh
+++ b/test/cases/installers.sh
@@ -340,7 +340,7 @@ sudo composer-cli blueprints push "$BLUEPRINT_FILE"
 sudo composer-cli blueprints depsolve installer
 
 # Build installer image.
-build_image installer tar-installer
+build_image installer image-installer
 
 # Download the image
 greenprint "📥 Downloading the installer image"
diff --git a/test/data/manifests/rhel_85-x86_64-tar_installer-boot.json b/test/data/manifests/rhel_85-x86_64-image_installer-boot.json
similarity index 99%
rename from test/data/manifests/rhel_85-x86_64-tar_installer-boot.json
rename to test/data/manifests/rhel_85-x86_64-image_installer-boot.json
index 552d63be6..fdac064dd 100644
--- a/test/data/manifests/rhel_85-x86_64-tar_installer-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-image_installer-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "rhel-85",
     "arch": "x86_64",
-    "image-type": "tar-installer",
+    "image-type": "image-installer",
     "repositories": [
       {
         "name": "baseos",
diff --git a/tools/test-case-generators/format-request-map.json b/tools/test-case-generators/format-request-map.json
index 40b157349..33804e362 100644
--- a/tools/test-case-generators/format-request-map.json
+++ b/tools/test-case-generators/format-request-map.json
@@ -240,11 +240,11 @@
       }
     }
   },
-  "tar-installer": {
+  "image-installer": {
     "compose-request": {
       "distro": "",
       "arch": "",
-      "image-type": "tar-installer",
+      "image-type": "image-installer",
       "repositories": [],
       "filename": "installer.iso",
       "blueprint": {}