Skip to content

Commit 4d72974

Browse files
Feature v2 model (#184)
* (WIP) First cut of mashling-gateway integration into the mashling repo. * Add docs from mashling-gateway. * (WIP) Initial cut of upgrade to 0.5.2 of flogo lib, contrib, and cli. * Update flogo flows as services to work correctly with flogo 0.5.2. * Add schema v1 asset generation to Makefile and regen assets. * Update makefile to support old mashling binaries and make more sensible defaults. Fix vet output. * Support loading branches, tags, or revisions in flogo flow url refs. * Use HEAD instead of upstream for now. * Regen assets. * Create dockerfile for consistent builds/compiles on all platforms. * Updating README for v2 usage. Still WIP. * Update mashling-cli commands to run through docker if docker is deteced. * Support native non-docker customized mashling binary creation even when docker exists and allow user to specify target OS type. * Collapse legacy CLI commands into new mashling-cli. * Remove unused dependencies. * Remove README references to legacy cli tool. * Remove more README references to old mashling cli code. * Move gateway to command style of cli. * New gateway commands. * Rename root command on CLI and move init funcs to top. * Update README.md Use feature-v2-model branch until the merge to master. * Continue docs work and regen assets. * Move policy proposal docs under gateway. * Continue updating docs for new cli usage and changes to commands. * Add full env to Mashling core activity context for conditional evaluation and param passing for configs. * Regen assets. * Add links to pre-built binary downloads. * Use URI reference as key in flogo flow map instead of definition provided ref value. * HTTP service looks at Content-Type header of response to try to parse JSON if appropriate. * Make Tracing.json compatible with latest Flogo. * Make sure CGO_ENABLED=0 in the makefile. * Update docs with Docker run examples specifying GOARCH. * Updated append logic for consul definitions * Add ability to pass architecture through to CLI create command. * update gateway docs to reflect default JSON parsing on HTTP services when content type is detected appropriately. * Remove superfluous print statement from flogo lib object mapping function. * Perform input mappings for all services in pure go to retain and propagate actual objects. Only convert to JSON for conditional logic. * Regen assets and shuffle shared assets. * Updated read me for consul * Added tunable fix * Add HTTP request header to gorillamuxtrigger outputs Generate assets as well * Handle request headers as interface than ',' seperated string * Attempt to parse the provided content as JSON if the provided MIME type is text/plain. Addresses #151. * Migrate compilation docker image from personal repo to Mashling repo on Dockerhub. * Updated jsonpath changes * Updated jsonpath changes * Rebuild assets. * Feature v2 ping (#147) * Added Ping service functionality * Updated ping service to use listener * Updated ping service functionality * Read me updated with ping functionality * updated ping funcitonality as per the comments * Updated readme * Updated read me page * Add ping-enabled flag to enable/disable ping service * Update README with ping-enabled flag * Update README * Minor changes to ping service to allow for graceful shutdown with appropriate error output. * Regen assets. * Update header parameter description * Handle embedded flogo flow definitions correctly. * regen cli assets. * Just create and re-use one Docker container and avoid mounting host volume when creating customized Mashling binaries. * added doc site content * clean up * Replace Makefile with a pure go equivalent (#163) * WIP: replace Makefile with go. * Remove GOPATH hijacking that used symlinks and only create a GOPATH when building custom binaries. * Regen assets. * Fix doc typo. * Update README files to reflect changes to build process and remove Makefile. * Typo on build command. * Remove make reference from log output when building with CLI. * Generate linux-amd64 release build before building docker * Fix go vet format issue * Generate assets * Feature v2 model cicd (#165) * updating travis file for v2 * travis changes * update travis file to support v2 and publish docs site * added a tutorial * Add type attribe to make Istio flow compatible with latest flogo * Minor language tweaks. * Remove unused V1 sample recipes * updated docsite content * update travis file * minor fix. * Added http service type. * Updated markdown for hugo tool compatibility. * Added port mapping for v1 recipes (#170) * issue fix 172 - copy exe into bin folder (#173) * Resolve environment flags used for service input mappings * Reverted issue 172 (#176) * Moved lambda activity from pointlander * Removed cli directory * Document inputs and outputs for each service type. * update travis file * Updated gorillamux trigger references correctly * Revert "Updated gorillamux trigger references correctly" * Replace jeffreybozek Github account repository references with mashling-support Github account after ownership transfer. * Regenerate assets with new repo refs. * Fixed gotests (#185)
1 parent 7b2f6f1 commit 4d72974

File tree

2,126 files changed

+599385
-9743
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,126 files changed

+599385
-9743
lines changed

.gitignore

+7-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ out/
1818
.DS_Store
1919

2020
bin/
21-
pkg/
2221
**/vendor/src/
2322
**/vendor/manifest
24-
vendor/
2523

2624
## Golang
2725

@@ -52,3 +50,10 @@ _testmain.go
5250

5351
tags
5452
.vscode/*
53+
54+
bin/
55+
release/
56+
.cache
57+
*.zip
58+
/.GOPATH
59+
/bin

.travis.yml

+28-27
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ services:
99
branches:
1010
only:
1111
- master
12+
- develop
1213
- /^v\d+\.\d+\.\d+(\.\d+)?(-\S*)?$/
1314

1415
cache:
@@ -21,44 +22,44 @@ git:
2122
# Do a github login using token
2223
before_install:
2324
- "echo -e \"machine github.com\n login ${GITHUB_USER_TOKEN}\" >> ~/.netrc"
24-
- pip install --user awscli
2525
install:
26-
- go get -u github.com/golang/dep/cmd/dep
2726
- go get -u github.com/ains/go-test-html
28-
27+
- go get github.com/spf13/hugo
28+
2929
script:
3030
- cd $GOPATH/src/github.com/TIBCOSoftware
3131
- git clone https://github.com/TIBCOSoftware/mashling-cicd.git mashling-cicd
32-
- cd mashling
33-
- dep ensure -vendor-only
32+
- git clone https://github.com/TIBCOSoftware/mashling-recipes.git mashling-recipes
33+
- cd mashling/docs/web && hugo
34+
- cd $GOPATH/src/github.com/TIBCOSoftware/mashling
3435
- go test ./... -v 2> >(tee gotest_stderr_file) | tee gotest_stdout_file
35-
- make all
36-
- mashling help
36+
- go run build.go buildgateway
3737
- cd $GOPATH/src/github.com/TIBCOSoftware
38-
- pushd mashling-cicd/sample-recipes
39-
- rm -rf builds
40-
- mkdir -p builds/latest
41-
- chmod ugo+x ./build-recipes.sh ./sanity.sh ./gotestreport.sh
42-
- ./gotestreport.sh
43-
- ./build-recipes.sh
44-
- ./sanity.sh
45-
- popd
46-
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
47-
pushd mashling-cicd/docker/mashling;
48-
chmod ugo+x ./build-mashling.sh ;
49-
./build-mashling.sh ;
50-
popd ;
51-
fi
38+
- pushd mashling-cicd/sample-recipes/scripts
39+
- chmod ugo+x ./init.sh ./get-mashling-release-candidate.sh
40+
- ./get-mashling-release-candidate.sh
41+
- ./init.sh
42+
- popd
5243

5344
after_script:
5445
- "[ -f \"${HOME}/.netrc\" ] && rm -f ${HOME}/.netrc"
5546
- "[ -f \"${HOME}/.aws\" ] && rm -f ${HOME}/.aws"
5647

57-
after_success:
58-
- "docker login -u=\"${DOCKER_USERNAME}\" -p=\"${DOCKER_PASSWORD}\" tibdocker.tibco.com"
59-
- source $GOPATH/src/github.com/TIBCOSoftware/mashling-cicd/scripts/init.sh
60-
- mashling::module::postbuild mashling mashling
61-
48+
deploy:
49+
- provider: releases
50+
api_key: "$GITHUB_USER_TOKEN"
51+
file_glob: true
52+
file: $GOPATH/src/github.com/TIBCOSoftware/mashling/artifacts/*
53+
skip_cleanup: true
54+
on:
55+
tags: true
56+
- provider: pages
57+
skip_cleanup: true
58+
local-dir: docs/web/public
59+
github_token: $GITHUB_USER_TOKEN
60+
on:
61+
branch: master
62+
6263
notifications:
6364
email:
6465
on_failure: always
@@ -68,4 +69,4 @@ notifications:
6869
6970
7071
71-
72+

0 commit comments

Comments
 (0)