Appname loading from api creator

Author: frikky

db-connector.go

@@ -5204,6 +5204,20 @@ func FindWorkflowAppByName(ctx context.Context, appName string) ([]WorkflowApp,
 	var apps []WorkflowApp
 
 	nameKey := "workflowapp"
+	cacheKey := fmt.Sprintf("%s_appname_%s", appName)
+	if project.CacheDb {
+		cache, err := GetCache(ctx, cacheKey)
+		if err == nil {
+			cacheData := []byte(cache.([]uint8))
+			err = json.Unmarshal(cacheData, &apps)
+			if err == nil {
+				return apps, nil
+			}
+		} else {
+			//log.Printf("[DEBUG] Failed getting cache for user: %s", err)
+		}
+	}
+
 	if project.DbType == "opensearch" {
 		var buf bytes.Buffer
 		query := map[string]interface{}{
@@ -5272,14 +5286,27 @@ func FindWorkflowAppByName(ctx context.Context, appName string) ([]WorkflowApp,
 		}
 	} else {
 		//log.Printf("Looking for name %s in %s", appName, nameKey)
-		q := datastore.NewQuery(nameKey).Filter("name =", appName)
+		q := datastore.NewQuery(nameKey).Filter("Name =", appName).Limit(6)
 		_, err := project.Dbclient.GetAll(ctx, q, &apps)
 		if err != nil && len(apps) == 0 {
 			log.Printf("[WARNING] Failed getting apps for name: %s", appName)
 			return apps, err
 		}
 	}
 
+	if project.CacheDb {
+		data, err := json.Marshal(apps)
+		if err != nil {
+			log.Printf("[WARNING] Failed marshalling apps for appname %s: %s", appName, err)
+			return apps, nil
+		}
+
+		err = SetCache(ctx, cacheKey, data, 1440)
+		if err != nil {
+			log.Printf("[WARNING] Failed updating cache: %s", err)
+		}
+	}
+
 	log.Printf("[INFO] Found %d apps for name %s in db-connector", len(apps), appName)
 	return apps, nil
 }
@@ -6273,6 +6300,7 @@ func GetPrioritizedApps(ctx context.Context, user User) ([]WorkflowApp, error) {
 				}
 
 				if err != nil {
+					//log.Printf("[INFO] Failed fetching results: %v", err)
 					if strings.Contains(fmt.Sprintf("%s", err), "cannot load field") {
 						//log.Printf("[ERROR] Error in reference_org app load of %s (%s): %s.", innerApp.Name, innerApp.ID, err)
 					} else {

shared.go

@@ -17555,7 +17555,7 @@ func CheckHookAuth(request *http.Request, auth string) error {
 }
 
 // Body = The action body received from the user to test.
-func PrepareSingleAction(ctx context.Context, user User, fileId string, body []byte, runValidationAction bool) (WorkflowExecution, error) {
+func PrepareSingleAction(ctx context.Context, user User, appId string, body []byte, runValidationAction bool) (WorkflowExecution, error) {
 	workflowExecution := WorkflowExecution{}
 
 	var action Action
@@ -17565,19 +17565,113 @@ func PrepareSingleAction(ctx context.Context, user User, fileId string, body []b
 		return workflowExecution, err
 	}
 
-	if fileId != action.AppID {
-		log.Printf("[WARNING] Bad appid in single execution of App %s", fileId)
+	if appId != action.AppID {
+		log.Printf("[WARNING] Bad appid in single execution of App %s", appId)
 		return workflowExecution, err
 	}
 
 	if len(action.ID) == 0 {
 		action.ID = uuid.NewV4().String()
 	}
 
-	app, err := GetApp(ctx, fileId, user, false)
-	if err != nil {
-		log.Printf("[WARNING] Error getting app (execute SINGLE app action): %s", fileId)
-		return workflowExecution, err
+	app := WorkflowApp{}
+	if strings.ToLower(appId) == "http" {
+		// Find the app and the ID for it
+		apps, err := FindWorkflowAppByName(ctx, "http") 
+		if err != nil {
+			log.Printf("[WARNING] Failed to find HTTP app in single action execution: %s", err)
+			return workflowExecution, err
+		} else {
+			if len(apps) > 0 {
+				// Just assuming we can use #1
+
+				// Find the highest version
+				app = apps[0]
+				latestVersion := ""
+				for _, innerApp := range apps {
+					// Semver check
+					if len(innerApp.AppVersion) == 0 {
+						continue
+					}
+
+					if len(latestVersion) == 0 {
+						latestVersion = innerApp.AppVersion
+						app = innerApp 
+						continue
+					}
+
+					v2, err := semver.NewVersion(innerApp.AppVersion)
+					if err != nil {
+						log.Printf("[ERROR] Failed parsing original app version %s: %s", innerApp.AppVersion, err)
+						continue
+					}
+
+					appConstraint := fmt.Sprintf("> %s", latestVersion)
+					c, err := semver.NewConstraint(appConstraint)
+					if err != nil {
+						log.Printf("[ERROR] Failed preparing constraint %s: %s", appConstraint, err)
+						continue
+					}
+
+					if c.Check(v2) {
+						app = innerApp
+						latestVersion = innerApp.AppVersion
+					}
+				}
+
+				appId = app.ID
+			} else {
+				log.Printf("[WARNING] Failed to find HTTP app in single action execution")
+				return workflowExecution, errors.New("Failed to find HTTP app. Is it installed?")
+			}
+		}
+
+		// Check if incoming action is "custom_action" and map it to HTTP
+		if action.Name == "custom_action" || action.Name == "Custom Action" {
+			urlIndex := -1
+			path := ""
+			queries := ""
+			for paramIndex, param := range action.Parameters {
+				if strings.ToLower(param.Name) == "method" {
+					action.Name = strings.ToUpper(param.Value)
+				} else if strings.ToLower(param.Name) == "url" {
+					urlIndex = paramIndex
+				} else if strings.ToLower(param.Name) == "path" {
+					path = param.Value
+				} else if strings.ToLower(param.Name) == "queries" {
+					queries = param.Value
+				}
+			}
+
+			if len(path) > 0 && urlIndex >= 0 {
+				if strings.HasPrefix(path, "/") {
+					path = path[1:]
+				}
+
+				action.Parameters[urlIndex].Value = fmt.Sprintf("%s/%s", action.Parameters[urlIndex].Value, path)
+			}
+
+			if len(queries) > 0 && urlIndex >= 0 {
+				// Split them and add to the URL
+				if strings.Contains(action.Parameters[urlIndex].Value, "?") {
+					action.Parameters[urlIndex].Value = fmt.Sprintf("%s&%s", action.Parameters[urlIndex].Value, queries)
+				} else {
+					action.Parameters[urlIndex].Value = fmt.Sprintf("%s?%s", action.Parameters[urlIndex].Value, queries)
+				}
+			}
+
+			log.Printf("URL: %#v", action.Parameters[urlIndex].Value)
+
+		}
+
+	} else {
+		newApp, err := GetApp(ctx, appId, user, false)
+		if err != nil || len(newApp.ID) == 0 {
+			log.Printf("[WARNING] Error getting app (execute SINGLE app action): %s", appId)
+			return workflowExecution, err
+		}
+
+		app = *newApp
 	}
 
 	// FIXME: We need to inject missing empty auth here in some cases
@@ -17629,7 +17723,7 @@ func PrepareSingleAction(ctx context.Context, user User, fileId string, body []b
 		} else {
 			//latestTimestamp := int64(0)
 			for _, auth := range auths {
-				if auth.App.ID != fileId {
+				if auth.App.ID != appId {
 					continue
 				}
 
@@ -17710,7 +17804,7 @@ func PrepareSingleAction(ctx context.Context, user User, fileId string, body []b
 		}
 	}
 
-	action.AppID = fileId
+	action.AppID = appId 
 	workflow := Workflow{
 		Actions: []Action{
 			action,