hcs-cli 0.1.317__py3-none-any.whl → 0.1.319__py3-none-any.whl

hcs_cli/cmds/dev/fs/provided_files/mqtt-secret.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 stringData:
   mqtt.server-host: "<mqtt-service-public-ip>"
@@ -6,24 +7,38 @@ stringData:
   mqtt.ssl: "true"
   mqtt.ca-cert: |-
     -----BEGIN CERTIFICATE-----
-    MIIDWDCCAkACCQCpb59HXtF0xzANBgkqhkiG9w0BAQsFADBuMQswCQYDVQQGEwJV
-    UzETMBEGA1UECAwKQ2FsaWZvcm5pYTESMBAGA1UEBwwJUGFsbyBBbHRvMQwwCgYD
-    VQQKDANFVUMxFjAUBgNVBAsMDUlUIERlcGFydG1lbnQxEDAOBgNVBAMMB0NBIFJv
-    b3QwHhcNMjAwNDAzMTgyNjA4WhcNMzAwNDAxMTgyNjA4WjBuMQswCQYDVQQGEwJV
-    UzETMBEGA1UECAwKQ2FsaWZvcm5pYTESMBAGA1UEBwwJUGFsbyBBbHRvMQwwCgYD
-    VQQKDANFVUMxFjAUBgNVBAsMDUlUIERlcGFydG1lbnQxEDAOBgNVBAMMB0NBIFJv
-    b3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcMtfoxsZcGlIM6HPg
-    +TG7Obh05DScU4XXXtgPckknoPfh085yfBSrAKT0n2hTeF+0qFDEVRBVu6MXRCbW
-    DyWCC+w5Fo9gBnqsDgoLzmhia/hQZOP6wc2u/gzmYjdUsT29tv4X+5w0PxA36gJd
-    ZdsM8hqn/QY5SJbiks0RzN9K9qQ/dfEbRiRlmpWNkQk0URBgg21/fYtnZvtDc3Vf
-    hXJRUYOuXdGdhSZdbmtH/75fwFKiZb1QdnmBCQSzJIGyxd1KmwjebB0DZfjmDnTp
-    QnDyXnsgL7rMRqa5dQUrUQF6tJox7B87oIsQKvX7PkCWuLrdhJZp8uQYGU4hKG87
-    NTBLAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFNL8oDvKddtYcV+cEVEoB2QIm41
-    g8PgpjAz3tC3zUBpsc6fuAl1EQJvLDsE49dVEr7xcMb8/F0rZ+ntv4rMZJQDn1qW
-    2kamm3dmrHMO59FV6LUEFoPdpbHOHkELv0csHc1N042VqvwCRwOj9DR+iq3ZeVB8
-    E1/HM0qSCHdHG6hW+snOf/+jY2P19oTGPt+T19RboFF0pd06m2Fax0BDtjtm11Db
-    B7jpmBh+z5zcp9JM0QtfnUc9/uBnkOLPQziHG2EqpaGEVIKS5RuioOX9qCAOW6ld
-    eFbmJAx17IB0pMppD0dxyaBt1AhLJRR5is/mslu+1ppw5jm4DAgKIiy03GE=
+    MIIF3TCCA8WgAwIBAgICEAAwDQYJKoZIhvcNAQENBQAwgYUxMDAuBgNVBAMMJ0hv
+    cml6b24gQ2xvdWQgU2VydmljZXMgTm9uIFByb2QgUm9vdCBDQTELMAkGA1UEBhMC
+    VVMxCzAJBgNVBAgMAkNBMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MR8wHQYDVQQK
+    DBZIb3Jpem9uIENsb3VkIFNlcnZpY2VzMB4XDTI1MDIyMTE3MzA0NVoXDTMwMDIy
+    MDE3MzA0NVowdTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMR8wHQYDVQQKDBZI
+    b3Jpem9uIENsb3VkIFNlcnZpY2VzMTgwNgYDVQQDDC9Ib3Jpem9uIENsb3VkIFNl
+    cnZpY2VzIE5vbiBQcm9kIEludGVybWVkaWF0ZSBDQTCCAiIwDQYJKoZIhvcNAQEB
+    BQADggIPADCCAgoCggIBANWNBcAUjV+MiAH+x/2WBTvnLRnoXPcMF+8tH4SIM8BS
+    4aZVnQtJCxhISfqKXhs1aQKv27diSL6vMi221bgXfS7jrqiJIkgT4ec45IA8vYW4
+    dlrYlA4OMDwrdEZlI/7FjirSc9TXeslPq8Dx5C0rpMP4dZ97ADhm6c44AwYsOzD/
+    GttwWb6JL+1jBzSCEnOou8XP6fUcxGUw4ZHpqMfWqU/eUYM7auexorTFm2JrNYxT
+    RGbT3w7DKKDLBAg0pRuwKuf5y4vfL9GcYkJlEXxDql9LOWsvkiN2sP5upea8ckDT
+    dns0co1h6hZslBqFJgMrOdyrMD6+jfNtrHbYHQdnHJ6pCPiJg2HN4WyJB9UtTFKI
+    AGadHJ/piAcFE8NTPIemhWzrdGGysbL2xXl/9CZkRXmze0eDM2S/7X4ixMb4nHZw
+    bFbPYl9Ydq+FWsdIywRYNC/qmFw+jf3Ne28eQZWLm/D3uwwv/+mSVTwHcsb1PsUz
+    zFLxwa0IyHlRYC7VTyGBR/N9NjodlnioFEoEfRez7Zj0G2qkT4YtaChJb+KwD8GH
+    M0BCESucelYgbVjxwQWGu7wUMd7NaJuTP3qQpaHGC8SloY9TUu1tGHCV7ThXPcMI
+    loJF53tny8yCFfMpilYQf/VfyhXAFyANHW6Y097ekpJ3IAtAvzgtTqc+C/atjok1
+    AgMBAAGjZjBkMB0GA1UdDgQWBBSZ8cV5Y1RCYYVup7GkUbKkbNZeCDAfBgNVHSME
+    GDAWgBTeYgdNiwgQmn4UfIPsKs6iAgec2TASBgNVHRMBAf8ECDAGAQH/AgECMA4G
+    A1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQ0FAAOCAgEAXHZHiWY7CCSVV3KAvarj
+    xMucEGR+RKEYtjM9EYoBeLUAha7hIdVtQsA3iJIoMISZYVgbSh/rL0tVo/oq3VxY
+    tAKFLLiglYbLegBxfHUrigJsUhrAV8WhWdhfJZriU5zTKw/JThvzgMIq4GvnkeJb
+    ezAIQcBqY1EDaIZz9U7GNzVIF8MWfGI6sXxr3vWuHajj/mECPkO4W3fHlPiHTWQY
+    qd+NwGM/xt7rSXGN+NULl37TkJ9XSjE4gLbNTAQzq9C1Lz86jZUGtndTx0/4Ekoe
+    YUCACnIKR4GlTjXhmqy1Ro/zr/v1e1rZgQYjHBZjASTxa8m1dAfvv9YjH+GZpMmu
+    OrlglgAz88segTQCe0gU5SKR5rVWwetJvhIyoGAcWcuJ/ajGrRLjCjUT+W/iVu1v
+    DzOBljaV5keM8HvfWLH9mwSbaS8jee+YwJBFdYVIPieoKdsguRWnr2KMCY4WlavG
+    s8ZOqSGN+55S4u9fZfP4XAWKG41AGDbQNYCzP4dgtw7uC7ZgXTyJhrlM+yGqRpbn
+    VEiV+hWjZFV0z/1bC63irCNVbGpO+zfukaVREdeEj5Eh5qcJz2AgAHuBSoW1H0/J
+    IcQEFMZ/URm3n2httI6o3hM41e/EtKWPwxqH4YLpxB6St3fuMMwQaSirVmWolShR
+    K57pspC1vC6L+K51FSgXIOk=
     -----END CERTIFICATE-----
     -----BEGIN CERTIFICATE-----
     MIIF/TCCA+WgAwIBAgIUU3p7FnhuTu9Ku9DxeShHEHZ9xEswDQYJKoZIhvcNAQEN
@@ -60,86 +75,166 @@ stringData:
     JcSvTMU2HOuQ/q6vFZq3PRbvroMeXlw2WJrqO3vu04SZwYiP8dcrlHTXQJh+Mp9T
     mQ==
     -----END CERTIFICATE-----
-  mqtt.ca-key: |-
-    -----BEGIN RSA PRIVATE KEY-----
-    MIIEowIBAAKCAQEA3DLX6MbGXBpSDOhz4Pkxuzm4dOQ0nFOF117YD3JJJ6D34dPO
-    cnwUqwCk9J9oU3hftKhQxFUQVbujF0Qm1g8lggvsORaPYAZ6rA4KC85oYmv4UGTj
-    +sHNrv4M5mI3VLE9vbb+F/ucND8QN+oCXWXbDPIap/0GOUiW4pLNEczfSvakP3Xx
-    G0YkZZqVjZEJNFEQYINtf32LZ2b7Q3N1X4VyUVGDrl3RnYUmXW5rR/++X8BSomW9
-    UHZ5gQkEsySBssXdSpsI3mwdA2X45g506UJw8l57IC+6zEamuXUFK1EBerSaMewf
-    O6CLECr1+z5Alri63YSWafLkGBlOIShvOzUwSwIDAQABAoIBAG1qYjjLlMMtXPoH
-    A5WVna2Pt+V1g+Lt6cKj4S6DtnAXnzS6n4npuAdksZLQJvHbDYtiW4fDUPOY4ihs
-    d/PD4Ppm3EFdwW6QqaIW88z8CohlaCTijRoL9R1wJY7Q3PebfrdnV4kpQGwBrhhq
-    kjRAqYEcSDyTEOWj+T2qfnXK3GWNjwlxA6/kMfZ576qqkcb6wAXt0AijdXIjDwSw
-    ZTiZktpJH5FGnzNM9UyDkjhDzTvMqZnQrnByWfcXLVz3a7LqKsJPsZKxCfsOLCVC
-    ISdtAqEDAehxsYL6EC90Ex/pVB6/2h1u4NT7DIflGWLC0lDnJuOduFpVnjIRytXr
-    OEu2rTECgYEA7eMTQRwHp61USMEXeNgVfBeeOwXJyD35Ip0KshDbenbruvoopO9p
-    OegknmTC6zKjdsRdlgpzHxKOFSz8UN+3aAb3qNnnuJokb0au6s0ysRCNCC82sUZr
-    qPKY/vawHerXdXBQSAx9ViblmPC73sD+NBGOTIlRQrdv/SsSSNZ1k7kCgYEA7Pb7
-    xIP5OSnKiDmEBg/NT2ZKJKTdOsHoqR2G2TNlIccrVk36qvCA52hVg//4WZUR776Z
-    vahBlEtc9RKrd7DGW5Huo5zy6ll8OEmE1GzPe9nhlrLHMpGcfFKE/wdGDXAe2z5z
-    2TqpuTk45rchvGfrcMmFMpWUqcCRcUnvA+Ys7iMCgYACBoLtdP2jsdgb3nkCsGRO
-    cC0Kt5vmNpDeeJPUvEwCGO0c5HBgJyGwOofFSXpXYlD9++IIGwKr6w6Go6FqVt1K
-    53RIXcKZUcapo+JtYV3jIA7zWOOQUtcr0xT2ZsdNGejHuTMVyfVvPFmMGdCfruj7
-    LIMXp7unY8RyVWGMeTb7EQKBgQDUjDUH79h8DaA80Fo7lbDypy2Z8Mb/DS9DgdiS
-    uibcRWn537gX2+HDrzIFVHPO5odQJAaCt4kbGv4mVLi4gzdoq10CJKU+z0U8t7UN
-    VQxGawiNw44pLbLPULU6i6uqIgeLYFlJX/UcztbbGyiHdi8Y26k91i2ilbffhhF9
-    zdg/QQKBgHCB2wOi4Ax6FZePQI5hV+sxRYW46jZV9P/ELFGIBNmnOrF4nmE+oqiI
-    aMzBPPROGsloYdTjkzaa7bSGac98aqEjRqacmxwzwGoggckg/xhKXQJOYpQTGJwm
-    hftB1Vzx09uhbjCCI6RNS7s08bviNY2FFjUClJDqSG/MQ/cO2o7g
-    -----END RSA PRIVATE KEY-----
-  mqtt.client-cert: |-
+    mqtt.ca-key: |-
+    -----BEGIN PRIVATE KEY-----
+    MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDUNJx2Cf0noNHc
+    DXB9AFPSFMkkpwxb0wtqaCLiB7v5zkF7CVBl5LnecVk7CM8bJY62H90Lv8Zv/2sl
+    MXofPfwezhJzHaIKFD+OM3czUE0KXODdPtEDjxuWb1xZfwGP43w+DpECbtvr1G2u
+    ArA5ihFCWtesdTi+O0Nwjhn0jEl5hVewNm3R3RVTzZJdePz/Tqrk3l6bMnQcqKmh
+    L2+HExvgpTqstqT4xsgMv77w0yGQP94Oagh4qc3kBYzbpZTSrtsMkf/XVogux9F7
+    JyspsZlmYf96Wl9IpoGHw65YMpZ3uH9yqbmjg+/M3wnZj3WGqp7hLJZCQUWwDSqu
+    a0Bg3563AgMBAAECgf9scyGDMe0EflbCShwIcPe65eSRAXkkyeGLqqzT13VktYRs
+    Miu551XBLoHr1GoD9a3PEM8SB3CNdyZ1sP44o/ULHptPOasWe5f/lKMsFl3zwy59
+    48dDil+5rNqwN7hp+64DXm5oT+pqcVDxyBidT3KCoZVCY1DHPS0Pg5AVlZyh/WpV
+    /xa25zV39rUDQbDu646+3BIq3h0P2fxtWkDYgtXRCBjnExl67h5BpFYsqkLZEg2A
+    mT76wKFFkkTJOHiI0ekDx1auhV1Wm53O7ExTJIeSV9pxRiEZaH7wnkpBkDluY58c
+    lSYoD/I9607XUzEXvJdxMwGiw1g3snPI2SRndfkCgYEA91S7DoSZyfdQAHMz0u8/
+    NxtgRdjBzokjksHSY/CSuhYREEl69DzSMdB+zRJRpB+lLe3AiZdU4BjcrZdBEOfp
+    20JThNDrhC+/C35VkoAozm+9YLg9Xlv4aKgZbR6b9nbr1QwPe4dpH797mu6iwCPK
+    I0qpVrd29uqJrgZ4uBmCpVkCgYEA26S0Q37ZIYsdBbthdqd8ZHYrS+gQOCO7IWpH
+    Kyi8W+62QAoxk5pOumUpSFKZbCFcmC28k5lDbjxA7Oq7aVQwErOy3UNZpBFZvQU4
+    cLesTFZxkSecszszSr2GlZu1pOfK7o6kKw2rFJfsoUhCaZAFTJqCXtiH0ZTXSsvi
+    XrHNEo8CgYAy31K6YbvgNuZVsVxvfpZaF19t/m+es8aFYSiNNeZ4MCHCX9rScdAq
+    PuBV/fac84VeNRDtPBtRHMwHSJ0xhQIs/y9+mhpXThrVml6vi3zZOVKSmlLFHdWy
+    cSEJuMoLn9pSL/DfT7LnvNMHwx3mt3XUXH8IPyRRFVzMVrht5ZFhwQKBgQCWTHiG
+    D1EpoPY1K+oftbBrVml+QciHgfvVe9JDeFacWhcgb1lJdbgV2I+NS+hsk8+22uVF
+    4wS/dD/BX0brZo6W3ZyxyBqZKL5NmDrs9uLSQfzopUCXbRVGObbUvX5o36x/3d/9
+    DhdZujRUkQvRDJpztu8rU+Rsx/si1a2LuwNnhQKBgQCmwoO7MADZl286n6imqotM
+    IK/djt0N7j52GYEhtnAOSKVKo/8EnbvKkcMqJzXMQOUySRgKkA96fkaKt7yDCvoo
+    boPQ+RK1VKj5UFkUKz5LiohLmCBEQ7sh1HBS2Vje8MFtg0P138sRlbMCvdAEARTZ
+    uQfAKLns7QFf9W1C60AVAQ==
+    -----END PRIVATE KEY-----
+    mqtt.client-cert: |-
+    -----BEGIN CERTIFICATE-----
+    MIIFKDCCAxCgAwIBAgIFALjj4O4wDQYJKoZIhvcNAQELBQAwdTELMAkGA1UEBhMC
+    VVMxCzAJBgNVBAgMAkNBMR8wHQYDVQQKDBZIb3Jpem9uIENsb3VkIFNlcnZpY2Vz
+    MTgwNgYDVQQDDC9Ib3Jpem9uIENsb3VkIFNlcnZpY2VzIE5vbiBQcm9kIEludGVy
+    bWVkaWF0ZSBDQTAeFw0yNTExMTQwNjA0MThaFw0yOTExMTQwNjA5MThaMG0xCzAJ
+    BgNVBAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEU
+    MBIGA1UECgwLT21uaXNzYSBMTEMxDTALBgNVBAsMBEVVQyAxFDASBgNVBAMMC21x
+    dHQtY2xpZW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuNGguKcs
+    tPvvg5A9XD0bDFjuADWfC+C2mh3IP3v9TW4hMXf0JWREjSZ5yMg9vamNYfVhhFQx
+    7SJ7JTnAJuMlNAVNKHsNef08/6ovbe7fHu6cKvopcPxFwMnZgKoZcLV1n6gYjewY
+    wugKiFzOXEXeIYeIsjax2afTWdSQJ9xYak+v/glual4ZXYI7BIOCkv7mkaG+sP7H
+    /M//mZcjfxFEBpSFpphsDAdj68yy9qu0kj9IReJJh3ou9J0qX0OVZ2yaNt2+pog/
+    fXE4WrpVIqRFs1JGCT4vZBSX+fFo/G9JUR0v4HNiPr5D8FObzZh0jdAj+aqja4Tb
+    Cqu7U2c4/1F4+QIDAQABo4HGMIHDMB0GA1UdDgQWBBTWq8aIUXO6TYHAIjwu/E4v
+    2vYlbTAfBgNVHSMEGDAWgBSZ8cV5Y1RCYYVup7GkUbKkbNZeCDAOBgNVHQ8BAf8E
+    BAMCB4AwDAYDVR0TAQH/BAIwADBjBggrBgEFBQcBAQRXMFUwUwYIKwYBBQUHMAGG
+    R2h0dHBzOi8vZGV2MWItd2VzdHVzMi1jcDEwMy5hemNwLmhvcml6b24ub21uaXNz
+    YS5jb20vcGtpL29jc3AvcmVzcG9uZGVyMA0GCSqGSIb3DQEBCwUAA4ICAQATLHHI
+    XHWEN2VyF/Aew8fEfzwa2Nl6sgRKPCKzgyqCgyn0ksN7SpmKXTIikNnFb2FWG0Pj
+    15VPqn6CkxfrTyt8uVrUMLeanvCOuX4r2zmE91KBzL2to6oXhzD64vyTo3+pHVJc
+    +BqIpIym3iEBdwKOOtfSYE4Uxc+uHVN/+Vw2tdQUGx3/GKPegOdvIHrY6LouklhR
+    K7MP99vc/orWz5nshEDMSQjXkpNa98NCRp88w14/kwcsT5wMTRNV63rW/CVfR2Xl
+    FLFsbFhe4WVYoTfvtyoL1Xfg7JJk5LgjneC/5aRsHK6qk2qLmzHBH82F3Fb4yneh
+    G9x/5CNJ+0WvnQeIwWqFB/gzDNS+4p3dGcbSnxPhokFjoJ1x+hzDxm9QY4H3t0O8
+    13ZfLmzeUd0io9S/pVaHGbAE5zW1tfh75RFDpx/HZXAmi5UZ4fzabfTBODoFjE77
+    tmlex5+OfVDH9Kr6ZiH6OtF2CQZhg48VvyjpudEh0T1MKv9FHug8obaRyl+i6+u7
+    R9ErneIqd1TNA6P3CYDZrs4fJR7nDZn6Elm+SEwdl9lon8PgkaHKT3f+W44aUWOj
+    8YRwdEMtuGpJjaPVzycvQgheYdWh2uVX1vZvgfOhF6htAIcsjtAzgPv4pgkbkrWK
+    fXUZKkCetrhvIGex8EfpH+VXIN0q0HkpPMBVHA==
+    -----END CERTIFICATE-----
+    -----BEGIN CERTIFICATE-----
+    MIIF3TCCA8WgAwIBAgICEAAwDQYJKoZIhvcNAQENBQAwgYUxMDAuBgNVBAMMJ0hv
+    cml6b24gQ2xvdWQgU2VydmljZXMgTm9uIFByb2QgUm9vdCBDQTELMAkGA1UEBhMC
+    VVMxCzAJBgNVBAgMAkNBMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MR8wHQYDVQQK
+    DBZIb3Jpem9uIENsb3VkIFNlcnZpY2VzMB4XDTI1MDIyMTE3MzA0NVoXDTMwMDIy
+    MDE3MzA0NVowdTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMR8wHQYDVQQKDBZI
+    b3Jpem9uIENsb3VkIFNlcnZpY2VzMTgwNgYDVQQDDC9Ib3Jpem9uIENsb3VkIFNl
+    cnZpY2VzIE5vbiBQcm9kIEludGVybWVkaWF0ZSBDQTCCAiIwDQYJKoZIhvcNAQEB
+    BQADggIPADCCAgoCggIBANWNBcAUjV+MiAH+x/2WBTvnLRnoXPcMF+8tH4SIM8BS
+    4aZVnQtJCxhISfqKXhs1aQKv27diSL6vMi221bgXfS7jrqiJIkgT4ec45IA8vYW4
+    dlrYlA4OMDwrdEZlI/7FjirSc9TXeslPq8Dx5C0rpMP4dZ97ADhm6c44AwYsOzD/
+    GttwWb6JL+1jBzSCEnOou8XP6fUcxGUw4ZHpqMfWqU/eUYM7auexorTFm2JrNYxT
+    RGbT3w7DKKDLBAg0pRuwKuf5y4vfL9GcYkJlEXxDql9LOWsvkiN2sP5upea8ckDT
+    dns0co1h6hZslBqFJgMrOdyrMD6+jfNtrHbYHQdnHJ6pCPiJg2HN4WyJB9UtTFKI
+    AGadHJ/piAcFE8NTPIemhWzrdGGysbL2xXl/9CZkRXmze0eDM2S/7X4ixMb4nHZw
+    bFbPYl9Ydq+FWsdIywRYNC/qmFw+jf3Ne28eQZWLm/D3uwwv/+mSVTwHcsb1PsUz
+    zFLxwa0IyHlRYC7VTyGBR/N9NjodlnioFEoEfRez7Zj0G2qkT4YtaChJb+KwD8GH
+    M0BCESucelYgbVjxwQWGu7wUMd7NaJuTP3qQpaHGC8SloY9TUu1tGHCV7ThXPcMI
+    loJF53tny8yCFfMpilYQf/VfyhXAFyANHW6Y097ekpJ3IAtAvzgtTqc+C/atjok1
+    AgMBAAGjZjBkMB0GA1UdDgQWBBSZ8cV5Y1RCYYVup7GkUbKkbNZeCDAfBgNVHSME
+    GDAWgBTeYgdNiwgQmn4UfIPsKs6iAgec2TASBgNVHRMBAf8ECDAGAQH/AgECMA4G
+    A1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQ0FAAOCAgEAXHZHiWY7CCSVV3KAvarj
+    xMucEGR+RKEYtjM9EYoBeLUAha7hIdVtQsA3iJIoMISZYVgbSh/rL0tVo/oq3VxY
+    tAKFLLiglYbLegBxfHUrigJsUhrAV8WhWdhfJZriU5zTKw/JThvzgMIq4GvnkeJb
+    ezAIQcBqY1EDaIZz9U7GNzVIF8MWfGI6sXxr3vWuHajj/mECPkO4W3fHlPiHTWQY
+    qd+NwGM/xt7rSXGN+NULl37TkJ9XSjE4gLbNTAQzq9C1Lz86jZUGtndTx0/4Ekoe
+    YUCACnIKR4GlTjXhmqy1Ro/zr/v1e1rZgQYjHBZjASTxa8m1dAfvv9YjH+GZpMmu
+    OrlglgAz88segTQCe0gU5SKR5rVWwetJvhIyoGAcWcuJ/ajGrRLjCjUT+W/iVu1v
+    DzOBljaV5keM8HvfWLH9mwSbaS8jee+YwJBFdYVIPieoKdsguRWnr2KMCY4WlavG
+    s8ZOqSGN+55S4u9fZfP4XAWKG41AGDbQNYCzP4dgtw7uC7ZgXTyJhrlM+yGqRpbn
+    VEiV+hWjZFV0z/1bC63irCNVbGpO+zfukaVREdeEj5Eh5qcJz2AgAHuBSoW1H0/J
+    IcQEFMZ/URm3n2httI6o3hM41e/EtKWPwxqH4YLpxB6St3fuMMwQaSirVmWolShR
+    K57pspC1vC6L+K51FSgXIOk=
+    -----END CERTIFICATE-----
     -----BEGIN CERTIFICATE-----
-    MIIDWzCCAkMCCQCQF8C4vi/nmzANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJV
-    UzETMBEGA1UECAwKQ2FsaWZvcm5pYTESMBAGA1UEBwwJUGFsbyBBbHRvMQwwCgYD
-    VQQKDANFVUMxFjAUBgNVBAsMDUlUIERlcGFydG1lbnQxEDAOBgNVBAMMB0NBIFJv
-    b3QwHhcNMjAwNDAzMTgyODIzWhcNMzAwNDAxMTgyODIzWjBxMQswCQYDVQQGEwJV
-    UzETMBEGA1UECAwKQ2FsaWZvcm5pYTESMBAGA1UEBwwJUGFsbyBBbHRvMQwwCgYD
-    VQQKDANFVUMxFjAUBgNVBAsMDUlUIERlcGFydG1lbnQxEzARBgNVBAMMCnZtd2Fy
-    ZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdOi39VF1yRArx
-    u27uOjEMBq1Z6lmLm18tlHQqgzTH4HQKk7wfK+aGMMDJE1xv0fa8b5rwC7cWHEWe
-    H1iPI7KrOBQ2ByK02bY4ltt5wN25YfAdKKsMMQpsu9EKBfQXyLrLVb0k9chZnvch
-    WeKhDpD+haWdizx5d6FMQ5lxUQCInXA4TAb3yGUB+0tS6PvNp+8KJlJBow57mX4D
-    0Igv4vBBgx+SWHWfW2FxDRzKuZ4eUcB8Qshl9d/RV5iT5plUHQFr4PYuw0WnXRXv
-    oXRS08s/vCKm08xsEiCdcnvQt1Ib8a5OjcE/0y2r5fj11lDJyy8X08tNlgUCM6cn
-    jfQuX/TZAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJG6V/7kqVCPN4CC3fCcOmHU
-    0kW9+yf2KB4iwwTHsvA/G/2xJ4CqGUjALhr4FcAuuc42KE+jJIpehAtEUr5v8wka
-    EE8VYbBXwK9BgDweHUVsJh0pHMPpSM2f20FQLD1bwjGOvTLvkuU7oNOpn4XUntVz
-    /xaUnLh5buoFBrt/DeRFBLTWxjbUxo6mK8h51FHX1dZj0RaWcx5sRTSM3VSEZE3L
-    Jdn3kuPmpgCwJpzrm6RCzX6XLMpPdwMWUyuvUd4Y0SwlL1uu5uU4NhgTfhSVx+I6
-    g180kzAVneGVDXXz28roz7RItvDH56aksEmZqxRFtWvchlaIjHuWNsDaxIIF/xo=
+    MIIF/TCCA+WgAwIBAgIUU3p7FnhuTu9Ku9DxeShHEHZ9xEswDQYJKoZIhvcNAQEN
+    BQAwgYUxMDAuBgNVBAMMJ0hvcml6b24gQ2xvdWQgU2VydmljZXMgTm9uIFByb2Qg
+    Um9vdCBDQTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMRYwFAYDVQQHDA1Nb3Vu
+    dGFpbiBWaWV3MR8wHQYDVQQKDBZIb3Jpem9uIENsb3VkIFNlcnZpY2VzMB4XDTI1
+    MDIyMTE3MjczM1oXDTM1MDIxOTE3MjczM1owgYUxMDAuBgNVBAMMJ0hvcml6b24g
+    Q2xvdWQgU2VydmljZXMgTm9uIFByb2QgUm9vdCBDQTELMAkGA1UEBhMCVVMxCzAJ
+    BgNVBAgMAkNBMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MR8wHQYDVQQKDBZIb3Jp
+    em9uIENsb3VkIFNlcnZpY2VzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+    AgEAsN/U9IYxPDHWQQ4qB/EpNKJ3qFKBTjs0eRSz7CkcX60q45Tep9Azq67N+MvA
+    8GvbhA52m5TIIvdQTLbgcGfHCGwGPWwhJ8Ve+aLc8kMXQ2s4dwgdbA+jEcyiVFgc
+    Hdh1uRSMPeHxVf43BhnEGZm1j09fbvnkPchh/Hx+tpeua99AUEPGd1ZBQHQZv4AN
+    iBw4SS7FjBeS3u3FRSUqO9dO4dGScjEEwzWMrbj3RI49jtY5H9Dh6gnrTPi6m4t+
+    JMsz1o8bJ/u5oyJFyRwXrwJ0ECLUH8tTQAH4kRF+14iep/8HmtSXoVV4PNhvCpC9
+    XZUB06zbcW5IVmVLBK+rUXER0jJd3Zysy5n7tBrFdKpU+n+9WUbCSXzszbHRuBcI
+    tH2qZmCa+mSBkH1PcwthhS8/wRimr6nh6m5m1gzZbJz5FY7YTuOYBJu47G/4QEQv
+    2DqXNGQeLEcXhlBaH9id7QRhixdfMWzccELlfkWJD+sgETyXkfPMZ1QWPJiJvOTR
+    58IKVAQ4hgahG/tqE7wikWQAdV16g1ynjVpYLSFig4GspPPYsQIfAfEr37dnxwNI
+    x6aIqIncrDRwrK3sRrUJQNnQzUUrBA6nmJx6TmlkzByhz/Qe2UiwHvXzV4EKXFZU
+    hDYcJ3UdkwIfjFFhcHquvse8Omz5QFHGmlxwiOCGaPp5jP8CAwEAAaNjMGEwHQYD
+    VR0OBBYEFN5iB02LCBCafhR8g+wqzqICB5zZMB8GA1UdIwQYMBaAFN5iB02LCBCa
+    fhR8g+wqzqICB5zZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0G
+    CSqGSIb3DQEBDQUAA4ICAQCo0FDz5wq6/6eXKyW/b5x99xPnYWc8tmZXfmmZEmyY
+    SW4qySsg7ZhUP+3lJiWxLM9p+ZWtekG3OifWFIwdxycLxscoId4M/1UZ6Ku4Crip
+    o4SV2BzpB3+Harr4yJvfy95p5uNyivvFHM3iXf//ldjivnyEBozX89T9dvstH/rg
+    7M1At7T8htXGDZGQt1tmt+rY8pYycAQZPgblFiWrhL+oCyNtOMwy3BTj/ipErAX9
+    zTnQ2Ktgl2A63xZ0eiTiXXspwUELNxbEIwfFw3Onw4jLhuAwjBLb5Qw9Ae+Qm2Iu
+    L7XR7RBTw3KphuxLcLpY0Qfh2n4NIUogl+zkANFWHTMT9PflhPeHxI5hRChKr8hE
+    YSmj7iUrNzpa2XVT0WUgHBR5uSb3gUzp6Jtg2ivXP2c/ll8RKghAYeEDOG6F7ls7
+    6bLEATOGrYgbawGhnxnWqp7lkXCo0BvgASA/dDGjPf8lEg6f5j99z+PN5DJsH17T
+    eloh+wa9XucNolC4x+Yv9Nj3ElOrkGHaVV7mNl1PpY20hC8WCvRmbrchMGRcrGU/
+    lgDR3KqjPQEexXDqqhxQxZC5/Gsw0NgJuVxYFB6QjItuB4bmWvC5ptPqJBmjm8LK
+    JcSvTMU2HOuQ/q6vFZq3PRbvroMeXlw2WJrqO3vu04SZwYiP8dcrlHTXQJh+Mp9T
+    mQ==
     -----END CERTIFICATE-----
-  mqtt.client-key: |-
+    mqtt.client-key: |-
     -----BEGIN PRIVATE KEY-----
-    MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCdOi39VF1yRArx
-    u27uOjEMBq1Z6lmLm18tlHQqgzTH4HQKk7wfK+aGMMDJE1xv0fa8b5rwC7cWHEWe
-    H1iPI7KrOBQ2ByK02bY4ltt5wN25YfAdKKsMMQpsu9EKBfQXyLrLVb0k9chZnvch
-    WeKhDpD+haWdizx5d6FMQ5lxUQCInXA4TAb3yGUB+0tS6PvNp+8KJlJBow57mX4D
-    0Igv4vBBgx+SWHWfW2FxDRzKuZ4eUcB8Qshl9d/RV5iT5plUHQFr4PYuw0WnXRXv
-    oXRS08s/vCKm08xsEiCdcnvQt1Ib8a5OjcE/0y2r5fj11lDJyy8X08tNlgUCM6cn
-    jfQuX/TZAgMBAAECggEAMckKZv0f2d7R2FmRdr3WaghzO9WJJTu9l6E6Z3vEasYX
-    +IFvQC+Wf0dQxFrtGjtR9bkhRoFvKAEryjYCxNB48t5/B9yakMmfeavLM3JuwxTQ
-    A2utPd8JfgS63IGmGSHmhBxSGDH7juVXO6hKqtUB9JY9KvW74HqRCKUfIVKU6Kzy
-    lvpPG4RphRSpj9LOcDJqGU8tRYlpioCX+yp9IY9GsYE20XLxtHfPt9ocaaGRsuhl
-    q3GH+1Gm9xC+UjopU3aZwsbvTtzc2DH+oFpAsWF0GB8ECzxuFxn2gqSrEOOcmq7d
-    XqeoJMX2QZ/xuRoVi38dA+yIH3Wb14SyVOkkBBTQAQKBgQDMuaJ3nrXGWdkXac62
-    y6NGVCVwwt7ZzOI4sa1ArrS5eMfFFo8IXyGmKVA7rpq6gbX4SCSGb5JLV0A2okH8
-    Zg4GoNSNx9Ju9cin4SEXUKAI5G2xlG0o8bZrhEuEaph3wl5MH4Va5qvfRCpAhAHM
-    5XHSZfma5k9Gf/UxwMwW8ZlfeQKBgQDEmx+Ea5U448Os2SjloxGPGr/csy/J2jYn
-    kanKBUVnIdlzH32YMB7WILukd+01Euk++mUTBnSGwBDNeoTj0XCE16wPtSZhlfYM
-    U0bpyxtqAqUjYCmIl0YGdchAwVNi9Pfyf4BSdQHdm8PFjrL6QBKYdoVddIdYTVcC
-    aJbsRb8IYQKBgQCbT0D3qomQHl1ZK8XMWxRUqEV3E/7oEEyWYgRji6ZDBmPXGtQL
-    r8/hNHpPrJhpYTnhTymWa1H6oghu6g1RI0MEuEJIBQ2ZbBB7e4kVHO8rj8+/5jAh
-    3a1cR5Las9tTDztmWItceJ5u1FGRfBO5k18UFJSVdJ8zhqNGyVKLHWITUQKBgQCn
-    iimJhsRa/n05RrV7O0MzV/A3+tq2gKW1goPWDDfgcxAC8srsbdVZU/uTZD9YAw2R
-    BYAsfku+qN2ovMeR/GCOU9vkZtKWRlyulCjSAqsR478mLkQ2ifK6fpRv2k9c/LRu
-    igioO92jI6HpMHmEmCVAl39+7FaKAR4sh0RVg/oPAQKBgQCJZWJ+IHXKTv0cl7jP
-    iuV4b7dnVlQpRycMndrzwBY5frZT+i2E0tk723fCpp4B8n10bl/OwtS+Ab07di6f
-    m53FWXUh/LcRil2EAP9hIbR70lBkWCG50EIl2w6SDEwjwAjECwyO8+As44v7ej42
-    B2d4N6psHg9haJVNwiSlRfXsdQ==
+    MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC40aC4pyy0+++D
+    kD1cPRsMWO4ANZ8L4LaaHcg/e/1NbiExd/QlZESNJnnIyD29qY1h9WGEVDHtInsl
+    OcAm4yU0BU0oew15/Tz/qi9t7t8e7pwq+ilw/EXAydmAqhlwtXWfqBiN7BjC6AqI
+    XM5cRd4hh4iyNrHZp9NZ1JAn3FhqT6/+CW5qXhldgjsEg4KS/uaRob6w/sf8z/+Z
+    lyN/EUQGlIWmmGwMB2PrzLL2q7SSP0hF4kmHei70nSpfQ5VnbJo23b6miD99cTha
+    ulUipEWzUkYJPi9kFJf58Wj8b0lRHS/gc2I+vkPwU5vNmHSN0CP5qqNrhNsKq7tT
+    Zzj/UXj5AgMBAAECggEAECRfAUG4qeYHOVpzwYakwiNSRjpotcTerf9D6ieOLCEe
+    TQ/JBysGwb1Gjb7Pha01aATii4g/BBMq5klw+vSD31NHNe3pc2om1b2rftKKMk1s
+    3mQTEoc2IGyAzrgMmMeAin1IB71DPGK/6MESVQTVLeCEk+wrBHOgBgyGurSIFGDT
+    FYnrSmfYJvkQHHjyRrhWfozVmlWR8GukakVQqCuMz87DpeYyu94DIZjyjhgKlbtE
+    QpiWYxeNRM+MrNuMTY6PL93M33hEtuZOYP2RwhLrw/T4bGmexHvoDV+ln94i+W1U
+    FoIb5yGlSxigdC9Cnln41PHKmfRTtFtKePjSDh+hsQKBgQD2ydKnUc8fwlmODmsZ
+    hoqUd6oGW7hElGxix/JmBXoJI87Je1xfuClw18bDPKWGn+a2gkILsjB7QRiNV76t
+    jnd6/XR7XZ0+VzqZ7YMKiX//WPMKDWYTVE1xPugHM5LVXBVeEQ9a1o1Kvtq6fcu6
+    LFAa3bx5raP7qjzG8zObJxaYNwKBgQC/t6hW6efFmaxiSwYKP646iXMmv8FnDZ5A
+    x+ffwa0wt61t9jLlajITTAOanXastF19SWbzbUM+3bNq65n2pXyDTCauNTA6nK+s
+    l0JCkFhuHjrmxHlU2z3qBxSyfQUdNlBiL7ek9XMlWOwb9An2xozGElTenedq4okg
+    MYqafiuATwKBgQC94sh9CYtvCmFR1nI9r7HNTs26GrSLwBAtaV9vdGNTyQOBL7QB
+    ynfIZZ5/9pf+H+arI0qiKTb4fzve9Va3v9ja/02y5nLo1sE2UvPzFZ0w4kYOxAR4
+    dvMnYZmygNJH7JRcTpAb+t24V2WA/O3Wj+YK5fXxQdPc/j3JbrOUe9z8vQKBgHnz
+    gYmH0H7JefYscvMh/toNhMopQAUljHz4rG6Q7HII5LEF4uo72w6bU8+OSmchdDa1
+    8l72Kchbjj19ELrsGYALeK9n9f3SnYzTyro8x4OEh0Mzx1pK+99aEbhX/mDOo+NR
+    JygvWcdwAQDnA0+OjQ2Rq5rQJty+rStlWB1eFJ3RAoGAFEW6PQcd7O2WBLnh+il9
+    QJGYtfRdtqtNqVZb0jiSmfHbmXxQ2a7per/lPgujoZ0jP02UK2pjeutLNOL1aPcq
+    38qt9q2rOGrgEiHOhAsGU+Yp4Rgp5rNRD0OwbP1QPMdUyP5WeW3/V3fqzd3Nu2+B
+    IwZjXoo/VY1ZyQ3dAQTV0TU=
     -----END PRIVATE KEY-----
 kind: Secret
 metadata:
   name: mqtt-secret
   namespace: <feature_stack_namespace>
-type: Opaque
+type: Opaque

hcs_cli/cmds/dev/fs/provided_files/mqtt-server-external.yaml

@@ -1,8 +1,8 @@
+---
 apiVersion: v1
 kind: Service
 metadata:
-  finalizers:
-    - service.kubernetes.io/load-balancer-cleanup
+  finalizers: [service.kubernetes.io/load-balancer-cleanup]
   labels:
     app: mqtt-server-external
   name: mqtt-server-external
@@ -11,8 +11,7 @@ spec:
   allocateLoadBalancerNodePorts: true
   externalTrafficPolicy: Cluster
   internalTrafficPolicy: Cluster
-  ipFamilies:
-    - IPv4
+  ipFamilies: [IPv4]
   ipFamilyPolicy: SingleStack
   ports:
     - name: mqtts
@@ -26,4 +25,4 @@ spec:
   selector:
     app: mqtt-server
   sessionAffinity: None
-  type: LoadBalancer
+  type: LoadBalancer

hcs_cli/cmds/dev/fs/provided_files/patch-mqtt-hostname.yml

@@ -1,3 +1,4 @@
+---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -6,6 +7,5 @@ spec:
   template:
     spec:
       hostAliases:
-        - ip: "127.0.0.1"
-          hostnames:
-            - "mqtt-server-0.{{FS_NAME}}.svc.cluster.local"
+        - ip: 127.0.0.1
+          hostnames: ["mqtt-server-0.{{FS_NAME}}.svc.cluster.local"]

hcs_cli/cmds/dev/fs/provided_files/patch-vernemq-ssl-depth.json

@@ -20,4 +20,4 @@
       }
     }
   }
-}
+}

hcs_cli/cmds/dev/fs/tailor.py

@@ -13,14 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import subprocess
-
 import click
 import questionary
 
 from hcs_cli.cmds.dev.fs.helper.k8s_util import kubectl
 from hcs_cli.cmds.dev.fs.helper.util import validate_fs_kubeconfig, validate_fs_profile
-from hcs_cli.cmds.dev.util.log import fail, warn
 
 _service_dependency = {
     "inventory": [],
@@ -39,15 +36,10 @@ _scenario_dependency_map = {
     "lcm-core": [
         "lcm",
         "inv-status-sync",
-        "smart-capacity-management",
-        "scheduler-control-service",
     ],
     "ring0": [
         "admin",
         "lcm",
-        "inv-status-sync",
-        "smart-capacity-management",
-        "scheduler-control-service",
         "inventory",
         "org-service",
         "credentials",
@@ -58,8 +50,12 @@ _scenario_dependency_map = {
         "connection-service",
         "license-features",
         "portal",
-        "deployer",
+    ],
+    "lcm-ext": [
+        "smart-capacity-management",
+        "scheduler-control-service",
         "images",
+        "deployer",
         "ad-twin",
         "graphql",
         "aims",
@@ -124,10 +120,9 @@ def tailor(for_scenario: str, **kwargs):
             continue
         missing_dependencies.add(d)
 
-    targets_to_remove = sorted(all_names - final_dependencies)
-    final_dependencies = sorted(final_dependencies)
+    targets_to_remove = sorted(list(all_names - final_dependencies))
 
-    for t in final_dependencies:
+    for t in sorted(list(final_dependencies)):
         click.echo(click.style(" KEEP    " + t, fg="white"))
     for t in missing_dependencies:
         click.echo(click.style(" MISSING " + t, fg="bright_yellow"))

hcs_cli/cmds/dev/mqtt.py

@@ -40,7 +40,6 @@ def _is_feature_stack():
 @mqtt.command()
 @cli.org_id
 def test(org: str, **kwargs):
-
     org_id = cli.get_org_id(org)
     print(f"Testing MQTT connection for organization: {org_id}")
 
@@ -104,7 +103,7 @@ def test_vmhub_otp(org_id: str):
         exec(cmd, raise_on_error=False)
 
         print("---- Testing pub/sub (via mqtt client) -----")
-        port = 8883 if _is_feature_stack() else ret.mqttServerPort
+        port = 8883 if _is_feature_stack() else int(ret.mqttServerPort)
         mqtt_helper.test_mqtt_pubsub(
             host=ret.mqttServerHost, port=port, ca_certs=ca_file, cert_file=cert_file, key_file=key_file, resource_id=resource_name
         )

hcs_cli/cmds/dev/onboard.py

@@ -1,3 +1,4 @@
+import os
 from time import sleep, time
 
 import click
@@ -8,7 +9,6 @@ from InquirerPy import inquirer
 from InquirerPy.base import Choice
 
 import hcs_cli.cmds.dev.util.github_helper as github_helper
-from hcs_cli.cmds.dev.fs.init import _retrieve_config_from_nightly_repo
 from hcs_cli.cmds.dev.util.log import fail
 from hcs_cli.support.exec_util import run_cli
 
@@ -125,6 +125,40 @@ def delete(all: bool, org: str):
     click.echo("Reset complete.")
 
 
+@onboard.command()
+@cli.org_id
+def init_org(org):
+    """[Global admin] Init HCS org (org, location, and license)."""
+    org_id = cli.get_org_id(org)
+    proceed = click.confirm("This only works with non-prod stack. Continue?")
+    if not proceed:
+        return "", 1
+    proceed = click.confirm("This operation requires that the current profile has global admin privileges. Continue?")
+    if not proceed:
+        return "", 1
+    proceed = click.confirm(f"Target org: {org_id}")
+    if not proceed:
+        return "", 1
+    _ensure_org_initialized(org_id, critical=True)
+
+
+def _ensure_org_initialized(org_id, critical=False):
+    os.environ["ORG_ID"] = org_id
+    try:
+        from hcs_cli.cmds.dev.fs.init import _create_license_info, _create_org_details, _create_org_location_mapping
+
+        _create_org_details()
+        _create_org_location_mapping()
+        _create_license_info()
+    except Exception as e:
+        if critical:
+            click.secho(f"Error initializing org: {e}", fg="bright_red")
+        else:
+            click.secho(
+                f"Error initializing org: {e}. If you have already initialized the org, you can ignore this warning.", fg="bright_yellow"
+            )
+
+
 def _delete_express_onboarding_deployment(org_id: str):
     deployment = run_cli(f"hcs api /deployment-orchestrator/v1/deployments?org_id={org_id}", output_json=True)
     if not deployment:

hcs_cli/cmds/dev/util/mqtt_helper.py

@@ -6,7 +6,6 @@ import time
 
 
 def test_mqtt_pubsub(host, port, ca_certs, cert_file, key_file, resource_id):
-
     import paho.mqtt.client as mqtt
     from paho.mqtt.client import CallbackAPIVersion, MQTTMessage
 

hcs_cli/cmds/hoc/search.py

@@ -5,6 +5,7 @@ from datetime import timezone
 
 import click
 import yumako
+from hcs_core.ctxp import CtxpException, util
 from hcs_core.sglib import cli_options as cli
 
 from hcs_cli.service import hoc
@@ -109,8 +110,15 @@ def search(org: str, from_param: str, to: str, service: str, type: str, query: s
 )
 @click.option("--raw", "-r", is_flag=True, default=False, help="Specify whether the payload is raw jsonp.")
 @click.option("--predefined", "-p", type=str, required=False, help="Predefined query name. E.g. 'no_spare'")
-def es(org: str, from_param: str, to: str, file, raw: bool, predefined: str):
+@click.option("--arg", type=str, multiple=True, help="Arguments for the predefined query, e.g. tid=12345")
+def es(org: str, from_param: str, to: str, file, raw: bool, predefined: str, arg: list[str]):
     """Perform a raw ES query."""
+
+    if raw and arg:
+        raise CtxpException("Cannot use --arg with --raw")
+    if raw and predefined:
+        raise CtxpException("Cannot use --predefined with --raw")
+
     if predefined:
         text = predefined_payload.load(f"hoc/{predefined}.json.template")
     else:
@@ -126,14 +134,25 @@ def es(org: str, from_param: str, to: str, file, raw: bool, predefined: str):
             "ignore_unavailable": True,
             "index": "hoc-ingested-events*-prod-*",
         }
-        text = yumako.template.replace(
-            text,
-            {
-                "from": int(yumako.time.of(from_param, tz=timezone.utc).timestamp() * 1000),
-                "to": int(yumako.time.of(to, tz=timezone.utc).timestamp() * 1000),
-                "org_id": org_id.replace("-", "\\\\-"),
-            },
-        )
+
+        replacements = {
+            "from": int(yumako.time.of(from_param, tz=timezone.utc).timestamp() * 1000),
+            "to": int(yumako.time.of(to, tz=timezone.utc).timestamp() * 1000),
+            "oid": org_id.replace("-", "\\\\-"),
+        }
+        if arg:
+            arg_dict = _parse_kv_args(arg)
+            replacements.update(arg_dict)
+
+        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
         try:
             payload_query = json.loads(text)
         except Exception as e:
@@ -143,3 +162,14 @@ def es(org: str, from_param: str, to: str, file, raw: bool, predefined: str):
         payload_jsonp = json.dumps(payload_type) + "\n" + json.dumps(payload_query) + "\n"
 
     return hoc.es.raw_query(payload_jsonp)
+
+
+def _parse_kv_args(arg_list: list[str]) -> dict[str, str]:
+    result = {}
+    for arg in arg_list:
+        if "=" not in arg:
+            raise ValueError(f"Invalid argument: {arg}. Expected format: key=value")
+        key, value = arg.split("=", 1)
+        key = key.strip()
+        result[key] = value.strip()
+    return result

hcs_cli/cmds/hst/clean.py

@@ -2,6 +2,7 @@ import logging
 from pathlib import Path
 
 import click
+from pyparsing import Callable
 from hcs_core.ctxp import context
 from hcs_core.sglib.client_util import hdc_service_client
 from hcs_ext_hst.base import cfg_mgr_delegate
@@ -64,7 +65,7 @@ def _delete_local_logs():
         p.unlink()
 
 
-def _delete_impl(type: str, fn_filter: callable = None):
+def _delete_impl(type: str, fn_filter: Callable = None):
     deleted = 0
     while True:
         page = _client.get(f"/v1/{type}?size=200")