chore: Refactor role binding and unbinding logic; update role management manifests

- Changed the binding structure in `bind.py` to include `newBindings` and `oldBindings`.
- Updated the `unbind.py` to reflect the new binding structure.
- Modified the `model.py` to streamline role updates by removing unnecessary parameters.
- Cleaned up imports in `model.py` and `util.py`.
- Removed obsolete manifest files related to deployments, disks, networks, role bindings, user groups, and values.
- Added new package manifests for boundary testing and role management.
- Updated test cases to reflect changes in package and secret management.
- Removed redundant code in test files for better clarity and maintainability.

Author: guptadev21

.gitignore

@@ -61,4 +61,6 @@ Pipfile
 
 # Test configuration files (contains sensitive data)
 tests/.password
-scripts/*
+scripts/*
+.coverage
+Pipfile

riocli/apply/parse.py

@@ -13,20 +13,18 @@
 # limitations under the License.
 from __future__ import annotations
 
-from collections.abc import Callable, Iterable, Mapping
+import graphlib
+import json
 from concurrent.futures import ThreadPoolExecutor
 from functools import partial
-import json
-from typing import Any
+from pathlib import Path
+from typing import TYPE_CHECKING, Any
 
 import click
-from rapyuta_io import Client
 import yaml
 from benedict import benedict
 from munch import munchify
 
-from yaspin.api import Yaspin
-
 from riocli.apply.util import (
     get_resource_class,
     init_jinja_environment,
@@ -44,10 +42,6 @@
 from riocli.utils import dump_all_yaml, print_centered_text, run_bash
 from riocli.utils.graph import GraphVisualizer, Graphviz
 from riocli.utils.spinner import with_spinner
-from riocli.v2client import Client as v2Client
-
-DEFAULT_MAX_WORKERS = 6
-DELETE_POLICY_LABEL = "rapyuta.io/deletionPolicy"
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterable, Mapping
@@ -288,8 +282,8 @@ def _delete_manifest(
 
     def _get_dependency_graph(
         self, objects: dict[str, Model]
-    ) -> tuple[TopologicalSorter[str], GraphVisualizer]:
-        graph: TopologicalSorter[str] = TopologicalSorter()
+    ) -> tuple[graphlib.TopologicalSorter[str], GraphVisualizer]:
+        graph: graphlib.TopologicalSorter[str] = graphlib.TopologicalSorter()
         diagram = Graphviz(direction="LR", format="svg")
 
         for key, obj in objects.items():
@@ -533,18 +527,18 @@ def worker_func(w: str) -> Exception | None:
     def _can_delete(obj: Model) -> bool:
         metadata = obj.get("metadata")
         if metadata is None:
-            return False
+            return True
 
         labels: dict[str, str] = metadata.get("labels")
         if labels is None:
-            return False
+            return True
 
         policy = labels.get(DELETE_POLICY_LABEL)
         if policy is None:
-            return False
+            return True
 
         if not isinstance(policy, str):
-            return False
+            return True
 
         # If a resource has a label with DELETE_POLICY_LABEL set
         # to 'retain', it should not be deleted.

riocli/apply/util.py

@@ -17,7 +17,6 @@
 from collections.abc import Iterable, Mapping
 from datetime import datetime
 from shutil import get_terminal_size
-from collections.abc import Iterable, Mapping
 from typing import Any, AnyStr
 
 import click

riocli/auth/util.py

@@ -21,16 +21,13 @@
 from rapyuta_io.utils import UnauthorizedError
 from rapyuta_io.utils.rest_client import HttpMethod, RestClient
 from rapyuta_io_sdk_v2 import Client as v2Client
-from rapyuta_io_sdk_v2.utils import handle_server_errors
+from rapyuta_io_sdk_v2.utils import handle_server_errors, walk_pages
 
 from riocli.config import Configuration
 from riocli.constants import Colors, Symbols
 from riocli.exceptions import OrganizationNotFound, ProjectNotFound
 from riocli.utils.selector import show_selection
 from riocli.utils.spinner import with_spinner
-from rapyuta_io_sdk_v2 import Client as v2Client
-from rapyuta_io_sdk_v2.utils import handle_server_errors, walk_pages
-from riocli.exceptions import ProjectNotFound, OrganizationNotFound
 
 TOKEN_LEVELS = {0: AuthTokenLevel.LOW, 1: AuthTokenLevel.MED, 2: AuthTokenLevel.HIGH}
 

riocli/bootstrap.py

@@ -17,11 +17,11 @@
 import os
 
 import click
-from click import Context
 import rapyuta_io
+from click import Context
 
 from riocli.apply import apply, delete, graph
-from riocli.apply.explain import list_examples, explain
+from riocli.apply.explain import explain, list_examples
 from riocli.apply.template import template
 from riocli.auth import auth
 from riocli.chart import chart

riocli/deployment/util.py

@@ -112,9 +112,8 @@ def poll_deployment(
         deployment = client.get_deployment(name=name)
         status = deployment.status
 
-    error_codes = []
     if status is not None and hasattr(status, "error_codes"):
-        error_codes = status.error_codes or []
+        pass
     msg = (
         f"Retries exhausted: Tried {retry_count} times with {sleep_interval}s interval. "
         f"Deployment: phase={status.phase} status={status.status} \n"

riocli/network/model.py

@@ -17,7 +17,6 @@
 from typing_extensions import override
 
 from riocli.model import Model
-from rapyuta_io_sdk_v2.exceptions import HttpAlreadyExistsError, HttpNotFoundError
 from riocli.network.util import poll_network
 
 

riocli/project/list.py

@@ -16,12 +16,12 @@
 import munch
 from click_help_colors import HelpColorsCommand
 from munch import unmunchify
+from rapyuta_io_sdk_v2.utils import walk_pages
 
 from riocli.config import new_v2_client
 from riocli.constants import Colors
 from riocli.organization.util import name_to_guid as name_to_organization_guid
 from riocli.utils import tabulate_data
-from rapyuta_io_sdk_v2.utils import walk_pages
 
 
 @click.command(

riocli/project/model.py

@@ -18,9 +18,6 @@
 from typing_extensions import Any, override
 from waiting import wait
 
-from riocli.config import Configuration
-from riocli.constants import ApplyResult
-from riocli.model import Model
 from riocli.auth.util import find_project_guid
 from riocli.config import Configuration
 from riocli.constants import ApplyResult

riocli/role/bind.py

@@ -79,7 +79,7 @@ def bind(
         subject_kind, subject_name = get_subject(subject)
 
         binding = {
-            "bindings": [
+            "newBindings": [
                 {
                     "metadata": {
                         "organizationGUID": config.organization_guid,
@@ -98,10 +98,11 @@ def bind(
                         },
                     },
                 }
-            ]
+            ],
+            "oldBindings": [],
         }
 
-        _ = client.create_role_binding(binding)
+        _ = client.update_role_binding(binding=binding)
         spinner.text = click.style("Binding created successfully.", fg=Colors.GREEN)
         spinner.green.ok(Symbols.SUCCESS)
     except Exception as e: