hcs-cli 0.1.339__tar.gz → 0.1.341__tar.gz

{hcs_cli-0.1.339 → hcs_cli-0.1.341}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-cli
-Version: 0.1.339
+Version: 0.1.341
 Summary: Horizon Cloud Service CLI.
 Project-URL: Homepage, https://github.com/euc-eng/hcs-cli
 Project-URL: Bug Tracker, https://github.com/euc-eng/hcs-cli/issues
@@ -14,7 +14,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
-Requires-Dist: hcs-core>=0.1.339
+Requires-Dist: hcs-core>=0.1.341
 Requires-Dist: inquirerpy>=0.3.4
 Requires-Dist: matplotlib>=3.8.0
 Requires-Dist: paho-mqtt>=2.1.0

{hcs_cli-0.1.339 → hcs_cli-0.1.341}/hcs_cli/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.1.339"
+__version__ = "0.1.341"
 
 from . import service as service  # noqa: F401

{hcs_cli-0.1.339 → hcs_cli-0.1.341}/hcs_cli/cmds/api.py

@@ -3,7 +3,9 @@ import sys
 from typing import Optional
 
 import click
-from hcs_core.ctxp import CtxpException, profile
+from hcs_core.ctxp import CtxpException
+from hcs_core.sglib import hdc as hdc_session
+from hcs_core.sglib.client_util import resolve_hcs_base_url
 from hcs_cli.service import api as hcs_api
 
 
@@ -148,7 +150,9 @@ def api(
             f"Method {method} does not support request body. Use --data or --json or STDIN only with POST, PUT, or PATCH methods."
         )
 
-    hcs_url = profile.current().hcs.url
+    # Command --hdc overrides global session; else session; else hcs.url
+    effective_hdc = hdc or hdc_session.active()
+    hcs_url = resolve_hcs_base_url(effective_hdc)
     if path.startswith(hcs_url):
         path = path[len(hcs_url) :]
         if not path.startswith("/"):
@@ -157,6 +161,7 @@ def api(
     if not path.startswith("/"):
         raise click.UsageError("Path must start with a '/'. Please provide a valid context path. Provided path=" + path)
 
+    # Command-level --hdc/--region override session for this invocation
     if region or hdc:
         handler = hcs_api.with_context(hdc=hdc, region=region)
     else:

{hcs_cli-0.1.339 → hcs_cli-0.1.341}/hcs_cli/cmds/dev/fs/helper/config.py

@@ -28,7 +28,7 @@ import hcs_cli.cmds.dev.util.github_helper as github_helper
 from hcs_cli.cmds.dev.util import log
 from hcs_cli.cmds.dev.util.log import fail
 
-FS_CUSTOMER_ORG_ID = "517419ab-9bf6-4dde-95ca-1916c6600a40"
+NIGHTLY_TESTS_BRANCH = "feature/nanw"
 
 
 def resolve(env_source: Optional[str], env_file: Optional[str], org_source_key: str, org_source_value: str):
@@ -38,8 +38,7 @@ def resolve(env_source: Optional[str], env_file: Optional[str], org_source_key:
         env_path = _from_user_path(env_file)
     elif env_source == "nightly":
         os.environ[org_source_key] = org_source_value
-        customer_org = _resolve_customer_org()
-        env_path = _from_nightly_repo(customer_org)
+        env_path = _from_nightly_repo()
     elif env_source == "local":
         os.environ.pop(org_source_key, None)
         env_path = _from_local()
@@ -69,8 +68,7 @@ def resolve_interactive(org_source_key: str, org_source_value: str) -> str:
 
     if env_choice == "nightly":
         os.environ[org_source_key] = org_source_value
-        customer_org = _resolve_customer_org()
-        return _from_nightly_repo(customer_org)
+        return _from_nightly_repo()
     elif env_choice == "user_specified":
         os.environ.pop(org_source_key, None)
         completer = PathCompleter(expanduser=True)
@@ -81,35 +79,22 @@ def resolve_interactive(org_source_key: str, org_source_value: str) -> str:
         return _from_local()
 
 
-# --- helpers ---
-
-
-def _resolve_customer_org() -> str:
-    """Return customer org ID: from env if set, otherwise prompt with default."""
-    org = os.getenv("ORG_ID")
-    if org:
-        log.info(f"Target customer ORG_ID={org}")
-        return org
-    org = prompt("Enter target ORG_ID: ", default=FS_CUSTOMER_ORG_ID).strip()
-    os.environ["ORG_ID"] = org
-    log.info(f"Target customer ORG_ID={org}")
-    return org
-
-
 # --- source resolvers ---
 
 
-def _from_nightly_repo(customer_org: str) -> str:
+def _from_nightly_repo() -> str:
     output_env_file = ".env"
 
     github_helper.check_ssh_access()
-    with github_helper.repo("git@github.com:euc-eng/horizonv2-sg.nightly-tests.git") as repo:
-        config_data = repo.get("src/test/resources/com/vmware/integration/sg/payloads/onboard/configuration.txt", format="json")
-        config_props = repo.get("src/test/resources/config.properties")
+    with github_helper.repo("git@github.com:euc-eng/horizonv2-sg.nightly-tests.git", branch=NIGHTLY_TESTS_BRANCH) as repo:
+        config_data = repo.get(
+            "src/test/resources/com/vmware/integration/sg/payloads/onboard/configuration.txt",
+            branch=NIGHTLY_TESTS_BRANCH,
+            format="json",
+        )
+        config_props = repo.get("src/test/resources/config.properties", branch=NIGHTLY_TESTS_BRANCH)
 
     _write_env_file(config_data, config_props, output_env_file)
-    with open(output_env_file, "a") as f:
-        f.write(f"\nORG_ID={customer_org}\n")
     _organize_env_file(output_env_file)
 
     log.good(f".env file created at: {Path(output_env_file).resolve()}")
@@ -175,6 +160,7 @@ def _write_env_file(data, props, env_file):
                 f.write(f"{_to_env_key(key)}={value}\n")
         config_block = f"""HCS_CLIENT_ID={props["csp.service.app.client_id"]}
 HCS_CLIENT_SECRET={props["csp.service.app.client_secret"]}
+CSP_API_TOKEN={props["fs.csp.app.api_token"]}
 IDP_TENANT_DOMAIN=test-sanity-domain
 UAG_FQDN=myuag.fqdn
 DESKTOP_SUBNET_CIDR=10.76.0.0/16
@@ -201,6 +187,7 @@ IMAGE_PASSWORD={ad_password}
 VM_USER_NAME={ad_username}
 VM_PASSWORD={ad_password}
 DEPLOYMENT_ID=az-1
+ORG_ID={props["fs.csp.app.orgId"]}
 """
         f.write(config_block)
 
@@ -216,7 +203,7 @@ def _to_env_key(key):
 def _organize_env_file(env_file):
     group_rules = OrderedDict(
         [
-            ("Credentials (Optional):", ["HCS_CLIENT_ID", "HCS_CLIENT_SECRET"]),
+            ("Credentials (Optional):", ["HCS_CLIENT_ID", "HCS_CLIENT_SECRET", "CSP_API_TOKEN"]),
             ("Identity Provider (IDP) Configuration", ["IDP_USER_NAME", "IDP_PASSWORD", "IDP_TENANT_DOMAIN"]),
             (
                 "AD Configuration",

{hcs_cli-0.1.339 → hcs_cli-0.1.341}/hcs_cli/cmds/dev/fs/helper/init_steps.py

@@ -18,7 +18,7 @@ from hcs_core.ctxp.util import error_details
 
 import hcs_cli.cmds.dev.util.github_helper as github_helper
 import hcs_cli.support.profile as profile_support
-from hcs_cli.cmds.dev.fs.helper import credential_helper, k8s_util, license_info, step_util, subscription_util, mqtt_certs
+from hcs_cli.cmds.dev.fs.helper import credential_helper, k8s_util, license_info, subscription_util, mqtt_certs
 from hcs_cli.cmds.dev.fs.helper.k8s_util import kubectl
 from hcs_cli.cmds.dev.fs.helper.step_util import step
 from hcs_cli.cmds.dev.util import log
@@ -369,11 +369,7 @@ def prepare_profile(fs_name: str):
 
     if profile_org_id:
         if profile_org_id != token_org_id and not use_nightly_test_org:
-            log.warn(
-                f"Profile orgId ({profile_org_id}) does not match API token org ({token_org_id}). Updating profile to use the API token org."
-            )
-            profile_data.csp.orgId = token_org_id
-            profile.save()
+            log.warn(f"Profile orgId ({profile_org_id}) does not match API token org ({token_org_id}). Be careful about such config.")
         else:
             pass
     else:
@@ -705,8 +701,9 @@ def update_mqtt():
             if delete_temp_files and os.path.exists(tmp_secret.name):
                 os.remove(tmp_secret.name)
 
-    profile_data = profile.current()
-    profile_data.hcs.regions[0].mqtt = ip_address
+    from hcs_core.sglib.client_util import resolve_regions
+
+    resolve_regions()[0].mqtt = ip_address
     profile.save()
     log.good("MQTT external IP updated in profile.")
 
@@ -714,10 +711,11 @@ def update_mqtt():
 @step
 def test_mqtt():
     import hcs_cli.cmds.dev.util.mqtt_helper as mqtt_helper
+    from hcs_core.sglib.client_util import resolve_regions
 
     try:
         cert_config = mqtt_helper.prepare_cert(os.getenv("ORG_ID"))
-        mqtt_helper.test_mqtt(profile.current().hcs.regions[0].mqtt, 443, cert_config)
+        mqtt_helper.test_mqtt(resolve_regions()[0].mqtt, 443, cert_config)
     except Exception as e:
         log.warn("Failed testing MQTT:" + error_details(e))
 

{hcs_cli-0.1.339 → hcs_cli-0.1.341}/hcs_cli/cmds/dev/fs/provided_files/akka.plan.yml

@@ -34,6 +34,7 @@ resource:
       providerInstanceId: ${myProvider.id}
       siteId: ${mySite.id}
       fqdn: ${default.name}.titan.omnissa.com
+      providerLabel: akka
   myGoldPattern:
     kind: hcs/gold_pattern
     data:

{hcs_cli-0.1.339 → hcs_cli-0.1.341}/hcs_cli/cmds/dev/mqtt.py

@@ -50,8 +50,9 @@ def test(org: str, **kwargs):
     _verify_cert_chain(cert_config["client_cert_chain_legacy_file"])
     _verify_cert_chain(cert_config["client_cert_chain_no_org_file"])
 
-    profile_data = profile.current()
-    for region_config in profile_data.hcs.regions:
+    from hcs_core.sglib.client_util import resolve_regions
+
+    for region_config in resolve_regions():
         print(f"---- Testing MQTT (cert from PKI) in region: {region_config.name} -----")
         host = region_config.mqtt
         port = 8883 if _is_feature_stack() else 443
@@ -78,9 +79,10 @@ def _test_mqtt(host, port, cert_config, cert_name):
 
 
 def test_vmhub_otp(org_id: str):
-    profile_data = profile.current()
+    from hcs_core.sglib.client_util import resolve_regions
+
     resource_name = "agent1"
-    for region_config in profile_data.hcs.regions:
+    for region_config in resolve_regions():
         print(f"---- Testing MQTT (cert from VMHub) in region: {region_config.name} -----")
         vmhub.credentials.use_region(region_config.name)
         otp = vmhub.credentials.request(org_id, resource_name)

{hcs_cli-0.1.339 → hcs_cli-0.1.341}/hcs_cli/cmds/dev/onboard.py

@@ -101,7 +101,7 @@ def delete(all: bool, org: str):
         url = profile_data.hcs.url
         org = run_cli("hcs org get", output_json=True)
 
-        click.secho("⚠️ This will delete all resources.", fg="bright_red")
+        click.secho("⚠️ This will DELETE ALL RESOURCES in the org.", fg="bright_red")
         click.echo("     Profile name: " + profile.name())
         click.echo("     HCS URL: " + url)
         click.echo("     Org: " + org["orgName"])

{hcs_cli-0.1.339 → hcs_cli-0.1.341}/hcs_cli/cmds/dev/util/github_helper.py

@@ -23,19 +23,20 @@ def check_ssh_access():
 
 
 class _RepoReader:
-    def __init__(self, git_url: str):
+    def __init__(self, git_url: str, branch: str = "master"):
         # url = "https://github.com/euc-eng/horizonv2-sg.nightly-tests.git"
         # url =     "git@github.com:euc-eng/horizonv2-sg.nightly-tests.git"
         if git_url.startswith("https://github.com/"):
             git_url = "git@github.com:" + git_url[len("https://github.com/") :]
         self.git_url = git_url
+        self.branch = branch
         self.temp_dir = None
 
     def __enter__(self):
         # Generate a unique temporary directory name (but don't create it)
         unique_id = str(uuid.uuid4())[:8]
         self.temp_dir = os.path.join(tempfile.gettempdir(), f"repo_reader_{unique_id}")
-        cmd = f"git clone --filter=blob:none --no-checkout --depth=1 {self.git_url} {self.temp_dir}"
+        cmd = f"git clone --filter=blob:none --no-checkout --depth=1 --branch {self.branch} {self.git_url} {self.temp_dir}"
         exec(cmd, log_error=True, raise_on_error=False, inherit_output=True).stdout
 
         return self
@@ -78,5 +79,5 @@ class _RepoReader:
             raise ValueError(f"Unsupported format: {format}")
 
 
-def repo(git_url: str) -> _RepoReader:
-    return _RepoReader(git_url)
+def repo(git_url: str, branch: str = "master") -> _RepoReader:
+    return _RepoReader(git_url, branch=branch)

hcs_cli-0.1.341/hcs_cli/cmds/log.py

@@ -0,0 +1,211 @@
+"""
+Copyright © 2025 Omnissa, LLC.
+"""
+
+import json
+import sys
+from datetime import timezone
+
+import click
+import yumako
+from hcs_core.ctxp import util
+from hcs_core.sglib import cli_options as cli
+
+from hcs_cli.service import hoc
+from hcs_cli.support import predefined_payload
+from hcs_cli.support.log.message_parser import parse_message
+from hcs_cli.support.log.query_builder import update_query
+
+_hdcs = ["US", "EU", "JP"]
+
+_regions = [
+    "any",  # magic flag. Search log of all regional clusters related to the selected HDC. [default]
+    "eastus2",
+    "westus2",
+    "centralus",
+    "westcentralus",
+    "germanynorth",
+    "germanywestcentral",
+    "northeurope",
+    "uksouth",
+    "westeurope",
+    "japaneast",
+    "japanwest",
+    "australiaeast",
+    "aussoutheast",
+    "centralindia",
+    "southindia",
+]
+
+
+# US
+PROD_US_HDC_WESTUS2 = "prod110-hdc-westus2-cp102-*"  # primary
+PROD_US_HDC_CENTRALUS = "prod110-hdc-centralus-cp102-*"
+
+PROD_US_R_WESTUS2 = "prod110-r-westus2-cp102-*"  # primary
+PROD_US_R_EASTUS2 = "prod110-r-eastus2-cp102-*"  # primary
+PROD_US_R_CENTRALUS = "prod110-r-centralus-cp102-*"  # standby
+PROD_US_R_WESTCENTRALUS = "prod110-r-westcentralus-cp102-*"  # standby
+
+# EU
+PROD_EU_HDC_NORTHEUROPE = "prod110-hdc-northeurope-cp102-*"  # primary
+PROD_EU_HDC_WESTEUROPE = "prod110-hdc-westeurope-cp102-*"
+
+PROD_EU_R_GERMANYNORTH = "prod110-r-germanynorth-cp102-*"  # primary
+PROD_EU_R_GERMANYWESTCENTRAL = "prod110-r-germanywestcentral-cp102-*"
+PROD_EU_R_NORTHEUROPE = "prod110-r-northeurope-cp102-*"  # primary
+PROD_EU_R_UKSOUTH = "prod110-r-uksouth-cp102-*"  # primary
+PROD_EU_R_WESTEUROPE = "prod110-r-westeurope-cp102-*"
+
+# JP
+PROD_JP_HDC_JAPANEAST = "prod110-hdc-japaneast-cp102-*"  # primary
+PROD_JP_HDC_JAPANWEST = "prod110-hdc-japanwest-cp102-*"
+
+PROD_JP_R_JAPANEAST = "prod110-r-japaneast-cp102-*"
+PROD_JP_R_JAPANWEST = "prod110-r-japanwest-cp102-*"
+PROD_AUS_R_AUSTRALIAEAST = "prod110-r-australiaeast-cp102-*"
+PROD_AUS_R_AUSSOUTHEAST = "prod110-r-aussoutheast-cp102-*"
+PROD_IND_R_CENTRALINDIA = "prod110-r-centralindia-cp102-*"
+PROD_IND_R_SOUTHINDIA = "prod110-r-southindia-cp102-*"
+
+
+ANY_HDC_AND_REGION = "prod110-*-*-cp102-*"
+
+
+@click.command()
+@click.option(
+    "--from",
+    "from_param",
+    type=str,
+    required=False,
+    default="-24h",
+    help="Sepcify the from date. E.g. '-1d', or '-1h35m', or '-1w', or '2023-12-04T00:19:22.854Z'.",
+)
+@click.option(
+    "--to",
+    type=str,
+    required=False,
+    default="now",
+    help="Sepcify the to date. E.g. 'now', or '-1d', or '-1h35m', or '-1w', or '2023-12-04T00:19:22.854Z'.",
+)
+@click.option("--hdc", required=False, type=click.Choice(_hdcs, case_sensitive=False), help="The HDC location.")
+@click.option("--region", required=False, type=click.Choice(_regions, case_sensitive=False), help="Search log of regional cluster.")
+@click.option(
+    "--service",
+    required=False,
+    help="Filter by kubernetes.pod_labels.app. If multiple apps, use comma to separate, e.g. --service inventory,lcm",
+)
+@click.option(
+    "--pod",
+    required=False,
+    help="Filter by kubernetes.pod_name. If multiple pods, use comma to separate, e.g. --pod clouddriver-statefulset-0,clouddriver-statefulset-1",
+)
+@click.option(
+    "--index",
+    required=False,
+    type=str,
+    help="Explicit ES index/index-pattern to query, overriding the --hdc-derived lookup. "
+    "E.g. --index 'prod110-r-japaneast-cp102-*' to search precisely for a single regional cluster.",
+)
+@cli.limit(default=500)
+@click.option("--raw", is_flag=True, default=False, help="If raw, output the raw result.")
+@click.argument("query", type=str, required=False)
+def log(
+    from_param: str,
+    to: str,
+    hdc: str,
+    region: str,
+    service: str,
+    pod: str,
+    index: str,
+    limit: int,
+    raw: bool,
+    query: str,
+):
+    """Search Kibana Log."""
+
+    if region and index:
+        return util.error_details(ValueError("--region and --index must not be used together.")), 1
+
+    # ES index pick (orthogonal to profile URL). Global --hdc fills in when command omits --hdc.
+    if not hdc:
+        from hcs_core.sglib import hdc as hdc_session
+
+        hdc = hdc_session.active() or "US"
+    else:
+        hdc = hdc.upper()
+
+    if index:
+        es_logs_search_index = index
+    elif region:
+        if region == "any":
+            # search any HDC and region. still scoped to datasource.
+            es_logs_search_index = ANY_HDC_AND_REGION
+        else:
+            # search only specific region
+            es_logs_search_index = f"prod110-r-{region.lower()}-cp102-*"
+    else:
+        # hdc only
+        if hdc == "US":
+            es_logs_search_index = PROD_US_HDC_WESTUS2
+        elif hdc == "EU":
+            es_logs_search_index = PROD_EU_HDC_NORTHEUROPE
+        elif hdc == "JP":
+            es_logs_search_index = PROD_JP_HDC_JAPANEAST
+        else:
+            raise ValueError("Unknown HDC")
+
+    text = predefined_payload.load("hoc/logs.jsont")
+    replacements = {
+        "from": int(yumako.time.of(from_param, tz=timezone.utc).timestamp() * 1000),
+        "to": int(yumako.time.of(to, tz=timezone.utc).timestamp() * 1000),
+        "query": query or "",
+        "es_logs_search_index": es_logs_search_index,
+    }
+    try:
+        text = yumako.template.replace(
+            text=text,
+            mapping=replacements,
+            raise_on_unresolved_vars=True,
+            raise_on_unused_vars=True,
+        )
+    except ValueError as e:
+        return util.error_details(e), 1
+
+    parts = text.split("///", 2)
+    try:
+        first_line = json.loads(parts[0])
+    except Exception as e:
+        print(text, file=sys.stderr)
+        print(e, file=sys.stderr)
+        return
+    try:
+        second_line = json.loads(parts[1])
+    except Exception as e:
+        print(text, file=sys.stderr)
+        print(e, file=sys.stderr)
+        return
+
+    second_line["size"] = limit
+
+    update_query(second_line, app_names=service, pod_names=pod)
+
+    payload_jsonp = json.dumps(first_line) + "\n" + json.dumps(second_line) + "\n"
+
+    # This will restrict to the specific data source.
+    hdc_location_mapping = {
+        "US": "US_APM",
+        "EU": "EU_APM",
+        "JP": "JP_APM",
+    }
+
+    # print(payload_jsonp)
+    result = hoc.es.raw_query(payload_jsonp, hdc_location=hdc_location_mapping[hdc])
+    if raw:
+        return result
+
+    # format the result to pure message array
+    ret = []
+    for item in result:
+        ret.append(parse_message(item))
+    return ret

{hcs_cli-0.1.339 → hcs_cli-0.1.341}/hcs_cli/cmds/login.py

@@ -60,13 +60,13 @@ from hcs_cli.support import profile as profile_support
     "-r",
     default=False,
     is_flag=True,
-    help="Used only in non-interactive mode. If specified, forcefully refresh the cached access token.",
+    help="Forcefully refresh the cached access token. Used only in non-interactive mode.",
 )
 @click.option(
     "--service",
     "-s",
     required=False,
-    help="The service to get login details for, if there's per-service login override.",
+    help="Get the auth details for a target service. Useful if per-service auth override is configured.",
 )
 @click.option(
     "--verbose",

{hcs_cli-0.1.339 → hcs_cli-0.1.341}/hcs_cli/cmds/profile/init.py

@@ -57,11 +57,7 @@ def init(name: str, dev: bool, feature_stack: str, org: str, client_id: str, cli
     if feature_stack:
         if not name:
             name = feature_stack
-        data = profile_support.get_dev_profile_template()
-        url = f"https://{feature_stack}.fs.devframe.cp.horizon.omnissa.com"
-        data["hcs"]["url"] = url
-        for r in data["hcs"]["regions"]:
-            r["url"] = url
+        data = profile_support.create_for_feature_stack(feature_stack)
     elif copy:
         data = profile_support.get_profile_template(copy)
         if not data: