vgs-cli 1.30.2.dev7__tar.gz → 1.30.2.dev9__tar.gz

{vgs-cli-1.30.2.dev7/vgs_cli.egg-info → vgs-cli-1.30.2.dev9}/PKG-INFO

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

{vgs-cli-1.30.2.dev7 → vgs-cli-1.30.2.dev9/vgs_cli.egg-info}/PKG-INFO

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

{vgs-cli-1.30.2.dev7 → vgs-cli-1.30.2.dev9}/vgscli/_version.py

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

{vgs-cli-1.30.2.dev7 → vgs-cli-1.30.2.dev9}/vgscli/cli/commands/apply.py

@@ -1,3 +1,4 @@
+import json
 import logging
 import time
 from typing import Optional
@@ -15,6 +16,7 @@ from vgscli.errors import ServiceClientCreationError, VgsCliError, handle_errors
 
 from vgs.sdk.errors import RouteNotValidError
 from vgs.sdk.routes import dump_yaml, normalize
+from vgs.sdk.serializers import Literal
 from vgs.sdk.vaults_api import create_api as create_vaults_api
 
 logger = logging.getLogger()
@@ -194,7 +196,9 @@ def sync_http_route(payload, ctx, vault_id):
             route_id, body={"data": payload["spec"]}
         )
         logger.debug(result)
-        result = normalize(result.body["data"])
+        print(result)
+        print(result.body)
+        result = normalize_one(json.loads(result.body)["data"])
         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"]])
@@ -207,6 +211,17 @@ def sync_mft_route(payload, ctx, vault_id):
     print(payload, ctx, vault_id)
 
 
+def normalize_one(route):
+    """
+    This method is extracted from `normalize` in the VGS SDK.
+    TODO: refactor and replace where it belongs.
+    """
+    for filter_item in route["attributes"]["entries"]:
+        if isinstance(filter_item["operations"], str):
+            filter_item["operations"] = Literal(filter_item["operations"])
+    return route
+
+
 HANDLERS = {
     ("vault.vgs.io/v1", "HttpRoute"): sync_http_route,
     ("apps.vgs.io/v1beta", "MftRoute"): sync_mft_route,