chore(helmbroker): support addon archive or not

Author: jianxiaoguo

rootfs/helmbroker/broker.py

@@ -17,7 +17,8 @@
 from .utils import get_instance_path, get_chart_path, get_plan_path, \
     get_addon_path, get_addon_updateable, get_addon_bindable, InstanceLock, \
     load_instance_meta, load_binding_meta, dump_instance_meta, \
-    load_addons_meta, get_addon_allow_paras, verify_parameters
+    load_addons_meta, get_addon_allow_paras, verify_parameters, \
+    get_addon_archive
 from .tasks import provision, bind, deprovision, update
 
 logger = logging.getLogger(__name__)
@@ -46,6 +47,9 @@ def provision(self,
             raise ErrInstanceAlreadyExists()
         if not async_allowed:
             raise ErrAsyncRequired()
+        if get_addon_archive(details.service_id):
+            raise ErrBadRequest(
+                msg="This addon has archived.")
         allow_paras = get_addon_allow_paras(details.service_id)
         not_allow_keys = verify_parameters(allow_paras, details.parameters)
         if not_allow_keys:

rootfs/helmbroker/loader.py

@@ -103,14 +103,14 @@ def load_addons(repository):
     save_file(remote_index, ADDONS_PATH, index_name)
     remote_index = yaml.load(remote_index, Loader=yaml.Loader)
     # save index.yaml addons
-    for _, v in remote_index.get('entries', {}).items():
+    for addon_name, v in remote_index.get('entries', {}).items():
         for _ in v:
             url = "/".join(repository["url"].split("/")[0:-1])
-            tgz_name = f'{_["name"]}-{_["version"]}'
+            tgz_name = f'{addon_name}-{_["version"]}'
             addon_tgz_url = f'{url}/{tgz_name}.tgz'
             download_file(addon_tgz_url, ADDONS_PATH)
             extract_tgz(f'{ADDONS_PATH}/{tgz_name}.tgz',
-                        f'{ADDONS_PATH}')
+                        f'{ADDONS_PATH}/{tgz_name}')
     addons_meta_file()
 
 

rootfs/helmbroker/utils.py

@@ -233,6 +233,11 @@ def get_addon_allow_paras(service_id):
     return service.get('allow_parameters', [])
 
 
+def get_addon_archive(service_id):
+    service = get_addon_meta(service_id)
+    return service.get('archive', False)
+
+
 def get_cred_value(ns, source):
     if source.get('serviceRef'):
         return get_service_key_value(ns, source['serviceRef'])