hcs-core 0.1.285__py3-none-any.whl → 0.1.286__py3-none-any.whl

hcs_core/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.285"
+__version__ = "0.1.286"

hcs_core/plan/core.py

@@ -127,7 +127,7 @@ def apply(
         dag.process_blueprint(
             blueprint=blueprint,
             fn_process_node=process_resource_node,
-            continue_on_error=False,
+            fail_fast=True,
             reverse=False,
             concurrency=concurrency,
             target_node_name=target_resource_name,
@@ -524,7 +524,7 @@ def _destroy_res(name, res_node, state, force):
 
 def destroy(
     data,
-    force: bool,
+    fail_fast: bool,
     target_resource_name: str = None,
     include_dependencies: bool = True,
     concurrency: int = 4,
@@ -542,7 +542,7 @@ def destroy(
         if not node:
             return dag.walker.next
 
-        _destroy_res(node_name, node, state, force)
+        _destroy_res(node_name, node, state, fail_fast)
         data_util.save_data_file(state, state_file)
         return dag.walker.next
 
@@ -550,7 +550,7 @@ def destroy(
         dag.process_blueprint(
             blueprint=blueprint,
             fn_process_node=destroy_resource,
-            continue_on_error=force,
+            fail_fast=fail_fast,
             reverse=True,
             concurrency=concurrency,
             target_node_name=target_resource_name,

hcs_core/plan/dag.py

@@ -72,7 +72,7 @@ class DAG:
 def process_blueprint(
     blueprint,
     fn_process_node: Callable,
-    continue_on_error: bool = False,
+    fail_fast: bool = False,
     reverse: bool = False,
     concurrency: int = 3,
     target_node_name: str = None,
@@ -88,7 +88,7 @@ def process_blueprint(
             return walker.next
         return fn_process_node(name)
 
-    return _walkthrough(dag, fn_process_node_impl, continue_on_error, concurrency)
+    return _walkthrough(dag, fn_process_node_impl, fail_fast, concurrency)
 
 
 def _filter_dag_by_target_node(dag: DAG, target_node_name, include_dependencies):
@@ -225,7 +225,7 @@ def _get_provider_id(node_data):
     return provider_type
 
 
-def _walkthrough(dag: DAG, fn_process_node: Callable, continue_on_error: bool, concurrency: int):
+def _walkthrough(dag: DAG, fn_process_node: Callable, fail_fast: bool, concurrency: int):
     topological_sorter = TopologicalSorter(dag.graph)
     topological_sorter.prepare()
     lock = threading.Lock()
@@ -250,10 +250,10 @@ def _walkthrough(dag: DAG, fn_process_node: Callable, continue_on_error: bool, c
         except Exception as e:
             with lock:
                 flags["err"] = e
-                if continue_on_error:
-                    topological_sorter.done(node_id)
-                else:
+                if fail_fast:
                     flag_stop.set()
+                else:
+                    topological_sorter.done(node_id)
         except SystemExit as e:
             with lock:
                 flags["err"] = e
@@ -292,7 +292,7 @@ def _walkthrough(dag: DAG, fn_process_node: Callable, continue_on_error: bool, c
             if flag_stop.is_set():
                 break
             with lock:
-                if not continue_on_error and flags["err"]:
+                if fail_fast and flags["err"]:
                     break
                 read_nodes = topological_sorter.get_ready()
             if not len(read_nodes):

hcs_core/plan/kop.py

@@ -85,7 +85,8 @@ class KOP:
         self._started = False
         self._closed = False
         job_id = kind + "/" + name
-        _job_view.add(job_id, job_id)
+        if _job_view:
+            _job_view.add(job_id, job_id)
 
     def _job_id(self):
         return self._kind + "/" + self._name
@@ -103,7 +104,8 @@ class KOP:
 
     def id(self, res_id: str):
         self._id = res_id
-        _job_view.update(self._job_id(), res_id)
+        if _job_view:
+            _job_view.update(self._job_id(), res_id)
 
     def start(self, mode: str = None, eta: str = None):
         if self._started:
@@ -114,7 +116,8 @@ class KOP:
             self._mode = mode
         self._started = True
         self._add_log(KopAction.start)
-        _job_view.start(self._job_id(), eta)
+        if _job_view:
+            _job_view.start(self._job_id(), eta)
 
     def _success(self):
         if not self._started:
@@ -125,7 +128,8 @@ class KOP:
             raise KopException("Kop already closed. This is a framework logging issue.")
         self._add_log(KopAction.success)
         self._closed = True
-        _job_view.success(self._job_id())
+        if _job_view:
+            _job_view.success(self._job_id())
 
     def error(self, err):
         if isinstance(err, Exception):
@@ -136,12 +140,14 @@ class KOP:
             details = str(err)
         self._add_log(KopAction.error, details)
         self._closed = True
-        _job_view.error(self._job_id(), details)
+        if _job_view:
+            _job_view.error(self._job_id(), details)
 
     def skip(self, reason):
         self._add_log(KopAction.skip, reason)
         self._closed = True
-        _job_view.skip(self._job_id(), reason)
+        if _job_view:
+            _job_view.skip(self._job_id(), reason)
 
     def _add_log(self, action: str, details: str = None):
         labels = {
@@ -174,6 +180,12 @@ class KOP:
 
         if _job_view == _DummyJobView:
             log.info(msg)
+        elif _job_view is None:
+            # explicitly set by user to disable log
+            pass
+        else:
+            # custom job view
+            pass
         entry = {"name": self._name, "time": int(time.time()), "action": action, "id": self._id}
         if details:
             entry["details"] = details

{hcs_core-0.1.285.dist-info → hcs_core-0.1.286.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.285
+Version: 0.1.286
 Summary: Horizon Cloud Service CLI module.
 Project-URL: Homepage, https://github.com/euc-eng/hcs-cli
 Project-URL: Bug Tracker, https://github.com/euc-eng/hcs-cli/issues

{hcs_core-0.1.285.dist-info → hcs_core-0.1.286.dist-info}/RECORD

@@ -1,4 +1,4 @@
-hcs_core/__init__.py,sha256=5YbVr3-aqJTRGHkmYg7hDxGfTrKj3cj9TWPVQZmzlII,24
+hcs_core/__init__.py,sha256=4caxYscIfyoO7-Tr-p1_vW2Lv80gd26hSwPyACIAZ4E,24
 hcs_core/ctxp/__init__.py,sha256=bHVHhJP10Luz1a3Kk3zFx14dAO4SY6Q20Lrv8rNWWGc,1075
 hcs_core/ctxp/_init.py,sha256=yq46VOty4zs_WcLt1SrtePxbW8S4RIz4YUCP3xIBvCA,2797
 hcs_core/ctxp/cli_options.py,sha256=g5JnzOtyWiGLCLcGp5x54MPFLW_NOfhfevXUlX5L8tM,2532
@@ -31,10 +31,10 @@ hcs_core/plan/__init__.py,sha256=-aEHqDPQd9Noqwg8bV8YBKxE9xrY25PFp2pknFXZiIc,428
 hcs_core/plan/actions.py,sha256=UvCynzApJUxi39HUoPIQ_uownlbvFbJ4aAs6pmulrLY,125
 hcs_core/plan/base_provider.py,sha256=CSJFN8lopWTUblw8CW78Epnef9BbJVLhPLk9bPfZceM,1299
 hcs_core/plan/context.py,sha256=5NI5Otk0jGKtBGvO8Sc1xdOHUCu_lXQYNrSctT3Hyq8,116
-hcs_core/plan/core.py,sha256=vJDG5WYV6XtYtDjK7lyM6MLrB0OEfH6YDqF06DoC9iw,21137
-hcs_core/plan/dag.py,sha256=TDpyXVuiwAxeWwNq2HkeZq8F90CnT97NfAl1NjYcII4,12970
+hcs_core/plan/core.py,sha256=21pSOJPcJCidQwNkLDgILaYVOElUZmc0nEwDA5itP_U,21132
+hcs_core/plan/dag.py,sha256=pyyoMSmbhCsS8BMZI6hW6YDkHqBgjmJOwys9CUDrIts,12926
 hcs_core/plan/helper.py,sha256=__b8tlzLBT1Rm3vgiS-pWnZImaoZbsmKSRJtt_1gj8E,7763
-hcs_core/plan/kop.py,sha256=G1bOPvvaSqrH_AHWWpGx3sFHNvsulbSu6OnPWgBkOqs,5455
+hcs_core/plan/kop.py,sha256=rhA4L8PUqImUTLvqH94jGlh4gmFk1UElVJLjhtZP-jQ,5773
 hcs_core/plan/provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hcs_core/plan/provider/dev/__init__.py,sha256=WpPDB-h5z5uF2BhcRlsdeJyZxBU5dun6tCf5ZZeaTJU,30
 hcs_core/plan/provider/dev/_prepare.py,sha256=PvVnheEQwpj8sWYz2lDONQVTs4pHPYuo2c4VD2if-hc,34
@@ -63,6 +63,6 @@ hcs_core/util/query_util.py,sha256=5bh3bUVIQuY9qerndfuyfyzkTExYJ8zD0_e3PSN7y-4,3
 hcs_core/util/scheduler.py,sha256=bPpCmGUL1UctJMfLPAg-h4Hl2YZr96FiI78-G_Usn08,2958
 hcs_core/util/ssl_util.py,sha256=MvU102fGwWWh9hhSmLnn1qQIWuD6TjZnN0iH0MXUtW0,1239
 hcs_core/util/versions.py,sha256=wwbcYFpxBohI-QjcrmxGsNghdnx4EWHBipMUL7vnpwM,1728
-hcs_core-0.1.285.dist-info/METADATA,sha256=UTr7anutc4oV_HOXJ_zUWerSit6quDs_BaqIw6dYSZs,1837
-hcs_core-0.1.285.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hcs_core-0.1.285.dist-info/RECORD,,
+hcs_core-0.1.286.dist-info/METADATA,sha256=63rzKWPPlVxWKBrOF070LzdUMiKl7ng5Ho9A3q9cf2s,1837
+hcs_core-0.1.286.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hcs_core-0.1.286.dist-info/RECORD,,