fix: do not ask question on skipped steps (#53)

canonical · Aug 27, 2024 · fa28f11 · fa28f11
1 parent 9f85390
commit fa28f11
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/anvil-python/anvil/commands/haproxy.py b/anvil-python/anvil/commands/haproxy.py
@@ -21,7 +21,7 @@
 from sunbeam.clusterd.client import Client
 from sunbeam.commands.terraform import TerraformInitStep
 from sunbeam.jobs import questions
-from sunbeam.jobs.common import BaseStep
+from sunbeam.jobs.common import BaseStep, ResultType
 from sunbeam.jobs.juju import JujuHelper
 from sunbeam.jobs.steps import (
     AddMachineUnitsStep,
@@ -106,7 +106,11 @@ def has_prompts(self) -> bool:
         if self.refresh:
             return False
 
-        return True
+        skip_result = self.is_skip()
+        if skip_result.result_type == ResultType.SKIPPED:
+            return False
+        else:
+            return True
 
     def prompt(self, console: Console | None = None) -> None:
         variables = questions.load_answers(

diff --git a/anvil-python/anvil/commands/postgresql.py b/anvil-python/anvil/commands/postgresql.py
@@ -182,7 +182,11 @@ def has_prompts(self) -> bool:
         if self.refresh:
             return False
 
-        return True
+        skip_result = self.is_skip()
+        if skip_result.result_type == ResultType.SKIPPED:
+            return False
+        else:
+            return True
 
 
 class ReapplyPostgreSQLTerraformPlanStep(DeployMachineApplicationStep):