vgs-cli 1.36.0.dev1__py3-none-any.whl → 1.36.0.dev2__py3-none-any.whl

{vgs_cli-1.36.0.dev1.dist-info → vgs_cli-1.36.0.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vgs-cli
-Version: 1.36.0.dev1
+Version: 1.36.0.dev2
 Summary: VGS Client
 Home-page: https://github.com/verygoodsecurity/vgs-cli
 Author: Very Good Security

{vgs_cli-1.36.0.dev1.dist-info → vgs_cli-1.36.0.dev2.dist-info}/RECORD

@@ -1,26 +1,26 @@
-vgs_cli-1.36.0.dev1.data/data/vgscli/collect-form-api-schema.yaml,sha256=THuJbLUo7LOr0c1JUo3FPJEc9Jvde59K4JjdlkVF3hw,1246
-vgs_cli-1.36.0.dev1.data/data/vgscli/collect-form-schema.yaml,sha256=vHAN6_Gsg14CeSL41sHEQgboYF-CHF2RaNw72aJ3W8o,1337
-vgs_cli-1.36.0.dev1.data/data/vgscli/console-route-schema.yaml,sha256=hKME9kKILXFWkf-zwbAAWwMoXZWnzFHG37_51SqPKKw,1305
-vgs_cli-1.36.0.dev1.data/data/vgscli/credentials-admin.yaml,sha256=acyLd54Cp7l2fpugfjVfYh07-MIE0BX-JVq4lHraE1s,869
-vgs_cli-1.36.0.dev1.data/data/vgscli/form-template.yaml,sha256=pY4gOd8jXJRohcpJYijBt4m5cPyHvEVlCBtHgs2AL8M,927
-vgs_cli-1.36.0.dev1.data/data/vgscli/http-route-template.yaml,sha256=vGHvBXA_6pwFtH1vVRWKiwxb4sahzuLvpqGAlavrStc,1085
-vgs_cli-1.36.0.dev1.data/data/vgscli/notification-integration-schema.yaml,sha256=1qHzS5ZxlhTdrDab6-qJhszwu7cpith2HleX3uAO_4E,1837
-vgs_cli-1.36.0.dev1.data/data/vgscli/notification-template.yaml,sha256=hr36msbrgiTjWligLHVDHMmO49QDzjTwBSLYoBw3WQE,1288
-vgs_cli-1.36.0.dev1.data/data/vgscli/public-credential-collect.yaml,sha256=CiorC-6TMx7M0TI8DHmoRSfVKDpOom2wIr_ilwmHQNA,696
-vgs_cli-1.36.0.dev1.data/data/vgscli/read-credentials-no-pci.yaml,sha256=_kWRne_ARh8v7A_jHG08gwgPG6NqZhrDRyq6L-ULs2M,769
-vgs_cli-1.36.0.dev1.data/data/vgscli/read-credentials-with-pci.yaml,sha256=jWXgFdcqZYisakAt9COM6cjf2-x_Q4eidDLaUh8CZOk,796
-vgs_cli-1.36.0.dev1.data/data/vgscli/service-account-schema.yaml,sha256=L1pjNXgnks15N1wNgf_1GmGcOvxn0nu49v7ersUjFno,1090
-vgs_cli-1.36.0.dev1.data/data/vgscli/sftp-route-template.yaml,sha256=zkT6lIVDgVyzLKgZ8QnyJJooy2egZk1cQthdjan_JrM,853
-vgs_cli-1.36.0.dev1.data/data/vgscli/tenant-schema.yaml,sha256=gBO7xVe2qXSymG0B_45hC11X5nm_jCCAH4Yjs-sbC8g,1457
-vgs_cli-1.36.0.dev1.data/data/vgscli/tenant-template.yaml,sha256=F0wIBkC2dFJUNeJet-FzPX3qrLMHcGIaJvhsDzzAOCc,765
-vgs_cli-1.36.0.dev1.data/data/vgscli/theme.tcss,sha256=01k7tUJrLaAxfdkFGvlh20JrUCaFE3IZOJU1Wxmr4io,7523
-vgs_cli-1.36.0.dev1.data/data/vgscli/vault-resources.yaml,sha256=95CCxQher3MBQq96bvjZviNgo1rgv_NhCtI8X-oxIpA,26335
-vgs_cli-1.36.0.dev1.data/data/vgscli/vault-schema.yaml,sha256=a-wW7X8RyHr-669wtOZrlxlIfeQVtx8EUfA-3vpYytk,637
-vgs_cli-1.36.0.dev1.data/data/vgscli/vault-template.yaml,sha256=IlDisL3H5LXUDMkhUaouKMarRdu0-pJxpTz8ij_lp_M,383
-vgs_cli-1.36.0.dev1.data/data/vgscli/vgs-cli.yaml,sha256=5gCjjloyepaKI6zZfDLeUEWxuRExI-dGJI9RO3omP2k,484
-vgs_cli-1.36.0.dev1.dist-info/licenses/LICENSE,sha256=NwSyzgDYdzv6O2ns2C6UODGI8LN1VnVe_FPTnWS4eXY,1082
+vgs_cli-1.36.0.dev2.data/data/vgscli/collect-form-api-schema.yaml,sha256=THuJbLUo7LOr0c1JUo3FPJEc9Jvde59K4JjdlkVF3hw,1246
+vgs_cli-1.36.0.dev2.data/data/vgscli/collect-form-schema.yaml,sha256=vHAN6_Gsg14CeSL41sHEQgboYF-CHF2RaNw72aJ3W8o,1337
+vgs_cli-1.36.0.dev2.data/data/vgscli/console-route-schema.yaml,sha256=hKME9kKILXFWkf-zwbAAWwMoXZWnzFHG37_51SqPKKw,1305
+vgs_cli-1.36.0.dev2.data/data/vgscli/credentials-admin.yaml,sha256=acyLd54Cp7l2fpugfjVfYh07-MIE0BX-JVq4lHraE1s,869
+vgs_cli-1.36.0.dev2.data/data/vgscli/form-template.yaml,sha256=pY4gOd8jXJRohcpJYijBt4m5cPyHvEVlCBtHgs2AL8M,927
+vgs_cli-1.36.0.dev2.data/data/vgscli/http-route-template.yaml,sha256=vGHvBXA_6pwFtH1vVRWKiwxb4sahzuLvpqGAlavrStc,1085
+vgs_cli-1.36.0.dev2.data/data/vgscli/notification-integration-schema.yaml,sha256=1qHzS5ZxlhTdrDab6-qJhszwu7cpith2HleX3uAO_4E,1837
+vgs_cli-1.36.0.dev2.data/data/vgscli/notification-template.yaml,sha256=hr36msbrgiTjWligLHVDHMmO49QDzjTwBSLYoBw3WQE,1288
+vgs_cli-1.36.0.dev2.data/data/vgscli/public-credential-collect.yaml,sha256=CiorC-6TMx7M0TI8DHmoRSfVKDpOom2wIr_ilwmHQNA,696
+vgs_cli-1.36.0.dev2.data/data/vgscli/read-credentials-no-pci.yaml,sha256=_kWRne_ARh8v7A_jHG08gwgPG6NqZhrDRyq6L-ULs2M,769
+vgs_cli-1.36.0.dev2.data/data/vgscli/read-credentials-with-pci.yaml,sha256=jWXgFdcqZYisakAt9COM6cjf2-x_Q4eidDLaUh8CZOk,796
+vgs_cli-1.36.0.dev2.data/data/vgscli/service-account-schema.yaml,sha256=L1pjNXgnks15N1wNgf_1GmGcOvxn0nu49v7ersUjFno,1090
+vgs_cli-1.36.0.dev2.data/data/vgscli/sftp-route-template.yaml,sha256=zkT6lIVDgVyzLKgZ8QnyJJooy2egZk1cQthdjan_JrM,853
+vgs_cli-1.36.0.dev2.data/data/vgscli/tenant-schema.yaml,sha256=gBO7xVe2qXSymG0B_45hC11X5nm_jCCAH4Yjs-sbC8g,1457
+vgs_cli-1.36.0.dev2.data/data/vgscli/tenant-template.yaml,sha256=F0wIBkC2dFJUNeJet-FzPX3qrLMHcGIaJvhsDzzAOCc,765
+vgs_cli-1.36.0.dev2.data/data/vgscli/theme.tcss,sha256=01k7tUJrLaAxfdkFGvlh20JrUCaFE3IZOJU1Wxmr4io,7523
+vgs_cli-1.36.0.dev2.data/data/vgscli/vault-resources.yaml,sha256=95CCxQher3MBQq96bvjZviNgo1rgv_NhCtI8X-oxIpA,26335
+vgs_cli-1.36.0.dev2.data/data/vgscli/vault-schema.yaml,sha256=a-wW7X8RyHr-669wtOZrlxlIfeQVtx8EUfA-3vpYytk,637
+vgs_cli-1.36.0.dev2.data/data/vgscli/vault-template.yaml,sha256=IlDisL3H5LXUDMkhUaouKMarRdu0-pJxpTz8ij_lp_M,383
+vgs_cli-1.36.0.dev2.data/data/vgscli/vgs-cli.yaml,sha256=5gCjjloyepaKI6zZfDLeUEWxuRExI-dGJI9RO3omP2k,484
+vgs_cli-1.36.0.dev2.dist-info/licenses/LICENSE,sha256=NwSyzgDYdzv6O2ns2C6UODGI8LN1VnVe_FPTnWS4eXY,1082
 vgscli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vgscli/_version.py,sha256=118bShYZRJrdvJYjFIJrDHFbdZrCR4YN8XGRrFHr-R0,1681
+vgscli/_version.py,sha256=lf6GJiUCDciREhi6VBPysryXHiAF5NYv7g3PUPnROKE,1681
 vgscli/access_logs.py,sha256=G0GjlLjWiC-N6OzK6-RCvWddcVGQlLCLAcyO9pLWIOM,1928
 vgscli/audits_api.py,sha256=AaF5Go019TOerBlQzygwMeOxeW9vPPJPgxa95kttF-M,3215
 vgscli/auth.py,sha256=vdUZ12nqtefIuSHNmwCFvxoqwS3m6ZP5TqLZFNwKnSU,2104
@@ -37,7 +37,7 @@ vgscli/collect_forms_api.py,sha256=rORLu-jd5IMsiAoR7VkgIkpskWd9GfjZs6zeHKEoOPs,1
 vgscli/config_file.py,sha256=HB8lANU0qoO09Wnkf-QDzPh2qtrnFcqcetnCaQgtQ3U,1543
 vgscli/console_config.py,sha256=7gSMXarjlyczxBwkiS0jpFrfbU8pbJSD7VaHnjgy1Mw,1522
 vgscli/diagnostics.py,sha256=iWKFr_jNQSZt4H1CnoecNo7-wNjSNpzXV2nRyhDm9es,1385
-vgscli/errors.py,sha256=ckEDgedNCp9ITAw9_RAZIfx5cZ0mtbdsqEAqvAMw6y8,12614
+vgscli/errors.py,sha256=1ppwh_AAvvEDIH_J7IZKecjsO_RDsOaaqdu7juEv6ps,12711
 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
@@ -53,7 +53,7 @@ vgscli/tenant_provisioning_api.py,sha256=-mQcSECgWG23LKczu1B9J1d7Bb6ZA6lkpr9RegJ
 vgscli/testing.py,sha256=MLrsvy3mEwvjtqyuG0UjwEX-rDkbWUo52aXvu2H2sTk,1437
 vgscli/text.py,sha256=c2d1As7awq8PlEF9NiI6JrjsYYousj9YT0o1xOQ2MQM,172
 vgscli/token_handler.py,sha256=qTshP4i8Rdhpgk9YUu0i5YAqYiRK3PsZCZAtPVc9BUU,239
-vgscli/vgs.py,sha256=kSxMYn0SRh7MJ6E0YxaTHGqWW95Adqnq0w16zzCQ7gk,7338
+vgscli/vgs.py,sha256=pciuwbJGV0i-4HhpirTfyqa8JTdM12Zrcm8ulHD-kN0,7395
 vgscli/cli/__init__.py,sha256=da9LPKYdnal26ntEP22PNn-dZYBbsNkP7tzOwzD6kY4,3915
 vgscli/cli/commands/__init__.py,sha256=8ptc9-Vzdx0HU3ZeMcKERYjmJyuB5IMjBSF3Igx5yQ4,206
 vgscli/cli/commands/apply.py,sha256=_BKC1cRLbDGF1T05UEnqTGLKllfGYY6Piw6qr0YJYTU,26193
@@ -67,7 +67,7 @@ vgscli/cli/types/variable.py,sha256=IVcszPoWmTjeo_evDsLN06LuUZGTLL-wcZCVfBNBP8I,
 vgscli/console/__init__.py,sha256=X48mjIkHuvVqtCrsN4vJ7CubJrL4xAE678jm1AFSm1o,44
 vgscli/console/app.py,sha256=z01FLQd6JWsoIF5ePynBKsq00RonslDO3PktMLF2WBw,90717
 vgscli/console/auth.py,sha256=xp2JmXgQGpa3sCrF49qA3tWvOrd-RvWVjkrOzCvABRk,1246
-vgscli/console/backend.py,sha256=ma-pr9JmbWm9mPnrnQh1RWkg98euPi7GAi7WenUqykA,10549
+vgscli/console/backend.py,sha256=P_Oj72N6UDrI-YXZg9FSQp721tY11W4kObE4VzrgQW4,10904
 vgscli/console/bootstrap.py,sha256=TY5cz8zzEuSIEiocxitNBIGHQV_Ugdp2Z_6joSgtDP4,733
 vgscli/console/commands.py,sha256=0lunvZfyj--BUhGG78u1gNE63eQzxCZXckdVEI5MCk0,3864
 vgscli/console/context.py,sha256=TgDgsqt52pbSeLsTZ-VX6PHuQFJTSUSrl4y2I36tquk,1719
@@ -111,8 +111,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.36.0.dev1.dist-info/METADATA,sha256=S5tlW5YA7vMjWAybbJJ9akXBkpCTHzrbdvYF_ilnhy0,10681
-vgs_cli-1.36.0.dev1.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-vgs_cli-1.36.0.dev1.dist-info/entry_points.txt,sha256=wCWhRQiMX4Ja6kkqJlYr8LbuiywpmXyyRAZPsau-_RY,39
-vgs_cli-1.36.0.dev1.dist-info/top_level.txt,sha256=gabTxCWMkl80q6ha_m-hs_1wQMfGntZcv5DEmkl8JEw,7
-vgs_cli-1.36.0.dev1.dist-info/RECORD,,
+vgs_cli-1.36.0.dev2.dist-info/METADATA,sha256=vbDoPGhQ9Ef0L8QTvAClT3q6nGB_J5ly5YhpJVf1e4g,10681
+vgs_cli-1.36.0.dev2.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+vgs_cli-1.36.0.dev2.dist-info/entry_points.txt,sha256=wCWhRQiMX4Ja6kkqJlYr8LbuiywpmXyyRAZPsau-_RY,39
+vgs_cli-1.36.0.dev2.dist-info/top_level.txt,sha256=gabTxCWMkl80q6ha_m-hs_1wQMfGntZcv5DEmkl8JEw,7
+vgs_cli-1.36.0.dev2.dist-info/RECORD,,

vgscli/_version.py

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

vgscli/console/backend.py

@@ -44,6 +44,16 @@ from vgscli.tenant_creation import (
 )
 from vgscli.tenant_provisioning_api import create_api as create_provisioning_api
 
+ACCOUNT_API_TIMEOUT_SECONDS = 50
+
+
+def _create_account_api(token: str, environment: str) -> AccountMgmtAPI:
+    api = AccountMgmtAPI(token, environment)
+    api.timeout = ACCOUNT_API_TIMEOUT_SECONDS
+    for resource in (api.organizations, api.service_accounts, api.vaults):
+        resource.timeout = ACCOUNT_API_TIMEOUT_SECONDS
+    return api
+
 
 @dataclass
 class ConsoleBackend:
@@ -53,7 +63,7 @@ class ConsoleBackend:
     session_authenticator: Callable[[str], str] | None = field(default=None, repr=False)
 
     def __post_init__(self):
-        self.account_api = AccountMgmtAPI(self.token, self.environment)
+        self.account_api = _create_account_api(self.token, self.environment)
         self._tenant: Tenant | None = None
         self._routes_api = None
         self._forms_api = None
@@ -233,7 +243,7 @@ class ConsoleBackend:
             token = self.session_authenticator(self.token)
             if token != self.token:
                 self.token = token
-                self.account_api = AccountMgmtAPI(token, self.environment)
+                self.account_api = _create_account_api(token, self.environment)
                 self._routes_api = self._forms_api = self._audits_api = None
             return self.token
 

vgscli/errors.py

@@ -301,7 +301,11 @@ def handle_errors(**outer_kwargs):
                 return f(*args, **kwargs)
             except (Abort, Exit):
                 raise
-            except (exceptions.ClientError, exceptions.ServerError) as e:
+            except (
+                exceptions.ClientError,
+                exceptions.ServerError,
+                exceptions.ClientConnectionError,
+            ) as e:
                 ctx = args[0] if args and isinstance(args[0], Context) else None
                 if ctx:
                     status = getattr(getattr(e, "response", None), "status_code", None)

vgscli/vgs.py

@@ -16,6 +16,7 @@ from vgscli.cli.commands import apply, certificate, delete, generate, get
 from vgscli.cli_utils import iter_entry_points
 from vgscli.click_extensions import Config, DateTimeDuration, tenant_option
 from vgscli.config_file import configuration_option
+from vgscli.errors import handle_errors
 from vgscli.telemetry import TelemetryGroup, record_runtime
 
 
@@ -57,6 +58,7 @@ cli.add_command(certificate)
 )
 @click.pass_context
 @configuration_option(section="console")
+@handle_errors()
 def console(ctx, diagnostics):
     """Open the interactive SANDBOX VGS Console."""
     if os.environ.get("VGS_CLIENT_ID") or os.environ.get("VGS_CLIENT_SECRET"):