Skip to content
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.

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

Swagger Feature #7

Open
wants to merge 88 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
cb9e141
Initial commit - Swagger feature
AkshayGadikar Nov 5, 2018
7cb5c89
flogo changes
AkshayGadikar Nov 6, 2018
03e230c
Fix
AkshayGadikar Nov 6, 2018
d118ce0
Fix
AkshayGadikar Nov 6, 2018
a126260
Added code for swagger doc
AkshayGadikar Nov 6, 2018
d415848
Added code for swagger doc
AkshayGadikar Nov 6, 2018
2acc50e
Fixes
AkshayGadikar Nov 6, 2018
0f9976a
Fixes - response
AkshayGadikar Nov 6, 2018
44ae91f
Fixes - error
AkshayGadikar Nov 6, 2018
00d92a2
Trace - 1
AkshayGadikar Nov 6, 2018
a1a7217
Trace - 2
AkshayGadikar Nov 6, 2018
0bb8f6c
Trace - 2
AkshayGadikar Nov 6, 2018
43cc8f4
Trace - 3
AkshayGadikar Nov 6, 2018
b49e4be
Trace - 4
AkshayGadikar Nov 6, 2018
d557929
Trace - 4
AkshayGadikar Nov 6, 2018
553f626
Trace - 4
AkshayGadikar Nov 6, 2018
68b6873
Trace - 4
AkshayGadikar Nov 6, 2018
ef8c208
Trace - 5
AkshayGadikar Nov 6, 2018
e4c2062
Fix - 1
AkshayGadikar Nov 6, 2018
3df09ae
Fix - 2
AkshayGadikar Nov 6, 2018
2926aa3
Fix - 3
AkshayGadikar Nov 6, 2018
6bc0dbd
Fix - 3
AkshayGadikar Nov 6, 2018
8a51098
Fix - 3
AkshayGadikar Nov 6, 2018
b57231e
Fix - 3
AkshayGadikar Nov 6, 2018
11e318b
Added AppConfig in trigger-config
AkshayGadikar Nov 7, 2018
0045be5
Added AppConfig in trigger-config
AkshayGadikar Nov 7, 2018
4543bce
Added AppConfig in trigger-config
AkshayGadikar Nov 7, 2018
195e398
Added AppConfig in trigger-config
AkshayGadikar Nov 7, 2018
784797b
Added Appconfig parameter in trigger struct
AkshayGadikar Nov 7, 2018
60c82e3
App config changes
AkshayGadikar Nov 7, 2018
391ee55
code clean
AkshayGadikar Nov 7, 2018
6391748
Display swagger response
AkshayGadikar Nov 7, 2018
c5f0503
Display swagger
AkshayGadikar Nov 7, 2018
b65f653
fix-1
AkshayGadikar Nov 7, 2018
d600aaf
Code clean
AkshayGadikar Nov 7, 2018
d722c24
fix-2
AkshayGadikar Nov 7, 2018
67e482c
code clean
AkshayGadikar Nov 7, 2018
7e34657
Code clean
AkshayGadikar Nov 7, 2018
d752631
code to get all available triggers
AkshayGadikar Nov 7, 2018
60e6b45
fix -1
AkshayGadikar Nov 7, 2018
5dc4dcb
Adding trigger detalis
AkshayGadikar Nov 8, 2018
c755079
added trigger info
AkshayGadikar Nov 8, 2018
632973b
Added AppConfig in trigger-config - fix
AkshayGadikar Nov 8, 2018
dd61970
added trigger info
AkshayGadikar Nov 8, 2018
54de82d
add trigger info -1
AkshayGadikar Nov 8, 2018
c41607c
Added AppConfig in trigger-config - fix
AkshayGadikar Nov 8, 2018
48f6fef
code for multiple triggers
AkshayGadikar Nov 8, 2018
937baac
fix -1
AkshayGadikar Nov 8, 2018
2ea3a28
Code clean
AkshayGadikar Nov 8, 2018
6e78b61
Added Hostname
AkshayGadikar Nov 8, 2018
deb6c9b
Updated swagger-trigger
AkshayGadikar Nov 8, 2018
565a44e
mux config
AkshayGadikar Nov 8, 2018
4e5e7b8
fix - 1
AkshayGadikar Nov 8, 2018
99fbc03
trace - 1
AkshayGadikar Nov 8, 2018
0b897ad
Added AppConfig in trigger-config
AkshayGadikar Nov 8, 2018
7891908
fix
AkshayGadikar Nov 8, 2018
970dce5
Adding triggername
AkshayGadikar Nov 8, 2018
b71349a
Added AppConfig in trigger-config
AkshayGadikar Nov 8, 2018
7884096
Added AppConfig in trigger-config
AkshayGadikar Nov 8, 2018
ea925bd
Added AppConfig in trigger-config
AkshayGadikar Nov 8, 2018
fad5366
Added AppConfig in trigger-config
AkshayGadikar Nov 8, 2018
3e7210f
dynamic path
AkshayGadikar Nov 8, 2018
82aef93
fix
AkshayGadikar Nov 8, 2018
479e39a
added mux lib
AkshayGadikar Nov 8, 2018
0194709
fix
AkshayGadikar Nov 8, 2018
6c2e9b8
added handler
AkshayGadikar Nov 8, 2018
523831a
getting triggername
AkshayGadikar Nov 8, 2018
3988615
code clean
AkshayGadikar Nov 8, 2018
5b67c97
code clean
AkshayGadikar Nov 8, 2018
0cc810d
code clean
AkshayGadikar Nov 8, 2018
4927376
code clean
AkshayGadikar Nov 8, 2018
6e4e00f
Code clean
AkshayGadikar Nov 9, 2018
26aafdc
Added Readme
AkshayGadikar Nov 9, 2018
8d523d6
Code clean
AkshayGadikar Nov 9, 2018
49cf245
Removed gorilla lib and added replacement code
AkshayGadikar Nov 9, 2018
cec571c
Changed endpoint URL
AkshayGadikar Nov 9, 2018
ed38189
Regex to check URL and get trigger name
AkshayGadikar Nov 9, 2018
715d3d5
Code clean
AkshayGadikar Nov 9, 2018
513da10
Code clean and Updated Readme
AkshayGadikar Nov 9, 2018
b3b1dcb
Added default handler for swagger
AkshayGadikar Nov 9, 2018
8fddfca
Added default handler for swagger
AkshayGadikar Nov 9, 2018
2f11a5a
code clean
AkshayGadikar Nov 9, 2018
6be2f6a
code clean
AkshayGadikar Nov 9, 2018
a75e0ef
remove swagger feature :- move to contrib
AkshayGadikar Nov 9, 2018
f99c116
Added Config : action.Config
AkshayGadikar Nov 15, 2018
167284c
Added Config : action.Config
AkshayGadikar Nov 15, 2018
9651d67
Clear channel map in stop function
AkshayGadikar Feb 15, 2019
f5bb28f
Merge remote-tracking branch 'upstream/master'
AkshayGadikar Feb 15, 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
3 changes: 2 additions & 1 deletion app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type Option func(*App) error

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

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

for _, anImport := range config.Imports {
registerImport(anImport)
Expand Down Expand Up @@ -89,6 +89,7 @@ func FinalizeProperties(processors ...property.PostProcessor) func(*App) error {
type App struct {
name string
version string
description string
propManager *property.Manager
resManager *resource.Manager
actions map[string]action.Action
Expand Down
7 changes: 4 additions & 3 deletions app/instances.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,19 @@ func (a *App) createSharedActions(actionConfigs []*action.Config) (map[string]ac
func (a *App) createTriggers(tConfigs []*trigger.Config, runner action.Runner) (map[string]*triggerWrapper, error) {

triggers := make(map[string]*triggerWrapper)

mapperFactory := mapper.NewFactory(resolve.GetBasicResolver())
expressionFactory := expression.NewFactory(resolve.GetBasicResolver())

for _, tConfig := range tConfigs {

tConfig.AppConfig = map[string]interface{}{"Name": a.name, "Version": a.version, "Description": a.description,
"Trigger": tConfigs}

_, exists := triggers[tConfig.Id]
if exists {
return nil, fmt.Errorf("Trigger with id '%s' already registered, trigger ids have to be unique", tConfig.Id)
}


if tConfig.Ref == "" {
var ok bool
tConfig.Ref, ok =support.GetAliasRef("trigger", tConfig.Type)
Expand Down Expand Up @@ -152,7 +154,6 @@ func (a *App) createTriggers(tConfigs []*trigger.Config, runner action.Runner) (

triggers[tConfig.Id] = &triggerWrapper{ref: tConfig.Ref, trg: trg, status: &managed.StatusInfo{Name: tConfig.Id}}
}

return triggers, nil
}

Expand Down
2 changes: 1 addition & 1 deletion engine/channels/channels.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func Stop() error {
log.RootLogger().Warnf("error stopping channel '%s', error: %s", channel.name, err.Error())
}
}

channels = make(map[string]*channelImpl)
active = false

return nil
Expand Down
11 changes: 6 additions & 5 deletions trigger/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ import (

// Config is the configuration for a Trigger
type Config struct {
Id string `json:"id"`
Type string `json:"type"` //an alias to the ref, can be used if imported
Ref string `json:"ref"`
Settings map[string]interface{} `json:"settings"`
Handlers []*HandlerConfig `json:"handlers"`
Id string `json:"id"`
Type string `json:"type"` //an alias to the ref, can be used if imported
Ref string `json:"ref"`
Settings map[string]interface{} `json:"settings"`
Handlers []*HandlerConfig `json:"handlers"`
AppConfig map[string]interface{} `json:"appconfig"`
}

func (c *Config) FixUp(md *Metadata) error {
Expand Down