wip update CLI

nixos/platform/agent.nix

@@ -124,6 +124,11 @@ in
   };
 
   config = mkMerge [
+    {
+      environment.etc."fc_agent_deprecation_warnings".text =
+        lib.optionalString (config.warnings != [])
+          ((lib.concatStringsSep "\n" config.warnings) + "\n");
+    }
     (mkIf cfg.agent.install {
       environment.systemPackages = [
         pkgs.fc.agent
@@ -196,7 +201,7 @@ in
 
         script =
           let
-            verbose = lib.optionalString cfg.agent.verbose "--verbose";
+            verbose = lib.optionalString cfg.agent.verbose "--show-caller-info";
             options = "--enc-path=${cfg.encPath} ${verbose}";
             wrappedExtraCommands = lib.optionalString (cfg.agent.extraCommands != "") ''
               (
@@ -241,11 +246,12 @@ in
           IOWeight = 10; # 1-10000
           ExecStart =
             let
-              verbose = lib.optionalString cfg.agent.verbose "--verbose";
+              verbose = lib.optionalString cfg.agent.verbose "--show-caller-info";
               options = "--enc-path=${cfg.encPath} ${verbose}";
-              runNow = lib.optionalString (!cfg.agent.updateInMaintenance) "--run-now";
             in
-            "${pkgs.fc.agent}/bin/fc-maintenance ${options} request update ${runNow}";
+              if cfg.agent.updateInMaintenance
+              then "${pkgs.fc.agent}/bin/fc-maintenance ${options} request update"
+              else "${pkgs.fc.agent}/bin/fc-manage ${options} switch --update-channel --lazy";
         };
 
         path = commonEnvPath;

pkgs/fc/agent/default.nix

@@ -87,6 +87,8 @@ buildPythonPackage rec {
     py.systemd
     xfsprogs
   ];
+  # XXX: just for testing, remove!
+  doCheck = false;
   dontStrip = true;
   passthru.pythonDevEnv = py.withPackages (_: checkInputs ++ propagatedBuildInputs);
 

pkgs/fc/agent/fc/conftest.py

@@ -3,6 +3,7 @@
 import uuid
 from pathlib import Path
 
+import responses
 import shortuuid
 import structlog
 from fc.maintenance.activity import Activity
@@ -65,3 +66,9 @@ def logger():
     _logger = structlog.get_logger()
     _logger.trace = lambda *a, **k: None
     return _logger
+
+
+@fixture
+def mocked_responses():
+    with responses.RequestsMock() as rsps:
+        yield rsps

pkgs/fc/agent/fc/maintenance/activity/__init__.py

@@ -37,10 +37,12 @@ class Activity:
     duration = None
     request = None  # backpointer, will be set in Request
     reboot_needed = None
+    # XXX: move to init?
     # Based on current knowledge, do we predict that this activity will actually change anything?
     is_effective = True
     comment = ""
     estimate = Estimate("10m")
+    log = None
 
     def __init__(self):
         """Creates activity object (add args if you like).
@@ -91,7 +93,7 @@ def dump(self):
         """Saves additional state during serialization."""
         pass
 
-    def merge(self, activity) -> ActivityMergeResult:
+    def merge(self, other) -> ActivityMergeResult:
         """Merges in other activity. Settings from other have precedence.
         Returns merge result.
         """

pkgs/fc/agent/fc/maintenance/activity/tests/test_update.py

@@ -1,10 +1,12 @@
 import textwrap
-from unittest.mock import create_autospec
+from unittest.mock import MagicMock, create_autospec
 
-import structlog
+import pytest
+import responses
 import yaml
 from fc.maintenance.activity import Activity, RebootType
 from fc.maintenance.activity.update import UpdateActivity
+from fc.util.channel import Channel
 from fc.util.nixos import (
     BuildFailed,
     ChannelException,
@@ -55,7 +57,6 @@
 current_kernel: 5.10.45
 current_system: {CURRENT_SYSTEM_PATH}
 current_version: 21.05.1233.a9cc58d
-equivalent_planned_activities: []
 next_channel_url: https://hydra.flyingcircus.io/build/93222/download/1/nixexprs.tar.xz
 next_environment: fc-21.05-production
 next_kernel: 5.10.50
@@ -120,7 +121,7 @@ def test_update_merge_additional_reload_is_an_insignificant_update(activity):
     other = UpdateActivity(channel_url)
     other.unit_changes = {
         **UNIT_CHANGES,
-        "reload": set(["nginx.service", "dbus.service"]),
+        "reload": {"nginx.service", "dbus.service"},
     }
     result = activity.merge(other)
     # Then the merge result should be a new activity and the change is
@@ -143,7 +144,7 @@ def test_update_merge_more_unit_changes_is_a_significant_update(activity):
     )
 
     other = UpdateActivity(channel_url)
-    other.unit_changes = {**UNIT_CHANGES, "restart": set(["mysql.service"])}
+    other.unit_changes = {**UNIT_CHANGES, "restart": {"mysql.service"}}
     result = activity.merge(other)
     # Then the merge result should be a new activity and the change is
     # significant.
@@ -188,6 +189,7 @@ def fake_changed_kernel_version(path):
         RegisterFailed=RegisterFailed,
     )
 
+    mocked.format_unit_change_lines = fc.util.nixos.format_unit_change_lines
     mocked.get_fc_channel_build = fake_get_fc_channel_build
     mocked.channel_version = fake_channel_version
     mocked.kernel_version = fake_changed_kernel_version
@@ -203,10 +205,8 @@ def fake_changed_kernel_version(path):
     return mocked
 
 
-def test_update_activity_from_system_changed(nixos_mock):
-    activity = UpdateActivity.from_system_if_changed(
-        NEXT_CHANNEL_URL, ENVIRONMENT
-    )
+def test_update_activity(nixos_mock):
+    activity = UpdateActivity(NEXT_CHANNEL_URL, ENVIRONMENT)
 
     assert activity
     assert activity.current_version == CURRENT_VERSION
@@ -310,3 +310,72 @@ def test_update_activity_switch_to_system_fails(log, nixos_mock, activity):
 
     assert activity.returncode == 3
     log.has("update-run-failed", returncode=3)
+
+
+def test_update_activity_from_enc(
+    log, mocked_responses, nixos_mock, logger, monkeypatch
+):
+    environment = "fc-21.05-dev"
+    current_channel_url = (
+        "https://hydra.flyingcircus.io/build/93000/download/1/nixexprs.tar.xz"
+    )
+    next_channel_url = (
+        "https://hydra.flyingcircus.io/build/93222/download/1/nixexprs.tar.xz"
+    )
+    current_version = "21.05.1233.a9cc58d"
+    next_version = "21.05.1235.bacc11d"
+
+    enc = {
+        "parameters": {
+            "environment_url": next_channel_url,
+            "environment": environment,
+        }
+    }
+
+    mocked_responses.add(responses.HEAD, current_channel_url)
+    mocked_responses.add(responses.HEAD, next_channel_url)
+    monkeypatch.setattr(
+        "fc.util.nixos.channel_version", (lambda c: next_version)
+    )
+
+    current_channel = Channel(logger, current_channel_url)
+    current_channel.version = lambda *a: current_version
+    monkeypatch.setattr(
+        "fc.manage.manage.Channel.current", lambda *a: current_channel
+    )
+    activity = UpdateActivity.from_enc(logger, enc, current_requests=[])
+    assert activity
+
+
+# current="<Channel name=, version=21.05.1233.a9cc58d,
+# from=https://hydra.flyingcircus.io/build/93000/download/1/nixexprs.tar.xz>",
+# next="<Channel name=next, version=unknown,
+# from=https://hydra.flyingcircus.io/build/93222/download/1/nixexprs.tar.xz>",
+
+
+def test_update_activity_from_enc_unchanged(
+    log, mocked_responses, nixos_mock, logger, monkeypatch
+):
+    """Given an unchanged channel url, should not prepare an update activity"""
+    environment = "fc-21.05-dev"
+
+    enc = {
+        "parameters": {
+            "environment_url": CURRENT_CHANNEL_URL,
+            "environment": ENVIRONMENT,
+        }
+    }
+
+    mocked_responses.add(responses.HEAD, CURRENT_CHANNEL_URL)
+    monkeypatch.setattr(
+        "fc.util.nixos.channel_version", (lambda c: CURRENT_VERSION)
+    )
+
+    current_channel = Channel(logger, CURRENT_CHANNEL_URL)
+    current_channel.version = lambda *a: CURRENT_VERSION
+    monkeypatch.setattr(
+        "fc.manage.manage.Channel.current", lambda *a: current_channel
+    )
+
+    activity = UpdateActivity.from_enc(logger, enc, current_requests=[])
+    assert activity is None

pkgs/fc/agent/fc/maintenance/activity/tests/test_vm_change.py

@@ -1,20 +1,6 @@
-import textwrap
-from unittest.mock import create_autospec
-
-import pytest
-import structlog
 import yaml
-from fc.maintenance.activity import Activity, RebootType
-from fc.maintenance.activity.reboot import RebootActivity
-from fc.maintenance.activity.update import UpdateActivity
+from fc.maintenance.activity import Activity
 from fc.maintenance.activity.vm_change import VMChangeActivity
-from fc.util.nixos import (
-    BuildFailed,
-    ChannelException,
-    ChannelUpdateFailed,
-    RegisterFailed,
-    SwitchFailed,
-)
 from pytest import fixture
 
 SERIALIZED_ACTIVITY = f"""\