Merge pull request #401 from foundriesio/finalize-what-was-installed-v94

api: Don't start newly enabled apps during finalization

Author: mike-sul

src/api.cc

@@ -591,6 +591,19 @@ class LiteInstall : public InstallContext {
       return InstallResult{InstallResult::Status::DownloadFailed, ""};
     }
 
+    // Update the target's custom data with a list of apps considered for an update taking into account
+    // the target's app list and the current .toml configuration.
+    auto custom{target_->custom_data()};
+    Json::Value app_list_json;
+    for (const auto& app :
+         ComposeAppManager::getRequiredApps(ComposeAppManager::Config(client_->config.pacman), *target_)) {
+      app_list_json[app.first] = app.second;
+    }
+    if (!app_list_json.empty()) {
+      custom["install-context"]["apps"] = app_list_json;
+    }
+    target_->updateCustom(custom);
+
     auto rc = client_->install(*target_, mode_);
     auto status = InstallResult::Status::Failed;
     if (rc == data::ResultCode::Numeric::kNeedCompletion) {

src/composeappmanager.cc

@@ -461,8 +461,26 @@ data::InstallationResult ComposeAppManager::finalizeInstall(const Uptane::Target
     } else {
       LOG_INFO << "Installing and starting Apps...";
     }
+
+    const auto install_context{target.custom_data().get("install-context", Json::nullValue)};
+    std::string newly_enabled_apps_msg;
     // "finalize" (run) Apps that were pulled and created before reboot
     for (const auto& app_pair : getApps(target)) {
+      if (!install_context.empty() && install_context.isMember("apps")) {
+        if (!(install_context["apps"].isMember(app_pair.first) &&
+              install_context["apps"][app_pair.first] == app_pair.second)) {
+          LOG_INFO << app_pair.first
+                   << " was enabled after the update reboot; skipping its start during finalization."
+                      " Re-run the update to fetch and install the newly enabled apps.";
+          if (!newly_enabled_apps_msg.empty()) {
+            newly_enabled_apps_msg += ", " + app_pair.first;
+          } else {
+            newly_enabled_apps_msg = "\n# Newly enabled apps are detected: " + app_pair.first;
+          }
+          continue;
+        }
+      }
+
       const AppEngine::Result run_res = app_engine_->run({app_pair.first, app_pair.second});
       if (!run_res) {
         const std::string err_desc{boost::str(
@@ -473,6 +491,7 @@ data::InstallationResult ComposeAppManager::finalizeInstall(const Uptane::Target
         // Do we need to set some flag for the uboot and trigger a system reboot in order to boot on a previous
         // ostree version, hence a proper/full rollback happens???
         ir.description += ", however " + err_desc;
+        ir.description += newly_enabled_apps_msg;
         ir.description += "\n# Apps running:\n" + getRunningAppsInfoForReport();
         // this is a hack to distinguish between ostree install (rollback) and App start failures.
         // data::ResultCode::Numeric::kInstallFailed - boot on a new ostree version failed (rollback at boot)
@@ -494,6 +513,9 @@ data::InstallationResult ComposeAppManager::finalizeInstall(const Uptane::Target
 
       app_engine_->prune(app_shortlist);
     }
+    if (!newly_enabled_apps_msg.empty()) {
+      ir.description += newly_enabled_apps_msg;
+    }
   }
 
   if (data::ResultCode::Numeric::kNeedCompletion != ir.result_code.num_code) {

src/main.cc

@@ -12,6 +12,7 @@
 #include <boost/program_options.hpp>
 
 #include "aktualizr-lite/cli/cli.h"
+#include "composeappmanager.h"
 #include "crypto/keymanager.h"
 #include "helpers.h"
 #include "http/httpclient.h"
@@ -206,6 +207,18 @@ static std::tuple<data::ResultCode::Numeric, DownloadResultWithStat, std::string
     return {res.result_code.num_code, download_res, target.correlation_id()};
   }
 
+  // Update the target's custom data with a list of apps considered for an update taking into account
+  // the target's app list and the current .toml configuration.
+  auto custom{target.custom_data()};
+  Json::Value app_list_json;
+  for (const auto& app : ComposeAppManager::getRequiredApps(ComposeAppManager::Config(client.config.pacman), target)) {
+    app_list_json[app.first] = app.second;
+  }
+  if (!app_list_json.empty()) {
+    custom["install-context"]["apps"] = app_list_json;
+  }
+  target.updateCustom(custom);
+
   return {client.install(target), download_res, target.correlation_id()};
 }