fixup

Author: duanhongyi

rootfs/helmbroker/broker.py

@@ -2,8 +2,7 @@
 import shutil
 from typing import Union, List
 from openbrokerapi import api
-from openbrokerapi.api import ServiceBroker
-from openbrokerapi.catalog import ServicePlan
+from openbrokerapi.api import ServiceBroker, ErrInstanceAlreadyExists, ErrAsyncRequired
 from openbrokerapi.service_broker import *
 
 from .meta import InstanceMeta
@@ -28,18 +27,17 @@ def provision(self,
                   **kwargs) -> ProvisionedServiceSpec:
         instance_path = get_instance_path(instance_id)
         if os.path.exists(instance_path):
-            return ProvisionedServiceSpec(
-                state=ProvisionState.IDENTICAL_ALREADY_EXISTS
-            )
+            raise ErrInstanceAlreadyExists("Instance %s already exists" % instance_id)
+        if not async_allowed:
+            raise ErrAsyncRequired()
         os.makedirs(instance_path, exist_ok=True)
         chart_path, plan_path =get_chart_path(instance_id), get_plan_path(instance_id)
         addon_chart_path, addon_plan_path = get_addon_path(details.service_id, details.plan_id)
         shutil.copy(addon_chart_path, chart_path)
         shutil.copy(addon_plan_path, plan_path)
-        if async_allowed:
-            provision.delay(instance_id, details, async_allowed, **kwargs)
-            return ProvisionedServiceSpec(state=ProvisionState.IS_ASYNC)
-        return provision(instance_id, details, async_allowed, **kwargs)
+        provision.delay(instance_id, details, async_allowed, **kwargs)
+        return ProvisionedServiceSpec(state=ProvisionState.IS_ASYNC)
+    
 
     def get_binding(self,
                     instance_id: str,
@@ -59,17 +57,16 @@ def bind(self,
         if not (InstanceMeta.load(instance_id) and
                 InstanceMeta.load(instance_id)['last_operation']['state'] == 'Ready'):
             return Binding(state="status error: this instance is not ready")
-
+        if not async_allowed:
+            raise ErrAsyncRequired()
         instance_path = get_instance_path(instance_id)
         if os.path.exists(f'{instance_path}/bind.yaml'):
             return Binding(state=BindState.IDENTICAL_ALREADY_EXISTS)
         chart_path, plan_path =get_chart_path(instance_id), get_plan_path(instance_id)
         addon_name = get_addon_name(details.service_id)
         shutil.copy(f'{plan_path}/bind.yaml', f'{chart_path}/{addon_name}/templates')
-        if async_allowed:
-            bind.delay(instance_id, binding_id, details, async_allowed, **kwargs)
-            return Binding(state=BindState.IS_ASYNC)
-        return bind(instance_id, binding_id, details, async_allowed, **kwargs)
+        bind.delay(instance_id, binding_id, details, async_allowed, **kwargs)
+        return Binding(state=BindState.IS_ASYNC)
 
     def unbind(self,
                instance_id: str,

rootfs/helmbroker/tasks.py

@@ -1,14 +1,26 @@
 import os
-import shutil
+import time
 from .utils import command, get_plan_path, get_chart_path, \
     get_or_create_instance_meta, get_or_create_binding_meta
+from .meta import dump_instance_meta
 from openbrokerapi.service_broker import *
 
 
-def provision(instance_id: str,
-              details: ProvisionDetails,
-              async_allowed: bool,
-              **kwargs) -> ProvisionedServiceSpec:
+def provision(instance_id: str, details: ProvisionDetails):
+    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,
+            "description": "%s in progress at %s" % (instance_id, time.time())
+        }
+    }
+    dump_instance_meta(data)
     chart_path = get_chart_path(instance_id)
     values_file =  os.path.join(get_plan_path(instance_id), "values.yaml")
     args = [
@@ -18,22 +30,19 @@ def provision(instance_id: str,
         "--namespace",
         details.context["namespace"],
         "--create-namespace",
-        "--output",
         "--wait",
         "--timeout 30m0s"
         "-f",
         values_file
     ]
+
     status, output = command("helm", *args)
     if status != 0:
-        return ProvisionedServiceSpec(state="status error: %s" % status, operation=output)
+        data["last_operation"]["state"] = OperationState.FAILED
+        data["last_operation"]["description"] = output
     else:
-        config = get_or_create_instance_meta(instance_id)
-        return ProvisionedServiceSpec(
-            dashboard_url=config.get("dashboard_url", None),
-            state=ProvisionState.SUCCESSFUL_CREATED,
-            operation=config.get("operation", None),
-        )
+        data["last_operation"]["state"] = OperationState.SUCCEEDED
+        data["last_operation"]["description"] = "succeeded at %s" % time.time()
 
 
 def bind(instance_id: str,