vgs-cli 1.30.2.dev9__tar.gz → 1.30.3.dev1__tar.gz

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

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

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

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

{vgs-cli-1.30.2.dev9 → vgs-cli-1.30.3.dev1}/vgs_cli.egg-info/SOURCES.txt

@@ -39,6 +39,8 @@ vgscli/cli/commands/get.py
 vgscli/cli/types/__init__.py
 vgscli/cli/types/resource_id.py
 vgscli/cli/types/variable.py
+vgscli/resource-templates/http-route-template.yaml
+vgscli/resource-templates/mft-route-template.yaml
 vgscli/resource-templates/vault-template.yaml
 vgscli/resource-templates/service-account/calm.yaml
 vgscli/resource-templates/service-account/checkout.yaml

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

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

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

@@ -1,4 +1,3 @@
-import json
 import logging
 import time
 from typing import Optional
@@ -192,18 +191,28 @@ def sync_http_route(payload, ctx, vault_id):
     route_id = payload["spec"]["id"]
     try:
         # api expects it to be wrapped in data attribute
-        result = vault_management_api.routes.update(
+        response = vault_management_api.routes.update(
             route_id, body={"data": payload["spec"]}
         )
-        logger.debug(result)
-        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"]])
         raise RouteNotValidError(error_msg)
-    return result
+    logger.debug(response)
+    payload = normalize_one(response.body["data"])
+    payload = wrap_in_http_envelope(payload)
+    click.echo(f"Route {route_id} processed")
+    return payload
+
+
+def wrap_in_http_envelope(payload):
+    # TODO: this either needs to come from the API or we should add support for versioning in the client (yuk)
+    envelope = {
+        "apiVersion": "vault.vgs.io/v1",
+        "kind": "HttpRoute",
+        "metadata": {"name": payload["id"]},
+        "spec": payload,
+    }
+    return envelope
 
 
 def sync_mft_route(payload, ctx, vault_id):
@@ -262,6 +271,5 @@ def all_vault_resources(
             response_payload = HANDLERS[(resource["apiVersion"], resource["kind"])](
                 resource, ctx, vault
             )
-            print(f'got {response_payload}')
-            # if response_payload:
-            #     print(dump_yaml(response_payload))
+            if response_payload:
+                print(dump_yaml(response_payload))

{vgs-cli-1.30.2.dev9 → vgs-cli-1.30.3.dev1}/vgscli/cli/commands/generate.py

@@ -1,10 +1,9 @@
 import click
 from click_plugins import with_plugins
 from pkg_resources import iter_entry_points
-
 from vgscli.cli import create_account_mgmt_api, create_vault_mgmt_api
-from vgscli.errors import handle_errors
 from vgscli.cli_utils import dump_camelized_yaml, read_file
+from vgscli.errors import handle_errors
 
 
 @with_plugins(iter_entry_points("vgs.generate.plugins"))
@@ -53,3 +52,21 @@ def generate_access_credentials(ctx, vault):
             }
         )
     )
+
+
+@generate.command("http-route")
+@handle_errors()
+def generate_route():
+    """
+    Generate a VGS HTTP Route
+    """
+    click.echo(read_file("resource-templates/http-route-template.yaml"), nl=False)
+
+
+@generate.command("mft-route")
+@handle_errors()
+def generate_route():
+    """
+    Generate a VGS MFT Route
+    """
+    click.echo(read_file("resource-templates/mft-route-template.yaml"), nl=False)

{vgs-cli-1.30.2.dev9 → vgs-cli-1.30.3.dev1}/vgscli/cli/commands/get.py

@@ -1,13 +1,18 @@
 import click
+import yaml
 from click_plugins import with_plugins
 from pkg_resources import iter_entry_points
-
 from simple_rest_client.exceptions import ClientError, ServerError
-
+from vgscli.auth import handshake, token_util
 from vgscli.cli import create_account_mgmt_api, create_vault_mgmt_api
 from vgscli.cli.types import ResourceId, ResourceIdParamType
-from vgscli.errors import handle_errors, ServiceClientListingError
 from vgscli.cli_utils import dump_camelized_yaml
+from vgscli.errors import ServiceClientListingError, handle_errors
+
+from vgs.sdk.routes import normalize
+from vgs.sdk.vaults_api import create_api as create_vault_mgmt_api
+
+from .apply import wrap_in_http_envelope
 
 
 @with_plugins(iter_entry_points("vgs.get.plugins"))
@@ -130,3 +135,27 @@ def get_vaults(ctx):
             }
         )
     )
+
+
+@get.command("http-routes")
+@click.option("--vault", "-V", help="Vault ID", required=True)
+@click.pass_context
+@handle_errors()
+def get_vaults(ctx, vault):
+    """
+    Get vaults
+    """
+
+    handshake(ctx, ctx.obj.env)
+
+    vault_management_api = create_vault_mgmt_api(
+        ctx, vault, ctx.obj.env, token_util.get_access_token()
+    )
+
+    response = vault_management_api.routes.list()
+    routes = normalize(response.body["data"])
+
+    # for each route, wrap in envelope and return
+    wrapped = [wrap_in_http_envelope(route) for route in routes]
+
+    click.echo(yaml.dump_all(wrapped, indent=2, default_flow_style=False))

vgs-cli-1.30.3.dev1/vgscli/resource-templates/http-route-template.yaml

@@ -0,0 +1,61 @@
+apiVersion: vault.vgs.io/v1
+kind: HttpRoute
+metadata:
+  name: your-name-here
+  labels:
+    vgs.io/vaultId: your-vault-id-here
+spec:
+  # TODO: Change this ID
+  id: &routeId 7478d3b7-beef-cafe-0000-000000000000
+  type: rule_chain
+  attributes:
+    id: *routeId
+    host_endpoint: httpbin.org
+    destination_override_endpoint: '*'
+    ordinal: 0
+    port: 0
+    protocol: http
+    source_endpoint: '*'
+    tags:
+      # TODO: add a good name
+      name: Display name of route here
+      # TODO: add version here
+      vgs.io/version: 0.1.0
+    # filters
+    entries:
+      # first filter - document here what it does
+      - classifiers: {}
+        config:
+          condition: OR
+          rules:
+            - expression:
+                field: PathInfo
+                operator: matches
+                type: string
+                values:
+                  - /post
+        id: 955834e8-beef-cafe-0000-000000000000
+        id_selector: null
+        operation: ENRICH
+        operations:
+          - name: github.com/verygoodsecurity/common/compute/larky/http/Process
+            parameters:
+              script: |
+                load('@stdlib//json', 'json')
+                load("@stdlib//builtins", "builtins")
+
+                load("@vgs//vault", "vault")
+
+                def process(input, ctx):
+                    # TODO: write your larky code here.
+
+                    return input
+        phase: REQUEST
+        public_token_generator: UUID
+        targets:
+          - body
+        token_manager: PERSISTENT
+        transformer: JSON_PATH
+        transformer_config:
+          - $.whatever_this_field_is_unused
+        transformer_config_map: null

vgs-cli-1.30.3.dev1/vgscli/resource-templates/mft-route-template.yaml

@@ -0,0 +1,10 @@
+---
+apiVersion: apps.vgs.io/v1beta
+kind: MftRoute
+metadata:
+  name: my-mft-route
+  id: foo
+spec:
+  source: foo
+  destination: bar
+  when: []

{vgs-cli-1.30.2.dev9 → vgs-cli-1.30.3.dev1}/vgscli/vgs.py

@@ -3,27 +3,27 @@ from typing import Optional
 
 import click
 from click_plugins import with_plugins
-from pkg_resources import iter_entry_points
 from jinja2 import Environment, PackageLoader, StrictUndefined, UndefinedError
+from pkg_resources import iter_entry_points
 from simple_rest_client.exceptions import ClientError
-
-from vgs.sdk.accounts_api import create_api as create_accounts_api
-from vgs.sdk.routes import dump_all_routes, sync_all_routes
-from vgs.sdk.serializers import wrap_records, format_logs
-from vgs.sdk.utils import resolve_env
-from vgs.sdk.vaults_api import create_api as create_vaults_api
-
 from vgscli import auth
 from vgscli._version import check_for_updates, version
-from vgscli.access_logs import prepare_filter, fetch_logs
-from vgscli.audits_api import create_api as create_audits_api, OperationLogsQueryConfig
+from vgscli.access_logs import fetch_logs, prepare_filter
+from vgscli.audits_api import OperationLogsQueryConfig
+from vgscli.audits_api import create_api as create_audits_api
 from vgscli.auth import client_credentials_login, handshake, token_util
-from vgscli.click_extensions import Config, DateTimeDuration
+from vgscli.cli.commands import apply, generate, get
+from vgscli.cli.types import Variable, VariableParamType
 from vgscli.cli_utils import format_org_id
+from vgscli.click_extensions import Config, DateTimeDuration
 from vgscli.config_file import configuration_option
-from vgscli.cli.commands import apply, generate, get
-from vgscli.cli.types import VariableParamType, Variable
-from vgscli.errors import handle_errors, ServiceClientDeletionError
+from vgscli.errors import ServiceClientDeletionError, handle_errors
+
+from vgs.sdk.accounts_api import create_api as create_accounts_api
+from vgs.sdk.routes import dump_all_routes, sync_all_routes
+from vgs.sdk.serializers import format_logs, wrap_records
+from vgs.sdk.utils import resolve_env
+from vgs.sdk.vaults_api import create_api as create_vaults_api
 
 
 @with_plugins(iter_entry_points("vgs.plugins"))