hcs-core 0.1.285__tar.gz → 0.1.287__tar.gz

{hcs_core-0.1.285 → hcs_core-0.1.287}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.285
+Version: 0.1.287
 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
@@ -40,6 +40,7 @@ Provides-Extra: dev
 Requires-Dist: bandit; extra == 'dev'
 Requires-Dist: black; extra == 'dev'
 Requires-Dist: build; extra == 'dev'
+Requires-Dist: flake8; extra == 'dev'
 Requires-Dist: mypy; extra == 'dev'
 Requires-Dist: pylint; extra == 'dev'
 Requires-Dist: pytest; extra == 'dev'

hcs_core-0.1.287/hcs_core/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.287"

{hcs_core-0.1.285 → hcs_core-0.1.287}/hcs_core/ctxp/profile.py

@@ -98,7 +98,6 @@ def current(reload: bool = False, exit_on_failure: bool = True, exclude_secret:
 
 def save():
     """Save the current profile"""
-    global _data
     if _data is None:
         return
     write(name(), _data)

{hcs_core-0.1.285 → hcs_core-0.1.287}/hcs_core/ctxp/task_schd.py

@@ -111,7 +111,6 @@ def statistics(reset_cycle: bool = False):
 
 def _daemon_worker():
     log.info("task scheduler daemon thread start")
-    global _g_flag_stop_daemon
     while not _g_flag_stop_daemon.is_set():
         if _g_flag_running:
             schedule.run_pending()
@@ -149,7 +148,6 @@ def resume():
 
 
 def stop_daemon():
-    global _g_flag_stop_daemon
     global _g_worker_thread
     if _g_worker_thread:
         _g_flag_stop_daemon.set()

{hcs_core-0.1.285 → hcs_core-0.1.287}/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-0.1.285 → hcs_core-0.1.287}/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-0.1.285 → hcs_core-0.1.287}/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 → hcs_core-0.1.287}/hcs_core/sglib/auth.py

@@ -125,12 +125,17 @@ def _get_new_oauth_token(old_oauth_token, effective_profile):
 def refresh_oauth_token(old_oauth_token: dict, csp_url: str):
     with OAuth2Client(token=old_oauth_token) as client:
         log.debug("Refresh auth token...")
-        new_token = client.refresh_token(csp_url + "/csp/gateway/am/api/auth/token")
+        token_url = csp_url + "/csp/gateway/am/api/auth/token"
+        from .login_support import identify_client_id
+
+        csp_specific_req_not_oauth_standard = (identify_client_id(csp_url), "")
+        new_token = client.refresh_token(token_url, auth=csp_specific_req_not_oauth_standard)
         log.debug(f"New auth token: {new_token}")
         if not new_token:
             raise Exception("CSP auth refresh failed.")
         if "cspErrorCode" in new_token:
             raise Exception(f"CSP auth failed: {new_token.get('message')}")
+
     return new_token
 
 

{hcs_core-0.1.285 → hcs_core-0.1.287}/hcs_core/sglib/login_support.py

@@ -19,17 +19,13 @@ limitations under the License.
 import logging
 import secrets
 import threading
-import time
 import webbrowser
 from http.server import BaseHTTPRequestHandler, HTTPServer
-from typing import Callable
 from urllib.parse import parse_qs, urlparse
 
 from authlib.integrations.httpx_client import OAuth2Client
 from authlib.oauth2.rfc7636 import create_s256_code_challenge
 
-from hcs_core.util.scheduler import ThreadPoolScheduler
-
 log = logging.getLogger(__name__)
 
 _server_address = ("127.0.0.1", 10762)

{hcs_core-0.1.285 → hcs_core-0.1.287}/pyproject.toml

@@ -58,6 +58,7 @@ dev = [
     "pylint",
     "pytest",
     "ruff",
+    "flake8",
 ]
 
 [project.urls]

hcs_core-0.1.285/hcs_core/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.285"