Merge pull request #322 from frikky/launch

0.8.71

.env

@@ -12,6 +12,7 @@ SHUFFLE_APP_DOWNLOAD_LOCATION=https://github.com/frikky/shuffle-apps
 SHUFFLE_DOWNLOAD_AUTH_USERNAME=
 SHUFFLE_DOWNLOAD_AUTH_PASSWORD=
 SHUFFLE_DOWNLOAD_AUTH_BRANCH=
+SHUFFLE_APP_FORCE_UPDATE=false
 
 # User config for first load. Username & PW: min length 3
 SHUFFLE_DEFAULT_USERNAME=

.gitignore

@@ -18,3 +18,7 @@ functions/generated_apps
 
 backend/onprem/app_sdk/apps
 *test.py
+
+shuffle-database
+*.exe
+*debug*

README.md

@@ -54,7 +54,7 @@ These are the main areas to contribute in:
 * Workflow creation (GUI & Conceptualizing) 
 * Content Creation (Blogs, videos etc) 
 
-Contributing guidelines for Github are outlined [here](https://github.com/frikky/Shuffle/blob/master/.github/CONTRIBUTING.md).
+Contributing guidelines are outlined [here](https://github.com/frikky/Shuffle/blob/master/.github/CONTRIBUTING.md).
 
 ## Contributors 
 ![ICPL logo](https://github.com/frikky/Shuffle/blob/launch/frontend/src/assets/img/icpl_logo.png)

backend/Dockerfile

@@ -1,4 +1,4 @@
-from golang as builder
+FROM golang:1.16.0-buster as builder
 
 # Add files
 RUN mkdir /app
@@ -7,14 +7,12 @@ WORKDIR /app
 ADD ./go-app/main.go /app
 ADD ./go-app/walkoff.go /app
 ADD ./go-app/docker.go /app
-ADD ./go-app/codegen.go /app
-ADD ./go-app/files.go /app
+ADD ./go-app/oauth2.go /app
 
 ADD ./go-app/go.mod /app
 
 # Required files for code generation
 ADD ./app_sdk/app_base.py /app_sdk
-ADD ./app_sdk/static_baseline.py /app_sdk
 ADD ./app_sdk_kali/app_base.py /app_sdk_kali
 ADD ./app_sdk_kali/static_baseline.py /app_sdk_kali
 ADD ./app_sdk_blackarch/app_base.py /app_sdk_blackarch

backend/app_sdk/README.md

@@ -1,9 +1,5 @@
 # app_sdk.py
 This is the SDK used for apps to behave like they should. 
-To change it in the backend, upload it to Buckets/shuffler.appspot.com/generated_apps/baseline.
-
-# static_baseline.py
-It's used for python code generation and should be under MIT. Has to be located here because it's used by the backend.
 
 ## If you want to update apps.. PS: downloads from docker hub do overrides.. :)
 1. Write your code & check if runtime works

backend/app_sdk/app_base.py

@@ -9,6 +9,7 @@ import requests
 import urllib.parse
 import http.client
 import urllib3
+import hashlib
 
 class AppBase:
     __version__ = None
@@ -27,6 +28,7 @@ class AppBase:
         self.authorization = os.getenv("AUTHORIZATION", "")
         self.current_execution_id = os.getenv("EXECUTIONID", "")
         self.full_execution = os.getenv("FULL_EXECUTION", "") 
+        self.start_time = int(time.time())
         self.result_wrapper_count = 0
 
         if isinstance(self.action, str):
@@ -91,6 +93,135 @@ class AppBase:
         else:
             return {()}
 
+    # Handles unique fields by negoiating with the backend 
+    def validate_unique_fields(self, params):
+        #print("IN THE UNIQUE FIELDS PLACE!")
+
+        newlist = [params]
+        if isinstance(params, list):
+            #print("ITS A LIST!")
+            newlist = params
+
+        #self.full_execution = os.getenv("FULL_EXECUTION", "") 
+        #print(len(params))
+        #print(params.items())
+        #print(list(params.items()))
+        #print(f"PARAM: {params}")
+        #print(f"NEWLIST: {newlist}")
+
+        # FIXME: Also handle MULTI PARAM
+        values = []
+        param_names = []
+        all_values = {}
+        index = 0
+        for outerparam in newlist:
+
+            #print(f"INNERTYPE: {type(outerparam)}")
+            #print(f"HANDLING PARAM {key}")
+            param_value = ""
+            for key, value in outerparam.items():
+                #print("KEY: %s" % key)
+                #value = params[key]
+                for param in self.action["parameters"]:
+                    try:
+                        if param["name"] == key and param["unique_toggled"]:
+                            print(f"FOUND: {key} with param {param}!")
+                            if isinstance(value, dict) or isinstance(value, list):
+                                try:
+                                    value = json.dumps(value)
+                                except json.decoder.JSONDecodeError as e:
+                                    print(f"Error in json decode for param {value}: {e}")
+                                    continue
+                            elif isinstance(value, int) or isinstance(value, float):
+                                value = str(value)
+                            elif value == False:
+                                value = "False"
+                            elif value == True:
+                                value = "True"
+
+                            print(f"VALUE APPEND: {value}")
+                            param_value += value
+                            if param["name"] not in param_names:
+                                param_names.append(param["name"])
+
+                    except (KeyError, NameError) as e:
+                        print(f"""Key/NameError in param handler for {param["name"]}: {e}""")
+
+            print(f"OUTER VALUE: {param_value}")
+            if len(param_value) > 0:
+                md5 = hashlib.md5(param_value.encode('utf-8')).hexdigest()
+                values.append(md5)
+                all_values[md5] = {
+                    "index": index, 
+                }
+
+            index += 1
+
+            # When in here, it means it should be unique
+            # Should this be done by the backend? E.g. ask it if the value is valid?
+            # 1. Check if it's unique towards key:value store in org for action
+            # 2. Check if COMBINATION is unique towards key:value store of action for org
+            # 3. Have a workflow configuration for unique ID's in unison or per field? E.g. if toggled, then send a hash of all fields together alphabetically, but if not, send one field at a time
+
+            # org_id = full_execution["workflow"]["execution_org"]["id"]
+
+            # USE ARRAY?
+
+        new_params = []
+        if len(values) > 0:
+            org_id = self.full_execution["workflow"]["execution_org"]["id"]
+            data = {
+                "append": True,
+                "workflow_check": False,
+                "authorization": self.authorization,
+                "execution_ref": self.current_execution_id,
+                "org_id": org_id,
+                "values": [{
+                        "app": self.action["app_name"],
+                        "action": self.action["name"],
+                        "parameternames": param_names,
+                        "parametervalues": values,
+                }]
+            }
+
+            #print(f"DATA: {data}")
+            # 1594869a676630b397bc34f7dc0951a3
+
+            #print(f"VALUE URL: {url}") 
+            #print(f"RET: {ret.text}")
+            #print(f"ID: {ret.status_code}")
+            url = f"{self.url}/api/v1/orgs/{org_id}/validate_app_values"
+            ret = requests.post(url, json=data)
+            if ret.status_code == 200:
+                json_value = ret.json()
+                if len(json_value["found"]) > 0: 
+                    modifier = 0
+                    for item in json_value["found"]:
+                        print(f"Should remove {item}")
+
+                        try:
+                            print(f"FOUND: {all_values[item]}")
+                            print(f"SHOULD REMOVE INDEX: {all_values[item]['index']}")
+
+                            try:
+                                newlist.pop(all_values[item]["index"]-modifier)
+                                modifier += 1
+                            except IndexError as e:
+                                print(f"Error popping value from array: {e}")
+                        except (NameError, KeyError) as e:
+                            print(f"Failed removal: {e}")
+                        
+                            
+                    #return False
+                else:
+                    print("None of the items were found!")
+                    return newlist
+            else:
+                print(f"[WARNING] Failed checking values with status code {ret.status_code}!")
+
+        #return True
+        return newlist
+
     # Returns a list of all the executions to be done in the inner loop
     # FIXME: Doesn't take into account whether you actually WANT to loop or not
     # Check if the last part of the value is #?
@@ -147,6 +278,7 @@ class AppBase:
         #self.action = action
 
         loopnames = []
+        print(f"Baseparams to check!!: {baseparams}")
         for key, value in baseparams.items():
             check_value = ""
             for param in self.action["parameters"]:
@@ -160,6 +292,7 @@ class AppBase:
                     self.result_wrapper_count = octothorpe_count
                     print("[INFO] NEW OCTOTHORPE WRAPPER: %d" % octothorpe_count)
 
+
             # This whole thing is hard.
             # item = [{"data": "1.2.3.4", "dataType": "ip"}] 
             # $item         = DONT loop items. 
@@ -178,12 +311,40 @@ class AppBase:
             # FIXME: Check the above, and fix so that nested looped items can be 
             # Skipped if wanted
 
-            print("\nCHECK: %s" % check_value)
+            #print("\nCHECK: %s" % check_value)
+            #try:
+            #    values = parameter["value_replace"]
+            #    if values != None:
+            #        print(values)
+            #        for val in values:
+            #            print(val)
+            #except:
+            #    pass
+
             should_merge = False
             if "#" in check_value:
                 should_merge = True
 
+            # Specific for OpenAPI body replacement
+            print("\n\n\nDOING STUFF BELOW HERE")
+            if not should_merge:
+                for parameter in self.action["parameters"]:
+                    if parameter["name"] == key:
+                        print("CHECKING BODY FOR VALUE REPLACE DATA!")
+                        try:
+                            values = parameter["value_replace"]
+                            if values != None:
+                                print(values)
+                                for val in values:
+                                    if "#" in val["value"]:
+                                        should_merge = True
+                                        break
+                        except:
+                            pass
+
+            print(f"MERGE: {should_merge}")
             if isinstance(value, list):
+                print("Item {value} is a list.")
                 if len(value) <= 1:
                     if len(value) == 1:
                         baseparams[key] = value[0]
@@ -206,7 +367,7 @@ class AppBase:
                 all_list_keys.append(key)
                 all_lists.append(baseparams[key])
             else:
-                print("%s is not a list: " % value)
+                print(f"{value} is not a list")
 
         print("Listlengths: %s" % listlengths)
         if len(listlengths) == 0:
@@ -271,20 +432,25 @@ class AppBase:
 
     # Runs recursed versions with inner loops and such 
     async def run_recursed_items(self, func, baseparams, loop_wrapper):
+        print(f"RECURSED ITEMS: {baseparams}")
         has_loop = False
 
         newparams = {}
         for key, value in baseparams.items():
             if isinstance(value, list) and len(value) > 0:
-                print("In list check")
+                print(f"In list check for {key}")
+
                 try:
-                    value[0] = json.loads(value[0])
+                    # Added skip for body (OpenAPI) which uses data= in requests
+                    # Can be screwed up if they name theirs body too 
+                    if key != "body":
+                        value[0] = json.loads(value[0])
                 except json.decoder.JSONDecodeError as e:
                     print("JSON casting error: %s" % e)
                 except TypeError as e:
                     print("TypeError: %s" % e)
 
-                print("POST list check")
+                print("POST initial list check")
 
             if isinstance(value, list) and len(value) == 1 and isinstance(value[0], list):
                 try:
@@ -294,12 +460,11 @@ class AppBase:
                 except KeyError:
                     loop_wrapper[key] = 1
 
-                print("Key %s is a list: %s" % (key, value))
+                print(f"Key {key} is a list: {value}")
                 newparams[key] = value[0]
                 has_loop = True 
             else:
-                print("Key %s is NOT a list within a list" % (key))
-
+                print(f"Key {key} is NOT a list within a list. Value: {value}")
                 newparams[key] = value
         
         results = []
@@ -313,8 +478,43 @@ class AppBase:
             ret = []
             param_multiplier = await self.get_param_multipliers(newparams)
 
+            # FIXME: This does a deduplication of the data
+            new_params = self.validate_unique_fields(param_multiplier)
+            print(f"NEW PARAMS: {new_params}")
+            if len(new_params) == 0:
+                print("[WARNING] SHOULD STOP MULTI-EXECUTION BECAUSE FIELDS AREN'T UNIQUE")
+                action_result = {
+                    "action": self.action,
+                    "authorization": self.authorization,
+                    "execution_id": self.current_execution_id,
+                    "result": f"All {len(param_multiplier)} values were non-unique",
+                    "started_at": self.start_time,
+                    "status": "SKIPPED",
+                    "completed_at": int(time.time()),
+                }
+
+                self.send_result(action_result, {"Content-Type": "application/json", "Authorization": "Bearer %s" % self.authorization}, "/api/v1/streams")
+                exit()
+                #return
+            else:
+                #subparams = new_params
+                print(f"NEW PARAMS: {new_params}")
+                param_multiplier = new_params
+
+            #print("Returned with newparams of length %d", len(new_params))
+            #if isinstance(new_params, list) and len(new_params) == 1:
+            #    params = new_params[0]
+            #else:
+            #    print("[WARNING] SHOULD STOP EXECUTION BECAUSE FIELDS AREN'T UNIQUE")
+            #    action_result["status"] = "SKIPPED"
+            #    action_result["result"] = f"A non-unique value was found"  
+            #    action_result["completed_at"] = int(time.time())
+            #    self.send_result(action_result, headers, stream_path)
+            #    return
+
             print("[INFO] Multiplier length: %d" % len(param_multiplier))
             for subparams in param_multiplier:
+                print(f"SUBPARAMS IN MULTI: {subparams}")
                 try:
                     tmp = await func(**subparams)
                 except:
@@ -356,7 +556,8 @@ class AppBase:
 
             print("Ret length: %d" % len(ret))
             if len(ret) == 1:
-                ret = ret[0]
+                #ret = ret[0]
+                print("DONT make list of 1 into 0!!")
 
         print("Return from execution: %s" % ret)
         if ret == None:
@@ -383,7 +584,8 @@ class AppBase:
                 results.append(ret)
 
         if len(results) == 1: 
-            results = results[0]
+            #results = results[0]
+            print("DONT MAKE LIST FROM 1 TO 0!!")
 
         print("\nLOOP: %s\nRESULTS: %s" % (loop_wrapper, results))
         return results
@@ -486,11 +688,11 @@ class AppBase:
                 data["filename"] = curfile["filename"]
                 filename = curfile["filename"]
             except KeyError as e:
-                print("KeyError in file setup: %s" % e)
+                print(f"KeyError in file setup: {e}")
                 pass
 
             ret = requests.post("%s%s" % (self.url, create_path), headers=headers, json=data)
-            print("Ret CREATE: %s" % ret.text)
+            print(f"Ret CREATE: {ret.text}")
             cur_id = ""
             if ret.status_code == 200:
                 print("RET: %s" % ret.text)
@@ -511,7 +713,7 @@ class AppBase:
                 continue
 
             new_headers = {
-                "Authorization": "Bearer %s" % self.authorization,
+                "Authorization": f"Bearer {self.authorization}",
             }
 
             upload_path = "/api/v1/files/%s/upload?execution_id=%s" % (cur_id, full_execution["execution_id"])
@@ -712,6 +914,41 @@ class AppBase:
                 return data.strip()
             if "split" in thistype:
                 return data.split()
+            if "join" in thistype:
+                print(f"SHOULD JOIN: {data}")
+                try:
+                    splitvalues = data.split(",")
+                    if "," not in data:
+                        return f"join({data})"
+
+                    if len(splitvalues) >= 2:
+                        print(f"SPLITVALUE: {splitvalues[-1]}")
+
+                        # 1. Take the list and parse it from string
+                        # 2. Take all the items and join them
+                        # 3. Parse them back as string and return
+                        values = ",".join(splitvalues[0:-1])
+                        print(f"VALUES: {values}")
+                        tmp = json.loads(values)
+                        print(f"TMP: {tmp}")
+                        #tmp = tmp[1:-1]
+                        #print(f"TMP2: {tmp}")
+                        try:
+                            newvalues = splitvalues[-1].join(str(item).strip() for item in tmp)
+                        except TypeError:
+                            newvalues = splitvalues[-1].join(json.dumps(item).strip() for item in tmp)
+
+                        print(f"new: {newvalues}")
+                        return newvalues
+                    else:
+                        print("Returning default")
+                        return f"join({data})"
+
+                except (KeyError, IndexError) as e:
+                    print(f"ERROR in join(): {e}")
+                except json.decoder.JSONDecodeError as e:
+                    print(f"JSON ERROR in join(): {e}")
+
             if "len" in thistype or "length" in thistype or "lenght" in thistype:
                 tmp = "" 
                 try:
@@ -725,9 +962,9 @@ class AppBase:
                         pass
 
                 if isinstance(tmp, list):
-                    return len(tmp)
+                    return str(len(tmp))
                 elif isinstance(tmp, object):
-                    return len(tmp)
+                    return str(len(tmp))
 
                 return str(len(data))
             if "parse" in thistype:
@@ -773,7 +1010,7 @@ class AppBase:
             #print("Running %s" % data)
         
             # Look for the INNER wrapper first, then move out
-            wrappers = ["int", "number", "lower", "upper", "trim", "strip", "split", "parse", "len", "length", "lenght"]
+            wrappers = ["int", "number", "lower", "upper", "trim", "strip", "split", "parse", "len", "length", "lenght", "join"]
             found = False
             for wrapper in wrappers:
                 if wrapper not in data.lower():
@@ -788,8 +1025,8 @@ class AppBase:
             # Do stuff here.
             innervalue = parse_nested_param(data, maxDepth(data)-0)
             outervalue = parse_nested_param(data, maxDepth(data)-1)
-            #print("INNER: ", innervalue)
-            #print("OUTER: ", outervalue)
+            print("INNER: ", innervalue)
+            print("OUTER: ", outervalue)
         
             if outervalue != innervalue:
                 #print("Outer: ", outervalue, " inner: ", innervalue)
@@ -971,7 +1208,9 @@ class AppBase:
                     outercnt += 1
         
             except KeyError as e:
-                print("Lower keyerror: %s" % e)
+                print("[INFO] Lower keyerror: %s" % e)
+                return "", False
+
                 #return basejson
                 #return "KeyError: Couldn't find key: %s" % e
 
@@ -1030,10 +1269,10 @@ class AppBase:
                                     baseresult = variable["value"]
                                     break
                         except KeyError as e:
-                            print("KeyError wf variables: %s" % e)
+                            print("[INFO] KeyError wf variables: %s" % e)
                             pass
                         except TypeError as e:
-                            print("TypeError wf variables: %s" % e)
+                            print("[INFO] TypeError wf variables: %s" % e)
                             pass
         
                     print("BEFORE EXECUTION VAR")
@@ -1046,10 +1285,10 @@ class AppBase:
                                     baseresult = variable["value"]
                                     break
                         except KeyError as e:
-                            print("KeyError exec variables: %s" % e)
+                            print("[INFO] KeyError exec variables: %s" % e)
                             pass
                         except TypeError as e:
-                            print("TypeError exec variables: %s" % e)
+                            print("[INFO] TypeError exec variables: %s" % e)
                             pass
         
             except KeyError as error:
@@ -1105,6 +1344,7 @@ class AppBase:
 
             # Matches with space in the first part, but not in subsequent parts.
             # JSON / yaml etc shouldn't have spaces in their fields anyway.
+            #match = ".*?([$]{1}([a-zA-Z0-9 _-]+\.?){1}([a-zA-Z0-9#_-]+\.?){0,})[$/, ]?"
             match = ".*?([$]{1}([a-zA-Z0-9 _-]+\.?){1}([a-zA-Z0-9#_-]+\.?){0,})"
 
             # Regex to find all the things
@@ -1220,16 +1460,16 @@ class AppBase:
             self.logger.info("Checking %s %s %s" % (sourcevalue, check, destinationvalue))
 
             if check == "=" or check.lower() == "equals":
-                if sourcevalue.lower() == destinationvalue.lower():
+                if str(sourcevalue).lower() == str(destinationvalue).lower():
                     return True
             elif check == "!=" or check.lower() == "does not equal":
-                if sourcevalue.lower() != destinationvalue.lower():
+                if str(sourcevalue).lower() != str(destinationvalue).lower():
                     return True
             elif check.lower() == "startswith":
-                if sourcevalue.lower().startswith(destinationvalue.lower()):
+                if str(sourcevalue).lower().startswith(str(destinationvalue).lower()):
                     return True
             elif check.lower() == "endswith":
-                if sourcevalue.lower().endswith(destinationvalue.lower()):
+                if str(sourcevalue).lower().endswith(str(destinationvalue).lower()):
                     return True
             elif check.lower() == "contains":
                 if destinationvalue.lower() in sourcevalue.lower():
@@ -1303,7 +1543,7 @@ class AppBase:
                     sourcevalue = condition["source"]["value"]
                     check, sourcevalue, is_loop = parse_params(action, fullexecution, condition["source"])
                     if check:
-                        return False, "Failed condition: %s %s %s because %s" % (sourcevalue, condition["condition"]["value"], destinationvalue, check)
+                        return False, {"success": False, "reason": "Failed condition: %s %s %s because %s" % (sourcevalue, condition["condition"]["value"], destinationvalue, check)}
 
 
                     #sourcevalue = sourcevalue.encode("utf-8")
@@ -1312,7 +1552,7 @@ class AppBase:
 
                     check, destinationvalue, is_loop = parse_params(action, fullexecution, condition["destination"])
                     if check:
-                        return False, "Failed condition: %s %s %s because %s" % (sourcevalue, condition["condition"]["value"], destinationvalue, check)
+                        return False, {"success": False, "reason": "Failed condition: %s %s %s because %s" % (sourcevalue, condition["condition"]["value"], destinationvalue, check)}
 
                     #destinationvalue = destinationvalue.encode("utf-8")
                     destinationvalue = parse_wrapper_start(destinationvalue)
@@ -1353,7 +1593,7 @@ class AppBase:
 
                     if not validation:
                         self.logger.info("Failed condition check for %s %s %s." % (sourcevalue, condition["condition"]["value"], destinationvalue))
-                        return False, "Failed condition: %s %s %s" % (sourcevalue, condition["condition"]["value"], destinationvalue)
+                        return False, {"success": False, "reason": "Failed condition: %s %s %s" % (sourcevalue, condition["condition"]["value"], destinationvalue)}
 
 
                 # Make a general parser here, at least to get param["name"] = param["value"] in maparameter[string]string
@@ -1361,12 +1601,14 @@ class AppBase:
     
             return True, ""
 
+
+        # THE START IS ACTUALLY RIGHT HERE :O
         # Checks whether conditions are met, otherwise set 
         branchcheck, tmpresult = check_branch_conditions(action, fullexecution)
         if not branchcheck:
             self.logger.info("Failed one or more branch conditions.")
             action_result["result"] = tmpresult
-            action_result["status"] = "FAILURE"
+            action_result["status"] = "SKIPPED"
             try:
                 ret = requests.post("%s%s" % (self.base_url, stream_path), headers=headers, json=action_result)
                 self.logger.info("Result: %d" % ret.status_code)
@@ -1392,7 +1634,7 @@ class AppBase:
         try:
             func = getattr(self, actionname, None)
             if func == None:
-                self.logger.debug("Failed executing %s because func is None." % actionname)
+                self.logger.debug(f"Failed executing {actionname} because func is None.")
                 action_result["status"] = "FAILURE" 
                 action_result["result"] = "Function %s doesn't exist." % actionname
             elif callable(func):
@@ -1409,7 +1651,7 @@ class AppBase:
                         params = {}
                         try:
                             for item in action["authentication"]:
-                                print("AUTH: ", key, value)
+                                #print("AUTH: ", key, value)
                                 params[item["key"]] = item["value"]
                         except KeyError:
                             print("No authentication specified!")
@@ -1431,12 +1673,16 @@ class AppBase:
                                     if "||" in parameter["value"]:
                                         splitvalue = parameter["value"].split("||")
                                         if len(splitvalue) > 1:
-                                            print(f'[INFO] Parsed split || options of actions["parameters"]["name"]')
+                                            #print(f'[INFO] Parsed split || options of actions["parameters"]["name"]')
                                             action["parameters"][counter]["value"] = splitvalue[1]
 
                             except (IndexError, KeyError, TypeError) as e:
-                                print("Options err: {e}")
+                                print("[WARNING] Options err: {e}")
 
+                            # This part is purely for OpenAPI accessibility. 
+                            # It replaces the data back into the main item
+                            # Earlier, we handled each of the items and did later string replacement, 
+                            # but this has changed to do lists within items and such
                             if parameter["name"] == "body": 
                                 bodyindex = counter
                                 #print("PARAM: %s" % parameter)
@@ -1445,16 +1691,28 @@ class AppBase:
                                     if values != None:
                                         added = 0
                                         for val in values:
-                                            newparams.append({
-                                                "name": val["key"],
-                                                "value": val["value"],
-                                                "variant": "STATIC_VALUE",
-                                                "id": "body_replacement",
-                                            })
+                                            #print(f"VAL: {val}")
+                                            #parameter["value"].replace(val["key"], val["value"], -1)
+                                            #print(f'PARAM1: {action["parameters"][counter]["value"]}')
+                                            action["parameters"][counter]["value"] = action["parameters"][counter]["value"].replace(val["key"], val["value"], 1)
+                                            #action["parameters"][counter]["value"].replace(r"${url}", r"$Find_URLs.valid.#.data", 1)
+                                            #print(f'PARAM2: {action["parameters"][counter]["value"]}')
+                                            #newparams.append({
+                                            #    "name": val["key"],
+                                            #    "value": val["value"],
+                                            #    "variant": "STATIC_VALUE",
+                                            #    "id": "body_replacement",
+                                            #    "schema": {
+                                            #        "type": "string",
+                                            #    },
+                                            #})
 
-                                            print("Added param %s for body" % val["key"])
+                                            #print(f'[INFO] Added param {val["key"]} for body with value {val["value"]} (using OpenAPI)')
+                                            print(f'[INFO] Added param {val["key"]} for body (using OpenAPI)')
                                             added += 1
 
+                                        #action["parameters"]["body"]
+
                                         print("ADDED %d parameters for body" % added)
                                 except KeyError as e:
                                     print("KeyError body OpenAPI: %s" % e)
@@ -1462,6 +1720,7 @@ class AppBase:
 
                                 break
 
+                        #print(action["parameters"])
                         for parameter in newparams:
                             action["parameters"].append(parameter)
 
@@ -1478,6 +1737,7 @@ class AppBase:
                         multi_parameters = json.loads(json.dumps(params))
                         multiexecution = False
                         multi_execution_lists = []
+                        remove_params = []
                         for parameter in action["parameters"]:
                             check, value, is_loop = parse_params(action, fullexecution, parameter)
                             if check:
@@ -1485,7 +1745,10 @@ class AppBase:
 
                             # Custom format for ${name[0,1,2,...]}$
                             #submatch = "([${]{2}([0-9a-zA-Z_-]+)(\[.*\])[}$]{2})"
-                            submatch = "([${]{2}#?([0-9a-zA-Z_-]+)#?(\[.*\])[}$]{2})"
+                            #print(f"Returnedvalue: {value}")
+                            # OLD: Used until 13.03.2021: submatch = "([${]{2}#?([0-9a-zA-Z_-]+)#?(\[.*\])[}$]{2})"
+                            # \${[0-9a-zA-Z_-]+#?(\[.*?]}\$)
+                            submatch = "([${]{2}#?([0-9a-zA-Z_-]+)#?(\[.*?]}\$))"
                             actualitem = re.findall(submatch, value, re.MULTILINE)
                             try:
                                 if action["skip_multicheck"]:
@@ -1505,17 +1768,24 @@ class AppBase:
                                 # Loop WITH variables go in else.
                                 print("Before first part in multiexec!")
                                 handled = False
+
+                                # Has a loop without a variable used inside
                                 if len(actualitem[0]) > 2 and actualitem[0][1] == "SHUFFLE_NO_SPLITTER":
+
                                     print("(1) Pre replacement: %s" % actualitem[0][2])
                                     tmpitem = value
 
-                                    replacement = actualitem[0][2]
+                                    index = 0
+                                    replacement = actualitem[index][2]
+                                    if replacement.endswith("}$"):
+                                        replacement = replacement[:-2]
+
                                     if replacement.startswith("\"") and replacement.endswith("\""):
                                         replacement = replacement[1:len(replacement)-1]
 
                                     print("POST replacement: %s" % replacement)
 
-                                    #json_replacement = tmpitem.replace(actualitem[0][0], replacement, 1)
+                                    #json_replacement = tmpitem.replace(actualitem[index][0], replacement, 1)
                                     #print("AFTER POST replacement: %s" % json_replacement)
                                     #json_replacement = replacement
                                     try:
@@ -1537,9 +1807,9 @@ class AppBase:
                                     for i in range(len(json_replacement)):
                                         if isinstance(json_replacement[i], dict) or isinstance(json_replacement[i], list):
                                             tmp_replacer = json.dumps(json_replacement[i])
-                                            newvalue = tmpitem.replace(actualitem[0][0], tmp_replacer, 1)
+                                            newvalue = tmpitem.replace(actualitem[index][0], tmp_replacer, 1)
                                         else:
-                                            newvalue = tmpitem.replace(actualitem[0][0], json_replacement[i], 1)
+                                            newvalue = tmpitem.replace(actualitem[index][0], json_replacement[i], 1)
 
                                         try:
                                             newvalue = json.loads(newvalue)
@@ -1552,13 +1822,13 @@ class AppBase:
                                     print("New replacement: %s" % new_replacement)
 
                                     # New
-                                    tmpitem = tmpitem.replace(actualitem[0][0], replacement, 1)
+                                    tmpitem = tmpitem.replace(actualitem[index][0], replacement, 1)
 
                                     # This code handles files.
-                                    print("(1) ------------ PARAM: %s" % parameter["schema"]["type"])
                                     resultarray = []
                                     isfile = False
                                     try:
+                                        print("(1) ------------ PARAM: %s" % parameter["schema"]["type"])
                                         if parameter["schema"]["type"] == "file" and len(value) > 0:
                                             print("(1) SHOULD HANDLE FILE IN MULTI. Get based on value %s" % tmpitem) 
                                             # This is silly :)
@@ -1572,8 +1842,10 @@ class AppBase:
                                                 print("(1) FILE VALUE FOR VAL %s: %s" % (tmp_file_split, file_value))
 
                                             isfile = True
+                                    except NameError as e:
+                                        print("(1) SCHEMA NAMEERROR IN FILE HANDLING: %s" % e)
                                     except KeyError as e:
-                                        print("(1) SCHEMA ERROR IN FILE HANDLING: %s" % e)
+                                        print("(1) SCHEMA KEYERROR IN FILE HANDLING: %s" % e)
                                     except json.decoder.JSONDecodeError as e:
                                         print("(1) JSON ERROR IN FILE HANDLING: %s" % e)
 
@@ -1589,7 +1861,7 @@ class AppBase:
                                     multi_execution_lists.append(new_replacement)
                                     #print("MULTI finished: %s" % json_replacement)
                                 else:
-                                    print("(2) Pre replacement. ") #% actualitem)
+                                    print(f"(2) Pre replacement (loop with variables). Variables: {actualitem}") #% actualitem)
                                     # This is here to handle for loops within variables.. kindof
                                     # 1. Find the length of the longest array
                                     # 2. Build an array with the base values based on parameter["value"] 
@@ -1601,9 +1873,15 @@ class AppBase:
                                         try:
                                             to_be_replaced = replace[0]
                                             actualitem = replace[2]
+                                            if actualitem.endswith("}$"):
+                                                actualitem = actualitem[:-2]
                                         except IndexError:
                                             continue
 
+                                        #print(f"\n\nTMPITEM: {actualitem}\n\n")
+                                        #actualitem = parse_wrapper_start(actualitem)
+                                        #print(f"\n\nTMPITEM2: {actualitem}\n\n")
+
                                         try:
                                             itemlist = json.loads(actualitem)
                                             if len(itemlist) > minlength:
@@ -1611,14 +1889,19 @@ class AppBase:
 
                                             if len(itemlist) > curminlength:
                                                 curminlength = len(itemlist)
+                                            
                                         except json.decoder.JSONDecodeError as e:
-                                            print("JSON Error: %s in %s" % (e, actualitem))
+                                            print("JSON Error (replace): %s in %s" % (e, actualitem))
 
                                         replacements[to_be_replaced] = actualitem
 
+
+                                    # Parses the data as string with length, split etc. before moving on. 
+
+
+                                    #print("In second part of else: %s" % (len(itemlist)))
                                     # This is a result array for JUST this value.. 
                                     # What if there are more?
-                                    print("LENGTH: %d. In second part of else: %s" % (len(itemlist), replacements))
                                     resultarray = []
                                     for i in range(0, curminlength): 
                                         tmpitem = json.loads(json.dumps(parameter["value"]))
@@ -1664,22 +1947,56 @@ class AppBase:
                                         multi_execution_lists.append(resultarray)
 
                                     multi_parameters[parameter["name"]] = resultarray
+
+                                    #if parameter["id"] == "body_replacement": 
+                                    #    print("Should run body MULTI replacement in index %d with %s" % (bodyindex, parameter))
+                                    #    try:
+                                    #        print("PREBODY: %s" % params["body"])
+
+                                    #        parsedarray = str(resultarray)
+                                    #        try:
+                                    #            parsedarray = json.dumps(resultarray)
+                                    #        except:
+                                    #            pass
+
+                                    #        if f'\"{parameter["name"]}\"' in params["body"]:
+                                    #            params["body"] = params["body"].replace(f'\"{parameter["name"]}\"' , parsedarray, -1)
+                                    #            multi_parameters["body"] = multi_parameters["body"].replace(f'\"{parameter["name"]}\"' , parsedarray, -1)
+                                    #        else:
+                                    #            params["body"] = params["body"].replace(parameter["name"], parsedarray, -1)
+                                    #            multi_parameters["body"] = multi_parameters["body"].replace(parameter["name"], parsedarray, -1)
+
+                                    #        #print("POSTBODY: %s" % params["body"])
+                                    #        #if isinstance(multi_parameters, list):
+                                    #        #    print("MULTIPARAM AS LIST (NOT REPLACING!!)!")
+                                    #        #    for multiparam in multi_parameters:
+                                    #        #        print(f"MULTIPARAM: {multiparam}")
+                                    #        #        #multi_parameters["body"] = multi_parameters["body"].replace(parameter["name"], str(parameter["value"]), -1)
+                                    #        #else:
+                        
+                                    #    except KeyError as e:
+                                    #        print("KEYERROR: %s" % e)
+
+                                    #    remove_params.append(parameter["name"])
+                                    #    #bodyindex = counter
+                                    #    continue
+
                             else:
                                 # Parses things like int(value)
                                 print("Normal parsing (not looping)")#with data %s" % value)
                                 value = parse_wrapper_start(value)
 
-                                if parameter["id"] == "body_replacement": 
-                                    print("Should run body replacement in index %d with %s" % (bodyindex, parameter))
-                                    try:
-                                        print("PREBODY: %s" % params["body"])
-                                        params["body"] = params["body"].replace(parameter["name"], parameter["value"], -1)
-                                        print("POSTBODY: %s" % params["body"])
-                                    except KeyError as e:
-                                        print("KEYERROR: %s" % e)
+                                #if parameter["id"] == "body_replacement": 
+                                #    print("Should run body replacement in index %d with %s" % (bodyindex, parameter))
+                                #    try:
+                                #        print("PREBODY: %s" % params["body"])
+                                #        params["body"] = params["body"].replace(parameter["name"], parameter["value"], -1)
+                                #        print("POSTBODY: %s" % params["body"])
+                                #    except KeyError as e:
+                                #        print("KEYERROR: %s" % e)
 
-                                    #bodyindex = counter
-                                    continue
+                                #    #bodyindex = counter
+                                #    continue
 
                                 #for parameter in action["parameters"]:
                                 #if parameter["name"] == "body": 
@@ -1702,6 +2019,8 @@ class AppBase:
                                 except KeyError as e:
                                     print("SCHEMA ERROR IN FILE HANDLING: %s" % e)
 
+
+                        #remove_params.append(parameter["name"])
                         # Fix lists here
                         # FIXME: This doesn't really do anything anymore
                         print("CHECKING multi execution list!")
@@ -1723,7 +2042,7 @@ class AppBase:
 
                             #print("New list length: %d" % len(filteredlist))
                             if len(filteredlist) > 1:
-                                print("Calculating new multi-loop length with %d lists" % len(filteredlist))
+                                print(f"Calculating new multi-loop length with {len(filteredlist)} lists")
                                 tmplength = 1
                                 for innerlist in filteredlist:
                                     tmplength = len(innerlist)*tmplength
@@ -1732,19 +2051,43 @@ class AppBase:
                                 minlength = tmplength
 
                                 print("New multi execution length: %d\n" % tmplength)
+
+                        # Cleaning up extra list params
+                        for subparam in remove_params:
+                            #print(f"DELETING {subparam}")
+                            try:
+                                del params[subparam]
+                            except:
+                                pass
+                                #print(f"Error with subparam deletion of {subparam} in {params}")
+                            try:
+                                del multi_parameters[subparam]
+                            except:
+                                #print(f"Error with subparam deletion of {subparam} in {multi_parameters} (2)")
+                                pass
+
+                        #print()
+                        #print(f"Param: {params}")
+                        #print(f"Multiparams: {multi_parameters}")
+                        #print()
                         
                         if not multiexecution:
-                            #newparams.append({
-                            #    "name": val["key"],
-                            #    "value": val["value"],
-                            #    "variant": "STATIC_VALUE",
-                            #    "id": "body_replacement",
-                            #})
+                            # Runs a single iteration here
+                            new_params = self.validate_unique_fields(params)
+                            print(f"Returned with newparams of length {len(new_params)}")
+                            if isinstance(new_params, list) and len(new_params) == 1:
+                                params = new_params[0]
+                            else:
+                                print("[WARNING] SHOULD STOP EXECUTION BECAUSE FIELDS AREN'T UNIQUE")
+                                action_result["status"] = "SKIPPED"
+                                action_result["result"] = f"A non-unique value was found"  
+                                action_result["completed_at"] = int(time.time())
+                                self.send_result(action_result, headers, stream_path)
+                                return
 
-                            #print("[INFO] APP_SDK DONE: Starting NORMAL execution of function")
                             print("[INFO] Running normal execution\n") 
                             newres = await func(**params)
-                            print("\n[INFO] Returned from execution with datalength!")#, newres)
+                            print("\n[INFO] Returned from execution!")#, newres)
                             if isinstance(newres, tuple):
                                 print("[INFO] Handling return as tuple")
                                 # Handles files.
@@ -1772,6 +2115,17 @@ class AppBase:
                             elif isinstance(newres, str):
                                 print("[INFO] Handling return as string of length %d" % len(newres))
                                 result += newres
+                            elif isinstance(newres, dict) or isinstance(newres, list):
+                                try:
+                                    result += json.dumps(newres, indent=4)
+                                except json.JSONDecodeError as e:
+                                    print("Failed decoding result: %s" % e)
+
+                                    try:
+                                        result += str(newres)
+                                    except ValueError:
+                                        result += "Failed autocasting. Can't handle %s type from function. Must be string" % type(newres)
+                                        print("Can't handle type %s value from function" % (type(newres)))
                             else:
                                 try:
                                     result += str(newres)
@@ -1898,10 +2252,16 @@ class AppBase:
 
                             # Dump the result as a string of a list
                             #print("RESULTS: %s" % results)
-                            if isinstance(results, list):
+                            if isinstance(results, list) or isinstance(results, dict):
                                 print("JSON OBJECT? ", json_object)
+
+                                # This part is weird lol
                                 if json_object:
-                                    result = json.dumps(results)
+                                    try:
+                                        result = json.dumps(results)
+                                    except json.JSONDecodeError as e:
+                                        print(f"Failed to decode: {e}")
+                                        result = results
                                 else:
                                     result = "["
                                     for item in results:
@@ -1926,14 +2286,13 @@ class AppBase:
                             else:
                                 print("Normal result - no list?")
                                 result = results
-                                
-                    print("RESULT: %s" % result)
+
                     action_result["status"] = "SUCCESS" 
                     action_result["result"] = str(result)
                     if action_result["result"] == "":
                         action_result["result"] = result
 
-                    self.logger.debug(f"Executed {action['label']}-{action['id']} with result: {result}")
+                    self.logger.debug(f"Executed {action['label']}-{action['id']}")#with result: {result}")
                     #self.logger.debug(f"Data: %s" % action_result)
                 except TypeError as e:
                     print("TypeError issue: %s" % e)

backend/app_sdk/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 NAME=shuffle-app_sdk
-VERSION=0.8.60
+VERSION=0.8.64
 
 docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force
 docker build . -t frikky/shuffle:app_sdk -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION

backend/app_sdk/requirements.txt

@@ -1,2 +1,2 @@
-urllib3
-requests
+urllib3=1.25.9
+requests=2.25.1

backend/app_sdk/static_baseline.py

@@ -1,76 +0,0 @@
-import os
-import sys
-import time 
-import logging
-import requests
-
-# Goal here:
-# * Make an app from WALKOFF able to run without app_base.py from WALKOFF
-# # How:
-# * Make it rely 100% on INPUT throug HTTP invocations instead of redis READS 
-# # But really, how?
-# * Make a WORKER that reads the queue, and reuses a function 
-
-# Here to get it global
-apikey = ""
-try:
-    apikey = os.environ["FUNCTION_APIKEY"]
-except KeyError:
-    pass
-
-# Authorize the execution 
-def authorization(request):
-    # This is basically my issue, but it enforces the use of an internal API key for execution
-    try:
-        apikey = os.environ["FUNCTION_APIKEY"]
-    except KeyError:
-        return f"Internal server error", 500
-
-
-    # Check API key from ENV authentication
-    authentication = request.headers.get("Authorization")
-    if authentication == None: return f"Unauthorized", 401
-
-    apikey_split = authentication.split(" ")
-    if apikey_split[0] != "Bearer" or len(apikey_split) != 2:
-        return f"Apikey error", 401
-
-    if apikey != apikey_split[1]:
-        return f"Unauthorized", 401
-
-    return run(request)
-
-class AppBase:
-    """ The base class for Python-based Walkoff applications, handles Redis and logging configurations. """
-    __version__ = None
-    app_name = None
-
-    def __init__(self, redis=None, logger=None, console_logger=None):#, docker_client=None):
-        self.logger = logger if logger is not None else logging.getLogger("AppBaseLogger")
-        self.redis=redis
-        self.console_logger=console_logger 
-        self.current_execution_id = None
-        self.url = "https://shuffler.io"
-        self.apikey = apikey
-
-    @classmethod
-    async def run(cls, action):
-        """ Connect to Redis and HTTP session, await actions """
-        logging.basicConfig(format="{asctime} - {name} - {levelname}:{message}", style='{')
-        logger = logging.getLogger(f"{cls.__name__}")
-        logger.setLevel(logging.DEBUG)
-
-        app = cls(redis=None, logger=logger, console_logger=logger)
-
-        # Authorization for the app/function to control the workflow
-        # Function will crash if its wrong, which it probably should. 
-
-        await app.execute_action(action)
-    
-    async def execute_action(self, action):
-        # FIXME - add request for the function STARTING here. Use "results stream" or something
-        # PAUSED, AWAITING_DATA, PENDING, COMPLETED, ABORTED, EXECUTING, SUCCESS, FAILURE
-
-        self.authorization = action["authorization"]
-        self.execution_id = action["execution_id"]
-        self.current_execution_id = action["execution_id"]

backend/go-app/docker.go

@@ -2,6 +2,8 @@ package main
 
 // Docker
 import (
+	"github.com/frikky/shuffle-shared"
+
 	"archive/tar"
 	"path/filepath"
 
@@ -24,7 +26,6 @@ import (
 	"net/http"
 	"os"
 	"strings"
-	//"google.golang.org/appengine"
 )
 
 // Parses a directory with a Dockerfile into a tar for Docker images..
@@ -798,7 +799,7 @@ func getDockerImage(resp http.ResponseWriter, request *http.Request) {
 	}
 
 	// Just here to verify that the user is logged in
-	_, err := handleApiAuthentication(resp, request)
+	_, err := shuffle.HandleApiAuthentication(resp, request)
 	if err != nil {
 		log.Printf("Api authentication failed in validate swagger: %s", err)
 		resp.WriteHeader(401)
@@ -862,7 +863,7 @@ func getDockerImage(resp http.ResponseWriter, request *http.Request) {
 	tagFound := ""
 	for _, image := range images {
 		for _, tag := range image.RepoTags {
-			log.Printf("Image: %s", tag)
+			log.Printf("[INFO] Docker Image: %s", tag)
 
 			if strings.ToLower(tag) == strings.ToLower(version.Name) {
 				img = image

backend/go-app/files.go

@@ -1,882 +0,0 @@
-package main
-
-/*
-	Handles files within Workflows.of Shuffle
-*/
-
-import (
-	"bytes"
-	"context"
-	"crypto/sha256"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"os"
-	"strconv"
-	"strings"
-	"time"
-
-	"cloud.google.com/go/datastore"
-	"github.com/satori/go.uuid"
-)
-
-type File struct {
-	Id           string   `json:"id" datastore:"id"`
-	Type         string   `json:"type" datastore:"type"`
-	CreatedAt    int64    `json:"created_at" datastore:"created_at"`
-	UpdatedAt    int64    `json:"updated_at" datastore:"updated_at"`
-	MetaAccessAt int64    `json:"meta_access_at" datastore:"meta_access_at"`
-	DownloadAt   int64    `json:"last_downloaded" datastore:"last_downloaded"`
-	Description  string   `json:"description" datastore:"description"`
-	ExpiresAt    string   `json:"expires_at" datastore:"expires_at"`
-	Status       string   `json:"status" datastore:"status"`
-	Filename     string   `json:"filename" datastore:"filename"`
-	URL          string   `json:"url" datastore:"org"`
-	OrgId        string   `json:"org_id" datastore:"org_id"`
-	WorkflowId   string   `json:"workflow_id" datastore:"workflow_id"`
-	Workflows    []string `json:"workflows" datastore:"workflows"`
-	DownloadPath string   `json:"download_path" datastore:"download_path"`
-	Md5sum       string   `json:"md5_sum" datastore:"md5_sum"`
-	Sha256sum    string   `json:"sha256_sum" datastore:"sha256_sum"`
-	FileSize     int64    `json:"filesize" datastore:"filesize"`
-	Duplicate    bool     `json:"duplicate" datastore:"duplicate"`
-	Subflows     []string `json:"subflows" datastore:"subflows"`
-}
-
-var basepath = os.Getenv("SHUFFLE_FILE_LOCATION")
-
-func fileAuthentication(request *http.Request) (string, error) {
-	executionId, ok := request.URL.Query()["execution_id"]
-	if ok && len(executionId) > 0 {
-		ctx := context.Background()
-		workflowExecution, err := getWorkflowExecution(ctx, executionId[0])
-		if err != nil {
-			log.Printf("[ERROR] Couldn't find execution ID %s", executionId[0])
-			return "", err
-		}
-
-		apikey := request.Header.Get("Authorization")
-		if !strings.HasPrefix(apikey, "Bearer ") {
-			log.Printf("[ERROR} Apikey doesn't start with bearer (2)")
-			return "", errors.New("No auth key found")
-		}
-
-		apikeyCheck := strings.Split(apikey, " ")
-		if len(apikeyCheck) != 2 {
-			log.Printf("[ERROR] Invalid format for apikey (2)")
-			return "", errors.New("No space in authkey")
-		}
-
-		// This is annoying af and is done because of maxlength lol
-		newApikey := apikeyCheck[1]
-		if newApikey != workflowExecution.Authorization {
-			//log.Printf("[ERROR] Bad apikey for execution %s. %s vs %s", executionId[0], apikey, workflowExecution.Authorization)
-			log.Printf("[ERROR] Bad apikey for execution %s.", executionId[0])
-			//%s vs %s", executionId[0], apikey, workflowExecution.Authorization)
-			return "", errors.New("Bad authorization key")
-		}
-
-		log.Printf("[INFO] Authorization is correct for execution %s!", executionId[0])
-		//%s vs %s. Setting Org", executionId, apikey, workflowExecution.Authorization)
-		if len(workflowExecution.ExecutionOrg) > 0 {
-			return workflowExecution.ExecutionOrg, nil
-		} else if len(workflowExecution.Workflow.ExecutingOrg.Id) > 0 {
-			return workflowExecution.ExecutionOrg, nil
-		} else {
-			log.Printf("[ERROR] Couldn't find org for workflow execution, but auth was correct.")
-		}
-	}
-
-	return "", errors.New("No execution id specified")
-}
-
-// https://golangcode.com/check-if-a-file-exists/
-func fileExists(filename string) bool {
-	info, err := os.Stat(filename)
-	if os.IsNotExist(err) {
-		return false
-	}
-	return !info.IsDir()
-}
-
-func handleGetFiles(resp http.ResponseWriter, request *http.Request) {
-	cors := handleCors(resp, request)
-	if cors {
-		return
-	}
-
-	// 1. Check user directly
-	// 2. Check workflow execution authorization
-	user, err := handleApiAuthentication(resp, request)
-	if err != nil {
-		log.Printf("[INFO] INITIAL Api authentication failed in file LIST: %s", err)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false}`))
-		return
-	}
-
-	if user.Role != "admin" {
-		log.Printf("[AUTH] User isn't admin")
-		resp.WriteHeader(401)
-		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Need to be admin"}`)))
-		return
-	}
-
-	ctx := context.Background()
-	files, err := getAllFiles(ctx, user.ActiveOrg.Id)
-	if err != nil {
-		log.Printf("[ERROR] Failed to get files: %s", err)
-		resp.WriteHeader(500)
-		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Error getting files."}`)))
-		return
-	}
-
-	log.Printf("[INFO] Got %d files for org %s", len(files), user.ActiveOrg.Id)
-	newBody, err := json.Marshal(files)
-	if err != nil {
-		log.Printf("[ERROR] Failed marshaling files: %s", err)
-		resp.WriteHeader(500)
-		resp.Write([]byte(`{"success": false, "reason": "Failed to marshal files"}`))
-		return
-	}
-
-	resp.WriteHeader(200)
-	resp.Write([]byte(newBody))
-}
-
-func handleGetFileMeta(resp http.ResponseWriter, request *http.Request) {
-	cors := handleCors(resp, request)
-	if cors {
-		return
-	}
-
-	var fileId string
-	location := strings.Split(request.URL.String(), "/")
-	if location[1] == "api" {
-		if len(location) <= 4 {
-			log.Printf("[INFO] Path too short: %d", len(location))
-			resp.WriteHeader(401)
-			resp.Write([]byte(`{"success": false}`))
-			return
-		}
-
-		fileId = location[4]
-	}
-
-	if strings.Contains(fileId, "?") {
-		fileId = strings.Split(fileId, "?")[0]
-	}
-
-	if len(fileId) != 36 {
-		log.Printf("Bad format for fileId %s", fileId)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false, "reason": "Badly formatted fileId"}`))
-		return
-	}
-
-	log.Printf("\n\n[INFO] User is trying to GET File Meta for %s\n\n", fileId)
-
-	// 1. Check user directly
-	// 2. Check workflow execution authorization
-	user, err := handleApiAuthentication(resp, request)
-	if err != nil {
-		log.Printf("[INFO] INITIAL Api authentication failed in file deletion: %s", err)
-
-		orgId, err := fileAuthentication(request)
-		if err != nil {
-			log.Printf("[ERROR] Bad file authentication in get: %s", err)
-			resp.WriteHeader(401)
-			resp.Write([]byte(`{"success": false}`))
-			return
-		}
-
-		user.ActiveOrg.Id = orgId
-		user.Username = "Execution File API"
-	}
-
-	// 1. Verify if the user has access to the file: org_id and workflow
-	log.Printf("[INFO] Should GET FILE META for %s if user has access", fileId)
-	ctx := context.Background()
-	file, err := getFile(ctx, fileId)
-	if err != nil {
-		log.Printf("[INFO] File %s not found: %s", fileId, err)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false}`))
-		return
-	}
-
-	found := false
-	if file.OrgId == user.ActiveOrg.Id {
-		found = true
-	} else {
-		for _, item := range user.Orgs {
-			if item == file.OrgId {
-				found = true
-				break
-			}
-		}
-	}
-
-	if !found {
-		log.Printf("[INFO] User %s doesn't have access to %s", user.Username, fileId)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false}`))
-		return
-	}
-
-	newBody, err := json.Marshal(file)
-	if err != nil {
-		resp.WriteHeader(500)
-		resp.Write([]byte(`{"success": false, "reason": "Failed to marshal filedata"}`))
-		return
-	}
-
-	log.Printf("[INFO] Successfully got file meta for %s", fileId)
-	resp.WriteHeader(200)
-	resp.Write([]byte(newBody))
-}
-
-func handleDeleteFile(resp http.ResponseWriter, request *http.Request) {
-	cors := handleCors(resp, request)
-	if cors {
-		return
-	}
-
-	var fileId string
-	location := strings.Split(request.URL.String(), "/")
-	if location[1] == "api" {
-		if len(location) <= 4 {
-			log.Printf("[INFO] Path too short: %d", len(location))
-			resp.WriteHeader(401)
-			resp.Write([]byte(`{"success": false}`))
-			return
-		}
-
-		fileId = location[4]
-	}
-
-	if strings.Contains(fileId, "?") {
-		fileId = strings.Split(fileId, "?")[0]
-	}
-
-	if len(fileId) != 36 {
-		log.Printf("Bad format for fileId %s", fileId)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false, "reason": "Badly formatted fileId"}`))
-		return
-	}
-
-	log.Printf("\n\n[INFO] User is trying to delete file %s\n\n", fileId)
-
-	// 1. Check user directly
-	// 2. Check workflow execution authorization
-	user, err := handleApiAuthentication(resp, request)
-	if err != nil {
-		log.Printf("[INFO] INITIAL Api authentication failed in file deletion: %s", err)
-
-		orgId, err := fileAuthentication(request)
-		if err != nil {
-			log.Printf("[ERROR] Bad file authentication in get: %s", err)
-			resp.WriteHeader(401)
-			resp.Write([]byte(`{"success": false}`))
-			return
-		}
-
-		user.ActiveOrg.Id = orgId
-		user.Username = "Execution File API"
-	}
-
-	// 1. Verify if the user has access to the file: org_id and workflow
-	log.Printf("[INFO] Should DELETE file %s if user has access", fileId)
-	ctx := context.Background()
-	file, err := getFile(ctx, fileId)
-	if err != nil {
-		log.Printf("[INFO] File %s not found: %s", fileId, err)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false}`))
-		return
-	}
-
-	found := false
-	if file.OrgId == user.ActiveOrg.Id {
-		found = true
-	} else {
-		for _, item := range user.Orgs {
-			if item == file.OrgId {
-				found = true
-				break
-			}
-		}
-	}
-
-	if !found {
-		log.Printf("[INFO] User %s doesn't have access to %s", user.Username, fileId)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false}`))
-		return
-	}
-
-	if file.Status == "deleted" {
-		log.Printf("[INFO] File with ID %s is already deleted.", fileId)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false}`))
-		return
-	}
-
-	if fileExists(file.DownloadPath) {
-		err = os.Remove(file.DownloadPath)
-		if err != nil {
-			log.Printf("[ERROR] Failed deleting file locally: %s", err)
-			resp.WriteHeader(401)
-			resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed deleting filein path %s"}`, file.DownloadPath)))
-			return
-		}
-
-		log.Printf("[INFO] Deleted file %s locally. Next is database.", file.DownloadPath)
-	} else {
-		log.Printf("[ERROR] File doesn't exist. Can't delete. Should maybe delete file anyway?")
-		resp.WriteHeader(200)
-		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "File in location %s doesn't exist"}`, file.DownloadPath)))
-		return
-	}
-
-	file.Status = "deleted"
-	err = setFile(ctx, *file)
-	if err != nil {
-		log.Printf("[ERROR] Failed setting file to deleted")
-		resp.WriteHeader(500)
-		resp.Write([]byte(`{"success": false, "reason": "Failed setting file to deleted"}`))
-		return
-	}
-
-	/*
-		//Actually delete it?
-		err = DeleteKey(ctx, "files", fileId)
-		if err != nil {
-			log.Printf("Failed deleting file with ID %s: %s", fileId, err)
-			resp.WriteHeader(401)
-			resp.Write([]byte(`{"success": false}`))
-			return
-		}
-	*/
-
-	log.Printf("[INFO] Successfully deleted file %s", fileId)
-	resp.WriteHeader(200)
-	resp.Write([]byte(`{"success": true}`))
-}
-
-func handleGetFileContent(resp http.ResponseWriter, request *http.Request) {
-	cors := handleCors(resp, request)
-	if cors {
-		return
-	}
-
-	var fileId string
-	location := strings.Split(request.URL.String(), "/")
-	if location[1] == "api" {
-		if len(location) <= 4 {
-			log.Printf("Path too short: %d", len(location))
-			resp.WriteHeader(401)
-			resp.Write([]byte(`{"success": false}`))
-			return
-		}
-
-		fileId = location[4]
-	}
-
-	if len(fileId) != 36 {
-		log.Printf("Bad format for fileId %s", fileId)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false, "reason": "Badly formatted fileId"}`))
-		return
-	}
-
-	log.Printf("\n\n[INFO] User is trying to download file %s\n\n", fileId)
-
-	// 1. Check user directly
-	// 2. Check workflow execution authorization
-	user, err := handleApiAuthentication(resp, request)
-	if err != nil {
-		log.Printf("INITIAL Api authentication failed in file download: %s", err)
-
-		orgId, err := fileAuthentication(request)
-		if err != nil {
-			log.Printf("Bad file authentication in get: %s", err)
-			resp.WriteHeader(401)
-			resp.Write([]byte(`{"success": false}`))
-			return
-		}
-
-		user.ActiveOrg.Id = orgId
-		user.Username = "Execution File API"
-		/*
-			} else {
-				resp.WriteHeader(401)
-				resp.Write([]byte(`{"success": false}`))
-				return
-			}
-		*/
-	}
-
-	// 1. Verify if the user has access to the file: org_id and workflow
-	log.Printf("[INFO] Should get file %s", fileId)
-	ctx := context.Background()
-	file, err := getFile(ctx, fileId)
-	if err != nil {
-		log.Printf("[ERROR] File %s not found: %s", fileId, err)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false}`))
-		return
-	}
-
-	found := false
-	if file.OrgId == user.ActiveOrg.Id {
-		found = true
-	} else {
-		for _, item := range user.Orgs {
-			if item == file.OrgId {
-				found = true
-				break
-			}
-		}
-	}
-
-	if !found {
-		log.Printf("User %s doesn't have access to %s", user.Username, fileId)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false}`))
-		return
-	}
-
-	if file.Status != "active" {
-		log.Printf("[ERROR] File status isn't active, but %s. Can't continue.", file.Status)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false, "reason": "The file isn't ready to be downloaded yet. Status required: active"}`))
-		return
-	}
-
-	// Fixme: More auth: org and workflow!
-	downloadPath := file.DownloadPath
-	log.Printf("[INFO] Downloadpath: %s", downloadPath)
-	Openfile, err := os.Open(downloadPath)
-	defer Openfile.Close() //Close after function return
-	if err != nil {
-		file.Status = "deleted"
-		err = setFile(ctx, *file)
-		if err != nil {
-			log.Printf("Failed setting file to uploading")
-			resp.WriteHeader(500)
-			resp.Write([]byte(`{"success": false, "reason": "Failed setting file to uploading"}`))
-			return
-		}
-
-		//File not found, send 404
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false, "reason": "File doesn't exist locally"}`))
-		return
-	}
-
-	//File is found, create and send the correct headers
-	//Get the Content-Type of the file
-	//Create a buffer to store the header of the file in
-	FileHeader := make([]byte, 512)
-	//Copy the headers into the FileHeader buffer
-	Openfile.Read(FileHeader)
-	//Get content type of file
-	FileContentType := http.DetectContentType(FileHeader)
-
-	//Get the file size
-	FileStat, _ := Openfile.Stat()                     //Get info from file
-	FileSize := strconv.FormatInt(FileStat.Size(), 10) //Get file size as a string
-
-	//Send the headers
-	resp.Header().Set("Content-Disposition", "attachment; filename="+fileId)
-	resp.Header().Set("Content-Type", FileContentType)
-	resp.Header().Set("Content-Length", FileSize)
-
-	//Send the file
-	//We read 512 bytes from the file already, so we reset the offset back to 0
-	Openfile.Seek(0, 0)
-	io.Copy(resp, Openfile) //'Copy' the file to the client
-	return
-
-	//log.Printf("Should download file %s", downloadPath)
-}
-func handleUploadFile(resp http.ResponseWriter, request *http.Request) {
-	cors := handleCors(resp, request)
-	if cors {
-		return
-	}
-
-	var fileId string
-	location := strings.Split(request.URL.String(), "/")
-	if location[1] == "api" {
-		if len(location) <= 4 {
-			log.Printf("Path too short: %d", len(location))
-			resp.WriteHeader(401)
-			resp.Write([]byte(`{"success": false}`))
-			return
-		}
-
-		fileId = location[4]
-	}
-
-	if len(fileId) != 36 {
-		log.Printf("Bad format for fileId %s", fileId)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false, "reason": "Badly formatted fileId"}`))
-		return
-	}
-
-	// 1. Check user directly
-	// 2. Check workflow execution authorization
-	user, err := handleApiAuthentication(resp, request)
-	if err != nil {
-		log.Printf("INITIAL Api authentication failed in file upload: %s", err)
-
-		orgId, err := fileAuthentication(request)
-		if err != nil {
-			log.Printf("Bad file authentication in create file: %s", err)
-			resp.WriteHeader(401)
-			resp.Write([]byte(`{"success": false}`))
-			return
-		}
-
-		user.ActiveOrg.Id = orgId
-		user.Username = "Execution File API"
-	}
-
-	log.Printf("[INFO] Should UPLOAD file %s if user has access", fileId)
-	ctx := context.Background()
-	file, err := getFile(ctx, fileId)
-	if err != nil {
-		log.Printf("File %s not found: %s", fileId, err)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false}`))
-		return
-	}
-
-	found := false
-	if file.OrgId == user.ActiveOrg.Id {
-		found = true
-	} else {
-		for _, item := range user.Orgs {
-			if item == file.OrgId {
-				found = true
-				break
-			}
-		}
-	}
-
-	if !found {
-		log.Printf("User %s doesn't have access to %s", user.Username, fileId)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false}`))
-		return
-	}
-
-	log.Printf("[INFO] STATUS: %s", file.Status)
-	if file.Status != "created" {
-		log.Printf("File status isn't created. Can't upload.")
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false, "reason": "This file already has data."}`))
-		return
-	}
-
-	request.ParseMultipartForm(32 << 20)
-	parsedFile, _, err := request.FormFile("shuffle_file")
-	if err != nil {
-		log.Printf("[ERROR] Couldn't upload file: %s", err)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false, "reason": "Failed uploading file"}`))
-		return
-	}
-	defer parsedFile.Close()
-
-	file.Status = "uploading"
-	err = setFile(ctx, *file)
-	if err != nil {
-		log.Printf("Failed setting file to uploading")
-		resp.WriteHeader(500)
-		resp.Write([]byte(`{"success": false, "reason": "Failed setting file to uploading"}`))
-		return
-	}
-
-	// Can be used for validation files for change
-	var buf bytes.Buffer
-	io.Copy(&buf, parsedFile)
-	contents := buf.Bytes()
-	file.FileSize = int64(len(contents))
-	md5 := md5sum(contents)
-	buf.Reset()
-
-	sha256Sum := sha256.Sum256(contents)
-	//parsedFile.Reset()
-
-	f, err := os.OpenFile(file.DownloadPath, os.O_WRONLY|os.O_CREATE, os.ModePerm)
-	if err != nil {
-		// Rolling back file
-		file.Status = "created"
-		setFile(ctx, *file)
-
-		log.Printf("[ERROR] Failed uploading and creating file: %s", err)
-		resp.WriteHeader(500)
-		resp.Write([]byte(`{"success": false}`))
-		return
-	}
-
-	defer f.Close()
-	parsedFile.Seek(0, io.SeekStart)
-	io.Copy(f, parsedFile)
-
-	// FIXME: Set this one to 200 anyway? Can't download file then tho..
-	file.Status = "active"
-	file.Md5sum = md5
-	file.Sha256sum = fmt.Sprintf("%x", sha256Sum)
-	log.Printf("[INFO] MD5 for file %s (%s) is %s and SHA256 is %s", file.Filename, file.Id, file.Md5sum, file.Sha256sum)
-
-	err = setFile(ctx, *file)
-	if err != nil {
-		log.Printf("[ERROR] Failed setting file back to active")
-		resp.WriteHeader(500)
-		resp.Write([]byte(`{"success": false, "reason": "Failed setting file to active"}`))
-		return
-	}
-
-	log.Printf("[INFO] Successfully uploaded file ID %s", file.Id)
-	resp.WriteHeader(200)
-	resp.Write([]byte(fmt.Sprintf(`{"success": true}`)))
-}
-
-func handleCreateFile(resp http.ResponseWriter, request *http.Request) {
-	cors := handleCors(resp, request)
-	if cors {
-		return
-	}
-
-	// 1. Check user directly
-	// 2. Check workflow execution authorization
-	user, err := handleApiAuthentication(resp, request)
-	if err != nil {
-		log.Printf("[INFO] INITIAL Api authentication failed in file creation: %s", err)
-
-		orgId, err := fileAuthentication(request)
-		if err != nil {
-			log.Printf("[ERROR] Bad file authentication in create file: %s", err)
-			resp.WriteHeader(401)
-			resp.Write([]byte(`{"success": false}`))
-			return
-		}
-
-		user.ActiveOrg.Id = orgId
-		user.Username = "Execution File API"
-	}
-
-	body, err := ioutil.ReadAll(request.Body)
-	if err != nil {
-		log.Println("Failed reading body")
-		resp.WriteHeader(401)
-		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed to read data"}`)))
-		return
-	}
-
-	type FileStructure struct {
-		Filename   string `json:"filename"`
-		OrgId      string `json:"org_id"`
-		WorkflowId string `json:"workflow_id"`
-	}
-
-	var curfile FileStructure
-	err = json.Unmarshal(body, &curfile)
-	if err != nil {
-		log.Printf("[ERROR] Failed unmarshaling: %s", err)
-		resp.WriteHeader(401)
-		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed to unmarshal data"}`)))
-		return
-	}
-
-	// Loads of validation below
-	if len(curfile.Filename) == 0 || len(curfile.OrgId) == 0 || len(curfile.WorkflowId) == 0 {
-		log.Printf("[ERROR] Missing field during fileupload. Required: filename, org_id, workflow_id")
-		log.Printf("INPUT: %s", string(body))
-		resp.WriteHeader(401)
-		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Missing field. Required: filename, org_id, workflow_id"}`)))
-		return
-	}
-
-	ctx := context.Background()
-	if user.ActiveOrg.Id != curfile.OrgId {
-		log.Printf("[ERROR] User can't access org %s", curfile.OrgId)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false, "reason": "Error with organization"}`))
-		return
-	}
-
-	var workflow *Workflow
-	if curfile.WorkflowId == "global" {
-		// PS: Not a security issue.
-		// Files are global anyway, but the workflow_id is used to identify origin
-		log.Printf("[INFO] Uploading filename %s for org %s as global file.", curfile.Filename, curfile.OrgId)
-	} else {
-		// Try to get the org and workflow in case they don't exist
-		workflow, err = getWorkflow(ctx, curfile.WorkflowId)
-		if err != nil {
-			log.Printf("[ERROR] Workflow %s doesn't exist.", curfile.WorkflowId)
-			resp.WriteHeader(401)
-			resp.Write([]byte(`{"success": false, "reason": "Error with workflow id or org id"}`))
-			return
-		}
-
-		_, err = getOrg(ctx, curfile.OrgId)
-		if err != nil {
-			log.Printf("[ERROR] Org %s doesn't exist.", curfile.OrgId)
-			resp.WriteHeader(401)
-			resp.Write([]byte(`{"success": false, "reason": "Error with workflow id or org id"}`))
-			return
-		}
-
-		if workflow.ExecutingOrg.Id != curfile.OrgId {
-			found := false
-			for _, curorg := range workflow.Org {
-				if curorg.Id == curfile.OrgId {
-					found = true
-					break
-				}
-			}
-
-			if !found {
-				log.Printf("[ERROR] Org %s doesn't have access to %s.", curfile.OrgId, curfile.WorkflowId)
-				resp.WriteHeader(401)
-				resp.Write([]byte(`{"success": false, "reason": "Error with workflow id or org id"}`))
-				return
-			}
-		}
-	}
-
-	if strings.Contains(curfile.Filename, "/") || strings.Contains(curfile.Filename, `"`) || strings.Contains(curfile.Filename, "..") || strings.Contains(curfile.Filename, "~") {
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false, "reason": "Invalid characters in filename"}`))
-		return
-	}
-
-	// 1. Create the file object.
-	if len(basepath) == 0 {
-		basepath = "shuffle-files"
-	}
-	folderPath := fmt.Sprintf("%s/%s/%s", basepath, curfile.OrgId, curfile.WorkflowId)
-
-	// Try to make the full file location
-	err = os.MkdirAll(folderPath, os.ModePerm)
-	if err != nil {
-		log.Printf("[ERROR] Writing issue for file location creation: %s", err)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false, "reason": "Failed creating upload location"}`))
-		return
-	}
-
-	filename := curfile.Filename
-	fileId := uuid.NewV4().String()
-	downloadPath := fmt.Sprintf("%s/%s", folderPath, fileId)
-
-	duplicateWorkflows := []string{}
-	if curfile.WorkflowId != "global" {
-		for _, trigger := range workflow.Triggers {
-			if trigger.AppName == "Shuffle Workflow" && trigger.TriggerType == "SUBFLOW" {
-				for _, parameter := range trigger.Parameters {
-					if parameter.Name == "workflow" && len(parameter.Value) > 0 {
-
-						found := false
-						for _, workflow := range duplicateWorkflows {
-							if workflow == parameter.Value {
-								found = true
-								break
-							}
-						}
-
-						if !found {
-							duplicateWorkflows = append(duplicateWorkflows, parameter.Value)
-						}
-
-						break
-					}
-				}
-			}
-		}
-	}
-
-	timeNow := time.Now().Unix()
-	newFile := File{
-		Id:           fileId,
-		CreatedAt:    timeNow,
-		UpdatedAt:    timeNow,
-		Description:  "",
-		Status:       "created",
-		Filename:     filename,
-		OrgId:        curfile.OrgId,
-		WorkflowId:   curfile.WorkflowId,
-		DownloadPath: downloadPath,
-		Subflows:     duplicateWorkflows,
-	}
-
-	err = setFile(ctx, newFile)
-	if err != nil {
-		log.Printf("[ERROR] Failed setting file: %s", err)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false, "reason": "Failed setting file reference"}`))
-		return
-	} else {
-		log.Printf("[INFO] Created file %s", newFile.DownloadPath)
-	}
-
-	resp.WriteHeader(200)
-	resp.Write([]byte(fmt.Sprintf(`{"success": true, "id": "%s"}`, fileId)))
-
-}
-
-func getFile(ctx context.Context, id string) (*File, error) {
-	key := datastore.NameKey("Files", id, nil)
-	curFile := &File{}
-	if err := dbclient.Get(ctx, key, curFile); err != nil {
-		return &File{}, err
-	}
-
-	return curFile, nil
-}
-
-func setFile(ctx context.Context, file File) error {
-	// clear session_token and API_token for user
-	timeNow := time.Now().Unix()
-	file.UpdatedAt = timeNow
-
-	k := datastore.NameKey("Files", file.Id, nil)
-	if _, err := dbclient.Put(ctx, k, &file); err != nil {
-		log.Println(err)
-		return err
-	}
-
-	return nil
-}
-
-func getAllFiles(ctx context.Context, orgId string) ([]File, error) {
-	var files []File
-	q := datastore.NewQuery("Files").Filter("org_id =", orgId).Order("-updated_at").Limit(100)
-
-	_, err := dbclient.GetAll(ctx, q, &files)
-	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "ResourceExhausted") {
-			q = q.Limit(50)
-			_, err := dbclient.GetAll(ctx, q, &files)
-			if err != nil {
-				return []File{}, err
-			}
-		} else {
-			return []File{}, err
-		}
-	}
-
-	return files, nil
-}

backend/go-app/go.mod

@@ -2,36 +2,40 @@ module shuffle
 
 go 1.13
 
+//replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared
+//replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi
+
 require (
-	cloud.google.com/go v0.57.0
-	cloud.google.com/go/datastore v1.1.0
+	cloud.google.com/go v0.75.0
+	cloud.google.com/go/datastore v1.4.0
 	cloud.google.com/go/pubsub v1.3.1
-	cloud.google.com/go/storage v1.7.0
+	cloud.google.com/go/storage v1.12.0
 	github.com/Microsoft/go-winio v0.4.14 // indirect
 	github.com/basgys/goxml2json v1.1.0
+	github.com/frikky/kin-openapi v0.38.0
 	github.com/carlescere/scheduler v0.0.0-20170109141437-ee74d2f83d82
 	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/docker/docker v1.13.1
 	github.com/docker/go-connections v0.4.0
 	github.com/docker/go-units v0.4.0 // indirect
-	github.com/getkin/kin-openapi v0.8.0
+	github.com/frikky/shuffle-shared v0.0.23
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-git/go-billy/v5 v5.0.0
 	github.com/go-git/go-git/v5 v5.0.0
 	github.com/google/go-github/v28 v28.1.1
 	github.com/gorilla/handlers v1.4.2 // indirect
-	github.com/gorilla/mux v1.7.4
+	github.com/gorilla/mux v1.8.0
 	github.com/h2non/filetype v1.0.12
 	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/satori/go.uuid v1.2.0
-	golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79
-	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
-	google.golang.org/api v0.23.0
-	google.golang.org/appengine v1.6.6
-	google.golang.org/genproto v0.0.0-20200507105951-43844f6eee31
-	google.golang.org/grpc v1.29.1
+	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
+	golang.org/x/oauth2 v0.0.0-20210113160501-8b1d76fa0423
+	google.golang.org/api v0.36.0
+	google.golang.org/appengine v1.6.7
+	google.golang.org/genproto v0.0.0-20210113195801-ae06605f4595
+	google.golang.org/grpc v1.34.1
 	gopkg.in/src-d/go-git.v4 v4.13.1
-	gopkg.in/yaml.v2 v2.2.8
-	gopkg.in/yaml.v3 v3.0.0-20200506231410-2ff61e1afc86
+	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )

backend/go-app/go.sum

@@ -12,14 +12,24 @@ cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bP
 cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
 cloud.google.com/go v0.57.0 h1:EpMNVUorLiZIELdMZbCYX/ByTFCdoYopYAGxaGVz9ms=
 cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
+cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
+cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
+cloud.google.com/go v0.66.0/go.mod h1:dgqGAjKCDxyhGTtC9dAREQGUJpkceNm1yt590Qno0Ko=
+cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
+cloud.google.com/go v0.75.0 h1:XgtDnVJRCPEUG21gjFiRPz4zI1Mjg16R+NYQjfmU4XY=
+cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
 cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
 cloud.google.com/go/bigquery v1.6.0/go.mod h1:hyFDG0qSGdHNz8Q6nDN8rYIkld0q/+5uBZaelxiDLfE=
+cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
+cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0 h1:/May9ojXjRkPBNVrq+oWLqmWCkr4OU5uRY29bu0mRyQ=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/datastore v1.4.0 h1:CFDJm15RpYXeEblQ0TMDUrYtqmBmbAWTy536nA8JIc8=
+cloud.google.com/go/datastore v1.4.0/go.mod h1:d18825/a9bICdAIJy2EkHs9joU4RlIZ1t6l8WDdbdY0=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
@@ -30,6 +40,10 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 cloud.google.com/go/storage v1.7.0 h1:DzdLPI8Em+DEk7IzA2a10ivq3mxIEASC9GeNJ6FFt5Q=
 cloud.google.com/go/storage v1.7.0/go.mod h1:jGMIBwF+L/tL6WN/W5InNgYYu4HP0DvGB6rQ1mufWfs=
+cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
+cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
+cloud.google.com/go/storage v1.12.0 h1:4y3gHptW1EHVtcPAVE0eBBlFuGqEejTTG3KdIE0lUX4=
+cloud.google.com/go/storage v1.12.0/go.mod h1:fFLk2dp2oAhDz8QFKwqrjdJvxSp/W2g7nillojlL5Ho=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -49,6 +63,7 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -66,10 +81,27 @@ github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
+github.com/frikky/kin-openapi v0.38.0 h1:V7ttwIJS8Vks4KL+mZVj1ZSqhIcQtgaG8akeqXEQgsE=
+github.com/frikky/kin-openapi v0.38.0/go.mod h1:Fr28TtCHL4K0kIqtqui8HWxN1LG5uAh3z/tDfFyiA1s=
+github.com/frikky/shuffle-shared v0.0.12 h1:+0EIfThmK47Po+LogPYZR4XjbS4Ds19WNMFu2YUSjhw=
+github.com/frikky/shuffle-shared v0.0.12/go.mod h1:SEY432/xs4oBkOUnGwxiYKCZWZLRaheGInhAoW7N8ww=
+github.com/frikky/shuffle-shared v0.0.15 h1:508ceeEHfPBMCC8/K4Zve3kwRQqiXNJSw6+BDoq9X4E=
+github.com/frikky/shuffle-shared v0.0.15/go.mod h1:SEY432/xs4oBkOUnGwxiYKCZWZLRaheGInhAoW7N8ww=
+github.com/frikky/shuffle-shared v0.0.20 h1:y6JlPnQDq//elICWvVfUfJyU9gH3fSpQmPy+agqZ5sA=
+github.com/frikky/shuffle-shared v0.0.20/go.mod h1:H7SqOta/EAYnfYuWzwzYSh/oWfF0kgnuaJTQNKQBvoQ=
+github.com/frikky/shuffle-shared v0.0.21 h1:xj/XPsXTa2rx41mm4nUc7+2K9RGkq2/mpjSPtIfpjE4=
+github.com/frikky/shuffle-shared v0.0.21/go.mod h1:H7SqOta/EAYnfYuWzwzYSh/oWfF0kgnuaJTQNKQBvoQ=
+github.com/frikky/shuffle-shared v0.0.22 h1:TFMcJCNmOOSneMMWbg5dNzp2z6m0aZLROuL+bzVToRE=
+github.com/frikky/shuffle-shared v0.0.22/go.mod h1:H7SqOta/EAYnfYuWzwzYSh/oWfF0kgnuaJTQNKQBvoQ=
+github.com/frikky/shuffle-shared v0.0.23 h1:Pnlc2M6fHnFRLFd5K1iLTVv4/t4P04Ri1GJ5CMxzq0U=
+github.com/frikky/shuffle-shared v0.0.23/go.mod h1:H7SqOta/EAYnfYuWzwzYSh/oWfF0kgnuaJTQNKQBvoQ=
 github.com/getkin/kin-openapi v0.8.0 h1:a6TQjTqwkyscC4/hShJX7WhCVE+4bi9lzw61XHQW5hE=
 github.com/getkin/kin-openapi v0.8.0/go.mod h1:zZQMFkVgRHCdhgb6ihCTIo9dyDZFvX0k/xAKqw1FhPw=
+github.com/getkin/kin-openapi v0.52.0 h1:6WqsF5d6PfJ8AscdD+9Rtb2RP2iBWyC7V6GcjssWg7M=
+github.com/getkin/kin-openapi v0.52.0/go.mod h1:fRpo2Nw4Czgy0QnrIesRrEXs5+15N1F9mGZLP/aIomE=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
@@ -85,6 +117,10 @@ github.com/go-git/go-git/v5 v5.0.0/go.mod h1:oYD8y9kWsGINPFJoLdaScGCN6dlKg23blmC
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
+github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -96,6 +132,7 @@ github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFU
 github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -108,6 +145,10 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0 h1:oOuy+ugB+P/kBdUnG5QaMXSIyJ1q38wWSojYCb3z5VQ=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -115,19 +156,32 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
 github.com/google/go-github/v28 v28.1.1 h1:kORf5ekX5qwXO2mGzXXOjMe/g6ap8ahVe0sBEulhSxo=
 github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM=
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200905233945-acf8798be1f7/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
@@ -135,11 +189,14 @@ github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YAR
 github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc=
 github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/h2non/filetype v1.0.12 h1:yHCsIe0y2cvbDARtJhGBTD2ecvqMSTvlIcph9En/Zao=
 github.com/h2non/filetype v1.0.12/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
@@ -155,6 +212,9 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
@@ -183,15 +243,21 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70=
 github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0=
+go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -201,6 +267,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 h1:IaQbIIB2X/Mp/DKctl6ROxz1KyMlKp4uyvL6+kQ7C88=
 golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -224,6 +292,7 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu
 golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
@@ -232,6 +301,9 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -242,6 +314,7 @@ golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -252,12 +325,28 @@ golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5 h1:WQ8q63x+f/zpC8Ac1s9wLElVoHhm32p6tudrU72n1QA=
 golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201224014010-6772e930b67b h1:iFwSg7t5GZmB/Q5TjiEAsdoLDrdJRC1RiF2WhuV29Qw=
+golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210113160501-8b1d76fa0423 h1:/hEknzWkMPCjTo7StMHRrBRa8YBbXuBWfck8680k3RE=
+golang.org/x/oauth2 v0.0.0-20210113160501-8b1d76fa0423/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -266,6 +355,9 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o=
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -291,11 +383,25 @@ golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200501052902-10377860bb8e h1:hq86ru83GdWTlfQFZGO4nZJTU4Bs2wfHl8oFHRaXsfc=
 golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3 h1:kzM6+9dur93BcC2kVlYl34cHU+TYZLanmpSJHVMmL64=
+golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
+golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -336,10 +442,25 @@ golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWc
 golang.org/x/tools v0.0.0-20200409170454-77362c5149f0/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d h1:lzLdP95xJmMpwQ6LUHwrc5V7js93hTiY7gkznu0BgmY=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200828161849-5deb26317202/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
+golang.org/x/tools v0.0.0-20200915173823-2db8f0ff891c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
+golang.org/x/tools v0.0.0-20200918232735-d647fc253266/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
+golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210114065538-d78b04bdf963/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -355,6 +476,15 @@ google.golang.org/api v0.21.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/
 google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/api v0.23.0 h1:YlvGEOq2NA2my8cZ/9V8BcEO9okD48FlJcdqN0xJL3s=
 google.golang.org/api v0.23.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
+google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
+google.golang.org/api v0.31.0/go.mod h1:CL+9IBCa2WWU6gRuBWaKqGWLFFwbEUXkfeMkHLQWYWo=
+google.golang.org/api v0.32.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
+google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
+google.golang.org/api v0.36.0 h1:l2Nfbl2GPXdWorv+dT2XfinX2jOOw4zv1VhLstx+6rE=
+google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -362,6 +492,8 @@ google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
+google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -387,6 +519,22 @@ google.golang.org/genproto v0.0.0-20200409111301-baae70f3302d/go.mod h1:55QSHmfG
 google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200507105951-43844f6eee31 h1:Bz1qTn2YRWV+9OKJtxHJiQKCiXIdf+kwuKXdt9cBxyU=
 google.golang.org/genproto v0.0.0-20200507105951-43844f6eee31/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
+google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200831141814-d751682dd103/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200914193844-75d14daec038/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200921151605-7abf4a1a14d5/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210113195801-ae06605f4595 h1:x7nk+/4+SvuTDI4wnzQUlhvi+DTpyfncXBo3QWTFs7U=
+google.golang.org/genproto v0.0.0-20210113195801-ae06605f4595/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -399,12 +547,26 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa
 google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
 google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4=
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
+google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
+google.golang.org/grpc v1.34.1 h1:ugq+9++ZQPFzM2pKUMCIK8gj9M0pFyuUWO9Q8kwEDQw=
+google.golang.org/grpc v1.34.1/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0 h1:qdOKuR/EIArgaWNjetjgTzgVTAZ+S/WXVrq9HW9zimw=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
+google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -421,8 +583,14 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200506231410-2ff61e1afc86 h1:OfFoIUYv/me30yv7XlMy4F9RJw8DEm8WQ6QG1Ph4bH0=
 gopkg.in/yaml.v3 v3.0.0-20200506231410-2ff61e1afc86/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -430,6 +598,7 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

backend/tests/dockerpull.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+curl -XPOST http://localhost:5001/api/v1/get_docker_image -d '{"name":"frikky/shuffle:Testing_1.0.0"}' -H "Authorization: Bearer db0373c6-1083-4dec-a05d-3ba73f02ccd4"

backend/tests/files.sh

@@ -0,0 +1,16 @@
+curl http://192.168.3.6:5001/api/v1/files/create -H "Authorization: Bearer db0373c6-1083-4dec-a05d-3ba73f02ccd4" -d '{"filename": "file.txt", "org_id": "b199646b-16d2-456d-9fd6-b9972e929466", "workflow_id": "global"}'
+
+curl http://localhost:5001/api/v1/files/create -H "Authorization: Bearer db0373c6-1083-4dec-a05d-3ba73f02ccd4" -d '{"filename": "file.txt", "org_id": "b199646b-16d2-456d-9fd6-b9972e929466", "workflow_id": "global"}'
+
+echo
+curl http://localhost:5001/api/v1/files/e19cffe4-e2da-47e9-809e-904f5cb03687/upload -H "Authorization: Bearer db0373c6-1083-4dec-a05d-3ba73f02ccd4" -F 'shuffle_file=@files.sh'
+
+curl http://localhost:5001/api/v1/files/1915981b-b897-4db1-8a2e-44bc34cead3b/content -H "Authorization: Bearer db0373c6-1083-4dec-a05d-3ba73f02ccd4" 
+curl http://localhost:5001/api/v1/files/e19cffe4-e2da-47e9-809e-904f5cb03687 -H "Authorization: Bearer db0373c6-1083-4dec-a05d-3ba73f02ccd4" 
+curl -XDELETE http://localhost:5001/api/v1/files/e19cffe4-e2da-47e9-809e-904f5cb03687 -H "Authorization: Bearer db0373c6-1083-4dec-a05d-3ba73f02ccd4" 
+
+	#r.HandleFunc("/api/v1/files/{fileId}/content", handleGetFileContent).Methods("GET", "OPTIONS")
+	#r.HandleFunc("/api/v1/files/create", handleCreateFile).Methods("POST", "OPTIONS")
+	#r.HandleFunc("/api/v1/files/{fileId}/upload", handleUploadFile).Methods("POST", "OPTIONS")
+	#r.HandleFunc("/api/v1/files/{fileId}", handleGetFileMeta).Methods("GET", "OPTIONS")
+	#r.HandleFunc("/api/v1/files/{fileId}", handleDeleteFile).Methods("DELETE", "OPTIONS")

backend/tests/hotload.sh

@@ -0,0 +1 @@
+curl http://localhost:5001/api/v1/apps/run_hotload -H "Authorization: Bearer e08c6f22-9a55-4557-b008-04388cc51fb0"

backend/tests/list_files.sh

@@ -0,0 +1 @@
+curl -XGET http://192.168.3.6:5001/api/v1/files -H "Authorization: Bearer db0373c6-1083-4dec-a05d-3ba73f02ccd4"

backend/tests/schedules.sh

@@ -1,2 +1,2 @@
 # Fails cus of unmarshal
-curl -XPOST http://localhost:5001/api/v1/workflows/1d9d8ce2-566e-4c3f-8a37-5d6c7d2000b5/schedule -d '{"name": "hey", "frequency": "*/1 * * * *", "execution_argument": "{\"test\": \"hey\"}"}' -H "Authorization: Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjYwZjQwNjBlNThkNzVmZDNmNzBiZWZmODhjNzk0YTc3NTMyN2FhMzEiLCJ0eXAiOiJKV1QifQ.eyJhdWQiOiJodHRwczovL3NodWZmbGVyLmlvL2FwaS92MS93b3JrZmxvd3MvMWQ5ZDhjZTItNTY2ZS00YzNmLThhMzctNWQ2YzdkMjAwMGI1L2V4ZWN1dGUiLCJhenAiOiIxMDMwNzY3ODIwNjE0MjQ2MTg0MjIiLCJlbWFpbCI6InNjaGVkdWxlckBzaHVmZmxlLTI0MTUxNy5pYW0uZ3NlcnZpY2VhY2NvdW50LmNvbSIsImVtYWlsX3ZlcmlmaWVkIjp0cnVlLCJleHAiOjE1NjU1Mjc1NTEsImlhdCI6MTU2NTUyMzk1MSwiaXNzIjoiaHR0cHM6Ly9hY2NvdW50cy5nb29nbGUuY29tIiwic3ViIjoiMTAzMDc2NzgyMDYxNDI0NjE4NDIyIn0.r0EDq9fjhf_5CPTiltyfk_L3uYJp577Uy0yYPcCAl2nv50_z_oUtbWGBpQLL8gcj-NGd3g4E52Qur8k6hCMIQweLS6WAb1279vGffEoCNDfkWb3Oy-yJGP1kzwLvqFJqnHLkSWYXNWvSyWnEimW8Rryx_m1BXS5wcA8l4NIr83kS7fPZrTwjnwFSeGSThwk91DVARzapQb8r0GEgOUyHZ1aBXnV98mikzSUt-5xFKe9eMdD22YJAj0Ru-DxAxs5nOqghX4PMRysWjshjOMrlR1piPWxqAmewp8YKZDCQ5gXskpeAFBDoULT971Wsx_NCohnJsFqx1JfPS9ZYMTW2oQ"
+curl -XPOST http://localhost:5001/api/v1/workflows/1d9d8ce2-566e-4c3f-8a37-5d6c7d2000b5/schedule -d '{"name": "hey", "frequency": "*/1 * * * *", "execution_argument": "{\"test\": \"hey\"}"}' -H "Authorization: Bearer WUT"

backend/tests/users.sh

@@ -0,0 +1,13 @@
+curl http://localhost:5001/api/v1/users/register -H "Authorization: Bearer 36a3eb38-0070-41c6-b20a-2a3e0941d10e" -d '{"username": "username1", "password": ""}'
+
+echo
+curl http://localhost:5001/api/v1/users -H "Authorization: Bearer 36a3eb38-0070-41c6-b20a-2a3e0941d10e" 
+
+echo UPDATE
+curl -XPUT http://localhost:5001/api/v1/users/updateuser -H "Authorization: Bearer 36a3eb38-0070-41c6-b20a-2a3e0941d10e" -d '{"user_id": "id", "role": "admin"}'
+
+echo 
+curl -XDELETE http://localhost:5001/api/v1/users/userid -H "Authorization: Bearer 36a3eb38-0070-41c6-b20a-2a3e0941d10e" 
+
+echo
+curl -XPOST http://localhost:5001/api/v1/users/generateapikey -H "Authorization: Bearer 36a3eb38-0070-41c6-b20a-2a3e0941d10e" -d '{"user_id": "390efa79-73a3-454b-8b1d-38f56eec14ad"}'

docker-compose.yml

@@ -2,7 +2,7 @@ version: '3'
 services:
   frontend:
     #build: ./frontend
-    image: ghcr.io/frikky/shuffle-frontend:0.8.60
+    image: ghcr.io/frikky/shuffle-frontend:0.8.71
     container_name: shuffle-frontend
     hostname: shuffle-frontend
     ports:
@@ -17,7 +17,7 @@ services:
       - backend
   backend:
     #build: ./backend
-    image: ghcr.io/frikky/shuffle-backend:0.8.60
+    image: ghcr.io/frikky/shuffle-backend:0.8.71
     container_name: shuffle-backend
     hostname: ${BACKEND_HOSTNAME}
     # Here for debugging:
@@ -35,9 +35,11 @@ services:
       - SHUFFLE_FILE_LOCATION=/shuffle-files
       - ORG_ID=${ORG_ID}
       - SHUFFLE_APP_DOWNLOAD_LOCATION=${SHUFFLE_APP_DOWNLOAD_LOCATION}
+      - SHUFFLE_DOWNLOAD_AUTH_BRANCH=${SHUFFLE_DOWNLOAD_AUTH_BRANCH}
       - SHUFFLE_DEFAULT_USERNAME=${SHUFFLE_DEFAULT_USERNAME}
       - SHUFFLE_DEFAULT_PASSWORD=${SHUFFLE_DEFAULT_PASSWORD}
       - SHUFFLE_DEFAULT_APIKEY=${SHUFFLE_DEFAULT_APIKEY}
+      - SHUFFLE_APP_FORCE_UPDATE=${SHUFFLE_APP_FORCE_UPDATE}
       - HTTP_PROXY=${SHUFFLE_HTTP_PROXY}
       - HTTPS_PROXY=${SHUFFLE_HTTPS_PROXY}
     restart: unless-stopped
@@ -45,7 +47,7 @@ services:
       - database
   orborus:
     #build: ./functions/onprem/orborus
-    image: ghcr.io/frikky/shuffle-orborus:0.8.60
+    image: ghcr.io/frikky/shuffle-orborus:0.8.71
     container_name: shuffle-orborus
     hostname: shuffle-orborus
     networks:
@@ -54,7 +56,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
       - SHUFFLE_APP_SDK_VERSION=0.8.60
-      - SHUFFLE_WORKER_VERSION=0.8.60
+      - SHUFFLE_WORKER_VERSION=0.8.71
       - ORG_ID=${ORG_ID}
       - ENVIRONMENT_NAME=${ENVIRONMENT_NAME}
       - BASE_URL=http://${OUTER_HOSTNAME}:${BACKEND_PORT}

frontend/Dockerfile

@@ -1,5 +1,5 @@
 # Build environment
-FROM node as builder
+FROM node:14 as builder
 
 RUN mkdir /usr/src/app
 
@@ -18,14 +18,10 @@ COPY ./src /usr/src/app/src/
 COPY ./*.sh /usr/src/app/
 COPY ./*.json /usr/src/app/
 
-# There were issues with the webpack installer from package.json
-RUN rm -rf /usr/src/app/node_modules/webpack
-#RUN yarn add webpack@4.42.0
-
 RUN yarn build
 
 # Production environment
-FROM nginx:latest
+FROM nginx:1.19
 
 RUN mkdir -p /usr/share/nginx/html/build
 RUN mkdir -p /usr/share/nginx/html/css

frontend/package.json

@@ -5,6 +5,7 @@
   "private": true,
   "dependencies": {
     "@material-ui/core": "^4.5.2",
+    "@material-ui/data-grid": "^4.0.0-alpha.22",
     "@material-ui/icons": "^4.5.1",
     "@material-ui/styles": "^4.5.2",
     "@use-it/interval": "^1.0.0",
@@ -35,6 +36,7 @@
     "react": "^16.14.0",
     "react-alert": "^5.5.0",
     "react-alert-template-basic": "^1.0.0",
+    "react-avatar-editor": "^11.1.0",
     "react-beforeunload": "^2.2.1",
     "react-chartjs-2": "^2.11.1",
     "react-cookie": "^4.0.1",
@@ -57,7 +59,7 @@
     "shellwords": "^0.1.1",
     "simplebar": "^4.2.3",
     "styled-components": "^4.4.0",
-    "webpack": "^4.42.0",
+    "webpack": "4.44.2",
     "websocket": "^1.0.30",
     "yaml": "^1.7.2",
     "yamljs": "^0.3.0",

frontend/src/App.jsx

@@ -13,10 +13,9 @@ import EditWebhook from "./views/EditWebhook";
 import AngularWorkflow from "./views/AngularWorkflow";
 
 import Header from './components/Header';
+import theme from './theme'
 import Apps from './views/Apps';
 import AppCreator from './views/AppCreator';
-import Contact from './views/Contact';
-import Oauth2 from './views/Oauth2';
 
 import Dashboard from "./views/Dashboard";
 import AdminSetup from "./views/AdminSetup";
@@ -28,11 +27,14 @@ import LandingPageNew from "./views/LandingpageNew";
 import LoginPage from "./views/LoginPage";
 import SettingsPage from "./views/SettingsPage";
 
+import MyView from "./views/MyView";
+
 import { createMuiTheme, MuiThemeProvider } from '@material-ui/core/styles';
 
 import ScrollToTop from "./components/ScrollToTop";
 import AlertTemplate from "./components/AlertTemplate";
 import { positions, Provider } from "react-alert";
+import {isMobile} from "react-device-detect";
 
 // Production - backend proxy forwarding in nginx
 var globalUrl = window.location.origin
@@ -43,34 +45,8 @@ if (window.location.protocol == "http:" && window.location.port === "3000") {
 	//globalUrl = "http://localhost:5002"
 }
 
-const theme = createMuiTheme({
-	palette: {
-		primary: {
-			main: "#f85a3e"
-		},
-		secondary: {
-			main: '#e8eaf6',
-		},
-		surfaceColor: "#27292d",
-		inputColor: "#383B40"
-	},
-	typography: {
-		useNextVariants: true
-	},
-	overrides: {
-		MuiMenu: {
-			list: {
-				backgroundColor: "#383B40",
-			},
-		},
-	},
-});
-
-
-// FIXME - set client side cookies
 const App = (message, props) => {
 	const [userdata, setUserData] = useState({});
-	//const [homePage, ] = useState(true);
 	const [cookies, setCookie, removeCookie] = useCookies([]);
 	const [isLoggedIn, setIsLoggedIn] = useState(false);
 	const [dataset, setDataset] = useState(false);
@@ -130,8 +106,6 @@ const App = (message, props) => {
 		<div style={{ backgroundColor: "#1F2023", color: "rgba(255, 255, 255, 0.65)", minHeight: "100vh" }}>
 			<ScrollToTop setCurpath={setCurpath} />
 			<Header cookies={cookies} removeCookie={removeCookie} isLoaded={isLoaded} globalUrl={globalUrl} setIsLoggedIn={setIsLoggedIn} isLoggedIn={isLoggedIn} userdata={userdata} {...props} />
-			<Route exact path="/oauth2" render={props => <Oauth2 isLoaded={isLoaded} globalUrl={globalUrl} {...props} />} />
-			<Route exact path="/contact" render={props => <Contact isLoaded={isLoaded} globalUrl={globalUrl} {...props} />} />
 			<Route exact path="/login" render={props => <LoginPage isLoggedIn={isLoggedIn} setIsLoggedIn={setIsLoggedIn} register={true} isLoaded={isLoaded} globalUrl={globalUrl} setCookie={setCookie} cookies={cookies} {...props} />} />
 			<Route exact path="/admin" render={props => <Admin userdata={userdata} isLoggedIn={isLoggedIn} setIsLoggedIn={setIsLoggedIn} register={true} isLoaded={isLoaded} globalUrl={globalUrl} setCookie={setCookie} cookies={cookies} {...props} />} />
 			<Route exact path="/admin/:key" render={props => <Admin isLoggedIn={isLoggedIn} setIsLoggedIn={setIsLoggedIn} register={true} isLoaded={isLoaded} globalUrl={globalUrl} setCookie={setCookie} cookies={cookies} {...props} />} />
@@ -147,10 +121,11 @@ const App = (message, props) => {
 			<Route exact path="/schedules/:key" render={props => <EditSchedule globalUrl={globalUrl} {...props} />} />
 			<Route exact path="/workflows" render={props => <Workflows cookies={cookies} removeCookie={removeCookie} isLoaded={isLoaded} isLoggedIn={isLoggedIn} globalUrl={globalUrl} cookies={cookies} userdata={userdata} {...props} />} />
 			<Route exact path="/workflows/:key" render={props => <AngularWorkflow userdata={userdata} globalUrl={globalUrl} isLoaded={isLoaded} isLoggedIn={isLoggedIn} {...props} />} />
-			<Route exact path="/docs/:key" render={props => <Docs isLoaded={isLoaded} globalUrl={globalUrl} {...props} />} />
+			<Route exact path="/docs/:key" render={props => <Docs isMobile={isMobile} isLoaded={isLoaded} globalUrl={globalUrl} {...props} />} />
 			<Route exact path="/docs" render={props => { window.location.pathname = "/docs/about" }} />
 			<Route exact path="/introduction" render={props => <Introduction isLoaded={isLoaded} globalUrl={globalUrl} {...props} />} />
 			<Route exact path="/introduction/:key" render={props => <Introduction isLoaded={isLoaded} globalUrl={globalUrl} {...props} />} />
+			<Route exact path="/myview" render={props => <MyView cookies={cookies} removeCookie={removeCookie} isLoaded={isLoaded} isLoggedIn={isLoggedIn} globalUrl={globalUrl} cookies={cookies} userdata={userdata} {...props} />} />
 			<Route exact path="/" render={props => <LoginPage isLoggedIn={isLoggedIn} setIsLoggedIn={setIsLoggedIn} register={true} isLoaded={isLoaded} globalUrl={globalUrl} setCookie={setCookie} cookies={cookies} {...props} />} />
 		</div>
 

frontend/src/components/AlertTemplate.js

@@ -18,6 +18,7 @@ const alertStyle = {
   width: 400,
   boxSizing: 'border-box',
 	zIndex: 100001,
+	overflow: "hidden",
 }
 
 const buttonStyle = {

frontend/src/components/ConfigureWorkflow.jsx

@@ -0,0 +1,97 @@
+import React, {useState} from 'react';
+
+import {Typography, } from '@material-ui/core';
+
+const Workflow = (props) => {
+	const { workflow, appAuthentication, apps } = props
+	const [requiredActions, setRequiredActions] = React.useState([])
+	const [firstLoad, setFirstLoad] = React.useState("")
+	
+	// Rofl
+	if (workflow === undefined || workflow === null) {
+		return null
+	}
+
+	if (apps === undefined || apps === null) {
+		return null
+	}
+
+	if (appAuthentication === undefined || appAuthentication === null) {
+		return null
+	}
+
+	if (firstLoad.length === 0 || firstLoad !== workflow.id) {
+		setFirstLoad(workflow.id)
+		const newactions = []
+		for (var key in workflow.actions) {
+			var newaction = {
+				"large_image": "",
+				"app_name": "",
+				"app_version": "",
+				"must_activate": false,
+				"must_authenticate": false,
+				"action_ids": [],
+			}
+
+			const action = workflow.actions[key]
+			console.log(action)
+				const app = apps.find(app => app.name === action.app_name && app.app_version === action.app_version)
+			if (app === undefined || app === null) {
+				console.log("COULDNT FIND APP - SEARCH BACKEND")
+
+				newaction.app_name = action.app_name
+				newaction.app_version = action.app_version
+			} else {
+				newaction.app_name = app.name
+				newaction.app_version = app.app_version
+
+				console.log("APP: ", app)
+				if (action.authentication_id === "" && app.authentication.required === true) {
+					console.log("Requires auth!")
+					newaction.must_authenticate = true
+					newaction.action_ids.push(action.id)
+				}
+
+				//newaction.app_name = action.app_name
+				//newaction.app_name = action.app_version
+			}
+
+			if (action.errors !== undefined && action.errors !== null && action.errors.length > 0) {
+				console.log("Has errors!")
+			}
+
+			console.log("NEWACTION: ", newaction)
+			if (newaction.must_authenticate || newaction.must_activate) {
+				newactions.push(newaction)
+			}
+		}
+
+		console.log("ACTIONS: ", newactions)
+		setRequiredActions(newactions)
+	}
+
+	const AppSection = (props) => {
+		const {action} = props
+
+		return (
+			<div>
+				<Typography variant="body2">Name: {action.app_name}:{action.app_version}. </Typography>
+			</div>
+		)
+	}
+
+	console.log(requiredActions)
+
+	return (
+		<div>
+			<Typography variant="h6">Workflow: {workflow.id}</Typography>
+			{requiredActions.map((data, index) => {
+				return (
+					<AppSection key={index} action={data} />
+				)
+			})}
+		</div>
+	)
+}
+
+export default Workflow 

frontend/src/components/Header.js

@@ -118,9 +118,43 @@ const Header = props => {
 
 
 	// Should be based on some path
-	const logoCheck = !homePage ?  null : null
+	const avatarMenu = 
+		<span>
+			<IconButton color="primary" style={{marginRight: 15, }} aria-controls="simple-menu" aria-haspopup="true" onClick={(event) => {
+				setAnchorEl(event.currentTarget);
+			}}>
+				<Avatar style={{height: 35, width: 35,}} alt="Your username here" src="" />
+			</IconButton>
+			<Menu
+				id="simple-menu"
+				anchorEl={anchorEl}
+				keepMounted
+				open={Boolean(anchorEl)}
+				onClose={() => {
+					handleClose()
+				}}
+			>
+				<MenuItem onClick={(event) => {
+					event.preventDefault()
+					handleClose() 
+				}}>
+					<Link to="/settings" style={hrefStyle}>
+						Settings
+					</Link>
+				</MenuItem>
+				<MenuItem style={{color: "white"}} onClick={(event) => {
+					event.preventDefault()
+					handleClose() 
+					handleClickLogout()
+				}}>
+					Logout
+				</MenuItem>
+			</Menu>
+		</span>
+
 
 	// Handle top bar or something
+	const logoCheck = !homePage ?  null : null
   const loginTextBrowser = !isLoggedIn ? 
     	<div style={{display: "flex"}}>
 			<List style={{display: "flex", flexDirect: "row"}} component="nav">
@@ -197,36 +231,7 @@ const Header = props => {
 				</List>
 			</div>
 			<div style={{flex: "10", display: "flex", flexDirection: "row-reverse"}}>
-				<IconButton color="primary" style={{marginRight: 15, }} aria-controls="simple-menu" aria-haspopup="true" onClick={(event) => {
-					setAnchorEl(event.currentTarget);
-				}}>
-					<Avatar style={{height: 35, width: 35,}} alt="Your username here" src="" />
-				</IconButton>
-				<Menu
-					id="simple-menu"
-					anchorEl={anchorEl}
-					keepMounted
-					open={Boolean(anchorEl)}
-					onClose={() => {
-						handleClose()
-					}}
-				>
-					<MenuItem onClick={(event) => {
-						event.preventDefault()
-						handleClose() 
-					}}>
-						<Link to="/settings" style={hrefStyle}>
-							Settings
-						</Link>
-					</MenuItem>
-					<MenuItem style={{color: "white"}} onClick={(event) => {
-						event.preventDefault()
-						handleClose() 
-						handleClickLogout()
-					}}>
-						Logout
-					</MenuItem>
-				</Menu>
+				{avatarMenu}
 				{userdata === undefined || userdata.admin === undefined || userdata.admin === null || !userdata.admin ? null : 
 					<Link to="/admin" style={hrefStyle}>
 						<Button color="primary" variant="contained" style={{marginRight: 15, marginTop: 12}}>
@@ -289,25 +294,9 @@ const Header = props => {
 				</List>
 			</div>
 			<div style={{flex: "10", display: "flex", flexDirection: "row-reverse"}}>
-				<List style={{display: 'flex', flexDirection: 'row-reverse'}} component="nav">
-					<ListItem style={{flex: "1", textAlign: "center"}}>
-						<div onMouseOver={handleLoginHover} onMouseOut={handleLoginHoverOut} onClick={handleClickLogout} style={{color: LoginHoverColor, cursor: "pointer"}}> 
-        	    	Logout
-        	  	</div>
-        		</ListItem>
-						{logoCheck}		
-        		<ListItem style={{flex: "1", textAlign: "center"}}>
-							<Link to="/settings" style={hrefStyle}>
-								<Button 
-									style={{}} 
-									variant="contained"
-									color="primary"> Settings</Button>
-							</Link>
-						</ListItem>
-						<ListItem></ListItem>
-				</List>
+				{avatarMenu}
 			</div>
-	    </div>
+	  </div>
 
 	// <Divider style={{height: "1px", width: "100%", backgroundColor: "rgb(91, 96, 100)"}}/>
 	const loadedCheck = 

frontend/src/components/RenderCytoscape.js

@@ -0,0 +1,146 @@
+import React, {useState, useEffect, useLayoutEffect} from 'react';
+import * as cytoscape from 'cytoscape';
+import CytoscapeComponent from 'react-cytoscapejs';
+import cystyle from '../defaultCytoscapeStyle';
+
+const surfaceColor = "#27292D"
+const CytoscapeWrapper = (props) => {
+  const { globalUrl, inworkflow } = props;
+
+	const [elements, setElements] = useState([])
+	const [workflow, setWorkflow] = useState(inworkflow)
+	const [cy, setCy] = React.useState()
+	const bodyWidth = 200
+	const bodyHeight = 150 
+
+	const setupGraph = () => {
+		const actions = workflow.actions.map(action => {
+			const node = {}
+			node.position = action.position
+			node.data = action
+
+			node.data._id = action["id"]
+			node.data.type = "ACTION"
+			node.isStartNode = action["id"] === workflow.start
+
+
+			var example = ""
+			if (action.example !== undefined && action.example !== null && action.example.length > 0) {
+				example = action.example
+			}
+
+			node.data.example = example
+			return node;
+		})
+
+		const triggers = workflow.triggers.map(trigger => {
+			const node = {}
+			node.position = trigger.position
+			node.data = trigger 
+
+			node.data._id = trigger["id"]
+			node.data.type = "TRIGGER"
+
+			return node;
+		})
+
+		// FIXME - tmp branch update
+		var insertedNodes = [].concat(actions, triggers)
+		const edges = workflow.branches.map((branch, index) => {
+			//workflow.branches[index].conditions = [{
+
+			const edge = { };
+			var conditions = workflow.branches[index].conditions
+			if (conditions === undefined || conditions === null) {
+				conditions = []
+			}
+
+			var label = ""
+			if (conditions.length === 1) {
+				label = conditions.length+" condition"
+			} else if (conditions.length > 1) {
+				label = conditions.length+" conditions"
+			}
+
+			edge.data = {
+				id: branch.id,
+				_id: branch.id,
+				source: branch.source_id,
+				target: branch.destination_id,
+				label: label,
+				conditions: conditions,
+				hasErrors: branch.has_errors
+			};
+
+			// This is an attempt at prettier edges. The numbers are weird to work with.
+			/*
+			//http://manual.graphspace.org/projects/graphspace-python/en/latest/demos/edge-types.html
+			const sourcenode = actions.find(node => node.data._id === branch.source_id)
+			const destinationnode = actions.find(node => node.data._id === branch.destination_id)
+			if (sourcenode !== undefined && destinationnode !== undefined && branch.source_id !== branch.destination_id) { 
+				//node.data._id = action["id"]
+				console.log("SOURCE: ", sourcenode.position)
+				console.log("DESTINATIONNODE: ", destinationnode.position)
+
+				var opposite = true 
+				if (sourcenode.position.x > destinationnode.position.x) {
+					opposite = false 
+				} else {
+					opposite = true 
+				}
+
+				edge.style = {
+					'control-point-distance': opposite ? ["25%", "-75%"] : ["-10%", "90%"],
+					'control-point-weight': ['0.3', '0.7'],
+				}
+			}
+			*/
+
+			return edge;
+		})
+
+		setWorkflow(workflow)
+
+		// Verifies if a branch is valid and skips others
+		var newedges = []
+		for (var key in edges) {
+			var item = edges[key]
+
+			const sourcecheck = insertedNodes.find(data => data.data.id === item.data.source)
+			const destcheck = insertedNodes.find(data => data.data.id === item.data.target)
+			if (sourcecheck === undefined || destcheck === undefined) {
+				continue
+			}
+
+			newedges.push(item)
+		}
+
+		insertedNodes = insertedNodes.concat(newedges)
+		setElements(insertedNodes)
+	}
+
+	if (elements.length === 0) {
+		setupGraph()
+	}
+
+	return (
+			<CytoscapeComponent 
+				elements={elements} 
+				minZoom={0.35}
+				maxZoom={2.00}
+				style={{width: bodyWidth-15, height: bodyHeight-5, backgroundColor: surfaceColor}} 
+				stylesheet={cystyle}
+				boxSelectionEnabled={true}
+				autounselectify={false}
+				showGrid={true}
+				cy={(incy) => {
+					// FIXME: There's something specific loading when
+					// you do the first hover of a node. Why is this different?
+					//console.log("CY: ", incy)
+					setCy(incy)
+				}}
+			/>
+	)
+}
+
+export default CytoscapeWrapper 

frontend/src/defaultCytoscapeStyle.js

@@ -6,7 +6,7 @@ const data = [{
 				'font-family': 'Segoe UI, Tahoma, Geneva, Verdana, sans-serif, sans-serif',
 				'font-weight': 'lighter',
 				'margin-right': '10px',
-				'font-size': '15px',
+				'font-size': '18px',
 				'width': '80px',
 				'height': '80px',
 				'color': 'white',
@@ -20,14 +20,15 @@ const data = [{
 			selector: 'edge',
 			css: {
 				'target-arrow-shape': 'triangle',
-				'target-arrow-color': 'yellow',
+				'target-arrow-color': 'grey',
 				'curve-style': 'unbundled-bezier',
 				'label': 'data(label)',
 				'text-margin-y': '-15px',
+				'width': '2px',
 				"color": "white",
 				"line-fill": "linear-gradient",
-				"line-gradient-stop-colors": ["cyan", "yellow"],
 				"line-gradient-stop-positions": ["0.0", "100"],
+				"line-gradient-stop-colors": ["grey", "grey"],
 			},
 		},
 		{
@@ -38,6 +39,21 @@ const data = [{
 				'border-color': '#81c784',
 				'background-width': '100%',
 				'background-height': '100%',
+				'border-radius': '5px',
+			},
+		},
+		{
+			selector: `node[app_name="Shuffle Tools"]`,
+			css: {
+				'width': '30px',
+				'height': '30px',
+			},
+		},
+		{
+			selector: `node[app_name="Testing"]`,
+			css: {
+				'width': '30px',
+				'height': '30px',
 			},
 		},
 		{
@@ -101,6 +117,8 @@ const data = [{
 			css: {
 				'shape': 'ellipse',
 				'border-color': '#80deea',
+				'width': '80px',
+				'height': '80px',
 			},
 		},
 		{
@@ -111,7 +129,7 @@ const data = [{
 			},
 		},
 		{
-			selector: 'node:selected',
+			selector: ':selected',
 			css: {
 				'background-color': '#77b0d0',
 				'border-color': '#77b0d0',
@@ -163,7 +181,7 @@ const data = [{
 			css: {
 				'background-color': '#ffef47',
 				'border-color': '#ffef47',
-				'border-width': '5px',
+				'border-width': '8px',
 				'transition-property': 'border-width',
 				'transition-duration': '0.25s',
 			},
@@ -183,9 +201,11 @@ const data = [{
 			css: {
 				'background-color': "#f85a3e",
 				'border-color': '#f85a3e',
-				'border-width': '5px',
+				'border-width': '12px',
 				'transition-property': 'border-width',
 				'transition-duration': '0.25s',
+				'font-size': '30px',
+				'label': 'data(label)',
 			},
 		},
 		{
@@ -211,10 +231,13 @@ const data = [{
 			selector: 'edge.success-highlight',
 			css: {
 				'width': '5px',
-				'target-arrow-color': '#399645',
-				'line-color': '#399645',
+				'target-arrow-color': '#41dcab',
+				'line-color': '#41dcab',
 				'transition-property': 'line-color, width',
 				'transition-duration': '0.5s',
+				"line-fill": "linear-gradient",
+				"line-gradient-stop-positions": ["0.0", "100"],
+				"line-gradient-stop-colors": ["#41dcab", "#41dcab"],
 			},
 		},
 		{
@@ -222,7 +245,10 @@ const data = [{
 			css: {
 				'target-arrow-color': '#991818',
 				'line-color': '#991818',
-				'line-style': 'dashed'
+				'line-style': 'dashed',
+				"line-fill": "linear-gradient",
+				"line-gradient-stop-positions": ["0.0", "100"],
+				"line-gradient-stop-colors": ["#991818", "#991818"],
 			},
 		},
 		{

frontend/src/views/Admin.jsx

@@ -1,60 +1,18 @@
 import React, { useState, useEffect } from 'react';
 
 import { makeStyles } from '@material-ui/styles';
+import { useTheme } from '@material-ui/core/styles';
 import {Link} from 'react-router-dom';
-import Paper from '@material-ui/core/Paper';
-import Card from '@material-ui/core/Card';
-import Tooltip from '@material-ui/core/Tooltip';
-import FormControlLabel from '@material-ui/core/FormControlLabel';
-import Typography from '@material-ui/core/Typography';
-import Switch from '@material-ui/core/Switch';
-import Select from '@material-ui/core/Select';
-import MenuItem from '@material-ui/core/MenuItem';
-import Divider from '@material-ui/core/Divider';
-import TextField from '@material-ui/core/TextField';
-import Button from '@material-ui/core/Button';
-import Tabs from '@material-ui/core/Tabs';
-import Tab from '@material-ui/core/Tab';
-import Grid from '@material-ui/core/Grid';
-import List from '@material-ui/core/List';
-import ListItem from '@material-ui/core/ListItem';
-import ListItemText from '@material-ui/core/ListItemText';
-import ListItemAvatar from '@material-ui/core/ListItemAvatar';
-import ListItemSecondaryAction from '@material-ui/core/ListItemSecondaryAction';
-import IconButton from '@material-ui/core/IconButton';
-import Avatar from '@material-ui/core/Avatar';
-import Zoom from '@material-ui/core/Zoom';
+
+import {Paper, Card, Tooltip, FormControlLabel, Typography, Switch, Select, MenuItem, Divider, TextField, Button, Tabs, Tab, Grid, List, ListItem, ListItemText, ListItemAvatar, ListItemSecondaryAction, IconButton, Avatar, Zoom,  Dialog, DialogTitle, DialogActions, DialogContent, CircularProgress } from '@material-ui/core';
+
+import {Edit as EditIcon, FileCopy as FileCopyIcon, Publish as PublishIcon, SelectAll as SelectAllIcon, OpenInNew as OpenInNewIcon, CloudDownload as CloudDownloadIcon, Description as DescriptionIcon, Polymer as PolymerIcon, CheckCircle as CheckCircleIcon, Close as CloseIcon, Apps as AppsIcon, Image as ImageIcon, Delete as DeleteIcon, Cached as CachedIcon, AccessibilityNew as AccessibilityNewIcon, Lock as LockIcon, Eco as EcoIcon, Schedule as ScheduleIcon, Cloud as CloudIcon, Business as BusinessIcon} from '@material-ui/icons';
+
 import { useAlert } from "react-alert";
 import Dropzone from '../components/Dropzone';
-
-import { Dialog, DialogTitle, DialogActions, DialogContent } from '@material-ui/core';
-import { useTheme } from '@material-ui/core/styles';
 import HandlePayment from './HandlePayment'
 import OrgHeader from '../components/OrgHeader'
 
-import CircularProgress from '@material-ui/core/CircularProgress';
-import EditIcon from '@material-ui/icons/Edit';
-import FileCopyIcon from '@material-ui/icons/FileCopy';
-import PublishIcon from '@material-ui/icons/Publish';
-import SelectAllIcon from '@material-ui/icons/SelectAll';
-import OpenInNewIcon from '@material-ui/icons/OpenInNew';
-import CloudDownloadIcon from '@material-ui/icons/CloudDownload';
-import DescriptionIcon from '@material-ui/icons/Description';
-import PolymerIcon from '@material-ui/icons/Polymer';
-import CheckCircleIcon from '@material-ui/icons/CheckCircle';
-import CloseIcon from '@material-ui/icons/Close';
-import AppsIcon from '@material-ui/icons/Apps';
-import ImageIcon from '@material-ui/icons/Image';
-import DeleteIcon from '@material-ui/icons/Delete';
-import CachedIcon from '@material-ui/icons/Cached';
-import AccessibilityNewIcon from '@material-ui/icons/AccessibilityNew';
-import LockIcon from '@material-ui/icons/Lock';
-import EcoIcon from '@material-ui/icons/Eco';
-import ScheduleIcon from '@material-ui/icons/Schedule';
-import CloudIcon from '@material-ui/icons/Cloud';
-import BusinessIcon from '@material-ui/icons/Business';
-
-
 const useStyles = makeStyles({
 	notchedOutline: {
 		borderColor: "#f85a3e !important"
@@ -233,6 +191,45 @@ const Admin = (props) => {
 			});
 	}
 
+	const handleStopOrgSync = (org_id) => {
+		if (org_id === undefined || org_id === null) {
+			alert.error("Couldn't get org "+org_id)
+			return 
+		}
+
+		const data = {}
+
+		const url = globalUrl + '/api/v1/orgs/' + org_id + "/stop_sync";
+		fetch(url, {
+			mode: 'cors',
+			method: 'POST',
+			body: JSON.stringify(data),
+			credentials: 'include',
+			crossDomain: true,
+			withCredentials: true,
+			headers: {
+				'Content-Type': 'application/json; charset=utf-8',
+			},
+		})
+		.then(response => {
+			if (response.status === 200) {
+				console.log("Cloud sync success?")
+				alert.success("Successfully stopped cloud sync")
+			} else {
+				console.log("Cloud sync fail?")
+				alert.error("Failed stopping sync. Try again, and contact support if this persists.")
+			}
+
+			return response.json()
+		})
+    .then((responseJson) => {
+			handleGetOrg(org_id) 
+		})
+		.catch(error => {
+			alert.error("Err: " + error.toString())
+		})
+	}
+
 	const enableCloudSync = (apikey, organization, disableSync) => {
 		setOrgSyncResponse("")
 
@@ -390,7 +387,9 @@ const Admin = (props) => {
 
 	const deleteUser = (data) => {
 		// Just use this one?
-		const url = globalUrl + '/api/v1/users/' + data.id
+		const userId = isCloud ? data.username : data.id 
+		
+		const url = globalUrl + '/api/v1/users/' + userId
 		fetch(url, {
 			method: 'DELETE',
 			credentials: "include",
@@ -419,6 +418,11 @@ const Admin = (props) => {
 	}
 
 	const handleGetOrg = (orgId) => {
+		if (orgId.length === 0) {
+			alert.error("Organization ID not defined. Please contact us on https://shuffler.io if this persists logout.")
+			return 
+		}
+
 		// Just use this one?
 		var baseurl = globalUrl
 		const url = baseurl + '/api/v1/orgs/'+orgId
@@ -472,11 +476,13 @@ const Admin = (props) => {
 
 	const submitUser = (data) => {
 		console.log("INPUT: ", data)
+		setLoginInfo("")
 
 		// Just use this one?
 		var data = { "username": data.Username, "password": data.Password }
 		var baseurl = globalUrl
 		const url = baseurl + '/api/v1/users/register';
+
 		fetch(url, {
 			method: 'POST',
 			credentials: "include",
@@ -488,7 +494,7 @@ const Admin = (props) => {
 			.then(response =>
 				response.json().then(responseJson => {
 					if (responseJson["success"] === false) {
-						setLoginInfo("Error in input: " + responseJson.reason)
+						setLoginInfo("Error: " + responseJson.reason)
 					} else {
 						setLoginInfo("")
 						setModalOpen(false)
@@ -910,7 +916,8 @@ const Admin = (props) => {
 		})
 			.then((response) => {
 				if (response.status !== 200) {
-					window.location.pathname = "/workflows"
+					// Ahh, this happens because they're not admin
+					// window.location.pathname = "/workflows"
 					return
 				}
 
@@ -954,11 +961,11 @@ const Admin = (props) => {
 		} else if (newValue === 2) {
 			getAppAuthentication()
 		} else if (newValue === 3) {
-			getEnvironments()
+			getFiles()
 		} else if (newValue === 4) {
 			getSchedules()
 		} else if (newValue === 5) {
-			getFiles()
+			getEnvironments()
 		} else if (newValue === 6) {
 			getOrgs() 
 		}
@@ -1072,7 +1079,8 @@ const Admin = (props) => {
 
 
 
-	const generateApikey = (userId) => {
+	const generateApikey = (user) => {
+		const userId = isCloud ? user.username : user.id
 		const data = { "user_id": userId }
 
 		fetch(globalUrl + "/api/v1/generateapikey", {
@@ -1199,11 +1207,11 @@ const Admin = (props) => {
 				},
 			}}
 		>
-			<DialogTitle><span style={{ color: "white" }}><EditIcon /></span></DialogTitle>
+			<DialogTitle><span style={{ color: "white" }}><EditIcon /> Edit user</span></DialogTitle>
 			<DialogContent>
 				<div style={{ display: "flex" }}>
 					<TextField
-						style={{ marginTop: 0, backgroundColor: theme.palette.inputColor, flex: 3 }}
+						style={{ marginTop: 0, backgroundColor: theme.palette.inputColor, flex: 3 , marginRight: 10,}}
 						InputProps={{
 							style: {
 								height: 50,
@@ -1243,7 +1251,7 @@ const Admin = (props) => {
 					style={{}}
 					variant="outlined"
 					color="primary"
-					onClick={() => generateApikey(selectedUser.id)}
+					onClick={() => generateApikey(selectedUser)}
 				>
 					Get new API key
 				</Button>
@@ -1399,14 +1407,14 @@ const Admin = (props) => {
 
 	const cancelSubscriptions = (subscription_id) => {
 		console.log(selectedOrganization)
+		const orgId = selectedOrganization.id
 		const data = {
 			"subscription_id": subscription_id,
 			"action": "cancel",
 			"org_id": selectedOrganization.id,
 		}
 
-
-		const url = globalUrl + `/api/v1/orgs/${selectedOrganization.id}`;
+		const url = globalUrl + `/api/v1/orgs/${orgId}`;
 		fetch(url, {
 			mode: 'cors',
 			method: 'POST',
@@ -1441,7 +1449,7 @@ const Admin = (props) => {
 	}
 
 	const organizationView = curTab === 0 && selectedOrganization.id !== undefined ?
-		<div>
+		<div style={{position: "relative"}}>
 			<div style={{ marginTop: 20, marginBottom: 20, }}>
 				<h2 style={{ display: "inline", }}>Organization overview</h2>
 				<span style={{ marginLeft: 25 }}>
@@ -1457,6 +1465,25 @@ const Admin = (props) => {
 					</div>
 					:
 					<div>
+						<Tooltip title={"Copy Organization ID"} style={{}} aria-label={"Copy orgid"}>
+							<IconButton style={{top: -10, right: 0, position: "absolute",}} onClick={() => {
+								const elementName = "copy_element_shuffle"
+								const org_id = selectedOrganization.id
+								var copyText = document.getElementById(elementName);
+								if (copyText !== null && copyText !== undefined) {
+									navigator.clipboard.writeText(org_id)
+									copyText.select();
+									copyText.setSelectionRange(0, 99999); /* For mobile devices */
+
+								/* Copy the text inside the text field */
+								document.execCommand("copy");
+
+								alert.info(org_id + " copied to clipboard")	
+							}
+						}}>
+							<FileCopyIcon style={{color: "rgba(255,255,255,0.8)"}}/>
+						</IconButton>
+					</Tooltip>
 						{selectedOrganization.name.length > 0 ?
 							<OrgHeader setSelectedOrganization={setSelectedOrganization} globalUrl={globalUrl} selectedOrganization={selectedOrganization}/>
 						: 
@@ -1487,27 +1514,41 @@ const Admin = (props) => {
 								<Typography style={{whiteSpace: "nowrap", marginTop: 25, marginRight: 10}}>
 									Your Apikey 
 								</Typography>
-								<TextField
-									color="primary"
-									style={{backgroundColor: theme.palette.inputColor, }}
-									InputProps={{
-										style: {
-											height: "50px",
-											color: "white",
-											fontSize: "1em",
-										},
-									}}
-									required
-									fullWidth={true}
-									disabled={true}
-									autoComplete="cloud apikey"
-									id="apikey_field"
-									margin="normal"
-									placeholder="Cloud Apikey"
-									variant="outlined"
-									defaultValue={userSettings.apikey}
-								/>
-							</div>
+								<div style={{display: "flex"}}>
+									<TextField
+										color="primary"
+										style={{backgroundColor: theme.palette.inputColor, }}
+										InputProps={{
+											style: {
+												height: "50px",
+												color: "white",
+												fontSize: "1em",
+											},
+										}}
+										required
+										fullWidth={true}
+										disabled={true}
+										autoComplete="cloud apikey"
+										id="apikey_field"
+										margin="normal"
+										placeholder="Cloud Apikey"
+										variant="outlined"
+										defaultValue={userSettings.apikey}
+									/>
+									{selectedOrganization.cloud_sync_active ? 
+										<Button
+											style={{ width: 150, height: 50, marginLeft: 10, marginTop: 17, }}
+											variant="contained"
+											color="primary"
+											onClick={() => {
+												handleStopOrgSync(selectedOrganization.id)
+											}}
+										>
+											Stop Sync	
+										</Button>
+									: null}
+								</div>
+								</div>
 						</div>
 					:
 					<div>
@@ -1626,7 +1667,7 @@ const Admin = (props) => {
 				}
 
 					<div style={{backgroundColor: "#1f2023", paddingTop: 25,}}>
-						<HandlePayment stripeKey={props.stripeKey} userdata={userdata} globalUrl={globalUrl} {...props} />
+						<HandlePayment theme={theme} stripeKey={props.stripeKey} userdata={userdata} globalUrl={globalUrl} {...props} />
 					</div>
 			</div>
 		: null
@@ -1743,7 +1784,6 @@ const Admin = (props) => {
 			</div>
 			<div />
 			<Button
-				disabled={isCloud}
 				style={{}}
 				variant="contained"
 				color="primary"
@@ -1751,17 +1791,25 @@ const Admin = (props) => {
 			>
 				Add user
 			</Button>
+			<Button 
+				style={{marginLeft: 5, marginRight: 15, }} 
+				variant="contained"
+				color="primary"
+				onClick={() => getUsers()}
+			> 
+				<CachedIcon />
+			</Button>
 			<Divider style={{ marginTop: 20, marginBottom: 20, backgroundColor: theme.palette.inputColor }} />
 			<List>
 				<ListItem>
 					<ListItemText
 						primary="Username"
-						style={{ minWidth: 200, maxWidth: 200 }}
+						style={{ minWidth: 300, maxWidth: 300}}
 					/>
 					
 					<ListItemText
 						primary="API key"
-						style={{ minWidth: 350, maxWidth: 350, overflow: "hidden" }}
+						style={{ minWidth: 100, maxWidth: 100, overflow: "hidden" }}
 					/>
 					
 					<ListItemText
@@ -1787,64 +1835,86 @@ const Admin = (props) => {
 						<ListItem key={index} style={{backgroundColor: bgColor}}>
 							<ListItemText
 								primary={data.username}
-								style={{ minWidth: 200, maxWidth: 200 }}
+								style={{ minWidth: 300, maxWidth: 300, overflow: "hidden",}}
 							/>
 							
 							<ListItemText
-								primary={data.apikey === undefined || data.apikey.length === 0 ? "" : data.apikey}
-								style={{ maxWidth: 350, minWidth: 350, }}
-							/>
+								style={{ maxWidth: 100, minWidth: 100, }}
+								primary={data.apikey === undefined || data.apikey.length === 0 ? "" : 
+									<Tooltip title={"Copy Api Key"} style={{}} aria-label={"Copy APIkey"}>
+										<IconButton style={{}} onClick={() => {
+												const elementName = "copy_element_shuffle"
+												var copyText = document.getElementById(elementName);
+												if (copyText !== null && copyText !== undefined) {
+													navigator.clipboard.writeText(data.apikey)
+													copyText.select();
+													copyText.setSelectionRange(0, 99999); /* For mobile devices */
+
+												/* Copy the text inside the text field */
+												document.execCommand("copy");
+
+												alert.info("Apikey copied to clipboard")	
+											}
+										}}>
+										<FileCopyIcon style={{color: "rgba(255,255,255,0.8)"}}/>
+									</IconButton>
+								</Tooltip>
+							}/>
 							
 							<ListItemText
 								primary=
-								{<Select
-									SelectDisplayProps={{
-									style: {
-										marginLeft: 10,
+									{<Select
+										SelectDisplayProps={{
+										style: {
+											marginLeft: 10,
+										}
+									}}
+									value={data.role}
+									fullWidth
+									onChange={(e) => {
+									console.log("VALUE: ", e.target.value)
+
+									if (isCloud) {	
+										setUser(data.username, "role", e.target.value)
+									} else {
+										setUser(data.id, "role", e.target.value)
 									}
 								}}
-								value={data.role}
-								fullWidth
-								onChange={(e) => {
-								console.log("VALUE: ", e.target.value)
-								setUser(data.id, "role", e.target.value)
-							}}
 										style={{ backgroundColor: theme.palette.surfaceColor, color: "white", height: "50px" }}
-										>
-							<MenuItem style={{ backgroundColor: theme.palette.inputColor, color: "white" }} value={"admin"}>
-								Admin
-										</MenuItem>
-							<MenuItem style={{ backgroundColor: theme.palette.inputColor, color: "white" }} value={"user"}>
-								User
-										</MenuItem>
-									</Select>}
-								style = {{ minWidth: 150, maxWidth: 150}}
+									>
+									<MenuItem style={{ backgroundColor: theme.palette.inputColor, color: "white" }} value={"admin"}>
+										Admin
+									</MenuItem>
+									<MenuItem style={{ backgroundColor: theme.palette.inputColor, color: "white" }} value={"user"}>
+										User
+									</MenuItem>
+								</Select>
+								}
+								style ={{ minWidth: 135, maxWidth: 135, marginRight: 15,}}
 							/>
 							<ListItemText
 					primary={data.active ? "True" : "False"}
 					style={{ minWidth: 180, maxWidth: 180 }}
 				/>
 				<ListItemText style={{ display: "flex" }}>
-					<Button
-						style={{}}
-						variant="outlined"
-						color="primary"
+					<IconButton
 						onClick={() => {
 							setSelectedUserModalOpen(true)
 							setSelectedUser(data)
 						}}
 					>
-						Edit user
-					</Button>
+						<EditIcon color="primary"/>
+					</IconButton>
 					<Button
-						style={{}}
+						onClick={() => {
+							generateApikey(data)
+						}}
 						variant="outlined"
 						color="primary"
-						onClick={() => generateApikey(data.id)}
 					>
-						Get new API key
+						New apikey 
 					</Button>
-					</ListItemText>
+				</ListItemText>
 				</ListItem>
 					)
 				})}
@@ -1890,7 +1960,7 @@ const Admin = (props) => {
 		uploadFiles(files)
   }
 
-	const filesView = curTab === 5 ?
+	const filesView = curTab === 3 ?
 		<Dropzone style={{maxWidth: window.innerWidth > 1366 ? 1366 : 1200, margin: "auto", padding: 20 }} onDrop={uploadFile}>
 		<div>
 			<div style={{marginTop: 20, marginBottom: 20,}}>
@@ -1939,7 +2009,7 @@ const Admin = (props) => {
 					/>
 					<ListItemText
 						primary="Status"
-						style={{minWidth: 75, maxWidth: 75}}
+						style={{minWidth: 75, maxWidth: 75, marginLeft: 10,}}
 					/>
 					<ListItemText
 						primary="Filesize"
@@ -1965,7 +2035,7 @@ const Admin = (props) => {
 								primary={new Date(file.created_at*1000).toISOString()}
 							/>
 							<ListItemText
-								style={{maxWidth: 150, minWidth: 150}}
+								style={{maxWidth: 150, minWidth: 150, overflow: "hidden",}}
 								primary={file.filename}
 							/>
 							<ListItemText
@@ -1991,7 +2061,7 @@ const Admin = (props) => {
 							/>
 							<ListItemText
 								primary={file.status}
-								style={{minWidth: 75, maxWidth: 75, overflow: "hidden"}}
+								style={{minWidth: 75, maxWidth: 75, overflow: "hidden", marginLeft: 10,}}
 							/>
 							<ListItemText
 								primary={file.filesize}
@@ -2034,7 +2104,7 @@ const Admin = (props) => {
 											/* Copy the text inside the text field */
 											document.execCommand("copy");
 
-											alert.info(file.id + "copied to clipboard")	
+											alert.info(file.id + " copied to clipboard")	
 										}
 									}}>
 										<FileCopyIcon style={{color: "white"}}/>
@@ -2228,7 +2298,7 @@ const Admin = (props) => {
 					/>
 					<ListItemText
 						primary="App Name"
-						style={{minWidth: 150, maxWidth: 150}}
+						style={{minWidth: 175, maxWidth: 175, marginLeft: 10,}}
 					/>
 					<ListItemText
 						primary="Ready"
@@ -2264,15 +2334,15 @@ const Admin = (props) => {
 							/>
 							<ListItemText
 								primary={data.label}
-								style={{minWidth: 225, maxWidth: 225}}
+								style={{minWidth: 225, maxWidth: 225, overflow: "hidden",}}
 							/>
 							<ListItemText
 								primary={data.app.name}
-								style={{minWidth: 150, maxWidth: 150}}
+								style={{minWidth: 175, maxWidth: 175, marginLeft: 10}}
 							/>
 							<ListItemText
 								primary={data.defined === false ? "No" : "Yes"}
-								style={{minWidth: 100, maxWidth: 100}}
+								style={{minWidth: 100, maxWidth: 100, marginLeft: 10,}}
 							/>
 							<ListItemText
 								primary={data.workflow_count === null ? 0 : data.workflow_count}
@@ -2334,7 +2404,7 @@ const Admin = (props) => {
 		</div>
 		: null
 
-	const environmentView = curTab === 3 ?
+	const environmentView = curTab === 5 ?
 		<div>
 			<div style={{marginTop: 20, marginBottom: 20,}}>
 				<h2 style={{display: "inline",}}>Environments</h2>
@@ -2578,10 +2648,10 @@ const Admin = (props) => {
 				>
 					<Tab label=<span><BusinessIcon style={iconStyle} /> Organization</span>/>
 					<Tab label=<span><AccessibilityNewIcon style={iconStyle} />Users</span> />
-					{isCloud ? null : <Tab label=<span><LockIcon style={iconStyle} />App Authentication</span>/>}
+					<Tab label=<span><LockIcon style={iconStyle} />App Authentication</span>/>
+					<Tab label=<span><DescriptionIcon style={iconStyle} />Files</span> />
+					<Tab label=<span><ScheduleIcon style={iconStyle} />Schedules</span> />
 					{isCloud ? null : <Tab label=<span><EcoIcon style={iconStyle} />Environments</span>/>}
-					{isCloud ? null : <Tab label=<span><ScheduleIcon style={iconStyle} />Schedules</span> />}
-					{isCloud ? null : <Tab label=<span><DescriptionIcon style={iconStyle} />Files</span> />}
 					{window.location.protocol == "http:" && window.location.port === "3000" ? <Tab label=<span><CloudIcon style={iconStyle} /> Hybrid</span>/> : null}
 					{window.location.protocol == "http:" && window.location.port === "3000" ? <Tab label=<span><BusinessIcon style={iconStyle} /> Organizations</span>/> : null}
 					{window.location.protocol === "http:" && window.location.port === "3000" ? <Tab label=<span><LockIcon style={iconStyle} />Categories</span>/> : null}

frontend/src/views/AppCreator.jsx

@@ -2,36 +2,24 @@ import React, {useState, useEffect} from 'react';
 import { makeStyles } from '@material-ui/styles';
 import {BrowserView, MobileView} from "react-device-detect";
 
+import {Paper, Typography, FormControlLabel, Button, Divider, Select, MenuItem, FormControl, Switch, Dialog, DialogTitle, DialogContent, DialogActions, TextField, Tooltip, Breadcrumbs, CircularProgress, Chip} from '@material-ui/core';
+import {CheckCircle as CheckCircleIcon, AttachFile as AttachFileIcon, Apps as AppsIcon, ErrorOutline as ErrorOutlineIcon} from '@material-ui/icons';
+
+
 import {Link} from 'react-router-dom';
-import Paper from '@material-ui/core/Paper';
-import Typography from '@material-ui/core/Typography';
-import FormControlLabel from '@material-ui/core/FormControlLabel';
-import Button from '@material-ui/core/Button';
-import Divider from '@material-ui/core/Divider';
-import Select from '@material-ui/core/Select';
-import MenuItem from '@material-ui/core/MenuItem';
-import FormControl from '@material-ui/core/FormControl';
-import Switch from '@material-ui/core/Switch';
-import Dialog from '@material-ui/core/Dialog';
-import DialogTitle from '@material-ui/core/DialogTitle';
-import DialogContent from '@material-ui/core/DialogContent';
-import DialogActions from '@material-ui/core/DialogActions';
-import TextField from '@material-ui/core/TextField';
-import Tooltip from '@material-ui/core/Tooltip';
-import CheckCircleIcon from '@material-ui/icons/CheckCircle';
-import AttachFileIcon from '@material-ui/icons/AttachFile';
-import Breadcrumbs from '@material-ui/core/Breadcrumbs';
-import AppsIcon from '@material-ui/icons/Apps';
-import CircularProgress from '@material-ui/core/CircularProgress';
-
-import Chip from '@material-ui/core/Chip';
-import ChipInput from 'material-ui-chip-input'
-
 import YAML from 'yaml'
-import ErrorOutline from '@material-ui/icons/ErrorOutline';
+import ChipInput from 'material-ui-chip-input'
 import { useAlert } from "react-alert";
 import words from "shellwords"
 
+import AvatarEditor from 'react-avatar-editor';
+import AddAPhotoIcon from '@material-ui/icons/AddAPhoto';
+import AddAPhotoOutlinedIcon from '@material-ui/icons/AddAPhotoOutlined';
+import ZoomInOutlinedIcon from '@material-ui/icons/ZoomInOutlined';
+import ZoomOutOutlinedIcon from '@material-ui/icons/ZoomOutOutlined';
+import LoopIcon from '@material-ui/icons/Loop';
+import AddPhotoAlternateIcon from '@material-ui/icons/AddPhotoAlternate';
+
 const surfaceColor = "#27292D"
 const inputColor = "#383B40"
 
@@ -65,6 +53,18 @@ const boxStyle = {
 	backgroundColor: surfaceColor,
 }
 
+const dividerStyle = { 
+	marginBottom: "10px", 
+	marginTop: "10px", 
+	height: "1px", 
+	width: "100%", 
+	backgroundColor: "grey",
+}
+
+const appIconStyle = { 
+	marginLeft: "5px",
+}
+
 const useStyles = makeStyles({
 	notchedOutline: {
 		borderColor: "#f85a3e !important"
@@ -319,6 +319,8 @@ const AppCreator = (props) => {
 	const checkQuery = () => {
 		var urlParams = new URLSearchParams(window.location.search)
 		if (!urlParams.has("id")) {
+			setActionAmount(0)
+
   		setIsAppLoaded(true)
 			return	
 		}
@@ -340,12 +342,10 @@ const AppCreator = (props) => {
 			return response.json()
 		})
 		.then((responseJson) => {
-			console.log("THE BODY IS HERE")
   		setIsAppLoaded(true)
 			if (!responseJson.success) {
 				alert.error("Failed to verify")
 			} else{
-				console.log("HMM 2")
 				var jsonvalid = false 
 				var tmpvalue = ""
 				try {
@@ -569,7 +569,7 @@ const AppCreator = (props) => {
 								}
 							}
 
-							console.log(methodvalue["requestBody"]["content"])
+							//console.log(methodvalue["requestBody"]["content"])
 							if (methodvalue["requestBody"]["content"]["multipart/form-data"] !== undefined) {
 								if (methodvalue["requestBody"]["content"]["multipart/form-data"]["schema"] !== undefined && methodvalue["requestBody"]["content"]["multipart/form-data"]["schema"] !== null) {
 									if (methodvalue["requestBody"]["content"]["multipart/form-data"]["schema"]["type"] === "object") {
@@ -1260,6 +1260,7 @@ const AppCreator = (props) => {
 		})
 
 		setActions(actions)
+		setActionAmount(actionAmount-1)
 		setUpdate(Math.random())
 	}
 
@@ -1303,13 +1304,13 @@ const AppCreator = (props) => {
 					id: 'outlined-age-simple',
 				}}
 			>
-				{apikeySelection.map(data => {
+				{apikeySelection.map((data, index) => {
 					if (data === undefined) {
 						return null
 					}
 
 					return (
-						<MenuItem style={{backgroundColor: inputColor, color: "white"}} value={data}>
+						<MenuItem key={index} style={{backgroundColor: inputColor, color: "white"}} value={data}>
 							{data}
 						</MenuItem>
 					)}
@@ -1327,7 +1328,7 @@ const AppCreator = (props) => {
 				const requiredColor = data.required === true ? "green" : "red"
 				//const required = data.required === true ? <div style={{color: "green", cursor: "pointer"}}>{data.required.toString()}</div> : <div onClick={() => {flipRequired(index)}} style={{display: "inline", color: "red", cursor: "pointer"}}>{data.required.toString()}</div>
 				return (
-					<Paper style={actionListStyle}>
+					<Paper key={index} style={actionListStyle}>
 						<div style={{marginLeft: "5px", width: "100%"}}>
 							<div style={{cursor: "pointer"}} onClick={() => {flipRequired(index)}}>
 								Required: <div style={{display: "inline", color: requiredColor}}>{data.required.toString()}</div>
@@ -1339,7 +1340,9 @@ const AppCreator = (props) => {
 								placeholder={'Query name'}
 								helperText={<span style={{color:"white", marginBottom: "2px",}}>Click required switch</span>}
 								onBlur={(e) => {
-									urlPathQueries[index].name = e.target.value
+									console.log("IN BLUR: ", e.target.value)
+									urlPathQueries[index].name = e.target.value.replaceAll("=", "")
+
 									setUrlPathQueries(urlPathQueries)
 								}}
 								InputProps={{
@@ -1367,7 +1370,7 @@ const AppCreator = (props) => {
 			{actions.slice(0,actionAmount).map((data, index) => {
 				var error = data.errors.length > 0 ? 
 					<Tooltip color="primary" title={data.errors.join("\n")} placement="bottom">
-						<ErrorOutline />
+						<ErrorOutlineIcon />
 					</Tooltip>
 					:
 					<Tooltip color="secondary" title={data.errors.join("\n")} placement="bottom">
@@ -1391,7 +1394,7 @@ const AppCreator = (props) => {
 				const url = data.url
 				const hasFile = data["file_field"] !== undefined && data["file_field"] !== null && data["file_field"].length > 0
 				return (
-					<Paper style={actionListStyle}>
+					<Paper key={index} style={actionListStyle}>
 						{error} 
 					 	<Tooltip title="Edit action" placement="bottom">
 							<div style={{marginLeft: "5px", width: "100%", cursor: "pointer", maxWidth: 725, overflowX: "hidden",}} onClick={() => {
@@ -1564,9 +1567,9 @@ const AppCreator = (props) => {
 		}
 
 		// Url verification
-		if (currentAction.url.length === 0) {
-			errormessage.push("URL path can't be empty.")
-		} else if (!currentAction.url.startsWith("/") && baseUrl.length > 0) {
+		//if (currentAction.url.length === 0) {
+		//	errormessage.push("URL path can't be empty.")
+		if (!currentAction.url.startsWith("/") && baseUrl.length > 0 && currentAction.url.length > 0) {
 			errormessage.push("URL must start with /")
 		}
 
@@ -1795,8 +1798,8 @@ const AppCreator = (props) => {
 							</MenuItem>
 							)
 						})}
-						{actionBodyRequest.map(data => (
-							<MenuItem style={{backgroundColor: inputColor, color: "white"}} value={data}>
+						{actionBodyRequest.map((data, index)  => (
+							<MenuItem key={index} style={{backgroundColor: inputColor, color: "white"}} value={data}>
 								{data}
 							</MenuItem>
 						))}
@@ -1832,8 +1835,8 @@ const AppCreator = (props) => {
 							console.log("URL: ", parsedurl)
 							if (parsedurl.includes("<") && parsedurl.includes(">")) {
 								console.log("REPLACE")
-								parsedurl = parsedurl.replace("<", "{")
-								parsedurl = parsedurl.replace(">", "}")
+								parsedurl = parsedurl.replaceAll("<", "{")
+								parsedurl = parsedurl.replaceAll(">", "}")
 							}
 
 							if (parsedurl.startsWith("PUT ") || parsedurl.startsWith("GET ") ||parsedurl.startsWith("POST ") || parsedurl.startsWith("DELETE ") ||parsedurl.startsWith("PATCH ") || parsedurl.startsWith("CONNECT ")) {
@@ -1936,7 +1939,7 @@ const AppCreator = (props) => {
 					{fileUploadEnabled ? 
 						<TextField
 							required
-							style={{backgroundColor: inputColor, display: "inline-block",}}
+							style={{backgroundColor: inputColor, display: "inline-block", marginLeft: 10, maxWidth: 210, marginTop: 7, }}
 							placeholder={"file"}
 							margin="normal"
 							variant="outlined"
@@ -2009,13 +2012,15 @@ const AppCreator = (props) => {
 	const categories = [
 		"Communication",
 		"Cases",
-		"EDR",
-		"Intel",
 		"SIEM",
-		"Network",
 		"Assets",
+		"Intel",
+		"IAM",
+		"Network",
+		"Eradication",
 		"Other",
 	]
+
 	const tagView = 
 		<div style={{color: "white"}}>
 			{/*
@@ -2057,8 +2062,8 @@ const AppCreator = (props) => {
 				value={newWorkflowCategories.length === 0 ? "Select a category" : newWorkflowCategories[0]}
 				style={{backgroundColor: inputColor, color: "white", height: "50px"}}
 				>
-				{categories.map(data => (
-					<MenuItem style={{backgroundColor: inputColor, color: "white"}} value={data}>
+				{categories.map((data, index) => (
+					<MenuItem key={index} style={{backgroundColor: inputColor, color: "white"}} value={data}>
 						{data}
 					</MenuItem>
 				))}
@@ -2089,8 +2094,24 @@ const AppCreator = (props) => {
 		</div>
 
 	const actionView = 
-		<div style={{color: "white"}}>
-			<h2>Actions ({actions.length})</h2>
+		<div style={{color: "white", position: "relative",}}>
+			<div style={{position: "absolute", right: 0, top: 0,}}>
+				{actionAmount > 0 && actionAmount < actions.length ? 
+					<Button color="primary" style={{float: "right", borderRadius: 0, textAlign: "center"}} variant="outlined" onClick={() => {
+						setActionAmount(actions.length)
+						/*
+						if (actionAmount+increaseAmount > actions.length) {
+							setActionAmount(actions.length)
+						} else {
+							setActionAmount(actionAmount+increaseAmount)
+						}
+						*/
+					}}>
+						See all actions 
+					</Button>
+				: null}
+			</div>
+			<h2>Actions {actionAmount > 0 ? <span>({actionAmount} / {actions.length})</span> : null}</h2>
 			Actions are the tasks performed by an app. Read more about actions and apps
 			<a target="_blank" src="https://shuffler.io/docs/apps#actions" style={{textDecoration: "none", color: "#f85a3e"}}> here</a>.
 			<div>
@@ -2113,18 +2134,7 @@ const AppCreator = (props) => {
 						setActionsModalOpen(true)
 					}}>New action</Button> 				
 					{/*
-					{actionAmount} {actions.length}
-					{actionAmount > 0 && actionAmount < actions.length ? null :  
-						<Button color="primary" style={{float: "right", marginTop: "20px", borderRadius: "0px", textAlign: "center"}} variant="outlined" onClick={() => {
-							if (actionAmount+increaseAmount > actions.length) {
-								setActionAmount(actions.length)
-							} else {
-								setActionAmount(actionAmount+increaseAmount)
-							}
-						}}>
-							See more actions	
-						</Button>
-					}
+						{actionAmount} {actions.length}
 					*/}
 				</div>
 			</div>
@@ -2184,8 +2194,120 @@ const AppCreator = (props) => {
 	//	</div> :
 	//	<img src={file} id="logo" style={{width: "100%", height: "100%"}} />
 
-	const imageData = file.length > 0 ? file : fileBase64 
-	const imageInfo = <img src={imageData} alt="Click to upload an image (174x174)" id="logo" style={{maxWidth: 174, maxHeight: 174, minWidth: 174, minHeight: 174, objectFit: "contain",}} />
+	const [imageUploadError, setImageUploadError] = useState("");
+	const [openImageModal, setOpenImageModal] = useState("");
+	const [scale, setScale] = useState(1);
+	const [rotate, setRotatation] = useState(0);
+	const [disableImageUpload, setDisableImageUpload] = useState(true);
+
+	let imageData = fileBase64;
+	let croppedData = file.length > 0 ? file : fileBase64
+
+	const imageInfo = <img src={imageData} id="logo" style={{maxWidth: 174, maxHeight: 174, minWidth: 174, minHeight: 174, objectFit: "contain",}} />
+
+	const alternateImg = <AddPhotoAlternateIcon style={{ width: 100, height: 100, flex: "1", display: "flex", flexDirection: "row", margin: "auto", marginTop: 30, marginLeft: 40,}} onClick={() => {
+		upload.click()
+	}}/>
+	
+	const zoomIn = () => {
+		console.log("ZOOOMING IN")
+		setScale(scale+0.1);
+	}
+
+	const zoomOut = () => {
+		setScale(scale-0.1);
+	}
+	const rotatation = () => {
+		setRotatation(rotate+10);
+	}
+
+	const onPositionChange = () => {
+		setDisableImageUpload(false);
+	}
+
+	const onCancelSaveAppIcon = () => {
+		setFile("");
+		setOpenImageModal(false)
+		setImageUploadError("")
+	}
+
+	let editor;
+	const setEditorRef = (imgEditor) => { editor = imgEditor; }
+
+	const onSaveAppIcon = () => {
+		if(editor){
+			setFile("");
+			const canvas = editor.getImageScaledToCanvas();
+			setFileBase64(canvas.toDataURL());
+			setOpenImageModal(false)
+			setDisableImageUpload(true);
+		}
+	}
+
+	const errorText = imageUploadError.length > 0 ? <div style={{marginTop: 10}}>Error: {imageUploadError}</div> : null
+	const imageUploadModalView = openImageModal ? 
+		<Dialog open={openImageModal} onClose={onCancelSaveAppIcon}
+			PaperProps={{
+				style: {
+					backgroundColor: surfaceColor,
+					color: "white",
+					minWidth: "300px",
+					minHeight: "300px",
+				},
+			}}
+		>
+			<FormControl>
+				<DialogTitle><div style={{color: "rgba(255,255,255,0.9)"}}>Upload App Icon</div></DialogTitle>
+				{errorText}
+				<DialogContent style={{color: "rgba(255,255,255,0.65)"}}>
+					<AvatarEditor
+						ref={setEditorRef}
+						image={croppedData}
+						width={174}
+						height={174}
+						border={50}
+						color={[0, 0, 0, 0.6]} // RGBA
+						scale={scale}
+						rotate={rotate}
+						onImageChange={onPositionChange}
+						onLoadSuccess={()=>setRotatation(0)}
+					/>
+					<Divider style={dividerStyle}/>
+						<Tooltip title={"New Icon"}>
+							<Button variant="outlined" component="label" color="primary" style={appIconStyle}>
+							<AddAPhotoOutlinedIcon onClick={() => {upload.click()}} color="primary" />	
+							</Button> 
+						</Tooltip>
+						<Tooltip title={"Zoom In"}>
+							<Button variant="outlined" component="label" color="primary" style={appIconStyle}>
+							<ZoomInOutlinedIcon onClick={zoomIn} color="primary" />	
+							</Button> 
+						</Tooltip>
+						<Tooltip title={"Zoom out"}>
+							<Button variant="outlined" component="label" color="primary" style={appIconStyle}>
+							<ZoomOutOutlinedIcon onClick={zoomOut} color="primary" />	
+							</Button> 
+						</Tooltip>
+						<Tooltip title={"Rotate"}>
+							<Button variant="outlined" component="label" color="primary" style={appIconStyle}>
+							<LoopIcon onClick={rotatation} color="primary" />	
+							</Button> 
+						</Tooltip>
+					<Divider style={dividerStyle} />
+				</DialogContent>
+				<DialogActions>
+					<Button style={{borderRadius: "0px"}} onClick={onCancelSaveAppIcon} color="primary">
+						Cancel
+					</Button>
+					<Button variant="contained" style={{borderRadius: "0px"}} disabled={disableImageUpload} onClick={() => {
+								onSaveAppIcon()
+							}} color="primary">
+						Continue	
+					</Button>
+				</DialogActions>
+			</FormControl>
+		</Dialog>
+		: null;
 
 	// Random names for type & autoComplete. Didn't research :^)
 	const landingpageDataBrowser = 
@@ -2201,14 +2323,25 @@ const AppCreator = (props) => {
 						{name} {actions === null || actions === undefined || actions.length === 0 ? null : <span>({actions.length})</span>}
 					</h2>
 				</Breadcrumbs>
+				{imageUploadModalView}
+				<input hidden type="file" ref={(ref) => upload = ref} onChange={editHeaderImage} />
 				<Paper style={boxStyle}>
 					<h2 style={{marginBottom: "10px", color: "white"}}>General information</h2>
 					<a target="_blank" href="https://shuffler.io/docs/apps#create_openapi_app" style={{textDecoration: "none", color: "#f85a3e"}}>Click here to learn more about app creation</a>
 					<div style={{color: "white", flex: "1", display: "flex", flexDirection: "row"}}>
 					 	<Tooltip title="Click to edit the app's image" placement="bottom">
-							<div style={{flex: "1", margin: 10, border: "1px solid #f85a3e", cursor: "pointer", backgroundColor: inputColor, maxWidth: 174, maxHeight: 174}} onClick={() => {upload.click()}}>
-								<input hidden type="file" ref={(ref) => upload = ref} onChange={editHeaderImage} />
+							<div style={{flex: "1", margin: 10, border: "1px solid #f85a3e", cursor: "pointer", backgroundColor: inputColor, maxWidth: 174, maxHeight: 174}} onClick={() => {
+									/*
+									if (fileBase64.length === 0) {
+										upload.click()
+									}
+									*/
+
+									setOpenImageModal(true)
+								}}>
+								{!imageData && (alternateImg)}
 								{imageInfo}
+								<input hidden type="file" ref={(ref) => upload = ref} onChange={editHeaderImage} />
 							</div>
 						</Tooltip>
 						<div style={{flex: "3", color: "white",}}>
@@ -2332,8 +2465,8 @@ const AppCreator = (props) => {
 							value={authenticationOption}
 							style={{backgroundColor: inputColor, color: "white", height: "50px"}}
 							>
-							{authenticationOptions.map(data => (
-								<MenuItem style={{backgroundColor: inputColor, color: "white"}} value={data}>
+							{authenticationOptions.map((data, index) => (
+								<MenuItem key={index} style={{backgroundColor: inputColor, color: "white"}} value={data}>
 									{data}
 								</MenuItem>
 							))}
@@ -2371,7 +2504,9 @@ const AppCreator = (props) => {
 					}}>
 						{appBuilding ? <CircularProgress /> : "Save"}
 					</Button>
-					{errorCode.length > 0 ? `Error: ${errorCode}` : null}
+					<Typography style={{marginTop: 5}}>
+						{errorCode.length > 0 ? `Error: ${errorCode}` : null}
+					</Typography>
 				</Paper>
 		</div>
 

frontend/src/views/Apps.jsx

@@ -2,47 +2,24 @@ import React, { useEffect } from 'react';
 
 import { useInterval } from 'react-powerhooks';
 
-import AppsIcon from '@material-ui/icons/Apps';
-import Grid from '@material-ui/core/Grid';
-import Select from '@material-ui/core/Select';
-import Paper from '@material-ui/core/Paper';
-import Divider from '@material-ui/core/Divider';
-import ButtonBase from '@material-ui/core/ButtonBase';
-import Button from '@material-ui/core/Button';
-import TextField from '@material-ui/core/TextField';
-import FormControl from '@material-ui/core/FormControl';
-import MenuItem from '@material-ui/core/MenuItem';
-import Tooltip from '@material-ui/core/Tooltip';
-import FormControlLabel from '@material-ui/core/FormControlLabel';
-import Switch from '@material-ui/core/Switch';
-import Input from '@material-ui/core/Input';
-import YAML from 'yaml'
-import {Link} from 'react-router-dom';
-import Breadcrumbs from '@material-ui/core/Breadcrumbs';
-import ReactJson from 'react-json-view'
-import Chip from '@material-ui/core/Chip';
+import {IconButton, Typography, Grid, Select, Paper, Divider, ButtonBase, Button, TextField, FormControl, MenuItem, Tooltip, FormControlLabel, Switch, Input, Breadcrumbs, Chip, Dialog, DialogTitle, DialogActions, DialogContent, CircularProgress} from '@material-ui/core';
+import {OpenInNew as OpenInNewIcon,Apps as AppsIcon, Cached as CachedIcon, Publish as PublishIcon, CloudDownload as CloudDownloadIcon, Edit as EditIcon, Delete as DeleteIcon} from '@material-ui/icons';
+
 import { useTheme } from '@material-ui/core/styles';
 
-import CachedIcon from '@material-ui/icons/Cached';
-import CloudDownloadIcon from '@material-ui/icons/CloudDownload';
-import PublishIcon from '@material-ui/icons/Publish';
-import CloudDownload from '@material-ui/icons/CloudDownload';
-import EditIcon from '@material-ui/icons/Edit';
-import DeleteIcon from '@material-ui/icons/Delete';
-
+import YAML from 'yaml'
+import {Link} from 'react-router-dom';
+import ReactJson from 'react-json-view'
 import { useAlert } from "react-alert";
-
-import Dialog from '@material-ui/core/Dialog';
-import DialogTitle from '@material-ui/core/DialogTitle';
-import DialogActions from '@material-ui/core/DialogActions';
-import DialogContent from '@material-ui/core/DialogContent';
-import CircularProgress from '@material-ui/core/CircularProgress';
-
 import Dropzone from '../components/Dropzone';
 
 const surfaceColor = "#27292D"
 const inputColor = "#383B40"
 
+const chipStyle = {
+	backgroundColor: "#3d3f43", height: 30, marginRight: 5, paddingLeft: 5, paddingRight: 5, height: 28, cursor: "pointer", borderColor: "#3d3f43", color: "white",
+}
+
 // Parses JSON data into keys that can be used everywhere :)
 export const GetParsedPaths = (inputdata, basekey) => {
 	const splitkey = " > "
@@ -200,7 +177,7 @@ const Apps = (props) => {
 		minHeight: 130,
 		maxHeight: 130,
 		minWidth: "100%",
-		maxWidth: "100%",
+		maxWidth: 612.5,
 		marginBottom: 5, 
 		borderRadius: 5, 
 		color: "white",
@@ -222,26 +199,57 @@ const Apps = (props) => {
 			setIsLoading(false)
 			if (response.status !== 200) {
 				console.log("Status not 200 for apps :O!")
+
+				if (isCloud) {
+					window.location.pathname = "/search"
+				}
 			}
 
 			return response.json()
 		})
     .then((responseJson) => {
 			//console.log("Apps: ", responseJson)
-			responseJson = sortByKey(responseJson, "large_image")
+			//responseJson = sortByKey(responseJson, "large_image")
+			//responseJson = sortByKey(responseJson, "is_valid")
+			//setFilteredApps(responseJson.filter(app => !internalIds.includes(app.name) && !(!app.activated && app.generated)))
+			
+			var privateapps = []
+			var valid = []
+			var invalid = []
+			for (var key in responseJson) {
+				const app = responseJson[key]
+				if (app.is_valid && !(!app.activated && app.generated)) {
+					privateapps.push(app)
+				} else if (app.private_id !== undefined && app.private_id.length > 0) {
+					valid.push(app)
+				} else {
+					invalid.push(app)
+				}
+			}
 
-			setApps(responseJson)
-			setFilteredApps(responseJson)
-			if (responseJson.length > 0) {
-				setSelectedApp(responseJson[0])
-				if (responseJson[0].actions !== null && responseJson[0].actions.length > 0) {
-					setSelectedAction(responseJson[0].actions[0])
+			//console.log(privateapps)
+			//console.log(valid)
+			//console.log(invalid)
+			//console.log(privateapps)
+			//privateapps.reverse()
+			privateapps.push(...valid)
+			privateapps.push(...invalid)
+
+			setApps(privateapps)
+			setFilteredApps(privateapps)
+			if (privateapps.length > 0) {
+				if (selectedApp.id === undefined || selectedApp.id === null) {
+					setSelectedApp(privateapps[0])
+				}
+
+				if (privateapps[0].actions !== null && privateapps[0].actions.length > 0) {
+					setSelectedAction(privateapps[0].actions[0])
 				} else {
 					setSelectedAction({})
 				}
 			} 
 			
-			runAppSearch("")
+			//runAppSearch("")
     })
 		.catch(error => {
 			alert.error(error.toString())
@@ -337,11 +345,9 @@ const Apps = (props) => {
 				//console.log("IMG LOADED!: ", event.target)
 			}} />
 
-		// FIXME - add label to apps, as this might be slow with A LOT of apps
 		var newAppname = data.name
-		newAppname = newAppname.replace("_", " ")
 		newAppname = newAppname.charAt(0).toUpperCase()+newAppname.substring(1)
-
+		newAppname = newAppname.replaceAll("_", " ")
 		var sharing = "public"
 		if (!data.sharing) {
 			sharing = "private"
@@ -357,7 +363,7 @@ const Apps = (props) => {
 		}
 
 		var description = data.description
-		const maxDescLen = 51
+		const maxDescLen = 60
 		if (description.length > maxDescLen) {
 			description = data.description.slice(0, maxDescLen)+"..."
 		}
@@ -366,6 +372,7 @@ const Apps = (props) => {
 		return (
 			<Paper square key={data.id} style={paperAppStyle} onClick={() => {
 				if (selectedApp.id !== data.id) {
+					data.name = newAppname
 					setSelectedApp(data)
 
 					console.log(data)
@@ -376,7 +383,7 @@ const Apps = (props) => {
 					}
 
 					if (data.sharing) {
-						setSharingConfiguration("everyone")
+						setSharingConfiguration(isCloud ? "public" : "everyone")
 					} 
 				}
 			}}>
@@ -384,19 +391,22 @@ const Apps = (props) => {
 					<ButtonBase style={{backgroundColor: theme.palette.inputColor, border: 3}}>
 						{imageline}
 					</ButtonBase>
-					<div style={{marginLeft: "10px", marginTop: "5px", marginBottom: "5px", width: boxWidth, backgroundColor: boxColor}}>
-					</div>
-					<Grid container style={{margin: "0px 10px 10px 10px", flex: "1"}}>
-						<Grid style={{display: "flex", flexDirection: "column", width: "100%"}}>
+					<div style={{marginLeft: "10px", marginTop: "5px", marginBottom: "5px", width: boxWidth, backgroundColor: boxColor}}/>
+					<Grid container style={{margin: "0px 0px 10px 10px", flex: "1"}}>
+						<Grid style={{display: "flex", flexDirection: "column", }}>
 							<Grid item style={{flex: "1"}}>
-								<h3 style={{marginBottom: "0px"}}>{newAppname}</h3>
+								<Typography variant="body1" style={{marginBottom: "0px", marginTop: 5,}}>
+									{newAppname}
+								</Typography>
 							</Grid>
-							<div style={{display: "flex", flex: "1"}}>
-								<Grid item style={{flex: "1", justifyContent: "center", overflow: "hidden"}}>
-									{description}	
+							<div style={{display: "flex", flex: "1", marginTop: 5,}}>
+								<Grid item style={{flex: 1, justifyContent: "center", overflow: "hidden", maxHeight: 43, overflow: "hidden",}}>
+									<Typography variant="body2" color="textSecondary">
+										{description}	
+									</Typography>
 								</Grid>
 							</div>
-							<Grid item style={{flex: "1", justifyContent: "center", marginTop: 5}}>
+							<Grid item style={{flex: 1, justifyContent: "center", marginTop: 8}}>
 								{data.tags === null || data.tags === undefined ? null : data.tags.map((tag, index) => {
 									if (index >= 3) {
 										return null
@@ -405,7 +415,7 @@ const Apps = (props) => {
 									return (
 										<Chip
 											key={index}
-											style={{height: 25, marginRight: 5, cursor: "pointer",}}
+											style={chipStyle}
 											label={tag}
 											variant="outlined"
 											color="primary"
@@ -420,7 +430,7 @@ const Apps = (props) => {
 				{data.activated && data.private_id !== undefined && data.private_id.length > 0 && data.generated ?
 				<Grid container style={{margin: "10px 10px 10px 10px", flex: "1"}} onClick={() => {downloadApp(data)}}>
 					<Tooltip title={"Download OpenAPI"} style={{marginTop: "28px", width: "100%"}} aria-label={data.name}>
-						<CloudDownload /> 
+						<CloudDownloadIcon /> 
 					</Tooltip>
 				</Grid>
 				: null}
@@ -447,7 +457,7 @@ const Apps = (props) => {
 		// FIXME - add label to apps, as this might be slow with A LOT of apps
 		var newAppname = selectedApp.name
 		if (newAppname !== undefined && newAppname.length > 0) {
-			newAppname = newAppname.replace("_", " ")
+			newAppname = newAppname.replaceAll("_", " ")
 			newAppname = newAppname.charAt(0).toUpperCase()+newAppname.substring(1)
 		} else {
 			newAppname = ""
@@ -467,7 +477,7 @@ const Apps = (props) => {
 					color="primary"
 					style={{marginTop: 10, marginRight: 8}}
 				>
-					<CloudDownload /> 
+					<CloudDownloadIcon /> 
 				</Button>
 			</Tooltip>
 			: null
@@ -599,22 +609,36 @@ const Apps = (props) => {
 
 		const userRoles = [
 			"you",
-			"everyone",
+			isCloud ? "public" : "everyone",
 		]
 
 		//fetch(globalUrl+"/api/v1/get_openapi/"+urlParams.get("id"), 
 		var baseInfo = newAppname.length > 0 ?
-			<div>
+			<div style={{position: "relative"}}>
 				<div style={{display: "flex"}}>
 					<div style={{marginRight: 15, marginTop: 10}}>
 						{imageline}
 					</div>
 					<div style={{maxWidth: "85%", overflow: "hidden"}}>
-						<h2 style={{marginTop: 20, marginBottom: 0, }}>{newAppname}</h2>
-						<p style={{marginTop: 5, marginBottom: 0,}}>Version {selectedApp.app_version}</p>	
-						<p style={{marginTop: 5, marginBottom: 0, maxHeight: 150, overflowY: "auto", overflowX: "hidden",}}>{description}</p>	
+						<Typography variant="h6" style={{marginBottom: 0, }}>
+							{newAppname}
+						</Typography>
+						<Typography variant="body1" color="textSecondary">
+							Version {selectedApp.app_version}
+						</Typography>	
+						<Typography variant="body2" color="textSecondary" style={{marginTop: 5, marginBottom: 0, maxHeight: 150, overflowY: "auto", overflowX: "hidden",}}>
+							{description}
+						</Typography>	
 					</div>
 				</div>
+				{isCloud ? 
+					<a href={"https://shuffler.io/apps/"+selectedApp.id} style={{textDecoration: "none", color: "#f85a3e"}} target="_blank">
+						<IconButton style={{top: -10, right: 0, position: "absolute", color: "#f85a3e"}} >
+							<OpenInNewIcon style={{}} />
+						</IconButton>
+					</a>
+				: null}
+
 				{activateButton}
 				{(props.userdata !== undefined && (props.userdata.role === "admin" || props.userdata.id === selectedApp.owner) || !selectedApp.generated) ? 
 					<div>
@@ -633,7 +657,7 @@ const Apps = (props) => {
 							return (
 								<Chip
 									key={index}
-									style={{height: 25, marginRight: 5, marginTop: 7, cursor: "pointer",}}
+									style={chipStyle}
 									variant="outlined"
 									label={tag}
 									color="primary"
@@ -645,15 +669,21 @@ const Apps = (props) => {
 				{props.userdata !== undefined && props.userdata.id === selectedApp.owner ? 
 					<div style={{marginTop: 15}}>
 						{/*<p><b>ID:</b> {selectedApp.id}</p>*/}
-						<b style={{marginRight: 15}}>Sharing:</b> 
+						<b style={{marginRight: 15}}>Sharing </b> 
 						<Select
 							value={sharingConfiguration}
 							onChange={(event) => {
-								setSharingConfiguration(event.target.value)
-								alert.info("Changed sharing to "+event.target.value)
+								alert.info("Changing sharing to "+event.target.value)
 
-								updateAppField(selectedApp.id, "sharing", !selectedApp.sharing)
-								//setSelectedAction(event.target.value)
+								setSharingConfiguration(event.target.value)
+
+								if (event.target.value === "you") {
+									updateAppField(selectedApp.id, "sharing", false)
+								} else if (event.target.value === "everyone" || event.target.value === "public") {
+									updateAppField(selectedApp.id, "sharing", true)
+								} else {
+									console.log("Can't handle value for sharing: ", event.target.value)
+								}
 							}}
 							style={{width: 150, backgroundColor: theme.palette.surfaceColor, backgroundColor: inputColor, color: "white", height: 35, marginleft: 10,}}
 							SelectDisplayProps={{
@@ -696,12 +726,7 @@ const Apps = (props) => {
 							>
 								{selectedApp.actions.map(data => {
 										var newActionname = data.label !== undefined && data.label.length > 0 ? data.label : data.name
-
-										// ROFL FIXME - loop
-										newActionname = newActionname.replace("_", " ")
-										newActionname = newActionname.replace("_", " ")
-										newActionname = newActionname.replace("_", " ")
-										newActionname = newActionname.replace("_", " ")
+										newActionname = newActionname.replaceAll("_", " ")
 										newActionname = newActionname.charAt(0).toUpperCase()+newActionname.substring(1)
 										return (
 											<MenuItem key={data.name} style={{backgroundColor: inputColor, color: "white"}} value={data}>
@@ -760,7 +785,9 @@ const Apps = (props) => {
 						&nbsp;- <a href="https://apis.guru/browse-apis/" style={{textDecoration: "none", color: "#f85a3e"}} target="_blank">OpenAPI directory</a>
 						&nbsp;- <a href="https://editor.swagger.io/" style={{textDecoration: "none", color: "#f85a3e"}} target="_blank">OpenAPI Validator</a>
 						<div/>
-						Apps interact with eachother in workflows. They are created with the app creator, using OpenAPI specification or manually in python. The links above are references to OpenAPI tools and other app repositories. There's thousands of them.
+						<Typography variant="body2" color="textSecondary">
+							Apps interact with eachother in workflows. They are created with the app creator, using OpenAPI specification or manually in python. The links above are references to OpenAPI tools and other app repositories. There's thousands of them.
+						</Typography>
 						<div/>
 						<Divider style={{height: 1, backgroundColor: dividerColor, marginTop: 20, marginBottom: 20}} />
 						<div style={{}}>
@@ -778,7 +805,7 @@ const Apps = (props) => {
 							&nbsp;OR&nbsp;
 							<Link to="/apps/new" style={{marginLeft: 5, textDecoration: "none", color: "#f85a3e"}}>
 								<Button
-									variant="text"
+									variant="outlined"
 									component="label"
 									color="primary"
 									style={{}}
@@ -808,6 +835,7 @@ const Apps = (props) => {
 		var tmpapps = searchableApps.filter(data => data.name.toLowerCase().includes(searchfield) || data.description.toLowerCase().includes(searchfield))
 		newapps.push(...tmpapps) 
 
+		console.log(newapps)
 		setFilteredApps(newapps)
 		//if ((newapps.length === 0 || searchBackend) && !appSearchLoading) {
 
@@ -854,29 +882,31 @@ const Apps = (props) => {
 	const appView = isLoggedIn ? 
 		<Dropzone style={{maxWidth: window.innerWidth > 1366 ? 1366 : 1200, margin: "auto", padding: 20 }} onDrop={uploadFile}>
 			<div style={appViewStyle}>	
-				<div style={{flex: 1}}>
+				<div style={{flex: 1, }}>
 					<Breadcrumbs aria-label="breadcrumb" separator="›" style={{color: "white",}}>
 						<Link to="/apps" style={{textDecoration: "none", color: "inherit",}}>
-							<h2 style={{color: "rgba(255,255,255,0.5)"}}>
+							<Typography variant="h6" style={{color: "rgba(255,255,255,0.5)"}}>
 								<AppsIcon style={{marginRight: 10}} />
 								App upload
-							</h2>
+							</Typography>
 						</Link>
 						{selectedApp.activated && selectedApp.private_id !== undefined && selectedApp.private_id.length > 0 && selectedApp.generated ?
 							<Link to={`/apps/edit/${selectedApp.id}`} style={{textDecoration: "none", color: "inherit",}}>
-								<h2>
+								<Typography variant="h6">
 									{selectedApp.name}
-								</h2>
+								</Typography>
 							</Link>
 						: null}
 					</Breadcrumbs>
+					<div style={{marginTop: 15}} />
 					<UploadView/>
 				</div>
-				<Divider style={{marginBottom: 10, marginTop: 10, height: "100%", width: 1, backgroundColor: dividerColor}}/>
-				<div style={{flex: 1, marginLeft: 10, marginRight: 10}}>
-					<div style={{display: "flex", minHeight: 84.81}}>
-						<div style={{flex: 1}}>
-							<h2>Your apps ({apps.length+searchableApps.length})</h2> 
+				<div style={{flex: 1, marginLeft: 10, marginRight: 10, }}>
+					<div style={{display: "flex",}}>
+						<div style={{flex: 1, marginBottom: 15, }}>
+							<Typography variant="h6">
+								Activated apps ({apps.length+searchableApps.length})
+							</Typography> 
 						</div>
 						{isCloud ? null : 
 						<span>
@@ -911,7 +941,7 @@ const Apps = (props) => {
 					}
 					</div>
 					<TextField
-						style={{backgroundColor: inputColor}} 
+						style={{backgroundColor: inputColor, borderRadius: 5,}} 
 						InputProps={{
 							style:{
 								color: "white",
@@ -919,6 +949,7 @@ const Apps = (props) => {
 								marginLeft: "5px",
 								maxWidth: "95%",
 								fontSize: "1em",
+								borderRadius: 5,
 							},
 						}}
 						fullWidth
@@ -948,9 +979,13 @@ const Apps = (props) => {
 								</div>
 							: 
 							<Paper square style={uploadViewPaperStyle}>
-								<h4 style={{margin: 10, }}>
-									Try a broader search term, e.g. http, alert, ticket etc. 
-								</h4>
+								<Typography style={{margin: 10, }}>
+									<span>
+										<a href={"https://shuffler.io/search"} style={{textDecoration: "none", color: "#f85a3e"}} target="_blank">
+											Click here 
+										</a> to search ALL apps, not just your activated ones.
+									</span>
+								</Typography>
 								<div/>
 
 								{appSearchLoading ? 
@@ -980,7 +1015,7 @@ const Apps = (props) => {
 		setValidation(true)
 
 		setIsLoading(true)
-		start()
+		//start()
 
 		const parsedData = {
 			"url": url,
@@ -1012,10 +1047,10 @@ const Apps = (props) => {
 			if (response.status === 200) {
 				alert.success("Loaded existing apps!")
 			}
-			setIsLoading(false)
-			stop()
-			setValidation(false)
 
+			//stop()
+			setIsLoading(false)
+			setValidation(false)
 			return response.json()
 		})
     .then((responseJson) => {
@@ -1028,7 +1063,7 @@ const Apps = (props) => {
 			console.log("ERROR: ", error.toString())
 			alert.error(error.toString())
 
-			stop()
+			//stop()
 			setIsLoading(false)
 			setValidation(false)
 		})
@@ -1055,8 +1090,11 @@ const Apps = (props) => {
 			return response.json()
 		})
 		.then((responseJson) => {
-			if (responseJson.reason !== undefined && responseJson.reason.length > 0) {
-				alert.info("Hotloading: ", responseJson.reason)
+			if (responseJson.success === true) {
+				alert.info("Successfully finished hotload")
+			} else {
+				alert.error("Failed hotload: ", responseJson.reason)
+				//(responseJson.reason !== undefined && responseJson.reason.length > 0) {
 			}
     })
 		.catch(error => {
@@ -1114,6 +1152,8 @@ const Apps = (props) => {
 		const data = {}
 		data[fieldname] = fieldvalue
 
+		console.log("DATA: ", data)
+
 		fetch(globalUrl+"/api/v1/apps/"+app_id, {
     	method: 'PATCH',
 			headers: {
@@ -1130,9 +1170,9 @@ const Apps = (props) => {
 			//console.log(responseJson)
 			//alert.info(responseJson)
 			if (responseJson.success) {
-				alert.info("Success")
+				alert.success("Successfully updated app configuration")
 			} else {
-				alert.error("Error updating app")
+				alert.error("Error updating app configuration")
 			}
     })
 		.catch(error => {

frontend/src/views/Docs.jsx

@@ -1,19 +1,12 @@
-import React, {useState, useEffect} from 'react';
+import React, {useState,} from 'react';
 
 import { useTheme } from '@material-ui/core/styles';
-import Divider from '@material-ui/core/Divider';
 import ReactMarkdown from 'react-markdown';
 import {BrowserView, MobileView} from "react-device-detect";
-import Button from '@material-ui/core/Button';
-import Menu from '@material-ui/core/Menu';
-import MenuItem from '@material-ui/core/MenuItem';
-import Typography from '@material-ui/core/Typography';
-import Paper from '@material-ui/core/Paper';
-import List from '@material-ui/core/List';
-import ListItem from '@material-ui/core/ListItem';
-
 import {Link} from 'react-router-dom';
 
+import {Divider, Button, Menu, MenuItem, Typography, Paper, List} from '@material-ui/core';
+
 const Body = {
   maxWidth: '1000px',
   minWidth: '768px',
@@ -31,13 +24,13 @@ const hrefStyle = {
 }
 
 const Docs = (props) => {
-  const { isLoaded, globalUrl, inputColor, selectedDoc, serverside, isMobile, update} = props;
+  const { globalUrl, selectedDoc, serverside, isMobile, } = props;
 
 	const theme = useTheme();
 	const [data, setData] = useState("");
 	const [firstrequest, setFirstrequest] = useState(true);
 	const [list, setList] = useState([]);
-	const [listLoaded, setListLoaded] = useState(false);
+	const [, setListLoaded] = useState(false);
 	const [anchorEl, setAnchorEl] = React.useState(null);
 	const [baseUrl, setBaseUrl] = React.useState(serverside === true ? "" : window.location.href)
 
@@ -153,10 +146,10 @@ const Docs = (props) => {
 
 			// H#
 			if (!found) {
-				var elements = parent.getElementsByTagName('h3')
+				elements = parent.getElementsByTagName('h3')
 				console.log(name)
-				var found = false
-				for (var key in elements) {
+				found = false
+				for (key in elements) {
 					const element = elements[key]
 					if (element.innerHTML === undefined) {
 						continue
@@ -213,7 +206,7 @@ const Docs = (props) => {
 
 	function CodeHandler(props) {
 		return (
-			<pre style={{padding: 15, minWidth: "50%", maxWidth: "100%", backgroundColor: inputColor, overflowX: "auto", overflowY: "hidden",}}>
+			<pre style={{padding: 15, minWidth: "50%", maxWidth: "100%", backgroundColor: theme.palette.inputColor, overflowX: "auto", overflowY: "hidden",}}>
 				<code>
 					{props.value}
 				</code>
@@ -221,15 +214,6 @@ const Docs = (props) => {
 		)
 	}
 
-	function TextWrapper(props) {
-		console.log(props)
-		return (
-			<Typography>
-				{props.value}			
-			</Typography>
-		)
-	}
-
 	function Heading(props) {
 		const element = React.createElement(`h${props.level}`, {style: {marginTop: 40}}, props.children)
 		return (
@@ -286,8 +270,8 @@ const Docs = (props) => {
 
 	const mobileStyle = {
 		color: "white",
-		marginLeft: 15,
-		marginRight: 15,
+		marginLeft: 25,
+		marginRight: 25,
 		paddingBottom: 50,
 		backgroundColor: "inherit",
 		display: "flex",
@@ -305,6 +289,7 @@ const Docs = (props) => {
 				<Menu
 					id="simple-menu"
 					anchorEl={anchorEl}
+					style={{}}
 					keepMounted
 					open={Boolean(anchorEl)}
 					onClose={handleClose}
@@ -313,7 +298,7 @@ const Docs = (props) => {
 					const path = "/docs/"+item
 					const newname = item.charAt(0).toUpperCase()+item.substring(1).split("_").join(" ").split("-").join(" ")
 					return (
-						<MenuItem key={index} onClick={() => {window.location.pathname = path}}>{newname}</MenuItem>
+						<MenuItem key={index} style={{color: "white",}} onClick={() => {window.location.pathname = path}}>{newname}</MenuItem>
 					)
 				})}
 				</Menu>

frontend/src/views/SettingsPage.jsx

@@ -1,11 +1,7 @@
 import React, {useState, useEffect} from 'react';
 
-import Paper from '@material-ui/core/Paper';
-import Button from '@material-ui/core/Button';
-import Divider from '@material-ui/core/Divider';
+import {Paper, Button, Divider, TextField} from '@material-ui/core';
 import {Link} from 'react-router-dom';
-
-import TextField from '@material-ui/core/TextField';
 import { useAlert } from "react-alert";
 import { useTheme } from '@material-ui/core/styles';
 

functions/onprem/orborus/Dockerfile

@@ -1,11 +1,17 @@
-from golang as builder
+FROM golang:1.16.0-buster as builder
 
 RUN mkdir /app
 WORKDIR /app
-RUN go get github.com/docker/docker/api/types github.com/docker/docker/api/types/container github.com/docker/docker/client
 
 COPY orborus.go /app/orborus.go
 RUN go mod init orborus 
+RUN go get github.com/docker/docker/api/types && \
+    go get github.com/docker/docker/api/types/container && \
+    go get github.com/docker/docker/client && \
+    go get github.com/mackerelio/go-osstat/cpu && \
+    go get github.com/mackerelio/go-osstat/memory && \
+    go get github.com/satori/go.uuid && \
+    go get github.com/frikky/shuffle-shared
 RUN go build
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o orborus .
 

functions/onprem/orborus/build.sh

@@ -1,5 +1,5 @@
 NAME=shuffle-orborus
-VERSION=0.8.60
+VERSION=0.8.71
 
 echo "Running docker build with $NAME:$VERSION"
 #docker rmi frikky/shuffle:$NAME --force

functions/onprem/orborus/go.mod

@@ -3,17 +3,18 @@ module orborus
 go 1.13
 
 require (
+	github.com/Microsoft/go-winio v0.4.16 // indirect
 	github.com/containerd/containerd v1.4.3 // indirect
 	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/docker/docker v20.10.1+incompatible
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.4.0 // indirect
+	github.com/frikky/shuffle-shared v0.0.23 // indirect
 	github.com/gogo/protobuf v1.3.1 // indirect
-	github.com/mackerelio/go-osstat v0.1.0 // indirect
+	github.com/mackerelio/go-osstat v0.1.0
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/satori/go.uuid v1.2.0
 	github.com/sirupsen/logrus v1.7.0 // indirect
-	google.golang.org/grpc v1.34.0 // indirect
 )

functions/onprem/orborus/go.sum

@@ -1,7 +1,54 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
+cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
+cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
+cloud.google.com/go v0.66.0/go.mod h1:dgqGAjKCDxyhGTtC9dAREQGUJpkceNm1yt590Qno0Ko=
+cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
+cloud.google.com/go v0.75.0 h1:XgtDnVJRCPEUG21gjFiRPz4zI1Mjg16R+NYQjfmU4XY=
+cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
+cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
+cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
+cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/datastore v1.4.0 h1:CFDJm15RpYXeEblQ0TMDUrYtqmBmbAWTy536nA8JIc8=
+cloud.google.com/go/datastore v1.4.0/go.mod h1:d18825/a9bICdAIJy2EkHs9joU4RlIZ1t6l8WDdbdY0=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
+cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
+cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
+cloud.google.com/go/storage v1.12.0 h1:4y3gHptW1EHVtcPAVE0eBBlFuGqEejTTG3KdIE0lUX4=
+cloud.google.com/go/storage v1.12.0/go.mod h1:fFLk2dp2oAhDz8QFKwqrjdJvxSp/W2g7nillojlL5Ho=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk=
+github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/containerd/containerd v1.4.3 h1:ijQT13JedHSHrQGWFcGEwzcNKrAGIiZ+jSD5QQG07SY=
 github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
@@ -17,14 +64,42 @@ github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/frikky/kin-openapi v0.38.0 h1:V7ttwIJS8Vks4KL+mZVj1ZSqhIcQtgaG8akeqXEQgsE=
+github.com/frikky/kin-openapi v0.38.0/go.mod h1:Fr28TtCHL4K0kIqtqui8HWxN1LG5uAh3z/tDfFyiA1s=
+github.com/frikky/shuffle-shared v0.0.12 h1:+0EIfThmK47Po+LogPYZR4XjbS4Ds19WNMFu2YUSjhw=
+github.com/frikky/shuffle-shared v0.0.12/go.mod h1:SEY432/xs4oBkOUnGwxiYKCZWZLRaheGInhAoW7N8ww=
+github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
+github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
@@ -33,16 +108,56 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200905233945-acf8798be1f7/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o=
+github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/mackerelio/go-osstat v0.1.0 h1:e57QHeHob8kKJ5FhcXGdzx5O6Ktuc5RHMDIkeqhgkFA=
 github.com/mackerelio/go-osstat v0.1.0/go.mod h1:1K3NeYLhMHPvzUu+ePYXtoB58wkaRpxZsGClZBJyIFw=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=
@@ -51,51 +166,310 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
+go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0=
+go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 h1:2M3HP5CCK1Si9FQhwnzYhXdG6DXeebvUHFpre8QvbyI=
+golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY=
+golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201224014010-6772e930b67b h1:iFwSg7t5GZmB/Q5TjiEAsdoLDrdJRC1RiF2WhuV29Qw=
+golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210113160501-8b1d76fa0423 h1:/hEknzWkMPCjTo7StMHRrBRa8YBbXuBWfck8680k3RE=
+golang.org/x/oauth2 v0.0.0-20210113160501-8b1d76fa0423/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190410235845-0ad05ae3009d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3 h1:kzM6+9dur93BcC2kVlYl34cHU+TYZLanmpSJHVMmL64=
+golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
+golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
+golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200828161849-5deb26317202/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
+golang.org/x/tools v0.0.0-20200915173823-2db8f0ff891c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
+golang.org/x/tools v0.0.0-20200918232735-d647fc253266/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
+golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210114065538-d78b04bdf963 h1:K+NlvTLy0oONtRtkl1jRD9xIhnItbG2PiE7YOdjPb+k=
+golang.org/x/tools v0.0.0-20210114065538-d78b04bdf963/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
+google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
+google.golang.org/api v0.31.0/go.mod h1:CL+9IBCa2WWU6gRuBWaKqGWLFFwbEUXkfeMkHLQWYWo=
+google.golang.org/api v0.32.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
+google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
+google.golang.org/api v0.36.0 h1:l2Nfbl2GPXdWorv+dT2XfinX2jOOw4zv1VhLstx+6rE=
+google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
+google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
+google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200831141814-d751682dd103/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200914193844-75d14daec038/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200921151605-7abf4a1a14d5/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210113195801-ae06605f4595 h1:x7nk+/4+SvuTDI4wnzQUlhvi+DTpyfncXBo3QWTFs7U=
+google.golang.org/genproto v0.0.0-20210113195801-ae06605f4595/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.34.0 h1:raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI=
 google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
+google.golang.org/grpc v1.34.1 h1:ugq+9++ZQPFzM2pKUMCIK8gj9M0pFyuUWO9Q8kwEDQw=
+google.golang.org/grpc v1.34.1/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -104,9 +478,25 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

functions/onprem/orborus/orborus.go

@@ -5,6 +5,8 @@ package main
 */
 
 import (
+	"github.com/frikky/shuffle-shared"
+
 	"bytes"
 	"context"
 	"encoding/json"
@@ -55,19 +57,6 @@ var runningMode = strings.ToLower(os.Getenv("RUNNING_MODE"))
 var cleanupEnv = strings.ToLower(os.Getenv("CLEANUP"))
 var executionIds = []string{}
 
-type ExecutionRequestWrapper struct {
-	Data []ExecutionRequest `json:"data"`
-}
-
-type ExecutionRequest struct {
-	ExecutionId       string `json:"execution_id"`
-	ExecutionArgument string `json:"execution_argument"`
-	WorkflowId        string `json:"workflow_id"`
-	Authorization     string `json:"authorization"`
-	Status            string `json:"status"`
-	Type              string `json:"type"`
-}
-
 var dockercli *dockerclient.Client
 var containerId string
 
@@ -106,7 +95,7 @@ func getThisContainerId() {
 	}
 
 	if fCol != "" {
-		cmd := fmt.Sprintf("cat /proc/self/cgroup | grep memory | tail -1 | cut -d/ -f%s", fCol)
+		cmd := fmt.Sprintf("cat /proc/self/cgroup | grep memory | tail -1 | cut -d/ -f%s | grep -o -E '[0-9A-z]{64}'", fCol)
 		out, err := exec.Command("bash", "-c", cmd).Output()
 		if err == nil {
 			containerId = strings.TrimSpace(string(out))
@@ -119,12 +108,14 @@ func getThisContainerId() {
 				//docker-76c537e9a4b7c7233011f5d70e6b7f2d600b6413ac58a96519b8dca7a3f7117a.scope
 			}
 		} else {
-			containerId = "shuffle-orborus"
-			log.Printf("[WARNING] Failed getting container ID: %s", err)
+			if fCol == "0" {
+				containerId = "shuffle-orborus"
+				log.Printf("[WARNING] Failed getting container ID: %s", err)
+			}
 		}
 	}
 
-	log.Printf("Started with containerId %s", containerId)
+	log.Printf(`[INFO] Started with containerId "%s"`, containerId)
 }
 
 // Deploys the internal worker whenever something happens
@@ -257,7 +248,7 @@ func initializeImages() {
 		log.Printf("[WARNING] SHUFFLE_APP_SDK_VERSION not defined. Defaulting to %s", appSdkVersion)
 	}
 	if workerVersion == "" {
-		workerVersion = "0.8.60"
+		workerVersion = "0.8.70"
 		log.Printf("[WARNING] SHUFFLE_WORKER_VERSION not defined. Defaulting to %s", workerVersion)
 	}
 
@@ -475,7 +466,7 @@ func main() {
 			continue
 		}
 
-		var executionRequests ExecutionRequestWrapper
+		var executionRequests shuffle.ExecutionRequestWrapper
 		err = json.Unmarshal(body, &executionRequests)
 		if err != nil {
 			log.Printf("[WARNING] Failed executionrequest in queue unmarshaling: %s", err)
@@ -521,7 +512,7 @@ func main() {
 		}
 
 		// New, abortable version. Should check executionid and remove everything else
-		var toBeRemoved ExecutionRequestWrapper
+		var toBeRemoved shuffle.ExecutionRequestWrapper
 		for _, execution := range executionRequests.Data {
 			if len(execution.ExecutionArgument) > 0 {
 				log.Printf("[INFO] Argument: %#v", execution.ExecutionArgument)
@@ -546,8 +537,8 @@ func main() {
 
 			// Doesn't work because of USER INPUT
 			if found {
-				//log.Printf("[INFO] Skipping duplicate %s", execution.ExecutionId)
-				//continue
+				log.Printf("[INFO] Skipping duplicate %s", execution.ExecutionId)
+				continue
 			} else {
 				//log.Printf("[INFO] Adding to be ran %s", execution.ExecutionId)
 				executionIds = append(executionIds, execution.ExecutionId)

functions/onprem/worker/Dockerfile

@@ -1,21 +1,28 @@
-from golang as builder
+FROM golang:1.16.0-buster as builder
 
 WORKDIR /app
+RUN go get github.com/docker/docker/api/types github.com/docker/docker/api/types/container github.com/docker/docker/client
 
-RUN go get -u github.com/docker/docker/api/types 
-RUN go get -u github.com/docker/docker/api/types/container
-RUN go get -u github.com/docker/docker/client
-RUN go get -u github.com/gorilla/mux
-RUN go get -u github.com/patrickmn/go-cache
-
+#RUN go env -w GO111MODULE=auto 
 COPY worker.go /app/worker.go
+RUN go mod init worker
+RUN go get github.com/docker/docker/api/types && \
+	go get github.com/docker/docker/api/types/container && \
+	go get github.com/docker/docker/client && \
+	go get github.com/gorilla/mux && \
+	go get github.com/patrickmn/go-cache && \
+	go get github.com/frikky/shuffle-shared && \
+	go get github.com/satori/go.uuid
+
+RUN go build
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o worker .
 
+## ALPINE IMAGE
 FROM alpine:3.12
 
 ENV SHUFFLE_BASE_IMAGE_REGISTRY=docker.io
 ENV SHUFFLE_BASE_IMAGE_NAME=frikky/shuffle
-ENV SHUFFLE_BASE_IMAGE_TAG_SUFFIX=0.8.5
+ENV SHUFFLE_BASE_IMAGE_TAG_SUFFIX=0.8.70
 
 RUN apk add --no-cache bash
 COPY --from=builder /app/ /

functions/onprem/worker/build.sh

@@ -1,5 +1,5 @@
 NAME=shuffle-worker
-VERSION=0.8.60
+VERSION=0.8.71
 
 echo "Running docker build with $NAME:$VERSION"
 #CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o worker.bin .
@@ -10,5 +10,5 @@ docker build . -t frikky/shuffle:$NAME -t frikky/shuffle:$NAME_$VERSION -t docke
 #docker push frikky/shuffle:$NAME_$VERSION
 #docker push docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION
 #docker tag frikky/shuffle:0.8.51 ghcr.io/frikky/shuffle-worker:0.8.5
-docker tag frikky/shuffle:$NAME ghcr.io/frikky/shuffle-worker:0.8.52
+#docker tag frikky/shuffle:$NAME ghcr.io/frikky/shuffle-worker:0.8.52
 docker push ghcr.io/frikky/$NAME:$VERSION

functions/onprem/worker/go.mod

@@ -0,0 +1,18 @@
+module worker
+
+go 1.15
+
+require (
+	github.com/containerd/containerd v1.4.4 // indirect
+	github.com/docker/distribution v2.7.1+incompatible // indirect
+	github.com/docker/docker v20.10.5+incompatible // indirect
+	github.com/docker/go-connections v0.4.0 // indirect
+	github.com/docker/go-units v0.4.0 // indirect
+	github.com/frikky/shuffle-shared v0.0.20 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/gorilla/mux v1.8.0 // indirect
+	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/image-spec v1.0.1 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+)