vgs-cli 1.30.2.dev3__tar.gz → 1.30.2.dev4__tar.gz

{vgs-cli-1.30.2.dev3/vgs_cli.egg-info → vgs-cli-1.30.2.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vgs-cli
-Version: 1.30.2.dev3
+Version: 1.30.2.dev4
 Summary: VGS Client
 Home-page: https://github.com/verygoodsecurity/vgs-cli
 Author: Very Good Security

{vgs-cli-1.30.2.dev3 → vgs-cli-1.30.2.dev4}/requirements.txt

@@ -12,6 +12,6 @@ pyhumps
 semver>=3,<4
 termcolor>=2,<3
 Jinja2>=2.10
-vgs-api-client>=0.0.46,<1
+vgs-api-client>=0.0.48,<1
 async-timeout
 # cython>=3.0.5,<4

{vgs-cli-1.30.2.dev3 → vgs-cli-1.30.2.dev4/vgs_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vgs-cli
-Version: 1.30.2.dev3
+Version: 1.30.2.dev4
 Summary: VGS Client
 Home-page: https://github.com/verygoodsecurity/vgs-cli
 Author: Very Good Security

{vgs-cli-1.30.2.dev3 → vgs-cli-1.30.2.dev4}/vgs_cli.egg-info/requires.txt

@@ -10,5 +10,5 @@ pyhumps
 semver<4,>=3
 termcolor<3,>=2
 Jinja2>=2.10
-vgs-api-client<1,>=0.0.46
+vgs-api-client<1,>=0.0.48
 async-timeout

{vgs-cli-1.30.2.dev3 → vgs-cli-1.30.2.dev4}/vgscli/_version.py

@@ -6,7 +6,7 @@ from semver import VersionInfo
 
 from vgscli.text import bold, green
 
-__version__ = "1.30.2.dev3"
+__version__ = "1.30.2.dev4"
 
 
 # noinspection PyBroadException

{vgs-cli-1.30.2.dev3 → vgs-cli-1.30.2.dev4}/vgscli/cli/commands/apply.py

@@ -5,6 +5,7 @@ from typing import Optional
 import click
 from click_plugins import with_plugins
 from pkg_resources import iter_entry_points
+from simple_rest_client import exceptions
 from simple_rest_client.exceptions import ClientError
 from vgscli.auth import handshake, token_util
 from vgscli.cli import create_account_mgmt_api, create_vault_mgmt_api
@@ -12,11 +13,13 @@ from vgscli.cli.types import ResourceId, ResourceIdParamType
 from vgscli.cli_utils import dump_camelized_yaml, validate_multi_yaml, validate_yaml
 from vgscli.errors import ServiceClientCreationError, VgsCliError, handle_errors
 
-from vgs.sdk.routes import sync_all_routes
+from vgs.sdk.errors import RouteNotValidError
+from vgs.sdk.routes import dump_yaml, normalize
 from vgs.sdk.vaults_api import create_api as create_vaults_api
 
 logger = logging.getLogger()
 
+
 @with_plugins(iter_entry_points("vgs.apply.plugins"))
 @click.group("apply")
 def apply() -> None:
@@ -181,15 +184,18 @@ def apply_vault(ctx: click.Context, org_id: Optional[ResourceId], file) -> None:
 def sync_http_route(payload, ctx, vault_id):
     handshake(ctx, ctx.obj.env)
 
-    route_data = payload["spec"]
     vault_management_api = create_vaults_api(
         ctx, vault_id, ctx.obj.env, token_util.get_access_token()
     )
-    sync_all_routes(
-        vault_management_api,
-        route_data,
-        lambda route_id: click.echo(f"Route {route_id} processed"),
-    )
+    route_id = payload["spec"]["id"]
+    try:
+        result = vault_management_api.routes.update(route_id, body=payload["spec"])
+        result = normalize(result)
+        click.echo(f"Route {route_id} processed")
+    except exceptions.ClientError as e:
+        error_msg = "\n".join([error["detail"] for error in e.response.body["errors"]])
+        raise RouteNotValidError(error_msg)
+    return result
 
 
 def sync_mft_route(payload, ctx, vault_id):
@@ -221,8 +227,6 @@ def all_vault_resources(
     """
     Apply all vault resources (routes, preferences, certificates) to a single vault.
     """
-    # print(f"{vault} {file} uscker")
-    # print(file)
     parsed_resources = validate_multi_yaml(
         file, "validation-schemas/vault-resources.yaml"
     )
@@ -233,5 +237,10 @@ def all_vault_resources(
             )
         else:
             # for each resource find handler.
-            logger.info(f"Processing {resource['apiVersion']} {resource['kind']} {resource['metadata']['name']} to server")
-            HANDLERS[(resource["apiVersion"], resource["kind"])](resource, ctx, vault)
+            logger.info(
+                f"Processing {resource['apiVersion']} {resource['kind']} {resource['metadata']['name']} to server"
+            )
+            response_payload = HANDLERS[(resource["apiVersion"], resource["kind"])](
+                resource, ctx, vault
+            )
+            print(dump_yaml(response_payload))

{vgs-cli-1.30.2.dev3 → vgs-cli-1.30.2.dev4}/vgscli/cli_utils.py

@@ -51,24 +51,29 @@ def validate_multi_yaml(file_to_validate, path_to_schema):
         if not file:
             logger.debug("Skipping blank file")
             continue
-        valid = any(try_validate(file, schema) for schema in schemas)
-        if not valid:
+        failures = [
+            x for x in [fails_validation(file, schema) for schema in schemas] if x
+        ]
+        if len(failures) == len(schemas):
+            for failure in failures:
+                logger.exception(failure)
             raise SchemaValidationError(
                 f"Failed to validate {file['apiVersion']} {file['kind']} {file['metadata']['name']} against any known schema."
             )
-        logger.debug(f"Validated {valid}")
+        logger.debug(
+            f"Validated {file['apiVersion']} {file['kind']} {file['metadata']['name']}"
+        )
         yield file
 
 
-def try_validate(file, schema):
+def fails_validation(file, schema):
     logger.info(
         f"Validating version={file['apiVersion']} kind={file['kind']} name={file['metadata']['name']}\nagainst\n\t{schema}"
     )
     try:
         jsonschema.validate(file, schema)
-        return file["apiVersion"], file["kind"], file["metadata"]["name"]
     except jsonschema.exceptions.ValidationError as ex:
-        logger.exception(ex)
+        return ex
     return None