Replace StepParseManifest into StepParseRpkManifest

Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>

diff --git a/src/rpk/rpk_installer.cc b/src/rpk/rpk_installer.cc
index 3962e3d0d74d6f5c35982b0d46845d8176707995..f7684b42f3cf5b4cb0ae01674f34d2a228cbdf19 100644 (file)
--- a/src/rpk/rpk_installer.cc
+++ b/src/rpk/rpk_installer.cc
@@ -3,8 +3,7 @@
 
 #include <common/installer/app_installer.h>
 
-//#include "lib/rpk_archive_info.h"
-
+#include "rpk/step/configuration/step_parse_rpk_manifest.h"
 #include "rpk/step/pkgmgr/step_kill_rscapps.h"
 
 namespace ci = common_installer;
@@ -41,14 +40,18 @@ void RpkInstaller::InstallSteps() {
   RemoveStep("CreateStorageDirectories");
   RemoveStep("CreateGlobalAppSymlinks");
 
+  ReplaceStep<rpk::configuration::StepParseRpkManifest>("ParseManifest",
+      rpk::configuration::StepParseRpkManifest::ManifestLocation::PACKAGE,
+      rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
+
 /*
   Current step order :
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
   AddStep<ci::recovery::StepCreateRecoveryFile>();
   AddStep<ci::filesystem::StepUnzip>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<rpk::configuration::StepParseRpkManifest>(
+      rpk::configuration::StepParseRpkManifest::ManifestLocation::PACKAGE,
+      rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
   AddStep<ci::configuration::StepCheckInstallLocation>();
   AddStep<ci::pkgmgr::StepCheckInstallable>();
   AddStep<ci::configuration::StepParsePreload>();
@@ -80,17 +83,24 @@ void RpkInstaller::UpdateSteps() {
   RemoveStep("UpdateStorageDirectories");
   RemoveStep("CreateGlobalAppSymlinks");
 
+  ReplaceStep<rpk::configuration::StepParseRpkManifest>("ParseManifest",
+    rpk::configuration::StepParseRpkManifest::ManifestLocation::PACKAGE,
+    rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
+
+  ReplaceStep<rpk::configuration::StepParseRpkManifest>("ParseManifest",
+    rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+    rpk::configuration::StepParseRpkManifest::StoreLocation::BACKUP);
 /*
   Current step order :
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
   AddStep<ci::recovery::StepCreateRecoveryFile>();
   AddStep<ci::filesystem::StepUnzip>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::BACKUP);
+  AddStep<rpk::configuration::StepParseRpkManifest>(
+      rpk::configuration::StepParseRpkManifest::ManifestLocation::PACKAGE,
+      rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
+  AddStep<ci::configuration::StepParseRpkManifest>(
+      rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+      rpk::configuration::StepParseRpkManifest::StoreLocation::BACKUP);
   AddStep<ci::configuration::StepCheckInstallLocation>();
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
@@ -120,6 +130,11 @@ void RpkInstaller::UninstallSteps() {
   RemoveStep("RemoveZipImage");
   RemoveStep("RemoveIcons");
   RemoveStep("RemoveTep");
+
+  ReplaceStep<rpk::configuration::StepParseRpkManifest>("ParseManifest",
+    rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+    rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
+
 /*
   Current step order :
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
@@ -127,9 +142,9 @@ void RpkInstaller::UninstallSteps() {
   AddStep<ci::pkgmgr::StepCheckRestriction>();
   AddStep<ci::pkgmgr::StepCheckRemovable>();
   AddStep<ci::pkgmgr::StepCheckForceClean>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<rpk::configuration::StepParseRpkManifest>(
+      rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+      rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
   AddStep<ci::configuration::StepCheckInstallLocation>();
   AddStep<ci::filesystem::StepRemovePerUserStorageDirectories>();
   AddStep<ci::pkgmgr::StepUnregisterApplication>();
@@ -148,14 +163,18 @@ void RpkInstaller::RecoverySteps() {
   RemoveStep("RecoverGlobalAppSymlinks");
   RemoveStep("MountRecover");
   RemoveStep("RecoverTrustAnchor");
+
+  ReplaceStep<rpk::configuration::StepParseRpkManifest>("ParseManifest",
+    rpk::configuration::StepParseRpkManifest::ManifestLocation::RECOVERY,
+    rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
 /*
   Current step order :
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
   AddStep<ci::recovery::StepOpenRecoveryFile>();
   AddStep<ci::filesystem::StepRemoveTemporaryDirectory>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::RECOVERY,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<rpk::configuration::StepParseRpkManifest>(
+      rpk::configuration::StepParseRpkManifest::ManifestLocation::RECOVERY,
+      rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
   AddStep<ci::filesystem::StepRecoverManifest>();
   AddStep<ci::filesystem::StepRecoverStorageDirectories>();
   AddStep<ci::filesystem::StepRecoverFiles>();
@@ -175,12 +194,17 @@ void RpkInstaller::ManifestDirectInstallSteps() {
   RemoveStep("RunParserPlugin");
   RemoveStep("CreateStorageDirectories");
   RemoveStep("GlobalAppSymlinks");
+
+  ReplaceStep<rpk::configuration::StepParseRpkManifest>("ParseManifest",
+    rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+    rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
+
 /*
   Current step order :
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<rpk::configuration::StepParseRpkManifest>(
+      rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+      rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
   AddStep<ci::pkgmgr::StepCheckInstallable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
@@ -203,12 +227,16 @@ void RpkInstaller::ManifestDirectUpdateSteps() {
   RemoveStep("RunParserPlugin");
   RemoveStep("CreateGlobalAppSymlinks");
 
+  ReplaceStep<rpk::configuration::StepParseRpkManifest>("ParseManifest",
+    rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+    rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
+
 /*
   Current step order :
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<rpk::configuration::StepParseRpkManifest>(
+      rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+      rpkci::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
@@ -230,12 +258,17 @@ void RpkInstaller::ManifestPartialInstallSteps() {
   RemoveStep("RunParserPlugin");
   RemoveStep("CreateStorageDirectories");
   RemoveStep("CreateGlobalAppSymlinks");
+
+  ReplaceStep<rpk::configuration::StepParseRpkManifest>("ParseManifest",
+    rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+    rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
+
 /*
   Current step order :
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<rpk::configuration::StepParseRpkManifest>(
+      rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+      rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::security::StepSignature>(false);
   AddStep<ci::pkgmgr::StepRegisterApplication>();
@@ -254,12 +287,16 @@ void RpkInstaller::ManifestPartialUpdateSteps() {
   RemoveStep("UpdateStorageDirectories");
   RemoveStep("CreateGlobalAppSymlinks");
 
+  ReplaceStep<rpk::configuration::StepParseRpkManifest>("ParseManifest",
+    rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+    rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
+
 /*
   Current step order :
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<rpk::configuration::StepParseRpkManifest>(
+      rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+      rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::security::StepSignature>(false);
   AddStep<ci::security::StepCheckOldCertificate>();
@@ -278,14 +315,18 @@ void RpkInstaller::PartialUninstallSteps() {
   RemoveStep("PrivacyPrivilege");
   RemoveStep("RunParserPlugin");
 
+  ReplaceStep<rpk::configuration::StepParseRpkManifest>("ParseManifest",
+    rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+    rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
+
 /*
   Current step order :
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
   AddStep<ci::pkgmgr::StepCheckRemovable>();
   AddStep<ci::pkgmgr::StepCheckForceClean>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<rpk::configuration::StepParseRpkManifest>(
+      rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+      rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
   AddStep<ci::configuration::StepCheckInstallLocation>();
   AddStep<ci::pkgmgr::StepUnregisterApplication>();
   AddStep<ci::security::StepRevokeSecurity>();
@@ -305,18 +346,25 @@ void RpkInstaller::ReadonlyUpdateInstallSteps() {
   RemoveStep("StepUpdateStorageDirectories");
   RemoveStep("StepCreateGlobalAppSymlinks");
 
+  ReplaceStep<rpk::configuration::StepParseRpkManifest>("ParseManifest",
+    rpk::configuration::StepParseRpkManifest::ManifestLocation::PACKAGE,
+    rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
+
+  ReplaceStep<rpk::configuration::StepParseRpkManifest>("ParseManifest",
+    rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+    rpk::configuration::StepParseRpkManifest::StoreLocation::BACKUP);
+
 /*
   Current step order :
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
   AddStep<ci::recovery::StepCreateRecoveryFile>();
   AddStep<ci::filesystem::StepUnzip>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::configuration::StepSwitchReadonlyMode>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::BACKUP);
+  AddStep<rpk::configuration::StepParseRpkManifest>(
+      rpk::configuration::StepParseRpkManifest::ManifestLocation::PACKAGE,
+      rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
+  AddStep<ci::configuration::StepParseRpkManifest>(
+      rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+      rpk::configuration::StepParseRpkManifest::StoreLocation::BACKUP);
   AddStep<ci::configuration::StepSwitchReadonlyMode>();
   AddStep<ci::configuration::StepCheckInstallLocation>();
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
@@ -347,16 +395,23 @@ void RpkInstaller::ReadonlyUpdateUninstallSteps() {
   RemoveStep("RunParserPlugin");
   RemoveStep("UpdateStorageDirectories");
 
+  ReplaceStep<rpk::configuration::StepParseRpkManifest>("ParseManifest",
+    rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+    rpk::configuration::StepParseRpkManifest::StoreLocation::BACKUP);
+
+  ReplaceStep<rpk::configuration::StepParseRpkManifest>("ParseManifest",
+    rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+    rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
+
 /*
   Current step order :
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::BACKUP);
-  AddStep<ci::configuration::StepSwitchReadonlyMode>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<rpk::configuration::StepParseRpkManifest>(
+      rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+      rpk::configuration::StepParseRpkManifest::StoreLocation::BACKUP);
+  AddStep<ci::configuration::StepParseRpkManifest>(
+      rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+      rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::security::StepSignature>(false);
@@ -375,12 +430,15 @@ void RpkInstaller::RecoverDBSteps() {
   RemoveStep("CheckMountPath");
   RemoveStep("GetPrivilegeLevel");
 
+  ReplaceStep<rpk::configuration::StepParseRpkManifest>("ParseManifest",
+    rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+    rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
 /*
   Current step order :
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<rpk::configuration::StepParseRpkManifest>(
+      rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
+      rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
   AddStep<ci::pkgmgr::StepCheckInstallable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::pkgmgr::StepRegisterApplication>();