fix(apply): fixes the schema not found errors

The recent change in JSON Schema validation made it such that the
Schemas are loaded at runtime. But, the Schemas were not being shipped
in the Python wheel. This was leading to schema not found error upon
running the apply command.

This commit adds schemas as part of the shipped Wheel to fix the issue.

.gitignore

@@ -6,7 +6,7 @@
 # Node artifact files
 node_modules/
 dist/
-jsonschema/json/
+riocli/jsonschema/schemas/json/
 # Compiled Java class files
 *.class
 

jsonschema

@@ -0,0 +1 @@
+riocli/jsonschema/schemas/

riocli/build/model.py

@@ -16,7 +16,7 @@
 from rapyuta_io import Build as v1Build, Client, BuildOptions, CatkinOption
 
 from riocli.model import Model
-from riocli.utils.validate import validate_manifest, load_schema
+from riocli.jsonschema.validate import validate_manifest, load_schema
 
 
 class Build(Model):

riocli/deployment/model.py

@@ -32,7 +32,7 @@
 from riocli.model import Model
 from riocli.package.util import find_package_guid
 from riocli.static_route.util import find_static_route_guid
-from riocli.utils.validate import validate_manifest, load_schema
+from riocli.jsonschema.validate import validate_manifest, load_schema
 
 
 class Deployment(Model):

riocli/device/model.py

@@ -17,7 +17,7 @@
 from rapyuta_io.clients.device import Device as v1Device, DevicePythonVersion
 
 from riocli.model import Model
-from riocli.utils.validate import validate_manifest, load_schema
+from riocli.jsonschema.validate import validate_manifest, load_schema
 
 
 class Device(Model):

riocli/disk/model.py

@@ -22,7 +22,7 @@
 
 from riocli.disk.util import _api_call
 from riocli.model import Model
-from riocli.utils.validate import load_schema, validate_manifest
+from riocli.jsonschema.validate import load_schema, validate_manifest
 
 
 class Disk(Model):

riocli/utils/validate.py → riocli/jsonschema/validate.py

@@ -25,7 +25,7 @@ def load_schema(resource: str) -> dict:
     """
     Reads JSON schema yaml and returns a dict.
     """
-    schema_dir = Path('jsonschema')
+    schema_dir = Path(__file__).parent.joinpath('schemas')
     with open(schema_dir.joinpath(resource + "-schema.yaml")) as f:
         return yaml.safe_load(f)
 

riocli/managedservice/model.py

@@ -18,7 +18,7 @@
 
 from riocli.managedservice.util import ManagedServicesClient
 from riocli.model import Model
-from riocli.utils.validate import load_schema, validate_manifest
+from riocli.jsonschema.validate import load_schema, validate_manifest
 
 
 class ManagedService(Model):

riocli/model/base.py

@@ -15,22 +15,17 @@
 from abc import ABC, abstractmethod
 from datetime import datetime
 from shutil import get_terminal_size
-import yaml
-import os
 
 import click
 from munch import Munch, munchify
 from rapyuta_io import Client
-from pathlib import Path
 
 from riocli.project.util import find_project_guid
 
 prompt = ">> {}{}{} [{}]"  # >> msg  spacer  rigth_msg time
 
 DELETE_POLICY_LABEL = 'rapyuta.io/deletionPolicy'
 
-schema_dir = Path('jsonschema')
-
 def message_with_prompt(msg, right_msg="", fg='white', with_time=True):
     columns, _ = get_terminal_size()
     time = datetime.now().isoformat('T')

riocli/network/model.py

@@ -20,7 +20,7 @@
 
 from riocli.model import Model
 from riocli.network.util import find_network_name, NetworkNotFound
-from riocli.utils.validate import validate_manifest, load_schema
+from riocli.jsonschema.validate import validate_manifest, load_schema
 
 
 class Network(Model):

riocli/package/model.py

@@ -19,7 +19,7 @@
 from rapyuta_io.clients.package import RestartPolicy
 
 from riocli.model import Model
-from riocli.utils.validate import validate_manifest, load_schema
+from riocli.jsonschema.validate import validate_manifest, load_schema
 
 
 class Package(Model):

riocli/project/model.py

@@ -16,7 +16,7 @@
 from rapyuta_io import Project as v1Project, Client
 
 from riocli.model import Model
-from riocli.utils.validate import validate_manifest, load_schema
+from riocli.jsonschema.validate import validate_manifest, load_schema
 
 
 class Project(Model):

riocli/secret/model.py

@@ -18,7 +18,7 @@
     SecretConfigSourceSSHAuth, Client
 
 from riocli.model import Model
-from riocli.utils.validate import load_schema, validate_manifest
+from riocli.jsonschema.validate import load_schema, validate_manifest
 
 
 class Secret(Model):

riocli/static_route/model.py

@@ -17,7 +17,7 @@
 from rapyuta_io.clients.static_route import StaticRoute as v1StaticRoute
 
 from riocli.model import Model
-from riocli.utils.validate import validate_manifest, load_schema
+from riocli.jsonschema.validate import validate_manifest, load_schema
 
 
 class StaticRoute(Model):

setup.py

@@ -20,7 +20,8 @@
     packages=find_packages(),
     package_data={
         'riocli': [
-            'apply/manifests/*.yaml'
+            'apply/manifests/*.yaml',
+            'jsonschema/schemas/*.yaml'
         ]
     },
     include_package_data=True,