vgs-cli 1.35.0.dev2__py3-none-any.whl → 1.35.0.dev3__py3-none-any.whl

{vgs_cli-1.35.0.dev2.data → vgs_cli-1.35.0.dev3.data}/data/vgscli/form-template.yaml

@@ -6,7 +6,7 @@ data:
   id: auto-generated
 
   # Display name of the Collect Form.
-  name: Auto Generated
+  name: Default
 
   # Card attributes to collect alongside the card number. Set an attribute to
   # true to enable it; leave it false to keep it disabled. Run

{vgs_cli-1.35.0.dev2.dist-info → vgs_cli-1.35.0.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vgs-cli
-Version: 1.35.0.dev2
+Version: 1.35.0.dev3
 Summary: VGS Client
 Home-page: https://github.com/verygoodsecurity/vgs-cli
 Author: Very Good Security
@@ -71,6 +71,7 @@ Command Line Tool for programmatic configurations on VGS.
   - [Service accounts](#service-accounts)
   - [Certificates](#certificates)
 - [Automation with VGS CLI](#automation-with-vgs-cli)
+- [Telemetry](#telemetry)
 
 ## Requirements
 [Python 3.11 or newer](https://www.python.org/downloads/) with OpenSSL 1.1.1 or newer, or [Docker](https://docs.docker.com/get-docker/).
@@ -244,3 +245,9 @@ for the full workflow.
 ## Automation with VGS CLI
 
 If you want to use the VGS CLI for automation, create a [service account](https://docs.verygoodsecurity.com/vault/developer-tools/vgs-cli/service-account).
+
+## Telemetry
+
+VGS CLI collects limited usage analytics to help VGS understand how the CLI is
+used and improve the product. To disable telemetry, set
+`VGS_CLI_TELEMETRY_OPTOUT=1` or `DO_NOT_TRACK=1`.

{vgs_cli-1.35.0.dev2.dist-info → vgs_cli-1.35.0.dev3.dist-info}/RECORD

@@ -1,63 +1,64 @@
-vgs_cli-1.35.0.dev2.data/data/vgscli/collect-form-api-schema.yaml,sha256=THuJbLUo7LOr0c1JUo3FPJEc9Jvde59K4JjdlkVF3hw,1246
-vgs_cli-1.35.0.dev2.data/data/vgscli/collect-form-schema.yaml,sha256=vHAN6_Gsg14CeSL41sHEQgboYF-CHF2RaNw72aJ3W8o,1337
-vgs_cli-1.35.0.dev2.data/data/vgscli/credentials-admin.yaml,sha256=acyLd54Cp7l2fpugfjVfYh07-MIE0BX-JVq4lHraE1s,869
-vgs_cli-1.35.0.dev2.data/data/vgscli/form-template.yaml,sha256=VblOlsDLfwZP6wR6nIIX1WSrUAt4leqfMdbXr3xYvWg,934
-vgs_cli-1.35.0.dev2.data/data/vgscli/http-route-template.yaml,sha256=vGHvBXA_6pwFtH1vVRWKiwxb4sahzuLvpqGAlavrStc,1085
-vgs_cli-1.35.0.dev2.data/data/vgscli/notification-integration-schema.yaml,sha256=1qHzS5ZxlhTdrDab6-qJhszwu7cpith2HleX3uAO_4E,1837
-vgs_cli-1.35.0.dev2.data/data/vgscli/notification-template.yaml,sha256=hr36msbrgiTjWligLHVDHMmO49QDzjTwBSLYoBw3WQE,1288
-vgs_cli-1.35.0.dev2.data/data/vgscli/public-credential-collect.yaml,sha256=CiorC-6TMx7M0TI8DHmoRSfVKDpOom2wIr_ilwmHQNA,696
-vgs_cli-1.35.0.dev2.data/data/vgscli/read-credentials-no-pci.yaml,sha256=_kWRne_ARh8v7A_jHG08gwgPG6NqZhrDRyq6L-ULs2M,769
-vgs_cli-1.35.0.dev2.data/data/vgscli/read-credentials-with-pci.yaml,sha256=jWXgFdcqZYisakAt9COM6cjf2-x_Q4eidDLaUh8CZOk,796
-vgs_cli-1.35.0.dev2.data/data/vgscli/service-account-schema.yaml,sha256=L1pjNXgnks15N1wNgf_1GmGcOvxn0nu49v7ersUjFno,1090
-vgs_cli-1.35.0.dev2.data/data/vgscli/sftp-route-template.yaml,sha256=zkT6lIVDgVyzLKgZ8QnyJJooy2egZk1cQthdjan_JrM,853
-vgs_cli-1.35.0.dev2.data/data/vgscli/tenant-schema.yaml,sha256=gBO7xVe2qXSymG0B_45hC11X5nm_jCCAH4Yjs-sbC8g,1457
-vgs_cli-1.35.0.dev2.data/data/vgscli/tenant-template.yaml,sha256=F0wIBkC2dFJUNeJet-FzPX3qrLMHcGIaJvhsDzzAOCc,765
-vgs_cli-1.35.0.dev2.data/data/vgscli/vault-resources.yaml,sha256=95CCxQher3MBQq96bvjZviNgo1rgv_NhCtI8X-oxIpA,26335
-vgs_cli-1.35.0.dev2.data/data/vgscli/vault-schema.yaml,sha256=a-wW7X8RyHr-669wtOZrlxlIfeQVtx8EUfA-3vpYytk,637
-vgs_cli-1.35.0.dev2.data/data/vgscli/vault-template.yaml,sha256=IlDisL3H5LXUDMkhUaouKMarRdu0-pJxpTz8ij_lp_M,383
-vgs_cli-1.35.0.dev2.data/data/vgscli/vgs-cli.yaml,sha256=5gCjjloyepaKI6zZfDLeUEWxuRExI-dGJI9RO3omP2k,484
-vgs_cli-1.35.0.dev2.dist-info/licenses/LICENSE,sha256=NwSyzgDYdzv6O2ns2C6UODGI8LN1VnVe_FPTnWS4eXY,1082
+vgs_cli-1.35.0.dev3.data/data/vgscli/collect-form-api-schema.yaml,sha256=THuJbLUo7LOr0c1JUo3FPJEc9Jvde59K4JjdlkVF3hw,1246
+vgs_cli-1.35.0.dev3.data/data/vgscli/collect-form-schema.yaml,sha256=vHAN6_Gsg14CeSL41sHEQgboYF-CHF2RaNw72aJ3W8o,1337
+vgs_cli-1.35.0.dev3.data/data/vgscli/credentials-admin.yaml,sha256=acyLd54Cp7l2fpugfjVfYh07-MIE0BX-JVq4lHraE1s,869
+vgs_cli-1.35.0.dev3.data/data/vgscli/form-template.yaml,sha256=pY4gOd8jXJRohcpJYijBt4m5cPyHvEVlCBtHgs2AL8M,927
+vgs_cli-1.35.0.dev3.data/data/vgscli/http-route-template.yaml,sha256=vGHvBXA_6pwFtH1vVRWKiwxb4sahzuLvpqGAlavrStc,1085
+vgs_cli-1.35.0.dev3.data/data/vgscli/notification-integration-schema.yaml,sha256=1qHzS5ZxlhTdrDab6-qJhszwu7cpith2HleX3uAO_4E,1837
+vgs_cli-1.35.0.dev3.data/data/vgscli/notification-template.yaml,sha256=hr36msbrgiTjWligLHVDHMmO49QDzjTwBSLYoBw3WQE,1288
+vgs_cli-1.35.0.dev3.data/data/vgscli/public-credential-collect.yaml,sha256=CiorC-6TMx7M0TI8DHmoRSfVKDpOom2wIr_ilwmHQNA,696
+vgs_cli-1.35.0.dev3.data/data/vgscli/read-credentials-no-pci.yaml,sha256=_kWRne_ARh8v7A_jHG08gwgPG6NqZhrDRyq6L-ULs2M,769
+vgs_cli-1.35.0.dev3.data/data/vgscli/read-credentials-with-pci.yaml,sha256=jWXgFdcqZYisakAt9COM6cjf2-x_Q4eidDLaUh8CZOk,796
+vgs_cli-1.35.0.dev3.data/data/vgscli/service-account-schema.yaml,sha256=L1pjNXgnks15N1wNgf_1GmGcOvxn0nu49v7ersUjFno,1090
+vgs_cli-1.35.0.dev3.data/data/vgscli/sftp-route-template.yaml,sha256=zkT6lIVDgVyzLKgZ8QnyJJooy2egZk1cQthdjan_JrM,853
+vgs_cli-1.35.0.dev3.data/data/vgscli/tenant-schema.yaml,sha256=gBO7xVe2qXSymG0B_45hC11X5nm_jCCAH4Yjs-sbC8g,1457
+vgs_cli-1.35.0.dev3.data/data/vgscli/tenant-template.yaml,sha256=F0wIBkC2dFJUNeJet-FzPX3qrLMHcGIaJvhsDzzAOCc,765
+vgs_cli-1.35.0.dev3.data/data/vgscli/vault-resources.yaml,sha256=95CCxQher3MBQq96bvjZviNgo1rgv_NhCtI8X-oxIpA,26335
+vgs_cli-1.35.0.dev3.data/data/vgscli/vault-schema.yaml,sha256=a-wW7X8RyHr-669wtOZrlxlIfeQVtx8EUfA-3vpYytk,637
+vgs_cli-1.35.0.dev3.data/data/vgscli/vault-template.yaml,sha256=IlDisL3H5LXUDMkhUaouKMarRdu0-pJxpTz8ij_lp_M,383
+vgs_cli-1.35.0.dev3.data/data/vgscli/vgs-cli.yaml,sha256=5gCjjloyepaKI6zZfDLeUEWxuRExI-dGJI9RO3omP2k,484
+vgs_cli-1.35.0.dev3.dist-info/licenses/LICENSE,sha256=NwSyzgDYdzv6O2ns2C6UODGI8LN1VnVe_FPTnWS4eXY,1082
 vgscli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vgscli/_version.py,sha256=0HHI66nZPGvwbIf40mXNC7yUBONlS3ZLuT9MVF9ALCM,1681
+vgscli/_version.py,sha256=j_AeccOPC7DV8cBY5WdN_c0pV8AQX8WbdoUyTLa3ZhQ,1681
 vgscli/access_logs.py,sha256=G0GjlLjWiC-N6OzK6-RCvWddcVGQlLCLAcyO9pLWIOM,1928
-vgscli/audits_api.py,sha256=6FjpS1yTALio-DejgIS2eDw75ChjDp4GoAGXh4uZExU,3211
+vgscli/audits_api.py,sha256=AaF5Go019TOerBlQzygwMeOxeW9vPPJPgxa95kttF-M,3215
 vgscli/auth.py,sha256=vdUZ12nqtefIuSHNmwCFvxoqwS3m6ZP5TqLZFNwKnSU,2104
-vgscli/auth_server.py,sha256=e-xYoVebWM6cQNxuMr5rYzKuswNIrexnLSYo1ma48WY,4096
+vgscli/auth_server.py,sha256=LX8SphoWE5vh4NRQ0490VTa73cKpa7FE9_CblNY31Ro,4482
 vgscli/auth_utils.py,sha256=aC1VI0dFdFeupLS9Okz4uDz-wHhhFabqiLUg2R5vO2s,600
 vgscli/callback_server.py,sha256=oFFF5AGbbwhF7Hsc5fzS7jeGFzIMbebc9Qdq8uEl1PY,1055
 vgscli/calm_api.py,sha256=5ZZhJUCuA2E5X670L-EkB_mL2kqHPrYy-ca6WtwTacg,1384
-vgscli/cert_manager_api.py,sha256=ek25BcyGeUo0pBoqineMTYMgmQaYJfimFFHMljZh5yA,1646
+vgscli/cert_manager_api.py,sha256=b_IEIZFLY7Q4ygThWcUUR8Ynr02MXgVVe9qDFE7CQUc,1650
 vgscli/cli_progress.py,sha256=Kpc7iZo0zO6YX3WynteBELuWSYGVvqEjKLq2E5x4lnE,2520
 vgscli/cli_utils.py,sha256=NzXK29_yIDrB-3T_XdLLB8NCWneQ-cpZFi9mazQL9tQ,3810
 vgscli/click_extensions.py,sha256=m-RpaPaH69m4caYbuiu0j2blxeyy8c8hA0Tvygw1Mvc,7271
 vgscli/collect_forms.py,sha256=HAg-tvpXxmVq5Zns4v8G0cP-tgYKuWmVFwzuNjieu-A,4619
-vgscli/collect_forms_api.py,sha256=JHnnsOUyStD7yR92LfGqn8DOpnu0l0yqTUMQnWE_NGs,1246
+vgscli/collect_forms_api.py,sha256=rORLu-jd5IMsiAoR7VkgIkpskWd9GfjZs6zeHKEoOPs,1258
 vgscli/config_file.py,sha256=HB8lANU0qoO09Wnkf-QDzPh2qtrnFcqcetnCaQgtQ3U,1543
-vgscli/errors.py,sha256=9iWS8v6Zq9A3Iqt3G1-NJQEwT4d8DI_JoU7fdiqHg00,11946
+vgscli/errors.py,sha256=5TzG28h1pK9MXjXT46zexcP9xeQ146QIYFQAotyqLuM,13961
 vgscli/file_token_util.py,sha256=537b54paMGw0u5PL5VJgQqQ7awKa9lQP88n3tUc_lyw,771
 vgscli/id_generator.py,sha256=3CbvSOUSyLON76p6M8wUhVQVig8j75_rnWdpxLhBifM,1510
 vgscli/keyring_token_util.py,sha256=cnR72-0AInzujUsIwHoXwPbgprbkllgAXN-AAI3qsPM,4632
 vgscli/notifications.py,sha256=6D8HFDEl3X4V0V9fYZT-9nWYe2KYVahfhRLMF0pbh4I,6252
 vgscli/notifications_api.py,sha256=1EXmRb2fOJrU1QOAZ6gmq8yMjBLhNZGSVs3kRtD2Dfw,2342
 vgscli/payment_accounts_api.py,sha256=wF6K3m7nlKtPmqO9RCpmGFSXYHWtwfhXqNfgI1IGqFI,1665
+vgscli/telemetry.py,sha256=pvOVw7Lv4_YB5FYjGwD6molA5X964MntFWkHn7CuhFQ,26113
 vgscli/tenant_configuration.py,sha256=iC33f2lBHDEL4oHPvdlWp_w--u2x_nWOb86jTHumDLg,5881
-vgscli/tenant_creation.py,sha256=9O1i4JsHuEIQt_QkcWYEcenLi8kGJBivcln6LkoHl7U,22230
+vgscli/tenant_creation.py,sha256=8vyqD5J_4xefqvc4Yvx0PeHSSpNlcU8CdqB101H6Bn0,22225
 vgscli/tenant_provisioning_api.py,sha256=-mQcSECgWG23LKczu1B9J1d7Bb6ZA6lkpr9RegJiiLg,1203
 vgscli/testing.py,sha256=MLrsvy3mEwvjtqyuG0UjwEX-rDkbWUo52aXvu2H2sTk,1437
 vgscli/text.py,sha256=c2d1As7awq8PlEF9NiI6JrjsYYousj9YT0o1xOQ2MQM,172
 vgscli/token_handler.py,sha256=MvtmlicqnGrcopNkTr8Q2RlKE7IDj_sJFxF_39Jd7W8,183
-vgscli/vgs.py,sha256=BiQuHeOuH25zbTdwNOsW_O69YuKsZFTYA2jr9JFRZng,6262
-vgscli/cli/__init__.py,sha256=112ej_l1olouWMRIM8H4-s5C4qiG8-u6RziWT102wNk,2765
+vgscli/vgs.py,sha256=a1t-0fy7wmHqI_0qVonA1XXz0rMCCRDOKS8e0KNMXC4,6364
+vgscli/cli/__init__.py,sha256=da9LPKYdnal26ntEP22PNn-dZYBbsNkP7tzOwzD6kY4,3915
 vgscli/cli/commands/__init__.py,sha256=8ptc9-Vzdx0HU3ZeMcKERYjmJyuB5IMjBSF3Igx5yQ4,206
-vgscli/cli/commands/apply.py,sha256=jLSllU1Hz8WX3ARL-lU8BtDv72bMzP3fXs0vGDtyoWc,26312
-vgscli/cli/commands/certificate.py,sha256=xQV-G8ZWP9uPFqrczlCpCZkHUt2aJflBP2cc5hjobIw,22930
-vgscli/cli/commands/delete.py,sha256=2nuYKhp0FhoGTcmJUECjRnlYrKLdAgIoIp-y25ViwDg,3873
-vgscli/cli/commands/generate.py,sha256=cVrU54_o3szgyi7tbMQtMAemx-37xYcFKrAcLcyMglw,5448
-vgscli/cli/commands/get.py,sha256=Xm8bN11vOjnDA3o_uuAkBXM2wtJQZDrTdQY1ykug4LE,11315
+vgscli/cli/commands/apply.py,sha256=p6ZbPLE3SebX-AUYCLkVqTDXppT_Dt7Ua7JaUoP-R08,26662
+vgscli/cli/commands/certificate.py,sha256=cy8oRiEkUYfFExCG5GdjYqEJ91rCgA6hy98cpHkorHM,22994
+vgscli/cli/commands/delete.py,sha256=D7k_3oHNIp3NqqLgOAPIKkXa8TSoELB8VrGEuHgKCRc,3937
+vgscli/cli/commands/generate.py,sha256=6SkeXN7lyzllezjYliWQ_CUncMWbDFX1Jx_1vlwDCh8,5512
+vgscli/cli/commands/get.py,sha256=7lFV3X7mMuxtA-dRmm3ru9AQ4ZwXdx85I6gvB_aOqEs,11392
 vgscli/cli/types/__init__.py,sha256=a-P-SoGHpLzMg7CL1hhg5x_nf6sHq0qAuGm_AtIITmw,107
 vgscli/cli/types/resource_id.py,sha256=7JILR-KjoVGQDHB40tXJfTcU53iR8wM9Zr24fY5le3o,1172
 vgscli/cli/types/variable.py,sha256=IVcszPoWmTjeo_evDsLN06LuUZGTLL-wcZCVfBNBP8I,414
-vgscli/resource-templates/form-template.yaml,sha256=VblOlsDLfwZP6wR6nIIX1WSrUAt4leqfMdbXr3xYvWg,934
+vgscli/resource-templates/form-template.yaml,sha256=pY4gOd8jXJRohcpJYijBt4m5cPyHvEVlCBtHgs2AL8M,927
 vgscli/resource-templates/http-route-template.yaml,sha256=vGHvBXA_6pwFtH1vVRWKiwxb4sahzuLvpqGAlavrStc,1085
 vgscli/resource-templates/notification-template.yaml,sha256=hr36msbrgiTjWligLHVDHMmO49QDzjTwBSLYoBw3WQE,1288
 vgscli/resource-templates/sftp-route-template.yaml,sha256=zkT6lIVDgVyzLKgZ8QnyJJooy2egZk1cQthdjan_JrM,853
@@ -75,8 +76,8 @@ vgscli/validation-schemas/service-account-schema.yaml,sha256=L1pjNXgnks15N1wNgf_
 vgscli/validation-schemas/tenant-schema.yaml,sha256=gBO7xVe2qXSymG0B_45hC11X5nm_jCCAH4Yjs-sbC8g,1457
 vgscli/validation-schemas/vault-resources.yaml,sha256=95CCxQher3MBQq96bvjZviNgo1rgv_NhCtI8X-oxIpA,26335
 vgscli/validation-schemas/vault-schema.yaml,sha256=a-wW7X8RyHr-669wtOZrlxlIfeQVtx8EUfA-3vpYytk,637
-vgs_cli-1.35.0.dev2.dist-info/METADATA,sha256=BgcCMIQRMIizLbofbdWzRQKrwq0V5iYsEfO_n22u24U,8984
-vgs_cli-1.35.0.dev2.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-vgs_cli-1.35.0.dev2.dist-info/entry_points.txt,sha256=wCWhRQiMX4Ja6kkqJlYr8LbuiywpmXyyRAZPsau-_RY,39
-vgs_cli-1.35.0.dev2.dist-info/top_level.txt,sha256=gabTxCWMkl80q6ha_m-hs_1wQMfGntZcv5DEmkl8JEw,7
-vgs_cli-1.35.0.dev2.dist-info/RECORD,,
+vgs_cli-1.35.0.dev3.dist-info/METADATA,sha256=Ic8p-cV8MBTlssFrLm-lqcNFY0x7ml_eIb8zN-zM8_Y,9210
+vgs_cli-1.35.0.dev3.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+vgs_cli-1.35.0.dev3.dist-info/entry_points.txt,sha256=wCWhRQiMX4Ja6kkqJlYr8LbuiywpmXyyRAZPsau-_RY,39
+vgs_cli-1.35.0.dev3.dist-info/top_level.txt,sha256=gabTxCWMkl80q6ha_m-hs_1wQMfGntZcv5DEmkl8JEw,7
+vgs_cli-1.35.0.dev3.dist-info/RECORD,,

vgscli/_version.py

@@ -6,7 +6,7 @@ from packaging.version import InvalidVersion, Version
 
 from vgscli.text import bold, green
 
-__version__ = "1.35.0.dev2"
+__version__ = "1.35.0.dev3"
 
 
 # noinspection PyBroadException

vgscli/audits_api.py

@@ -5,8 +5,8 @@ from typing import Dict
 from simple_rest_client.api import API
 from simple_rest_client.resource import Resource
 
-from vgscli._version import __version__
 from vgscli.errors import VaultNotFoundError
+from vgscli.telemetry import request_headers
 
 logger = logging.getLogger(__name__)
 
@@ -75,13 +75,14 @@ def create_api(ctx, vault_id, environment, token):
     api = API(
         api_root_url=env_url[environment],
         params={},  # default params
-        headers={
-            "VGS-Tenant": vault_id,
-            "Content-Type": "application/vnd.api+json",
-            "Accept": "application/vnd.api+json",
-            "User-Agent": "VGS CLI {}".format(__version__),
-            "Authorization": "Bearer {}".format(token),
-        },  # default headers
+        headers=request_headers(
+            {
+                "VGS-Tenant": vault_id,
+                "Content-Type": "application/vnd.api+json",
+                "Accept": "application/vnd.api+json",
+                "Authorization": "Bearer {}".format(token),
+            }
+        ),  # default headers
         timeout=50,  # default timeout in seconds
         append_slash=False,  # append slash to final url
         json_encode_body=True,  # encode body as json

vgscli/auth_server.py

@@ -11,6 +11,7 @@ from vgs.sdk.utils import is_port_accessible
 from vgscli.auth_utils import code_challenge, generate_code_verifier
 from vgscli.callback_server import RequestServer
 from vgscli.keyring_token_util import KeyringTokenUtil
+from vgscli.telemetry import apply_request_headers, request_headers
 from vgscli.token_handler import CodeHandler
 
 
@@ -46,7 +47,7 @@ class AuthServer:
         )
         self.app = RequestServer(self.host, self.accessible_port)
         self.environment = environment
-        self.auth_api = auth_api.create_api(environment)
+        self.auth_api = apply_request_headers(auth_api.create_api(environment))
 
     def login(self, environment, **kwargs):
         thread = self.ServerThread(self.app)
@@ -86,11 +87,17 @@ class AuthServer:
         return self.token_util.get_access_token()
 
     def logout(self):
-        auth_api.logout(
-            self.auth_api,
-            self.CLIENT_ID,
-            self.token_util.get_access_token(),
-            self.token_util.get_refresh_token(),
+        self.auth_api.auth.logout(
+            headers=request_headers(
+                {
+                    "Authorization": self.token_util.get_access_token(),
+                    "Content-Type": "application/x-www-form-urlencoded",
+                }
+            ),
+            body="client_id={client_id}&refresh_token={refresh_token}".format(
+                client_id=self.CLIENT_ID,
+                refresh_token=self.token_util.get_refresh_token(),
+            ),
         )
 
     def refresh_authentication(self):

vgscli/cert_manager_api.py

@@ -1,7 +1,7 @@
 from simple_rest_client.api import API
 from simple_rest_client.resource import Resource
 
-from vgscli._version import __version__
+from vgscli.telemetry import request_headers
 
 CERT_MANAGER_URLS = {
     "dev": "https://cert-manager-api.verygoodsecurity.io",
@@ -32,12 +32,13 @@ def create_cert_manager_api(vault_id, environment, token):
     base = CERT_MANAGER_URLS.get(env, CERT_MANAGER_URLS["prod"])
     api_root_url = _ensure_api_root(base)
 
-    headers = {
-        "Content-Type": "application/vnd.api+json",
-        "Accept": "application/json",
-        "User-Agent": f"VGS CLI {__version__}",
-        "Authorization": f"Bearer {token}",
-    }
+    headers = request_headers(
+        {
+            "Content-Type": "application/vnd.api+json",
+            "Accept": "application/json",
+            "Authorization": f"Bearer {token}",
+        }
+    )
     if vault_id:
         headers["VGS-Tenant"] = vault_id
 

vgscli/cli/__init__.py

@@ -5,13 +5,17 @@ from vgs.sdk.vault_mgmt import VaultMgmtAPI
 from vgscli.auth import handshake, token_util
 from vgscli.calm_api import create_api as create_calm_api_client
 from vgscli.collect_forms_api import create_api as create_collect_forms_api_client
+from vgscli.errors import VaultNotFoundError
 from vgscli.notifications import resolve_organization
 from vgscli.notifications_api import create_api as create_notifications_api_client
 from vgscli.payment_accounts_api import create_api as create_payment_accounts_api_client
+from vgscli.telemetry import apply_request_headers
 from vgscli.tenant_provisioning_api import (
     create_api as create_tenant_provisioning_api_client,
 )
 
+ROUTES_API_TIMEOUT_SECONDS = 50
+
 
 def create_account_mgmt_api(ctx: click.Context) -> AccountMgmtAPI:
     environment = ctx.obj.env
@@ -19,7 +23,7 @@ def create_account_mgmt_api(ctx: click.Context) -> AccountMgmtAPI:
     handshake(ctx, environment)
     access_token = token_util.get_access_token()
 
-    return AccountMgmtAPI(access_token, environment)
+    return apply_request_headers(AccountMgmtAPI(access_token, environment))
 
 
 def create_vault_mgmt_api(ctx: click.Context, root_url: str) -> VaultMgmtAPI:
@@ -28,7 +32,28 @@ def create_vault_mgmt_api(ctx: click.Context, root_url: str) -> VaultMgmtAPI:
     handshake(ctx, environment)
     access_token = token_util.get_access_token()
 
-    return VaultMgmtAPI(access_token, root_url)
+    return apply_request_headers(VaultMgmtAPI(access_token, root_url))
+
+
+def create_routes_api(
+    ctx: click.Context, vault_id: str, environment: str, access_token: str
+) -> VaultMgmtAPI:
+    """Resolve and create a routes API without losing CLI request headers."""
+    account_mgmt = apply_request_headers(AccountMgmtAPI(access_token, environment))
+    account_mgmt.timeout = ROUTES_API_TIMEOUT_SECONDS
+    account_mgmt.vaults.timeout = ROUTES_API_TIMEOUT_SECONDS
+    response = account_mgmt.vaults.get_by_id(vault_id)
+    try:
+        root_url = response.body["data"][0]["links"]["vault_management_api"]
+    except (KeyError, IndexError, TypeError):
+        raise VaultNotFoundError(vault_id, ctx)
+
+    api = apply_request_headers(VaultMgmtAPI(access_token, root_url))
+    api.timeout = ROUTES_API_TIMEOUT_SECONDS
+    api.routes.timeout = ROUTES_API_TIMEOUT_SECONDS
+    api.vaults.timeout = ROUTES_API_TIMEOUT_SECONDS
+    api.headers["VGS-Tenant"] = vault_id
+    return api
 
 
 def create_collect_forms_api(ctx: click.Context, vault_id: str):
@@ -80,9 +105,11 @@ def create_notifications_api(ctx: click.Context, organization_id: str = None):
     access_token = token_util.get_access_token()
     organization_internal_id = None
     if organization_id:
-        account_mgmt = AccountMgmtAPI(access_token, environment)
+        account_mgmt = apply_request_headers(AccountMgmtAPI(access_token, environment))
         organization_internal_id = resolve_organization(account_mgmt, organization_id)
 
-    return create_notifications_api_client(
-        environment, access_token, organization_internal_id
+    return apply_request_headers(
+        create_notifications_api_client(
+            environment, access_token, organization_internal_id
+        )
     )

vgscli/cli/commands/apply.py

@@ -12,7 +12,6 @@ from click_plugins import with_plugins
 from simple_rest_client import exceptions
 from simple_rest_client.exceptions import ClientError
 from vgs.sdk.routes import dump_yaml, normalize
-from vgs.sdk.vaults_api import create_api as create_vaults_api
 
 from vgscli.auth import handshake, token_util
 from vgscli.cli import (
@@ -21,9 +20,9 @@ from vgscli.cli import (
     create_collect_forms_api,
     create_notifications_api,
     create_payment_accounts_api,
-    create_tenant_provisioning_api,
-    create_vault_mgmt_api,
 )
+from vgscli.cli import create_routes_api as create_vaults_api
+from vgscli.cli import create_tenant_provisioning_api, create_vault_mgmt_api
 from vgscli.cli.types import ResourceId, ResourceIdParamType
 from vgscli.cli_progress import Spinner
 from vgscli.cli_utils import (
@@ -58,6 +57,7 @@ from vgscli.notifications import (
     redact_notification_integration,
     validate_notification_configuration,
 )
+from vgscli.telemetry import TelemetryGroup, record_outcome, record_tenant_id
 from vgscli.tenant_creation import (
     TenantCreationStageError,
     TenantCreationState,
@@ -106,7 +106,7 @@ def _sync_route(route_data, vault_management_api, ctx=None):
 
 
 @with_plugins(iter_entry_points("vgs.apply.plugins"))
-@click.group("apply")
+@click.group("apply", cls=TelemetryGroup)
 def apply() -> None:
     """
     Create or update a VGS resource.
@@ -393,6 +393,7 @@ def _apply_tenant_data(
         attributes = response.body["data"]["attributes"]
 
         output_data["id"] = attributes["identifier"]
+        record_tenant_id(output_data["id"])
         output_data["credentials"] = {
             "username": attributes["credentials"]["key"],
             "password": attributes["credentials"]["secret"],
@@ -515,6 +516,8 @@ def apply_tenant(
                 state = existing_state
                 is_resuming = True
 
+    record_tenant_id(state.tenant_id)
+
     try:
         account_mgmt = create_account_mgmt_api(ctx)
         existing_tenant_name = None
@@ -562,13 +565,17 @@ def apply_tenant(
         raise TenantCreationError(
             error.stage, error.state_path, error.cause, ctx=ctx
         ) from None
+    finally:
+        record_tenant_id(state.tenant_id)
 
     if existing_tenant_name is not None:
+        record_outcome("already-exists")
         click.echo(
             f'Tenant "{existing_tenant_name}" already exists. No changes were made.'
         )
         return
 
+    record_outcome("resumed" if is_resuming else "created")
     _echo_tenant_creation_state(state, resolved_state_file)
 
 

vgscli/cli/commands/certificate.py

@@ -16,6 +16,7 @@ from vgscli.cert_manager_api import create_cert_manager_api
 from vgscli.cli_utils import dump_camelized_yaml
 from vgscli.click_extensions import tenant_option
 from vgscli.errors import handle_errors
+from vgscli.telemetry import TelemetryGroup
 
 logger = logging.getLogger(__name__)
 
@@ -314,7 +315,7 @@ def _read_certificate_as_pem(cert_file: str) -> str:
     return _der_to_pem_certificate(data)
 
 
-@click.group("certificate")
+@click.group("certificate", cls=TelemetryGroup)
 def certificate() -> None:
     """Manage certificates."""
 

vgscli/cli/commands/delete.py

@@ -1,6 +1,5 @@
 import click
 from click_plugins import with_plugins
-from vgs.sdk.vaults_api import create_api as create_vaults_api
 
 from vgscli.auth import handshake, token_util
 from vgscli.cli import (
@@ -8,15 +7,17 @@ from vgscli.cli import (
     create_collect_forms_api,
     create_notifications_api,
 )
+from vgscli.cli import create_routes_api as create_vaults_api
 from vgscli.cli.types import ResourceId, ResourceIdParamType
 from vgscli.cli_utils import iter_entry_points
 from vgscli.click_extensions import tenant_option
 from vgscli.collect_forms import validate_collect_form_identifier
 from vgscli.errors import handle_errors
+from vgscli.telemetry import TelemetryGroup
 
 
 @with_plugins(iter_entry_points("vgs.delete.plugins"))
-@click.group("delete")
+@click.group("delete", cls=TelemetryGroup)
 def delete():
     """
     Delete VGS resource.
@@ -95,7 +96,7 @@ def delete_route(ctx, vault, route_id, confirm: bool):
     vaults_api = create_vaults_api(
         ctx, vault, ctx.obj.env, token_util.get_access_token()
     )
-    vaults_api.routes.delete(route_id)
+    vaults_api.routes.destroy(route_id)
 
     click.secho(f"Route {route_id} deleted successfully", fg="green")
 

vgscli/cli/commands/generate.py

@@ -14,10 +14,11 @@ from vgscli.click_extensions import (
     tenant_selection_option,
 )
 from vgscli.errors import handle_errors
+from vgscli.telemetry import TelemetryGroup
 
 
 @with_plugins(iter_entry_points("vgs.generate.plugins"))
-@click.group("generate")
+@click.group("generate", cls=TelemetryGroup)
 def generate() -> None:
     """
     Output a VGS resource template. Edited templates can be applied with a

vgscli/cli/commands/get.py

@@ -4,7 +4,6 @@ from click_plugins import with_plugins
 from simple_rest_client.exceptions import ClientError, ServerError
 from vgs.sdk.routes import dump_all_routes, normalize
 from vgs.sdk.serializers import yaml  # this one correctly outputs blocks
-from vgs.sdk.vaults_api import create_api as create_vault_mgmt_api_routes
 
 from vgscli.auth import handshake, token_util
 from vgscli.cli import (
@@ -13,9 +12,9 @@ from vgscli.cli import (
     create_collect_forms_api,
     create_notifications_api,
     create_payment_accounts_api,
-    create_tenant_provisioning_api,
-    create_vault_mgmt_api,
 )
+from vgscli.cli import create_routes_api as create_vault_mgmt_api_routes
+from vgscli.cli import create_tenant_provisioning_api, create_vault_mgmt_api
 from vgscli.cli.types import ResourceId, ResourceIdParamType
 from vgscli.cli_utils import dump_camelized_yaml, iter_entry_points
 from vgscli.click_extensions import (
@@ -33,12 +32,13 @@ from vgscli.notifications import (
     enrich_notification_events,
     redact_notification_integrations,
 )
+from vgscli.telemetry import TelemetryGroup
 
 from .apply import wrap_in_http_envelope
 
 
 @with_plugins(iter_entry_points("vgs.get.plugins"))
-@click.group("get")
+@click.group("get", cls=TelemetryGroup)
 def get() -> None:
     """
     Get VGS resource.

vgscli/collect_forms_api.py

@@ -1,7 +1,7 @@
 from simple_rest_client.api import API
 from simple_rest_client.resource import Resource
 
-from vgscli._version import __version__
+from vgscli.telemetry import request_headers
 
 COLLECT_FORMS_URLS = {
     "dev": "https://dashboard-service.apps.verygoodsecurity.io",
@@ -23,13 +23,14 @@ def create_api(vault_id, environment, token):
     api = API(
         api_root_url=COLLECT_FORMS_URLS[environment],
         params={},
-        headers={
-            "Accept": "application/json",
-            "Content-Type": "application/json",
-            "User-Agent": f"VGS CLI {__version__}",
-            "Authorization": f"Bearer {token}",
-            "vgs-vault": vault_id,
-        },
+        headers=request_headers(
+            {
+                "Accept": "application/json",
+                "Content-Type": "application/json",
+                "Authorization": f"Bearer {token}",
+                "vgs-vault": vault_id,
+            }
+        ),
         timeout=30,
         append_slash=False,
         json_encode_body=True,