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

hcs_core/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.286"
+__version__ = "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/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/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/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.286.dist-info → hcs_core-0.1.287.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.286
+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.286.dist-info → hcs_core-0.1.287.dist-info}/RECORD

@@ -1,4 +1,4 @@
-hcs_core/__init__.py,sha256=4caxYscIfyoO7-Tr-p1_vW2Lv80gd26hSwPyACIAZ4E,24
+hcs_core/__init__.py,sha256=QcbCKd-QO9eRF5w2FWOK-QGs0v1RFZihFd7Cm-DcOiY,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
@@ -14,11 +14,11 @@ hcs_core/ctxp/fn_util.py,sha256=bEYmj5WgUkRE5S4oQjT_zutuViXWYU9q5MR-MlTA_bY,1573
 hcs_core/ctxp/fstore.py,sha256=qgd4aDLrRWqSsB-7StBv1TAqd0wxIB-scvt6FZSTtyQ,8958
 hcs_core/ctxp/jsondot.py,sha256=U2_ToR8j3-hex75X3OSqTgADiw5cqjRDVO38-IbvapM,11369
 hcs_core/ctxp/logger.py,sha256=6Sh1WXUrjrQNU7K6zUlBzE34fIS6o6oMU3eqSknUOEo,6321
-hcs_core/ctxp/profile.py,sha256=OElbba1V1hnnn-m9UI7-WjUglYpaJ_FHeHjeqyhm13c,7690
+hcs_core/ctxp/profile.py,sha256=DQUQXThHNZa49tDcyGfh-w658CJBE1YIKmNHWXSDaiw,7673
 hcs_core/ctxp/profile_store.py,sha256=v4RvKSaKSJhAt5rEGbC6v-NfaI3N67YffPm-qlrQWdg,1566
 hcs_core/ctxp/recent.py,sha256=Lbv1q6Ld-7FKFaA_FNyqI_WaFDp9zQAOFjFVzox5GoE,1767
 hcs_core/ctxp/state.py,sha256=gjcMRVONKBq7WiFQo-xca1726ngZe90mnPrF3vbXDrU,1634
-hcs_core/ctxp/task_schd.py,sha256=dKNVUGqv1SSXdHufm552FoLr812Grrj3-CNYmSiCfyw,4648
+hcs_core/ctxp/task_schd.py,sha256=mvZMeKDSSo2p7VidSoZY1XZj433TQn_YF9SGJEzl9lg,4586
 hcs_core/ctxp/template_util.py,sha256=XslvIuRBlTVsUW0Y9M_D8gUPc1jWq6X2p4At2VAe1KU,731
 hcs_core/ctxp/timeutil.py,sha256=RyRrIRdFHbIghdB8wbC8VdABvc7hki2v51b1x2JvHgo,445
 hcs_core/ctxp/util.py,sha256=67oR--oVZHzo2wgDbEGg_1mvbl32ReW5edEHjosOjA8,10308
@@ -41,14 +41,14 @@ hcs_core/plan/provider/dev/_prepare.py,sha256=PvVnheEQwpj8sWYz2lDONQVTs4pHPYuo2c
 hcs_core/plan/provider/dev/dummy.py,sha256=zKEr9J4WHhlN5gFdmrFyEfCF0xlQlCJg0CC1dG9VaLA,1958
 hcs_core/plan/provider/dev/fibonacci.py,sha256=8WhDr5c9harNAlVPZomQJEqbWe0hUqbppO6ZkwEUcJ0,1104
 hcs_core/sglib/__init__.py,sha256=oT0etW7vsEbHlXiGL5x23ZXyyFqeLi81RxQQ5lfKSV0,654
-hcs_core/sglib/auth.py,sha256=4nYqW4Hl1mOytQRR0uR7MmT_9BOUQW8RwjyPCZcNIQA,6235
+hcs_core/sglib/auth.py,sha256=otsiBEvKae3B0-bPt5Ggir7ceTRLWG1x7ZaSblHisdA,6443
 hcs_core/sglib/cli_options.py,sha256=NvdiHpX_o6IYPEM8cQYLb_R7T4aiXVvYLqn6Vk4Q2-Y,1761
 hcs_core/sglib/client_util.py,sha256=ZCXmNfmUL4_iry4yU2bPWL0dLLNIGu3zp541cFt6Or0,10876
 hcs_core/sglib/csp.py,sha256=anZqbQLIZw831PgW9Z4pweqfAeBH7rXPIAkwkyPkfGY,8054
 hcs_core/sglib/ez_client.py,sha256=6R_gnRRxxmJYg6oJTnUB7ZLvUTRlEEYuhRyLLOvMxWI,7592
 hcs_core/sglib/hcs_client.py,sha256=pxRZQ79ABhOyihAI8oOeTxw2dXkce5-NyRkJAoo0OL0,888
 hcs_core/sglib/init.py,sha256=w_0ZU70Q1TGbSZsqSi7ewKQqpExFlepOT7mIqH0wnho,310
-hcs_core/sglib/login_support.py,sha256=9YLhaocomqMLkoXcVW5-iDfS7QW9ON2Btx4OBZMAhaE,7581
+hcs_core/sglib/login_support.py,sha256=5vU3MOGM00yUcjsoSJeTY0p5PVYOO76YVEggTB6i7U4,7484
 hcs_core/sglib/payload_util.py,sha256=Hnj7rjzrQ1j5gpbrwZX34biN8MIZjy6dOJZ63ulmzdw,685
 hcs_core/sglib/requtil.py,sha256=O37DrD4VVBmmRkkHJLbDtPfFq8l6fLZwYZggt2FTEFc,920
 hcs_core/sglib/utils.py,sha256=FLgB8M5EiS3WhCzX5xUA9aFzB5jKQI8pqxtrmE4SsjQ,3164
@@ -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.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,,
+hcs_core-0.1.287.dist-info/METADATA,sha256=0XqaqWNnewWHGoV9N-vTbCZH1vMhUKJ0pMw5vw3Vk70,1875
+hcs_core-0.1.287.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hcs_core-0.1.287.dist-info/RECORD,,