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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (51) hide show
  1. {vgs-cli-1.30.2.dev8/vgs_cli.egg-info → vgs-cli-1.30.2.dev9}/PKG-INFO +1 -1
  2. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9/vgs_cli.egg-info}/PKG-INFO +1 -1
  3. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/_version.py +1 -1
  4. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/cli/commands/apply.py +15 -1
  5. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/LICENSE +0 -0
  6. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/MANIFEST.in +0 -0
  7. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/README.md +0 -0
  8. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/requirements.txt +0 -0
  9. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/setup.cfg +0 -0
  10. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/setup.py +0 -0
  11. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/test-requirements.txt +0 -0
  12. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgs_cli.egg-info/SOURCES.txt +0 -0
  13. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgs_cli.egg-info/dependency_links.txt +0 -0
  14. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgs_cli.egg-info/entry_points.txt +0 -0
  15. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgs_cli.egg-info/not-zip-safe +0 -0
  16. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgs_cli.egg-info/requires.txt +0 -0
  17. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgs_cli.egg-info/top_level.txt +0 -0
  18. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/__init__.py +0 -0
  19. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/access_logs.py +0 -0
  20. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/audits_api.py +0 -0
  21. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/auth.py +0 -0
  22. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/auth_server.py +0 -0
  23. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/auth_utils.py +0 -0
  24. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/callback_server.py +0 -0
  25. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/cli/__init__.py +0 -0
  26. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/cli/commands/__init__.py +0 -0
  27. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/cli/commands/generate.py +0 -0
  28. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/cli/commands/get.py +0 -0
  29. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/cli/types/__init__.py +0 -0
  30. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/cli/types/resource_id.py +0 -0
  31. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/cli/types/variable.py +0 -0
  32. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/cli_utils.py +0 -0
  33. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/click_extensions.py +0 -0
  34. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/config_file.py +0 -0
  35. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/errors.py +0 -0
  36. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/file_token_util.py +0 -0
  37. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/id_generator.py +0 -0
  38. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/keyring_token_util.py +0 -0
  39. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/resource-templates/service-account/calm.yaml +0 -0
  40. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/resource-templates/service-account/checkout.yaml +0 -0
  41. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/resource-templates/service-account/payments-admin.yaml +0 -0
  42. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/resource-templates/service-account/sub-account-checkout.yaml +0 -0
  43. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/resource-templates/service-account/vgs-cli.yaml +0 -0
  44. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/resource-templates/vault-template.yaml +0 -0
  45. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/testing.py +0 -0
  46. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/text.py +0 -0
  47. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/token_handler.py +0 -0
  48. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/validation-schemas/service-account-schema.yaml +0 -0
  49. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/validation-schemas/vault-resources.yaml +0 -0
  50. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/validation-schemas/vault-schema.yaml +0 -0
  51. {vgs-cli-1.30.2.dev8 → vgs-cli-1.30.2.dev9}/vgscli/vgs.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: vgs-cli
3
- Version: 1.30.2.dev8
3
+ Version: 1.30.2.dev9
4
4
  Summary: VGS Client
5
5
  Home-page: https://github.com/verygoodsecurity/vgs-cli
6
6
  Author: Very Good Security
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: vgs-cli
3
- Version: 1.30.2.dev8
3
+ Version: 1.30.2.dev9
4
4
  Summary: VGS Client
5
5
  Home-page: https://github.com/verygoodsecurity/vgs-cli
6
6
  Author: Very Good Security
@@ -6,7 +6,7 @@ from semver import VersionInfo
6
6
 
7
7
  from vgscli.text import bold, green
8
8
 
9
- __version__ = "1.30.2.dev8"
9
+ __version__ = "1.30.2.dev9"
10
10
 
11
11
 
12
12
  # noinspection PyBroadException
@@ -1,3 +1,4 @@
1
+ import json
1
2
  import logging
2
3
  import time
3
4
  from typing import Optional
@@ -15,6 +16,7 @@ from vgscli.errors import ServiceClientCreationError, VgsCliError, handle_errors
15
16
 
16
17
  from vgs.sdk.errors import RouteNotValidError
17
18
  from vgs.sdk.routes import dump_yaml, normalize
19
+ from vgs.sdk.serializers import Literal
18
20
  from vgs.sdk.vaults_api import create_api as create_vaults_api
19
21
 
20
22
  logger = logging.getLogger()
@@ -195,7 +197,8 @@ def sync_http_route(payload, ctx, vault_id):
195
197
  )
196
198
  logger.debug(result)
197
199
  print(result)
198
- result = normalize(result.body["data"])
200
+ print(result.body)
201
+ result = normalize_one(json.loads(result.body)["data"])
199
202
  click.echo(f"Route {route_id} processed")
200
203
  except exceptions.ClientError as e:
201
204
  error_msg = "\n".join([error["detail"] for error in e.response.body["errors"]])
@@ -208,6 +211,17 @@ def sync_mft_route(payload, ctx, vault_id):
208
211
  print(payload, ctx, vault_id)
209
212
 
210
213
 
214
+ def normalize_one(route):
215
+ """
216
+ This method is extracted from `normalize` in the VGS SDK.
217
+ TODO: refactor and replace where it belongs.
218
+ """
219
+ for filter_item in route["attributes"]["entries"]:
220
+ if isinstance(filter_item["operations"], str):
221
+ filter_item["operations"] = Literal(filter_item["operations"])
222
+ return route
223
+
224
+
211
225
  HANDLERS = {
212
226
  ("vault.vgs.io/v1", "HttpRoute"): sync_http_route,
213
227
  ("apps.vgs.io/v1beta", "MftRoute"): sync_mft_route,
File without changes
File without changes
File without changes
File without changes
File without changes