Skip to content

Support classic and alternate import syntax in flogo.json #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fm-tibco merged 3 commits into from
Feb 28, 2019
Merged

Support classic and alternate import syntax in flogo.json #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5bcf5c
Update imports in flogo.json to the new Flogo import syntax (cf. http…
debovema Feb 22, 2019
f5d0c00
Register imports with correct (Go) import path
debovema Feb 22, 2019
5f2c8b8
Put alternative flogo.json syntax in a separate alternative directory
debovema Feb 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package app
import (
"fmt"
"path"
"regexp"
"runtime/debug"
"strings"

Expand All @@ -18,12 +19,15 @@ import (

type Option func(*App) error

var flogoImportPattern = regexp.MustCompile(`^(([^ ]*)[ ]+)?([^@:]*)@?([^:]*)?:?(.*)?$`) // extract import path even if there is an alias and/or a version

func New(config *Config, runner action.Runner, options ...Option) (*App, error) {

app := &App{stopOnError: true, name: config.Name, version: config.Version}

for _, anImport := range config.Imports {
registerImport(anImport)
matches := flogoImportPattern.FindStringSubmatch(anImport)
registerImport(matches[1] + matches[3] + matches[5]) // alias + module path + relative import path
}

properties := make(map[string]interface{}, len(config.Properties))
Expand Down
71 changes: 71 additions & 0 deletions examples/alt/engine/flogo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"name": "_APP_NAME_",
"type": "flogo:app",
"version": "0.0.1",
"description": "My flogo application description",
"appModel": "1.0.0",
"imports": [
"github.com/project-flogo/contrib@latest:/activity/log",
"github.com/project-flogo/contrib@latest:/trigger/rest",
"github.com/project-flogo/flow@latest"
],
"triggers": [
{
"id": "my_rest_trigger",
"type": "rest",
"settings": {
"port": "8888"
},
"handlers": [
{
"settings": {
"method": "GET",
"path": "/test/:val"
},
"actions": [
{
"type": "flow",
"settings": {
"flowURI": "res://flow:simple_flow"
},
"input": {
"in": "=$.pathParams.val"
}
}
]
}
]
}
],
"resources": [
{
"id": "flow:simple_flow",
"data": {
"name": "simple_flow",
"metadata": {
"input": [
{ "name": "in", "type": "string", "value": "test" }
],
"output": [
{ "name": "out", "type": "string" }
]
},
"tasks": [
{
"id": "log",
"name": "Log Message",
"activity": {
"type": "log",
"input": {
"message": "=$flow.in",
"flowInfo": "false",
"addToFlow": "false"
}
}
}
],
"links": []
}
}
]
}