chore(helmbroker): update bind and update

Author: lijianguo

rootfs/helmbroker/broker.py

@@ -4,7 +4,8 @@
 
 from openbrokerapi.catalog import ServicePlan
 from openbrokerapi.errors import ErrInstanceAlreadyExists, ErrAsyncRequired, \
-    ErrBindingAlreadyExists, ErrBadRequest, ErrInstanceDoesNotExist
+    ErrBindingAlreadyExists, ErrBadRequest, ErrInstanceDoesNotExist, \
+    ServiceException
 from openbrokerapi.service_broker import ServiceBroker, Service, \
     ProvisionDetails, ProvisionedServiceSpec, ProvisionState, GetBindingSpec, \
     BindDetails, Binding, BindState, UnbindDetails, UnbindSpec, \
@@ -73,15 +74,18 @@ def bind(self,
         if not (instance_meta and
                 instance_meta['last_operation']['state'] == 'succeeded'):
             raise ErrBadRequest(msg="This instance %s is not ready" % instance_id)  # noqa
-        # if not async_allowed:
-        #     raise ErrAsyncRequired()
         instance_path = get_instance_path(instance_id)
-        if os.path.exists(f'{instance_path}/bind.yaml'):
+        if os.path.exists(f'{instance_path}/bind.json'):
             raise ErrBindingAlreadyExists()
         chart_path, plan_path = get_chart_path(instance_id), get_plan_path(instance_id)  # noqa
         shutil.copy(f'{plan_path}/bind.yaml', f'{chart_path}/templates')
-        bind.delay(instance_id, binding_id, details, async_allowed, **kwargs)
-        return Binding(state=BindState.IS_ASYNC)
+        bind(instance_id, binding_id, details, async_allowed, **kwargs)
+        data = load_binding_meta(instance_id)
+        if data["last_operation"]["state"] == OperationState.SUCCEEDED.value:
+            return Binding(state=BindState.SUCCESSFUL_BOUND,
+                           credentials=data["credentials"])
+        else:
+            raise ServiceException(data["last_operation"]["description"])
 
     def unbind(self,
                instance_id: str,
@@ -92,7 +96,8 @@ def unbind(self,
                ) -> UnbindSpec:
         instance_path = get_instance_path(instance_id)
         binding_info = f'{instance_path}/binding.json'
-        shutil.rmtree(binding_info, ignore_errors=True)
+        if os.path.exists(binding_info):
+            os.remove(binding_info)
         return UnbindSpec(is_async=False)
 
     def update(self,
@@ -104,17 +109,18 @@ def update(self,
         instance_path = get_instance_path(instance_id)
         if not os.path.exists(instance_path):
             raise ErrBadRequest(msg="Instance %s does not exist" % instance_id)
-        is_plan_updateable = get_addon_updateable(instance_id)
+        is_plan_updateable = get_addon_updateable(details.service_id)
         if not is_plan_updateable:
             raise ErrBadRequest(msg="Instance %s does not updateable" % instance_id)  # noqa
         if not async_allowed:
             raise ErrAsyncRequired()
-        plan_path = get_plan_path(instance_id)
-        # delete the pre plan
-        shutil.rmtree(plan_path, ignore_errors=True)
-        _, addon_plan_path = get_addon_path(details.service_id, details.plan_id)  # noqa
-        # add the new plan
-        shutil.copytree(addon_plan_path, plan_path)
+        if details.plan_id is not None:
+            plan_path = get_plan_path(instance_id)
+            # delete the pre plan
+            shutil.rmtree(plan_path, ignore_errors=True)
+            _, addon_plan_path = get_addon_path(details.service_id, details.plan_id)  # noqa
+            # add the new plan
+            shutil.copytree(addon_plan_path, plan_path)
         update.delay(instance_id, details)
         return UpdateServiceSpec(is_async=True)
 

rootfs/helmbroker/tasks.py

@@ -57,18 +57,18 @@ def provision(instance_id: str, details: ProvisionDetails):
 
 @app.task(serializer='pickle')
 def update(instance_id: str, details: UpdateDetails):
-    data = {
-        "id": instance_id,
-        "details": {
-            "service_id": details.service_id,
-            "plan_id": details.plan_id,
-            "context": details.context,
-            "parameters": details.parameters,
-        },
-        "last_operation": {
-            "state": OperationState.IN_PROGRESS.value,
-            "description": "update %s in progress at %s" % (instance_id, time.time())  # noqa
-        }
+    data = load_instance_meta(instance_id)
+    if details.service_id:
+        data['details']['service_id'] = details.service_id
+    if details.plan_id:
+        data['details']['service_id'] = details.plan_id
+    if details.context:
+        data['details']['context'] = details.context
+    if details.parameters:
+        data['details']['service_id'] = details.parameters
+    data['last_operation'] = {
+        "state": OperationState.IN_PROGRESS.value,
+        "description": "update %s in progress at %s" % (instance_id, time.time())  # noqa
     }
     dump_instance_meta(instance_id, data)
     chart_path = get_chart_path(instance_id)
@@ -107,8 +107,7 @@ def bind(instance_id: str,
          **kwargs):
     data = {
         "binding_id": binding_id,
-        "credential": {
-        },
+        "credentials": {},
         "last_operation": {
             "state": OperationState.IN_PROGRESS.value,
             "description": "binding %s in progress at %s" % (binding_id, time.time())  # noqa
@@ -141,7 +140,7 @@ def bind(instance_id: str,
             success_flag = False
             errors.append(val)
         else:
-            data['credential'][_['name']] = val
+            data['credentials'][_['name']] = val
     if success_flag:
         data['last_operation'] = {
             'state': OperationState.SUCCEEDED.value,
@@ -154,7 +153,8 @@ def bind(instance_id: str,
         }
     dump_binding_meta(instance_id, data)
     bind_yaml = f'{chart_path}/templates/bind.yaml'
-    shutil.rmtree(bind_yaml, ignore_errors=True)
+    if os.path.exists(bind_yaml):
+        os.remove(bind_yaml)
 
 
 @app.task()

rootfs/helmbroker/utils.py

@@ -21,10 +21,15 @@ def command(cmd, *args, output_type="text"):
 get_plan_path = lambda instance_id: os.path.join(get_instance_path(instance_id), "plan") # noqa
 
 
-def get_addon_path(service_id, plan_id):
+def get_addon_meta(service_id):
     services = load_addons_meta()
     service = [addon for addon in [addons for _, addons in services.items()]
                if addon['id'] == service_id][0]
+    return service
+
+
+def get_addon_path(service_id, plan_id):
+    service = get_addon_meta(service_id)
     plan = [plan for plan in service['plans'] if plan['id'] == plan_id][0]
     service_name = f'{service["name"]}-{service["version"]}'
     plan_name = plan['name']
@@ -33,13 +38,6 @@ def get_addon_path(service_id, plan_id):
     return service_path, plan_path
 
 
-def get_addon_meta(service_id):
-    services = load_addons_meta()
-    service = [addon for addon in [addons for _, addons in services.items()]
-               if addon['id'] == service_id][0]
-    return service
-
-
 def get_addon_name(service_id):
     service = get_addon_meta(service_id)
     return service['name']