fix #262 align custom global action check new action params

R/geoflow_action.R

@@ -23,7 +23,7 @@
 #'    packages = list(),
 #'    pid_generator = NULL,
 #'    generic_uploader = FALSE,
-#'    fun = function(config, entity){},
+#'    fun = function(action, entity, config){},
 #'    available_options = list(
 #'      option_name = list(def = "option description", default = FALSE)
 #'    ),

R/initWorkflow.R

@@ -568,21 +568,21 @@ initWorkflow <- function(file, dir = ".", jobDirPath = NULL, handleMetadata = TR
             stop(errMsg)
           }
           funparams <- unlist(names(formals(customfun)))
-          if(!("entity" %in% funparams)){
+          if(!("action" %in% funparams)){
             config$logger.warn(sprintf("Action '%s' - Custom action arguments: [%s]", action$id, paste(funparams, collapse=",")))
-            errMsg <- sprintf("Missing parameter 'entity' in function '%s'", action$id)
+            errMsg <- sprintf("Missing parameter 'action' in function '%s'", action$id)
             config$logger.error(errMsg)
             stop(errMsg)
           }
-          if(!("config" %in% funparams)){
+          if(!("entity" %in% funparams)){
             config$logger.warn(sprintf("Custom action arguments: [%s]", paste(funparams, collapse=",")))
-            errMsg <- sprintf("Missing parameter 'config' in function '%s'", action$id)
+            errMsg <- sprintf("Missing parameter 'entity' in function '%s'", action$id)
             config$logger.error(errMsg)
             stop(errMsg)
           }
-          if(!("options" %in% funparams)){
+          if(!("config" %in% funparams)){
             config$logger.warn(sprintf("Custom action arguments: [%s]", paste(funparams, collapse=",")))
-            errMsg <- sprintf("Missing parameter 'options' in function '%s'", action$id)
+            errMsg <- sprintf("Missing parameter 'config' in function '%s'", action$id)
             config$logger.error(errMsg)
             stop(errMsg)
           }