Merge branch 'main' of github.com:drycc/helmbroker into main

Author: duanhongyi

rootfs/helmbroker/broker.py

@@ -7,15 +7,15 @@
 
 from .meta import load_instance_meta, load_binding_meta, dump_binding_meta
 from .utils import get_instance_path, get_chart_path, get_plan_path, \
-    get_addon_path, get_addon_name, get_addon_updateable
+    get_addon_path, get_addon_name, get_addon_updateable, get_addon_bindable
 from .tasks import provision, bind, deprovision, update
-from helmbroker.loader import read_addons_file
+from helmbroker.meta import load_addons_meta
 
 
 class HelmServiceBroker(ServiceBroker):
 
     def catalog(self) -> Union[Service, List[Service]]:
-        services = read_addons_file()
+        services = load_addons_meta()
         return [Service(
             **addons
         ) for _, addons in services.items()]
@@ -55,7 +55,10 @@ def bind(self,
              async_allowed: bool,
              **kwargs
              ) -> Binding:
-        instance_meta = dump_binding_meta(instance_id)
+        is_addon_bindable = get_addon_bindable(instance_id)
+        if not is_addon_bindable:
+            raise ErrBadRequest("Instance %s does not bindable" % instance_id)
+        instance_meta = load_instance_meta(instance_id)
         if not (instance_meta and
                 instance_meta['last_operation']['state'] == 'Ready'):
             raise ErrBadRequest(msg="This instance %s is not ready" % instance_id)

rootfs/helmbroker/config.py

@@ -1,15 +1,13 @@
 import os
-import yaml
 
 HELMBROKER_ROOT = os.environ.get("HELMBROKER_CELERY_BROKER", '/etc/helmbroker')
 
 ADDONS_PATH = os.path.join(HELMBROKER_ROOT, 'addons')
 CONFIG_PATH = os.path.join(HELMBROKER_ROOT, 'config')
 INSTANCES_PATH = os.path.join(HELMBROKER_ROOT, 'instances')
 
+
 class Config:
-    DEBUG = True
+    DEBUG = os.environ.get("DEBUG", False)
     if not os.path.exists(ADDONS_PATH):
         os.makedirs(ADDONS_PATH)
-    with open(CONFIG_PATH, 'r') as f:
-        repository = yaml.load(f.read())

rootfs/helmbroker/loader.py

@@ -4,7 +4,8 @@
 import requests
 import yaml
 
-from helmbroker.config import ADDONS_PATH, CONFIG_PATH, Config
+from .config import ADDONS_PATH, CONFIG_PATH
+from .meta import dump_addons_meta
 
 
 def download_file(url, dest):
@@ -19,14 +20,6 @@ def download_file(url, dest):
                          Loader=yaml.Loader)
 
 
-def read_addons_file():
-    data = read_file(f'{ADDONS_PATH}/addons.yaml')
-    if not data:
-        return {}
-    addons_info = yaml.load(data, Loader=yaml.Loader)
-    return addons_info
-
-
 def read_file(filename):
     if not os.path.exists(filename):
         return
@@ -80,7 +73,7 @@ def addons_meta_file():
         with open(f'{ADDONS_PATH}/{"/".join(plan_meta)}', 'r') as f:
             addons_mata = yaml.load(f.read(), Loader=yaml.Loader)
             addons_dict[f'{"-".join(plan_meta[0].split("-")[0:-1])}']['plans'].append(addons_mata) # noqa
-    save_file(yaml.dump(addons_dict), ADDONS_PATH, 'addons.yaml')
+    dump_addons_meta(addons_dict)
 
 
 def load_addons(repository):

rootfs/helmbroker/meta.py

@@ -2,8 +2,7 @@
 import json
 import time
 from jsonschema import validate
-from .config import INSTANCES_PATH
-
+from .config import INSTANCES_PATH, ADDONS_PATH
 
 INSTANCE_META_SCHEMA = {
     "type": "object",
@@ -43,7 +42,7 @@ def dump_instance_meta(instance_id, data):
     file = os.path.join(INSTANCES_PATH, instance_id, "instance.json")
     validate(instance=data, schema=INSTANCE_META_SCHEMA)
     with open(file, "w") as f:
-        json.dump(f, data)
+        f.write(json.dumps(data, sort_keys=True, indent=2))
 
 
 BINDING_META_SCHEMA = {
@@ -78,4 +77,64 @@ def dump_binding_meta(instance_id, data):
     file = os.path.join(INSTANCES_PATH, instance_id, "binding.json")
     validate(instance=data, schema=INSTANCE_META_SCHEMA)
     with open(file, "w") as f:
-        f.write(json.dumps(data))
+        f.write(json.dumps(data, sort_keys=True, indent=2))
+
+
+ADDONS_META_SCHEMA = {
+    "type": "object",
+    "patternProperties": {
+        ".*": {
+            "id": {"type": "string"},
+            "name": {"type": "string"},
+            "version": {"type": "string"},
+            "bindable": {"type": "boolean"},
+            "instances_retrievable": {"type": "boolean"},
+            "bindings_retrievable": {"type": "boolean"},
+            "allow_context_updates": {"type": "boolean"},
+            "description": {"type": "string"},
+            "tags": {"type": "string"},
+            "requires": {"type": "array"},
+            "metadata": {"type": "object"},
+            "plan_updateable": {"type": "boolean"},
+            "dashboard_client": {"type": "object"},
+            "plans": {
+                "type": "object",
+                "id": {"type": "string"},
+                "name": {"type": "string"},
+                "description": {"type": "string"},
+                "metadata": {"type": "object"},
+                "free": {"type": "boolean"},
+                "bindable": {"type": "boolean"},
+                "binding_rotatable": {"type": "boolean"},
+                "plan_updateable": {"type": "boolean"},
+                "schemas": {"type": "object"},
+                "maximum_polling_duration": {"type": "integer"},
+                "maintenance_info": {"type": "object"},
+                "required": [
+                    "id", "name", "description"
+                ]
+            },
+            "required": [
+                "id", "name", "description", "bindable", "version", "plans"
+            ]
+        }
+    }
+}
+
+
+def load_addons_meta():
+    file = os.path.join(ADDONS_PATH, "addons.json")
+    with open(file, 'r') as f:
+        data = json.loads(f.read())
+        if not data:
+            return {}
+        validate(instance=data, schema=INSTANCE_META_SCHEMA)
+        return data
+
+
+def dump_addons_meta(data):
+    file = os.path.join(ADDONS_PATH, "addons.json")
+    validate(instance=data, schema=INSTANCE_META_SCHEMA)
+    with open(file, "w") as f:
+        print("save addons.json")
+        f.write(json.dumps(data, sort_keys=True, indent=2))

rootfs/helmbroker/utils.py

@@ -4,7 +4,7 @@
 import subprocess
 
 from .config import INSTANCES_PATH, ADDONS_PATH
-from .loader import read_addons_file
+from .meta import load_addons_meta
 
 
 def command(cmd, *args, output_type="text"):
@@ -22,7 +22,7 @@ def command(cmd, *args, output_type="text"):
 
 
 def get_addon_path(service_id, plan_id):
-    services = read_addons_file()
+    services = load_addons_meta()
     service = [addon for addon in [addons for _, addons in services.items()]
                if addon['id'] == service_id][0]
     plan = [plan for plan in service['plans'] if plan['id'] == plan_id][0]
@@ -34,7 +34,7 @@ def get_addon_path(service_id, plan_id):
 
 
 def get_addon_meta(service_id):
-    services = read_addons_file()
+    services = load_addons_meta()
     service = [addon for addon in [addons for _, addons in services.items()]
                if addon['id'] == service_id][0]
     return service
@@ -50,6 +50,11 @@ def get_addon_updateable(service_id):
     return service.get('plan_updateable', False)
 
 
+def get_addon_bindable(service_id):
+    service = get_addon_meta(service_id)
+    return service.get('bindable', False)
+
+
 def get_cred_value(ns, source):
     if source.get('serviceRef'):
         return get_service_key_value(ns, source['serviceRef'])