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

fix line endings for in swagger-ui.js #110

Open
wants to merge 179 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
179 commits
Select commit Hold shift + click to select a range
b04a03a
fixed the blue/green idle/live labeling
siamaksade Jan 25, 2017
2555d70
removed links to screenshots branch
siamaksade Jan 26, 2017
8348aa3
added hystrix dashboard url to demo guides
siamaksade Jan 26, 2017
cfd60c8
added probes to guides pod
siamaksade Jan 26, 2017
de4bfa1
updated pipline-dc annotations
siamaksade Jan 26, 2017
765a00b
fixed the issue with setting label in pipeline
siamaksade Jan 26, 2017
fb4ed15
increased mem for turbine
siamaksade Jan 26, 2017
25d9b23
updated workshop content branch
siamaksade Jan 27, 2017
db8f0b2
increased resources
siamaksade Jan 30, 2017
b90e207
increases gogs and jenkins limits
siamaksade Jan 30, 2017
45fe32e
check only dc when verifying deploys
siamaksade Jan 30, 2017
3d19db9
increased web-ui resource limits
siamaksade Jan 31, 2017
87507d6
increase inventory resources in inventory template
siamaksade Jan 31, 2017
52866e5
updated swagger page title
siamaksade Feb 1, 2017
b445df2
increase limits for builds
siamaksade Feb 1, 2017
93d4582
updated git ref in provisioning
siamaksade Feb 2, 2017
3960598
updated demo guides deployment
siamaksade Feb 2, 2017
5fc36bb
added Gogs prefix env var to guides container
siamaksade Feb 3, 2017
46f8326
added content url to demo guides
siamaksade Feb 7, 2017
edb4289
starting builds one by one during provisioning
siamaksade Feb 8, 2017
47c4067
Assign admin to users after creating projects
siamaksade Feb 13, 2017
f55128c
updated README
siamaksade Feb 14, 2017
75b5eee
removed master-url from provisining arguments
siamaksade Feb 14, 2017
294511e
start builds with delays after prev one is started and verify complete
siamaksade Feb 15, 2017
b5b7081
moved gateway build to be first
siamaksade Feb 15, 2017
bbbc707
set default branch to stable-ocp-3.4
siamaksade Feb 16, 2017
f143ac1
added asciinema for provisioning
siamaksade Feb 16, 2017
ff3bcee
added project suffix env var to guides
siamaksade Feb 16, 2017
5495bb3
added new demos
siamaksade Feb 16, 2017
4a59ba6
removed Gogs restart
siamaksade Feb 17, 2017
7c19727
optimized provisioning
siamaksade Feb 18, 2017
cfa3b08
redirect error logs from pod network
siamaksade Feb 18, 2017
4de8021
start gateway build last to give time for is import
siamaksade Feb 18, 2017
4980e7b
fixed jenkins project permissions
siamaksade Feb 19, 2017
89002c5
fixed nexus template spaces
siamaksade Feb 19, 2017
ef7b352
scale guides to zero if minimal
siamaksade Feb 20, 2017
14f1c87
added docs for minimal quota
siamaksade Feb 20, 2017
e90e844
wait longer for gogs before init starts
siamaksade Feb 20, 2017
d75f81f
added inventory to the minimal setup
siamaksade Feb 20, 2017
84afe4d
added namespace when adjusting jenkins resources
siamaksade Feb 20, 2017
e12329f
updated provisioning docs
siamaksade Feb 20, 2017
de3a307
updated to coolstore-gw image to 2.0 GA
siamaksade Feb 22, 2017
74aef5c
updated required mem for full demo
siamaksade Feb 22, 2017
16dff70
added nexus back to the minimal setup
siamaksade Feb 22, 2017
57a56cc
added Nexus with RH repos as a pre-req
siamaksade Feb 23, 2017
1f2ad94
added back deployment verification
siamaksade Feb 24, 2017
555d786
fixed jquery version issue
siamaksade Feb 27, 2017
122030a
removed merged leftovers
siamaksade Feb 27, 2017
ca7dd91
set resource limits for guides deployment
siamaksade Mar 1, 2017
fe915a5
added more resource for guides build
siamaksade Mar 1, 2017
e3d0e32
skip tls on gogs
siamaksade Mar 1, 2017
471fceb
extract master url from oc status
siamaksade Mar 3, 2017
06d9605
Removed duplicate verification
tqvarnst Mar 8, 2017
8d2e410
set resource limits for nexus
siamaksade Mar 9, 2017
f197692
Merge branch 'stable-ocp-3.4' of github.com:jbossdemocentral/coolstor…
siamaksade Mar 9, 2017
02a2631
adjusted jquery version to fix the build
siamaksade Mar 22, 2017
38b3180
replaced eap-based cart with the spring-boot one
siamaksade Mar 27, 2017
fee7d07
removed EAP-based cart-service
siamaksade Mar 27, 2017
c096f7d
fixed the delete project bug
siamaksade Mar 27, 2017
3840235
removed spring from cart service name
siamaksade Mar 27, 2017
bd0298e
reduced cpu limits
siamaksade Mar 28, 2017
9d1b70b
deleting projects doesn't need --user
siamaksade Mar 28, 2017
5c0b59a
increased cart cpu limit
siamaksade Mar 28, 2017
0380463
updated project annotations
siamaksade Apr 3, 2017
0973814
added deployment verification as a separate command to provisioning
siamaksade Apr 3, 2017
1096327
fixed current directory issue
siamaksade Apr 3, 2017
b051005
removed extra argument from popd
siamaksade Apr 3, 2017
4d46f60
added idling support
siamaksade Apr 12, 2017
0b71457
updated default branch to stable-ocp-3.5
siamaksade Apr 25, 2017
b65c514
removed fis and openjdk imagestreams
siamaksade Apr 25, 2017
b7546d0
fis and openjdk imagestreams namespace set to openshift
siamaksade Apr 25, 2017
45e975e
replaced -v with --param
siamaksade Apr 25, 2017
a2f3066
oc rollout instead of oc deploy
siamaksade May 16, 2017
7701731
oc set resources on guides build removed
siamaksade May 16, 2017
372067c
workshopper docker image used instead of building it
siamaksade May 16, 2017
f1641d2
guides pod probes adjusted to wildfly
siamaksade May 17, 2017
5cb0ff7
workshop url updated
siamaksade May 17, 2017
a491289
added a dev-prod pipeline
siamaksade May 17, 2017
c11967f
modularized demo provisioning
siamaksade May 16, 2017
e26c827
removed asciimovie
siamaksade May 17, 2017
06d2034
removed pricing from merge
siamaksade May 17, 2017
213bf0c
Update README.md
siamaksade May 17, 2017
24e864d
timeout increased for web-ui probes
siamaksade May 17, 2017
e447d03
Gogs info printed when cicd is enabled
siamaksade May 18, 2017
9caadec
fixed delete projects based on demo type
siamaksade May 18, 2017
2f9c8b1
use oc whoami to get master url
siamaksade May 18, 2017
7d3f2b0
jenkins ephemeral instead of persistent
siamaksade May 18, 2017
bcf605a
removed verify build from pipeline
siamaksade May 22, 2017
ed3ca0a
checkout master in provisioning script
siamaksade May 22, 2017
34ccfc8
set git ret param for inventory template during provisioning
siamaksade May 22, 2017
ba4e32f
updated README
siamaksade May 22, 2017
211b9f7
import github repo to gogs via new repo instead of migrate
siamaksade May 22, 2017
0f20624
updated travic ci config
siamaksade May 24, 2017
2c361c6
adjusted health probes parameters
siamaksade May 24, 2017
eaef5c5
unidling added to provisioning
siamaksade May 24, 2017
97e37f0
inventory and catalog health check check db connection (fixes #54)
siamaksade May 25, 2017
f5b673d
Adding new timout values for Hystrix. Fixes issue #24
tqvarnst May 25, 2017
b5902e1
Merge pull request #56 from tqvarnst/stable-ocp-3.5
tqvarnst May 25, 2017
3842bbd
redeploy if deployments has taken too long
siamaksade May 25, 2017
62d619a
status.availableReplicas used instead of status.replicas to get deplo…
siamaksade May 25, 2017
ca43897
adjusted catalog and web-ui health checks
siamaksade May 25, 2017
deea445
fixed webhook url
siamaksade May 30, 2017
02aed38
increased inventory memory
siamaksade May 30, 2017
4b08080
updated code change in inventory
siamaksade May 30, 2017
a67100b
increase gateware resource limits
siamaksade Jun 30, 2017
1a9d88a
tuning probe params
siamaksade Jun 30, 2017
dba182c
replace http probes with shell commands
siamaksade Jun 30, 2017
6744591
verify db deployments before others due to dependencies
siamaksade Jun 30, 2017
454f399
verify checks only the provisioned projects
siamaksade Jul 4, 2017
5d4343b
updated provisioning script log messages
siamaksade Jul 5, 2017
b839881
Update README.md
siamaksade Jul 6, 2017
e6491af
Fixed #75 non-existing inventory template git branch
siamaksade Jul 13, 2017
843469e
build triggers added to inventory bc
siamaksade Jul 14, 2017
c43d83f
updated default workshop yml
siamaksade Jul 21, 2017
930fa32
updated for OCP 3.6
siamaksade Aug 10, 2017
818f75a
slimmed down the git repo in gogs
siamaksade Aug 10, 2017
c58a7cd
print ephemeral config in provisioning logs
siamaksade Aug 30, 2017
3324a5a
Added pipeline diagram
siamaksade Sep 14, 2017
f9188b1
Added pipeline diagram
siamaksade Sep 14, 2017
58bbc74
updated gogs template to user rpm branch
siamaksade Sep 18, 2017
a285924
updated gogs template to user rpm branch
siamaksade Sep 18, 2017
a6a8da7
deploy guides only for ci/cd
siamaksade Sep 19, 2017
8fa31a6
Added an option to use pre-built images instead of building
siamaksade Sep 19, 2017
8781bb8
updated coolstore project desc
siamaksade Sep 19, 2017
7e06e05
updated store screenshot
siamaksade Sep 20, 2017
2849588
Merge branch 'master' into stable-ocp-3.5
siamaksade Sep 20, 2017
d95b698
updated image build pipeline to jbossdemocentral
siamaksade Sep 20, 2017
f28b0fa
allow overriding the pre-built images namespace
siamaksade Sep 20, 2017
71ed058
import images earlier during the provisioning
siamaksade Sep 20, 2017
17b2b11
Merge branch 'master' into stable-ocp-3.6
siamaksade Sep 20, 2017
9a99ecf
updated tags to stable-ocp-3.6
siamaksade Sep 20, 2017
5c73207
set commit user and email on Gogs
siamaksade Sep 20, 2017
b2c5f92
added a param for image streams namespace
siamaksade Sep 20, 2017
e979504
fixed rating testAddRating unit test
siamaksade Sep 20, 2017
8f3f66c
added option to keep buildconfigs after builds are complete
siamaksade Sep 27, 2017
64382c3
deploy nexus in prod project for msa
siamaksade Sep 27, 2017
08516da
fixing docs for verifying all services are functioning
Sep 26, 2017
5baa1d4
scaled rating, review, pricing and netflix to zero in the template
siamaksade Oct 3, 2017
260cd7a
removed all build triggers
siamaksade Oct 4, 2017
76e0ae4
scale down non-required pods in test env based on labels
siamaksade Oct 5, 2017
8e1e9d4
updated deployment verification
siamaksade Oct 5, 2017
0d38cbf
added project owner to provisioning logs
siamaksade Oct 18, 2017
7da472a
added comp-required labels
siamaksade Nov 28, 2017
9c20db3
labeled pricing dc
siamaksade Nov 29, 2017
54c8628
updated imagebuild template
siamaksade Nov 30, 2017
77f626b
updated imagebuild pipeline
siamaksade Dec 1, 2017
b59bf03
replaced wait function with oc
siamaksade Nov 22, 2017
27f441a
use pipeline declarative synta and openshift client plugin
siamaksade Dec 2, 2017
f982672
updated templates to stable-ocp-3.7
siamaksade Dec 2, 2017
f4cbe76
added uses-database label to deployment configs
siamaksade Dec 2, 2017
1bce522
fixed rollout namespace
siamaksade Dec 2, 2017
e302ee9
pinned jenkins version
siamaksade Dec 6, 2017
aa1fdd1
import jenkins tags added to instructions
siamaksade Dec 6, 2017
df6cb99
maven mirror url param is optional
siamaksade Dec 7, 2017
812271b
null env vars not allowed in buildconfig
siamaksade Dec 7, 2017
e65a79e
import only v3.7 jenkins tag
siamaksade Dec 7, 2017
b03fa79
fixed jenkins image tag ref
siamaksade Dec 7, 2017
5c10263
added wait when canceling deployment
siamaksade Dec 12, 2017
ebbc8fc
added back --oc-options
siamaksade Dec 12, 2017
06a837f
addex web-ui dependency fix
siamaksade Jan 23, 2018
939beeb
enabled debug
siamaksade Jan 29, 2018
cbbd107
check imagestream for existing images
siamaksade Jan 29, 2018
6691d7b
updated builds pipeline
siamaksade Jan 29, 2018
fc74ade
update guides url
siamaksade Jan 31, 2018
f63f51d
added missing buildconfig labels
siamaksade Feb 12, 2018
b6d436e
updated image build pipeline
siamaksade Feb 14, 2018
fd2082e
Merge branch 'master' into stable-ocp-3.9
siamaksade Mar 22, 2018
65058a2
updated versions to ocp 3.9
siamaksade Mar 22, 2018
8362198
fix line endings in swagger-ui.js
mrjoshuap May 19, 2018
2b83866
Merge branch 'crlf_fix'
mrjoshuap May 19, 2018
ac2022f
add README.md to appropriate projects
mrjoshuap Jun 2, 2018
c580981
ignore package lock files
mrjoshuap Jun 2, 2018
3b30e60
fix line endings in swagger-ui.js
mrjoshuap May 19, 2018
4367f15
add README.md to appropriate projects
mrjoshuap Jun 2, 2018
6b38caa
ignore package lock files
mrjoshuap Jun 2, 2018
d565acc
Merge branch 'master' of github.com:/mrjoshuap/coolstore-microservice
mrjoshuap Jun 2, 2018
fe098ac
rename app to application
mrjoshuap Jun 2, 2018
19b4aec
major cleanup of labels
mrjoshuap Jun 5, 2018
d0c0406
clean up hardcoded passwords
mrjoshuap Jun 5, 2018
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ data
logs/
tmp/
.vscode/
/coolstore-ui/package-lock.json
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Red Hat Cool Store Microservice Demo [![Build Status](https://travis-ci.org/jbossdemocentral/coolstore-microservice.svg?branch=master)](https://travis-ci.org/jbossdemocentral/coolstore-microservice)
Red Hat Cool Store Microservice Demo [![Build Status](https://travis-ci.org/jbossdemocentral/coolstore-microservice.svg?branch=stable-ocp-3.9)](https://travis-ci.org/jbossdemocentral/coolstore-microservice)
====================================
This is an example demo showing a retail store consisting of several microservices based on [Red Hat OpenShift Application Runtimes](https://www.redhat.com/en/resources/openshift-application-runtimes-datasheet) (Spring Boot, WildFly Swarm, Vert.x, JBoss EAP and Node.js) deployed to [OpenShift](https://access.redhat.com/documentation/en/openshift-container-platform).

Expand Down Expand Up @@ -63,8 +63,9 @@ Troubleshooting

```
oc login -u system:admin
oc create -n openshift -f https://raw.githubusercontent.com/openshift/openshift-ansible/master/roles/openshift_examples/files/examples/v3.7/xpaas-streams/fis-image-streams.json
oc create -n openshift -f https://raw.githubusercontent.com/openshift/openshift-ansible/master/roles/openshift_examples/files/examples/v3.7/xpaas-streams/jboss-image-streams.json
oc create -n openshift -f https://raw.githubusercontent.com/openshift/openshift-ansible/master/roles/openshift_examples/files/examples/v3.9/xpaas-streams/fis-image-streams.json
oc create -n openshift -f https://raw.githubusercontent.com/openshift/openshift-ansible/master/roles/openshift_examples/files/examples/v3.9/xpaas-streams/jboss-image-streams.json
```

* If you attempt to deploy any of the services, and nothing happens, it may just be taking a while to download the Docker builder images. Visit the OpenShift web console and navigate to
Browse->Events and look for errors, and re-run the 'oc delete ; oc create' commands to re-install the images (as outlined at the beginning.)
11 changes: 11 additions & 0 deletions cart-service/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Required Environment Variables

CATALOG_ENDPOINT
PRICING_ENDPOINT

KIE_SERVER_USER
KIE_SERVER_PASSWORD
KIE_CONTAINER_DEPLOYMENT

DATAGRID_HOST
DATAGRID_PORT
6 changes: 6 additions & 0 deletions catalog-service/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Required Environment Variables

DB_NAME
DB_SERVER
DB_USERNAME
DB_PASSWORD
10 changes: 8 additions & 2 deletions coolstore-gw/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
This service is the CoolStore Gateway which acts as an API aggregator towards other
services using Apache Camel (Fuse Integration Services) and Spring Boot.

This service connects to Cart service, Catalog service and inventory service
This service connects to Cart service, Catalog service and inventory service


Required Environment Variables

CART_ENDPOINT=cart:8080
CATALOG_ENDPOINT=catalog:8080
INVENTORY_ENDPOINT=inventory:8080
RATING_ENDPOINT=rating:8080
REVIEW_ENDPOINT=review:8080
326 changes: 163 additions & 163 deletions coolstore-gw/src/main/resources/static/swagger-ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -21476,169 +21476,169 @@ function request(RequestConstructor, method, url) {
module.exports = request;

},{}],162:[function(require,module,exports){
/**
* Expose `Emitter`.
*/
if (typeof module !== 'undefined') {
module.exports = Emitter;
}
/**
* Initialize a new `Emitter`.
*
* @api public
*/
function Emitter(obj) {
if (obj) return mixin(obj);
};
/**
* Mixin the emitter properties.
*
* @param {Object} obj
* @return {Object}
* @api private
*/
function mixin(obj) {
for (var key in Emitter.prototype) {
obj[key] = Emitter.prototype[key];
}
return obj;
}
/**
* Listen on the given `event` with `fn`.
*
* @param {String} event
* @param {Function} fn
* @return {Emitter}
* @api public
*/
Emitter.prototype.on =
Emitter.prototype.addEventListener = function(event, fn){
this._callbacks = this._callbacks || {};
(this._callbacks['$' + event] = this._callbacks['$' + event] || [])
.push(fn);
return this;
};
/**
* Adds an `event` listener that will be invoked a single
* time then automatically removed.
*
* @param {String} event
* @param {Function} fn
* @return {Emitter}
* @api public
*/
Emitter.prototype.once = function(event, fn){
function on() {
this.off(event, on);
fn.apply(this, arguments);
}
on.fn = fn;
this.on(event, on);
return this;
};
/**
* Remove the given callback for `event` or all
* registered callbacks.
*
* @param {String} event
* @param {Function} fn
* @return {Emitter}
* @api public
*/
Emitter.prototype.off =
Emitter.prototype.removeListener =
Emitter.prototype.removeAllListeners =
Emitter.prototype.removeEventListener = function(event, fn){
this._callbacks = this._callbacks || {};
// all
if (0 == arguments.length) {
this._callbacks = {};
return this;
}
// specific event
var callbacks = this._callbacks['$' + event];
if (!callbacks) return this;
// remove all handlers
if (1 == arguments.length) {
delete this._callbacks['$' + event];
return this;
}
// remove specific handler
var cb;
for (var i = 0; i < callbacks.length; i++) {
cb = callbacks[i];
if (cb === fn || cb.fn === fn) {
callbacks.splice(i, 1);
break;
}
}
return this;
};
/**
* Emit `event` with the given args.
*
* @param {String} event
* @param {Mixed} ...
* @return {Emitter}
*/
Emitter.prototype.emit = function(event){
this._callbacks = this._callbacks || {};
var args = [].slice.call(arguments, 1)
, callbacks = this._callbacks['$' + event];
if (callbacks) {
callbacks = callbacks.slice(0);
for (var i = 0, len = callbacks.length; i < len; ++i) {
callbacks[i].apply(this, args);
}
}
return this;
};
/**
* Return array of callbacks for `event`.
*
* @param {String} event
* @return {Array}
* @api public
*/
Emitter.prototype.listeners = function(event){
this._callbacks = this._callbacks || {};
return this._callbacks['$' + event] || [];
};
/**
* Check if this emitter has `event` handlers.
*
* @param {String} event
* @return {Boolean}
* @api public
*/
Emitter.prototype.hasListeners = function(event){
return !! this.listeners(event).length;
};

/**
* Expose `Emitter`.
*/

if (typeof module !== 'undefined') {
module.exports = Emitter;
}

/**
* Initialize a new `Emitter`.
*
* @api public
*/

function Emitter(obj) {
if (obj) return mixin(obj);
};

/**
* Mixin the emitter properties.
*
* @param {Object} obj
* @return {Object}
* @api private
*/

function mixin(obj) {
for (var key in Emitter.prototype) {
obj[key] = Emitter.prototype[key];
}
return obj;
}

/**
* Listen on the given `event` with `fn`.
*
* @param {String} event
* @param {Function} fn
* @return {Emitter}
* @api public
*/

Emitter.prototype.on =
Emitter.prototype.addEventListener = function(event, fn){
this._callbacks = this._callbacks || {};
(this._callbacks['$' + event] = this._callbacks['$' + event] || [])
.push(fn);
return this;
};

/**
* Adds an `event` listener that will be invoked a single
* time then automatically removed.
*
* @param {String} event
* @param {Function} fn
* @return {Emitter}
* @api public
*/

Emitter.prototype.once = function(event, fn){
function on() {
this.off(event, on);
fn.apply(this, arguments);
}

on.fn = fn;
this.on(event, on);
return this;
};

/**
* Remove the given callback for `event` or all
* registered callbacks.
*
* @param {String} event
* @param {Function} fn
* @return {Emitter}
* @api public
*/

Emitter.prototype.off =
Emitter.prototype.removeListener =
Emitter.prototype.removeAllListeners =
Emitter.prototype.removeEventListener = function(event, fn){
this._callbacks = this._callbacks || {};

// all
if (0 == arguments.length) {
this._callbacks = {};
return this;
}

// specific event
var callbacks = this._callbacks['$' + event];
if (!callbacks) return this;

// remove all handlers
if (1 == arguments.length) {
delete this._callbacks['$' + event];
return this;
}

// remove specific handler
var cb;
for (var i = 0; i < callbacks.length; i++) {
cb = callbacks[i];
if (cb === fn || cb.fn === fn) {
callbacks.splice(i, 1);
break;
}
}
return this;
};

/**
* Emit `event` with the given args.
*
* @param {String} event
* @param {Mixed} ...
* @return {Emitter}
*/

Emitter.prototype.emit = function(event){
this._callbacks = this._callbacks || {};
var args = [].slice.call(arguments, 1)
, callbacks = this._callbacks['$' + event];

if (callbacks) {
callbacks = callbacks.slice(0);
for (var i = 0, len = callbacks.length; i < len; ++i) {
callbacks[i].apply(this, args);
}
}

return this;
};

/**
* Return array of callbacks for `event`.
*
* @param {String} event
* @return {Array}
* @api public
*/

Emitter.prototype.listeners = function(event){
this._callbacks = this._callbacks || {};
return this._callbacks['$' + event] || [];
};

/**
* Check if this emitter has `event` handlers.
*
* @param {String} event
* @return {Boolean}
* @api public
*/

Emitter.prototype.hasListeners = function(event){
return !! this.listeners(event).length;
};

},{}]},{},[1])(1)
});
Expand Down
Loading