validio-cli 0.18.2__tar.gz → 0.20.0__tar.gz

{validio_cli-0.18.2 → validio_cli-0.20.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: validio-cli
-Version: 0.18.2
+Version: 0.20.0
 Summary: CLI tool to interact with the Validio platform
 Home-page: https://validio.io/
 License: Apache-2.0
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: camel-converter (>=3.0.0,<4.0.0)
-Requires-Dist: classdiff (==0.4.0)
+Requires-Dist: classdiff (>=0.5.0,<0.6.0)
 Requires-Dist: prompt-toolkit (>=3.0.38,<4.0.0)
 Requires-Dist: pydantic (==2.4.2)
 Requires-Dist: tabulate (>=0.9.0,<0.10.0)

{validio_cli-0.18.2 → validio_cli-0.20.0}/pyproject.toml

@@ -3,7 +3,7 @@ name = "validio-cli"
 # This version does not represent the released version or any tag. For each
 # release we automatically bump this before building and publishing so this
 # should be kept at 0.0.1dev1
-version = "0.18.2"
+version = "0.20.0"
 description = "CLI tool to interact with the Validio platform"
 authors = ["Validio <support@validio.io>"]
 license = "Apache-2.0"
@@ -15,7 +15,7 @@ readme = "README_PUBLIC.md"
 [tool.poetry.dependencies]
 python = "^3.10"
 camel-converter = "^3.0.0"
-classdiff = "0.4.0"
+classdiff = "^0.5.0"
 validio-sdk = "*"
 typer = { extras = ["all"], version = "^0.7.0" }
 prompt-toolkit = "^3.0.38"

{validio_cli-0.18.2 → validio_cli-0.20.0}/validio_cli/bin/entities/channels.py

@@ -39,7 +39,7 @@ async def get(
             )
         ]
     else:
-        channels = await vc.get_channels(  # type: ignore
+        channels = await vc.list_channels(  # type: ignore
             filter=ResourceFilter(namespace_id=ns)
         )
 

{validio_cli-0.18.2 → validio_cli-0.20.0}/validio_cli/bin/entities/code.py

@@ -21,6 +21,9 @@ from validio_cli import AsyncTyper, ConfigDir, Namespace, get_client_and_config
 from validio_cli.bin.entities.resources import do_move
 from validio_cli.components import proceed_with_operation
 
+"""Maximum number of deprecation warnings to show."""
+MAX_DEPRECATIONS_TO_SHOW = 20
+
 app = AsyncTyper(help="Plan or apply your configuration")
 
 
@@ -40,7 +43,7 @@ directory_option = typer.Option(
     ),
 )
 
-no_capture_option: bool = typer.Option(
+no_capture_option = typer.Option(
     False,
     help=(
         "By default, the code program's stdout output is hidden; "
@@ -92,6 +95,16 @@ update_all_schemas_option = typer.Option(
     ),
 )
 
+target_option = typer.Option(
+    [],
+    help=(
+        "[red][bold]BETA[/bold][/red] "
+        "Only target selected resources and ignore changes for others."
+        "Format is '<type>:<name>', e.g. 'source:my-bq-source' or "
+        "'window:my-global-window'"
+    ),
+)
+
 
 @app.command(help="Initialize a new IaC project")
 def init(
@@ -120,6 +133,7 @@ async def plan(
     destroy: bool = destroy_option,
     show_secrets: bool = show_secrets_option,
     color: bool = color_option,
+    target: list[str] = target_option,
 ) -> None:
     dir_path = directory_or_default(directory)
     client, _ = await get_client_and_config(config_dir)
@@ -140,6 +154,7 @@ async def plan(
         show_schema=show_schema,
         diff_output=diff_output,
         show_secrets=show_secrets,
+        targets=set(target),
     )
 
 
@@ -158,6 +173,7 @@ async def apply(
     destroy: bool = destroy_option,
     show_secrets: bool = show_secrets_option,
     color: bool = color_option,
+    target: list[str] = target_option,
 ) -> None:
     dir_path = directory_or_default(directory)
     client, _ = await get_client_and_config(config_dir)
@@ -178,6 +194,7 @@ async def apply(
         show_schema=show_schema,
         diff_output=diff_output,
         show_secrets=show_secrets,
+        targets=set(target),
     )
 
     if diff.num_operations() == 0:
@@ -306,8 +323,9 @@ async def _plan(
     diff_output: DiffOutput = DiffOutput.FULL,
     show_secrets: bool = False,
     show_diff: bool = True,
+    targets: set[str] = set(),
 ) -> tuple[GraphDiff, DiffContext]:
-    (diff, manifest_ctx) = await code_plan.plan(
+    plan_result = await code_plan.plan(
         namespace=namespace,
         client=client,
         directory=directory,
@@ -315,8 +333,11 @@ async def _plan(
         destroy=destroy,
         no_capture=no_capture,
         show_secrets=show_secrets,
+        targets=_create_resource_names(targets),
     )
 
+    diff, manifest_ctx = plan_result.graph_diff, plan_result.diff_context
+
     if show_diff:
         if diff.num_operations() == 0:
             _print_no_changes()
@@ -328,6 +349,7 @@ async def _plan(
             show_secrets=show_secrets,
             escape=sys.stdout.isatty() and color,
             diff_output=diff_output,
+            deprecations=plan_result.deprecations,
         )
 
     return diff, manifest_ctx
@@ -339,6 +361,7 @@ def _show_resources_diff(
     show_secrets: bool,
     escape: bool,
     diff_output: DiffOutput,
+    deprecations: list[code_plan.ResourceDeprecation],
 ) -> None:
     resource_types = DiffContext.fields()
     if diff.num_creates() > 0:
@@ -371,6 +394,8 @@ def _show_resources_diff(
                 diff_output=diff_output,
             )
 
+    _show_deprecations(deprecations)
+
     print(
         "\n"
         f"Plan: {diff.num_creates()} to create, {diff.num_updates()} to update, "
@@ -481,6 +506,25 @@ def _diff_field_rewrites(show_schema: bool) -> dict[str, Any]:
     return {} if show_schema else {"jtd_schema": "[NOT SHOWN]"}
 
 
+def _show_deprecations(deprecations: list[code_plan.ResourceDeprecation]) -> None:
+    if not deprecations:
+        return
+
+    title = "⚠️ NOTICE"
+    footer = ""
+
+    if len(deprecations) > MAX_DEPRECATIONS_TO_SHOW:
+        footer = f"And {len(deprecations) - MAX_DEPRECATIONS_TO_SHOW} more...\n"
+        deprecations = deprecations[:MAX_DEPRECATIONS_TO_SHOW]
+
+    print()
+    print(f"\033[93m{title}\033[0m")  # Make the text yellow
+    for i, message in enumerate(sorted(deprecations)):
+        print(f"\033[93m{i+1:>2}. {message}\033[0m")
+
+    print(footer, end="")
+
+
 def create_source_schema_reinference(
     schemas_to_update: list[str], update_all_schemas: bool
 ) -> SourceSchemaReinference:
@@ -493,6 +537,31 @@ def create_source_schema_reinference(
     return SourceSchemaReinference(set(source_names) if source_names else None)
 
 
+def _create_resource_names(strings: set[str]) -> code_plan.ResourceNames:
+    """Construct object from a set of strings.
+
+    Strings in format <resource_type>:<resource_name> will be converted by
+    splitting on `:` and parsing the values.
+    """
+    resource_names = code_plan.ResourceNames()
+
+    for target in strings:
+        # A resource name can't contain `:` so it's safe to split like this.
+        resource_type, name = target.split(":")
+
+        # User specifies resources in singular (credential) but the class fields
+        # throughout the code uses plural so we add an 's'
+        resource_type = f"{resource_type}s"
+
+        if not hasattr(resource_names, resource_type):
+            raise ValidioError(f"Invalid resource type '{resource_type}'")
+
+        v = getattr(resource_names, resource_type)
+        v.add(name)
+
+    return resource_names
+
+
 def _print_no_changes() -> None:
     print("No changes. The configuration is up-to-date!")
 

{validio_cli-0.18.2 → validio_cli-0.20.0}/validio_cli/bin/entities/config.py

@@ -110,9 +110,11 @@ def get(
         "default_namespace": validio_config.default_namespace,
         "endpoint": validio_config.endpoint,
         "access_key": validio_config.access_key,
-        "access_secret": validio_config._access_secret
-        if show_secrets
-        else validio_config.access_secret,
+        "access_secret": (
+            validio_config._access_secret
+            if show_secrets
+            else validio_config.access_secret
+        ),
     }
 
     if output_format == OutputFormat.JSON:
@@ -180,7 +182,7 @@ async def _test_configuration(config: ValidioConfig) -> str | None:
 
     try:
         # NOTE: Do we need an explicit ping command here?
-        await vc.get_users()
+        await vc.list_users()
     except UnauthorizedError:
         return "Unauthorized"
     except httpx.ConnectError:

{validio_cli-0.18.2 → validio_cli-0.20.0}/validio_cli/bin/entities/notification_rules.py

@@ -39,7 +39,7 @@ async def get(
             )
         ]
     else:
-        notification_rules = await vc.get_notification_rules(  # type: ignore
+        notification_rules = await vc.list_notification_rules(  # type: ignore
             filter=ResourceFilter(namespace_id=get_namespace(namespace, cfg))
         )
 

{validio_cli-0.18.2 → validio_cli-0.20.0}/validio_cli/bin/entities/users.py

@@ -34,7 +34,7 @@ async def get(
             )
         ]
     else:
-        users = await vc.get_users()
+        users = await vc.list_users()
 
     if output_format == OutputFormat.JSON:
         return output_json(users, identifier)