hcs-cli 0.1.332__tar.gz → 0.1.333__tar.gz

{hcs_cli-0.1.332 → hcs_cli-0.1.333}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-cli
-Version: 0.1.332
+Version: 0.1.333
 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.332
+Requires-Dist: hcs-core>=0.1.333
 Requires-Dist: inquirerpy>=0.3.4
 Requires-Dist: matplotlib>=3.8.0
 Requires-Dist: paho-mqtt>=2.1.0

{hcs_cli-0.1.332 → hcs_cli-0.1.333}/hcs_cli/__init__.py

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

{hcs_cli-0.1.332 → hcs_cli-0.1.333}/hcs_cli/cmds/dev/fs/clear.py

@@ -49,33 +49,33 @@ def clear(only_default: bool, **kwargs):
 
 def _delete_all():
     # all lcm templates
-    lcm_template_ids = run_cli("hcs lcm template list --ids", output_json=True)
+    lcm_template_ids = run_cli("hcs lcm template list --ids", output_json=True, raise_on_error=False)
     for tid in lcm_template_ids:
         run_cli("hcs lcm template delete -y --force " + tid)
     # all pools
-    pool_ids = run_cli("hcs pool list --ids", output_json=True)
+    pool_ids = run_cli("hcs pool list --ids", output_json=True, raise_on_error=False)
     for pid in pool_ids:
-        run_cli("hcs pool delete -y --delete-templates " + pid)
+        run_cli("hcs pool delete -y --delete-templates " + pid, raise_on_error=False)
     # wait for template deletion, from admin perspective
     for tid in lcm_template_ids:
-        run_cli("hcs template delete -y --force --wait 5m " + tid)
+        run_cli("hcs template delete -y --force --wait 5m " + tid, raise_on_error=False)
     # all images
-    image_ids = run_cli("hcs ims list --ids", output_json=True)
+    image_ids = run_cli("hcs ims list --ids", output_json=True, raise_on_error=False)
     for iid in image_ids:
         run_cli("hcs ims delete " + iid)
     # all image gold patterns
-    gold_pattern_ids = run_cli("hcs ims gold-pattern list --ids", output_json=True)
+    gold_pattern_ids = run_cli("hcs ims gold-pattern list --ids", output_json=True, raise_on_error=False)
     for gid in gold_pattern_ids:
         run_cli("hcs ims gold-pattern delete -y " + gid)
     # all edges
-    edge_ids = run_cli("hcs edge list --ids", output_json=True)
+    edge_ids = run_cli("hcs edge list --ids", output_json=True, raise_on_error=False)
     for eid in edge_ids:
-        run_cli("hcs edge delete -y --force --delete-all --field id,status " + eid)
+        run_cli("hcs edge delete -y --force --delete-all --field id,status " + eid, raise_on_error=False)
     # wait for edge deletion
     for eid in edge_ids:
-        run_cli("hcs edge delete -y --force --delete-all -w 5m " + eid)
+        run_cli("hcs edge delete -y --force --delete-all -w 5m " + eid, raise_on_error=False)
     # all sites
-    site_ids = run_cli("hcs site list --ids", output_json=True)
+    site_ids = run_cli("hcs site list --ids", output_json=True, raise_on_error=False)
     for sid in site_ids:
         run_cli("hcs site delete -y " + sid)
     # all providers

{hcs_cli-0.1.332 → hcs_cli-0.1.333}/hcs_cli/cmds/dev/fs/helper/credential_helper.py

@@ -65,7 +65,10 @@ def get_client_credential_from_k8s_and_update_profile():
 
     # get auth service info
     app_properties = _get_application_properties_from_configmap("common-config")
-    auth_service_token_url = app_properties["spring.security.oauth2.client.provider.auth-service.token-uri"]
+    auth_service_token_url = app_properties.get(
+        "spring.security.oauth2.client.provider.auth-service.token-uri",
+        "https://dev1b-westus2-cp103.azcp.horizon.omnissa.com/auth/v1/oauth/token",
+    )
     profile_data.setdefault("auth", {})["tokenUrl"] = auth_service_token_url
 
     # get secrets

{hcs_cli-0.1.332 → hcs_cli-0.1.333}/hcs_cli/cmds/dev/fs/init.py

@@ -33,8 +33,7 @@ from hcs_cli.cmds.dev.fs.helper.step_util import step as step
 from hcs_cli.cmds.dev.util import log
 from hcs_cli.cmds.dev.util.log import fail as fail
 from hcs_cli.cmds.dev.util.log import warn as warn
-from hcs_cli.service import auth, org_service
-from hcs_cli.service.admin.uag import list as list_uags
+import hcs_cli.service as hcs
 from hcs_cli.support.exec_util import exec, run_cli
 from hcs_cli.support.template_util import with_template_file
 
@@ -92,6 +91,7 @@ def _common_init():
     _reg_datacenter()
     _create_org_details()
     _create_org_location_mapping()
+    _init_for_dct_collection()
     _patch_mqtt_alias()
     _update_mqtt()
     _show_mqtt_info()
@@ -103,6 +103,40 @@ def _common_init():
     _touch_fs_to_avoid_recycle()
 
 
+@step
+def _init_for_dct_collection():
+    hv2_org_id = "e7923078-6663-4178-9555-bcd5a036693e"
+    # create org details
+    payload = {
+        "customerName": "Horizon v2",
+        "customerType": "INTERNAL",
+        "orgId": hv2_org_id,
+        "wsOneOrgId": "pseudo-ws1-org-id2",
+    }
+    try:
+        ret = hcs.org_service.details.create(payload)
+        print(ret)
+        log.trivial("Org details created for service org: Horizon v2 " + hv2_org_id)
+    except Exception as e:
+        if "already exist" in error_details(e):
+            log.trivial("Org details already exist. Skipping creation.")
+        else:
+            raise
+    # create org location mapping
+    try:
+        payload = {"location": "US", "orgId": hv2_org_id}
+        ret = hcs.org_service.orglocationmapping.create(payload)
+        log.trivial("Org location mapping created for service org: Horizon v2 " + hv2_org_id)
+    except Exception as e:
+        if "already exist" in error_details(e):
+            log.trivial("Org location mapping already exist. Skipping creation.")
+        else:
+            raise
+    log.trivial("Granting user org the ops access conscent")
+    user_org = os.getenv("ORG_ID")
+    hcs.api.post(f"/org-service/v1/diagnostic/ops-access?access_perf=true&org_id={user_org}")
+
+
 @step
 def _prepare_profile(fs_name: str):
     api_token = os.getenv("HCS_API_TOKEN")
@@ -524,12 +558,12 @@ def _write_env_file(data, props, env_file):
         INFRA_VNET=horizonv2-sg-dev-vnet
         PRIMARY_BIND_USER_NAME={ad_username}
         PRIMARY_BIND_PASSWORD={ad_password}
-        AUXILIARY_BIND_USER_NAME={ad_username}-2
-        AUXILIARY_BIND_PASSWORD={ad_password}-2
-        PRIMARY_JOIN_USER_NAME={ad_username}-3
-        PRIMARY_JOIN_PASSWORD={ad_password}-3
-        AUXILIARY_JOIN_USER_NAME={ad_username}-4
-        AUXILIARY_JOIN_PASSWORD={ad_password}-4
+        AUXILIARY_BIND_USER_NAME={ad_username}
+        AUXILIARY_BIND_PASSWORD={ad_password}
+        PRIMARY_JOIN_USER_NAME={ad_username}
+        PRIMARY_JOIN_PASSWORD={ad_password}
+        AUXILIARY_JOIN_USER_NAME={ad_username}
+        AUXILIARY_JOIN_PASSWORD={ad_password}
         ENTITLEMENT_USER_1={ad_username}
         ENTITLEMENT_USER_2={ad_username}-2
         IMAGE_USER_NAME={ad_username}
@@ -791,7 +825,7 @@ def _retrieve_mqtt_server_ip_address(service_name, timeout=300, interval=5):
 @step
 def _validate_fs_auth():
     try:
-        org_service.datacenter.list()
+        hcs.org_service.datacenter.list()
         log.good("Auth to feature stack")
     except Exception as e:
         fail(
@@ -989,8 +1023,9 @@ def _reg_datacenter():
 
         profile_data = profile.current()
         url = profile_data.hcs.url
-        custom_auth = profile_data.csp
-        custom_client = hcs_client(url=url, custom_auth=custom_auth)
+        super_auth = {"url": profile_data.csp.url, "clientId": os.environ["HCS_CLIENT_ID"], "clientSecret": os.environ["HCS_CLIENT_SECRET"]}
+
+        custom_client = hcs_client(url=url, custom_auth=super_auth)
         ret = custom_client.post("/org-service/v1/datacenters", payload1)
         print(ret)
         log.good("Datacenter registered.")
@@ -1011,7 +1046,7 @@ def _create_org_details():
         "wsOneOrgId": "pseudo-ws1-org-id",
     }
     try:
-        ret = org_service.details.create(payload2)
+        ret = hcs.org_service.details.create(payload2)
         print(ret)
         log.good("Org details created.")
     except Exception as e:
@@ -1024,7 +1059,7 @@ def _create_org_details():
 @step
 def _create_org_location_mapping():
     payload3 = {"location": "US", "orgId": os.getenv("ORG_ID")}
-    ret = org_service.orglocationmapping.create(payload3)
+    ret = hcs.org_service.orglocationmapping.create(payload3)
     print(ret)
     log.good("Org location mapping created.")
 
@@ -1033,7 +1068,7 @@ def _create_org_location_mapping():
 def _create_idp():
     org_id = os.getenv("ORG_ID")
     try:
-        existing_map = auth.admin.get_org_idp_map(org_id=org_id)
+        existing_map = hcs.auth.admin.get_org_idp_map(org_id=org_id)
     except Exception as e:
         fail(f"Failed to fetch existing IDP map: {error_details(e)}")
     # Check if IDP mapping already exists
@@ -1051,12 +1086,12 @@ def _create_idp():
                 "orgId": org_id,
                 "idpTenantDomain": os.getenv("IDP_TENANT_DOMAIN"),
             }
-            ret = auth.admin.create_org_idp_map_internal(payload)
+            ret = hcs.auth.admin.create_org_idp_map_internal(payload)
             print(ret)
             log.good("IDP set up.")
         except Exception as e:
             print(e)
-            fail(
+            warn(
                 "IDP credentials require 2FA, which is currently not supported via API calls. Please manually set up "
                 "your IDP in Astro. Once you have completed set up, re-run the 'hcs dev fs init' command skipping the"
                 "Common Init step."
@@ -1087,7 +1122,7 @@ def _wait_for_services_restart():
 def _map_fqdn_to_lb(fs_name):
     orgId = os.getenv("ORG_ID")
     deployment_id = os.getenv("DEPLOYMENT_ID")
-    for uag in list_uags(orgId):
+    for uag in hcs.admin.uag.list(orgId):
         if uag.get("name") == deployment_id and uag.get("orgId") == orgId:
             print("The next step requires adding FQDN mapping. Run the following command in another window:")
             print(f'echo "{uag["loadBalancer"]["ipAddress"]} {os.getenv("UAG_FQDN")}" | sudo tee -a /etc/hosts')

{hcs_cli-0.1.332 → hcs_cli-0.1.333}/hcs_cli/cmds/dev/fs/provided_files/azure.plan.yml

@@ -180,50 +180,51 @@ resource:
         data:
           certificate: |
             -----BEGIN CERTIFICATE-----
-            MIIC2DCCAcCgAwIBAgIJAMWJXNXU+fD5MA0GCSqGSIb3DQEBCwUAMBoxCzAJBgNV
-            BAYTAlVTMQswCQYDVQQIDAJDQTAeFw0yNDA5MTYwNDQ5NDFaFw0yNjA5MTYwNDQ5
-            NDFaMBoxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTCCASIwDQYJKoZIhvcNAQEB
-            BQADggEPADCCAQoCggEBANTfGlpoSreVvoOlHOoe/SdZzEUIM4EwDH4BURCOYjin
-            QCh/trlgXOKSXOz+p2yrMddKKX7VW0dzg/B+g2rxyjYItnORcHaexUBM/IJC/u8Z
-            3gTIu3KmQZabXfWHfdFAm8XOVQHVY/dpnOAb0szjBXYl3c7Gz/6SJeGSrm+Q7HMJ
-            M40CgYpYFSde2ULIby6ruGP+Z2xRdBVZsK7QefDywtFOzKJLlvOZBVXHKUAWYVDG
-            twBp3zeBVYxeen7jWY2IcYCB/9wJrlChVwU7mKFhzbJr2eehPJnKCLljc5j7jANa
-            VRJg9DKAD41dJBScJ25FB93vul5R6CwPDm5R0QfheDkCAwEAAaMhMB8wHQYDVR0O
-            BBYEFBI/JhBCdLrbegYpDc9zb2OWWohKMA0GCSqGSIb3DQEBCwUAA4IBAQAfqo6S
-            rWMne9vuH4E/9pAZkYvTd5cXUCL3gfItHzhDi7sGXCqgp/sC4HOdALbrfJkzgAmc
-            q3JJAOTC3nanbwVYlUo8DDiTcRH8MLnKB6qR2HpcFxbjdTKxFrpIQtcxh8hIU4Gk
-            /BnyrYO/uuqAEXX70onP2e8fST8JUqbSGvuJ3enjd+4SARsMRIsKq8p2EQLZRQYC
-            nBDcnGtzQ+ZGByhJh5pflg1CqTNV6uDOWOOywtNY4hA6E5dI7SdjeeLxJNbHfbPj
-            gd8doB807z2GC5iocHFwboEkHsmC7yR9oHh5hcHYdBvqtJgc+gQsOz7gkLWL7TCL
-            lS6gRq3JWJgzpDQS
+            MIIDFjCCAf6gAwIBAgIUP8VbTRccnywpa8e05p/twnTl2C4wDQYJKoZIhvcNAQEL
+            BQAwGjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMB4XDTI2MDQxNDIxNDMxNFoX
+            DTM2MDQxMTIxNDMxNFowGjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMIIBIjAN
+            BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA08Ekw54tG1YV9s2vjQryiR3Wkc+W
+            xnn9p5icaNVzgbpGPnUSL14b07TbC4nh04sZcaYjPb2oP0YNnDsuJ0Dx5eW2YmGg
+            vRyetNT6UQuoFQZTv+XuBT6ILqxduIRNuyGKHjXO9M+F6w2ubtmh9E+3H5BSkKVk
+            WbbHvGdXPJnKm+DXLyG3X2fsXhSNMhnzHtFuFNWs5MXfBQwRpcScvcAWVv0nx9xk
+            Jw2eULY1efDBIfWfKLeQLCxvHbCz6DYa/fnZgquc1VX/HC8/oexuroMWHhHcHVXo
+            VzYAaK4CgJ9+nh3TjiLNZEURA7rikAb1a2R8+v7WPv8VRwb7Ohs4xuG+pQIDAQAB
+            o1QwUjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggr
+            BgEFBQcDATAdBgNVHQ4EFgQUHYFD2uCCDq/A5/rlaEoo0bxx4fEwDQYJKoZIhvcN
+            AQELBQADggEBAEWZi+sn7/Rdogc7UDVHCRV6lhKWDtEV6PWKTGDi7co6u7p6FBLj
+            cZCBiqAhwGTcUUz07WaK227gNNSnAJxCEDsq7b8k3GEDzo81EBRtquCC4F+F2cD/
+            cy/laiTgcdcsNins7oYe/MqjXE1y3Lr7X7/uLThLOpcLu51M5LDxoX4g1VSWdg0r
+            Z+6aElI6y4wW9Z0Nd/hDCUgXyuDiuxY64WMfVLGNkJjMX/HQHVg85MpnWJpxT/o+
+            N0jddWbVZyxLSXs9dC5hvepHcMRO3zmeQVgN9ZFvO1BaFlbSDrJIzqbXHGYvY410
+            sz9vYKXmiAxlhRf2AhfxbLpc3MgEBFRpuhM=
             -----END CERTIFICATE-----
             -----BEGIN PRIVATE KEY-----
-            MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDU3xpaaEq3lb6D
-            pRzqHv0nWcxFCDOBMAx+AVEQjmI4p0Aof7a5YFziklzs/qdsqzHXSil+1VtHc4Pw
-            foNq8co2CLZzkXB2nsVATPyCQv7vGd4EyLtypkGWm131h33RQJvFzlUB1WP3aZzg
-            G9LM4wV2Jd3Oxs/+kiXhkq5vkOxzCTONAoGKWBUnXtlCyG8uq7hj/mdsUXQVWbCu
-            0Hnw8sLRTsyiS5bzmQVVxylAFmFQxrcAad83gVWMXnp+41mNiHGAgf/cCa5QoVcF
-            O5ihYc2ya9nnoTyZygi5Y3OY+4wDWlUSYPQygA+NXSQUnCduRQfd77peUegsDw5u
-            UdEH4Xg5AgMBAAECggEBAMAIF6zxIl4k/v2hSMlHdVY3Ytfvgw8Kumo9Y9TMrXyw
-            HGesdrkaXhCiuqOtQnn8ofS2WWKqtDJr2d1tM76ZKrK9/2GYFV1c81KDYNNd/r7R
-            lgC42KifpNFpjUR+mxjW8O9rqDIEP68lHjjpwKvGLNodZNAxd9cOHpA0k5nfof5O
-            7AlsMqimjfF70nCf6iP7l/sd8TRYVsL3jRUo8Rn7FvqNcdM7p1KwQga4cfR1xGqW
-            QJvcdDW8urBtrA2qmjLSBSeMqh5Nzpo/2yaItx1Uka3HRMYZUfFZQmYwE4jSIy57
-            UOML3SuSjcXd07fzUvganb0lpredK+Tc7XL20Ilw2QECgYEA9HrXkM6rJI+1yxJk
-            v4iNH5T3lZSBkGxgWx1lcoN0Wu0JBxZ56yJdY9UiTHc+67ehD0PC+vqjsWfQSSyW
-            fTCIIbLKLJAqbl4ROSwcKf+MJBPbYT4U87SJiqwq1XVzkbj01jODg5NLUySMB3YZ
-            5D1hATM+PlDx8VWy8zKqhIG7mdkCgYEA3ub4OLVvWIprgNtbjiJlBZhZy8rpC/ac
-            gVr0Nbm6jjKEAsv/a62om5iqVTASjqEHgP2cohuLwLUyVgsqs4HGnPw2Dtb6GMpH
-            LJ3OJ0AO1Te6nSROVXMtx130MLjMxSCUGVCqXqijXlyz9GXXMYW16CP8h7mdJFwM
-            U8RugMzcdWECgYAt0Cs/FotZoZiGgl7gyXzwkyDGJfsVjkmMKXkOOXX/Z/XOHzcf
-            ieQIRjNUMvBWiaWjz6XlFDzCjNqqK7HTqdmIvxFFwopA/l2p4gsxD5M6W4I7ub+B
-            X656jwLD12udvhQbY7HcYSi3XtzitQ3rCFl6ORkL4m1ENTQAgNkVVZ5LGQKBgALH
-            XFbQpDe1Wgu8MFMASMQeFxh8ShV1GJRgPuUgkJvPM2gZhPChtJVj/NOdCs4uYbqQ
-            7s/yifZ4C82YzAp61rAEUOQ0d9+xPdvnh7djjAvKaxAkcLmN+wceO7oTw7G9azs5
-            jzYo4gh+HVwxnNIoOZFQSYijnrriTuEIdNw0MZdhAoGASCNPSp6XEX4984ugtxTf
-            mAxw6J6ByZtw90TARsnScZKwksk9ZDKbSWlM6TOugfSMBocRW5jsURni0bIcLV0B
-            UR6RWezvMNXcqfz7Z3BNfnV0+pphZQzJKuDbw1X7zEajtnTIbzbE6AKMxvNnXKzz
-            J1/sLXvki3toEOdVa9pF1NY=
+            MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDTwSTDni0bVhX2
+            za+NCvKJHdaRz5bGef2nmJxo1XOBukY+dRIvXhvTtNsLieHTixlxpiM9vag/Rg2c
+            Oy4nQPHl5bZiYaC9HJ601PpRC6gVBlO/5e4FPogurF24hE27IYoeNc70z4XrDa5u
+            2aH0T7cfkFKQpWRZtse8Z1c8mcqb4NcvIbdfZ+xeFI0yGfMe0W4U1azkxd8FDBGl
+            xJy9wBZW/SfH3GQnDZ5QtjV58MEh9Z8ot5AsLG8dsLPoNhr9+dmCq5zVVf8cLz+h
+            7G6ugxYeEdwdVehXNgBorgKAn36eHdOOIs1kRREDuuKQBvVrZHz6/tY+/xVHBvs6
+            GzjG4b6lAgMBAAECggEAIpx3PeIkzUsM3AJSp2MasX7HC546rsZRx4sSRbBd6N5h
+            jOPlzQg81CXDh+dJmiIqToExUW4mifERWG/z40aiQ0mAviPm+gIrjrMhFw4oswcN
+            uVgDx6eo6rgRuY8mhWe+A6IX6bvhz8G0uTmpVx2QeQBF/o6KEH/ntcvOXoFktIWH
+            h28mgn8CZv8lvYiZ+eRF1DufT8Yslnc7Qb/c71uOaBlj3XffKEAygaieU3SfI7q9
+            azfAZVT5+OZRycfg7rWaaEr10SJjylu/kxxiv/xaHn4RuVuvHrMVaMx4TIHlegM8
+            7vCRyWZDqnbUPD9gRcaRsgwLfpkP8AlRi4oWlQ+wAQKBgQDscBN+qJvXGT6R1NGa
+            gAuArh0e10UcJptDFeBSmV5APeeDcQFL96w8fxBf3NzJ7V9CJQPQoHbZuRe+Jwbu
+            heZEMaUJjMB2XD5mlrACLC3UpC70AffBgYEZAI0mQT+U9TrEToKCB56vJmHh2sGJ
+            L2tEuroWMTdOp7xHIb1XPx9IJQKBgQDlRkGzOdHkkFFgMxHelUFw7RdMleE05Z1P
+            +PhlTzJIuR0A5rsOPYsvrvfaraQPGHAZMRTI+87WQZps3KzpA3y1rW6gYKs2PAhR
+            U/vah1NLKKCPN+qpvcFsklX79hjvTUqEZPemUfE06w20u69sflfewrZf0skmMJBy
+            +bCdS/WUgQKBgQCGUXlRuBmoTegU0rEss1dViBR1A9h4EJqdttzUL9qyZjiSnG0f
+            KhnH2GuF+iPX9yjpm7uaFr7OG2+Yj/VJJfpVfVqDnVltJCQzBaIB6fUzWv5tknyc
+            iqS7fmuxctnbFqGHCg7sLcYBPK3Yr/zIoY6v4eB7YQRJg9LbGhjFas+rnQKBgQCD
+            DpQDtStrsasyiD7QsxTDTmOhHZOsPwybaD/k+U5PD7GqkDmgvEFRsnxvfg5nqpp5
+            a/rroDTteHajf8k/MQUafNbdyiRUTiCbDJzMn8pXDhQpidcTzCpCu6t26Yf7Un0k
+            DOsbIX/1td8Rzq9KHzZvWXISeFUPBXesoVn5sC/jAQKBgQC1K+zlpYhTI1qcI/zJ
+            ZHMhbh9yNVogN9Iz6xApz2pg4gaakRMdPZAsRPqmj/h0NPyD3SG1DnoyXGFFa0kZ
+            VQzwaQfw6s4soi5rCXLGeZeMxq2yOJLlF1hYCFdk3OdgB5LGXa2F+D1kwoF1TfvI
+            j4spDbrt03r4bXP+DFX0eF1ZPg==
             -----END PRIVATE KEY-----
         type: PEM
       resourceTags: ${var.resourceTag}
@@ -312,17 +313,17 @@ resource:
         versionType: MAJOR
         gpuType: NONE
         sourceStreamType: AZURE_MARKET_PLACE
-        os: Windows 10 Enterprise, 22H2
+        os: Windows 11 Enterprise, 22H2
         osType: WINDOWS
         markers:
           - name: default
         assetDetails:
           data:
-            generationType: V1
+            generationType: V2
             licenseType: Windows_Client
-            offer: windows-10
+            offer: windows-11
             publisher: microsoftwindowsdesktop
-            sku: win10-22h2-ent
+            sku: win11-22h2-ent
             vmSize: Standard_DS2_v2
             subNet: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}/subnets/${var.desktop.subnet}
             vNet: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}
@@ -769,27 +770,27 @@ resource:
       templates:
         - id: ${myTemplateMulti.id}
       resourceTags: ${var.resourceTag}
-  myEntitlementDedicated:
-    kind: hcs/entitlement
-    data:
-      orgId: ${var.orgId}
-      poolIds: ["${myPoolDedicated.id}"]
-      resourceDetails:
-        - poolId: ${myPoolDedicated.id}
-      userIds: ["${env.ENTITLEMENT_USER_1}", "${env.ENTITLEMENT_USER_2}"]
-  myEntitlementFloating:
-    kind: hcs/entitlement
-    data:
-      orgId: ${var.orgId}
-      poolIds: ["${myPoolFloating.id}"]
-      resourceDetails:
-        - poolId: ${myPoolFloating.id}
-      userIds: ["${env.ENTITLEMENT_USER_1}", "${env.ENTITLEMENT_USER_2}"]
-  myEntitlementMulti:
-    kind: hcs/entitlement
-    data:
-      orgId: ${var.orgId}
-      poolIds: ["${myPoolMulti.id}"]
-      resourceDetails:
-        - poolId: ${myPoolMulti.id}
-      userIds: ["${env.ENTITLEMENT_USER_1}", "${env.ENTITLEMENT_USER_2}"]
+#  myEntitlementDedicated:
+#    kind: hcs/entitlement
+#    data:
+#      orgId: ${var.orgId}
+#      poolIds: ["${myPoolDedicated.id}"]
+#      resourceDetails:
+#        - poolId: ${myPoolDedicated.id}
+#      userIds: ["${env.ENTITLEMENT_USER_1}"]
+#  myEntitlementFloating:
+#    kind: hcs/entitlement
+#    data:
+#      orgId: ${var.orgId}
+#      poolIds: ["${myPoolFloating.id}"]
+#      resourceDetails:
+#        - poolId: ${myPoolFloating.id}
+#      userIds: ["${env.ENTITLEMENT_USER_1}", "${env.ENTITLEMENT_USER_2}"]
+#  myEntitlementMulti:
+#    kind: hcs/entitlement
+#    data:
+#      orgId: ${var.orgId}
+#      poolIds: ["${myPoolMulti.id}"]
+#      resourceDetails:
+#        - poolId: ${myPoolMulti.id}
+#      userIds: ["${env.ENTITLEMENT_USER_1}", "${env.ENTITLEMENT_USER_2}"]

{hcs_cli-0.1.332 → hcs_cli-0.1.333}/hcs_cli/cmds/vm/log.py

@@ -47,6 +47,7 @@ def log(recreate: bool, verbose: bool, save_path, vm_path: str, org: str, **kwar
     is_ops = has_any_permission(["sgadm:supportw", "sgadm:supportlog", "sgadm:service", "sgadm:support"])
 
     dct_info = dct_service.latest(org_id, template_id, vm_id, is_ops)
+
     if not dct_info:
         if verbose:
             click.echo("No DCT log found for VM.")

{hcs_cli-0.1.332 → hcs_cli-0.1.333}/hcs_cli/service/vmm/dct.py

@@ -30,7 +30,7 @@ def request(org_id: str, template_id: str, vm_id: str, is_ops: bool):
     if is_ops:
         url = f"/vm-manager/v1/ops/agentdct?customer_org_id={org_id}&action=create"
     else:
-        url = f"/vm-manager/v1/agentdct?customer_org_id={org_id}&action=create"
+        url = f"/vm-manager/v1/agentdct?org_id={org_id}&action=create"
     body = {"requestList": [{"templateId": template_id, "vmId": vm_id}]}
 
     try:
@@ -119,7 +119,7 @@ def search(
     if is_ops:
         url = f"/vm-manager/v2/ops/dct/status/search?search={search}&customer_org_id={org_id}"
     else:
-        url = f"/vm-manager/v2/dct/status/search?search={search}&customer_org_id={org_id}"
+        url = f"/vm-manager/v2/dct/status/search?search={search}&org_id={org_id}"
     items = hcs_api.get(url, all_pages=True)
 
     # client filter to work around service bugs

{hcs_cli-0.1.332 → hcs_cli-0.1.333}/pyproject.toml

@@ -21,7 +21,7 @@ keywords = [
 ]
 dynamic = ["version"]
 dependencies = [
-    "hcs-core>=0.1.332",
+    "hcs-core>=0.1.333",
     "reportlab>=4.0.0",
     "matplotlib>=3.8.0",
     "InquirerPy>=0.3.4",