Skip to content
This repository was archived by the owner on Oct 30, 2023. It is now read-only.

Commit 3785015

Browse files
chiragobchiragob
authored
Merge pull request #71 from FlowzPlatform/QA
Qa
2 parents 8415f79 + cb05c8b commit 3785015

6 files changed

Lines changed: 50 additions & 22 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ notifications:
6060
- chirag@officebrain.com
6161
- avasani@officebrain.com
6262
on_success: always
63-
on_failure: always
63+
on_failure: always

‎finish.sh‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,61 @@ if [ "$TRAVIS_BRANCH" = "master" ]
22
then
33
{
44
echo "call $TRAVIS_BRANCH branch"
5-
ENV_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects?name=Production" | jq '.data[].id' | tr -d '"'`
5+
ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_MASTER":"$RANCHER_SECRETKEY_MASTER"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_MASTER/v2-beta/projects?name=Production" | jq '.data[].id' | tr -d '"'`
66
echo $ENV_ID
7+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_MASTER";
8+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_MASTER";
9+
RANCHER_URL="$RANCHER_URL_MASTER";
710
}
811
elif [ "$TRAVIS_BRANCH" = "develop" ]
912
then
1013
{
1114
echo "call $TRAVIS_BRANCH branch"
12-
ENV_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects?name=Develop" | jq '.data[].id' | tr -d '"'`
15+
ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_DEVELOP":"$RANCHER_SECRETKEY_DEVELOP"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_DEVELOP/v2-beta/projects?name=Develop" | jq '.data[].id' | tr -d '"'`
1316
echo $ENV_ID
17+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_DEVELOP";
18+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_DEVELOP";
19+
RANCHER_URL="$RANCHER_URL_DEVELOP";
1420
}
1521
elif [ "$TRAVIS_BRANCH" = "staging" ]
1622
then
1723
{
1824
echo "call $TRAVIS_BRANCH branch"
19-
ENV_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects?name=Staging" | jq '.data[].id' | tr -d '"'`
25+
ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_STAGING":"$RANCHER_SECRETKEY_STAGING"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_STAGING/v2-beta/projects?name=Staging" | jq '.data[].id' | tr -d '"'`
2026
echo $ENV_ID
27+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_STAGING";
28+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_STAGING";
29+
RANCHER_URL="$RANCHER_URL_STAGING";
2130
}
2231
else
2332
{
2433
echo "call $TRAVIS_BRANCH branch"
25-
ENV_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects?name=QA" | jq '.data[].id' | tr -d '"'`
34+
ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_QA":"$RANCHER_SECRETKEY_QA"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_QA/v2-beta/projects?name=QA" | jq '.data[].id' | tr -d '"'`
2635
echo $ENV_ID
36+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_QA";
37+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_QA";
38+
RANCHER_URL="$RANCHER_URL_QA";
2739
}
2840
fi
2941

30-
SERVICE_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects/$ENV_ID/services?name=subscription-backend-service-flowz" | jq '.data[].id' | tr -d '"'`
42+
SERVICE_ID=`curl -u ""$RANCHER_ACCESSKEY":"$RANCHER_SECRETKEY"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL/v2-beta/projects/$ENV_ID/services?name=subscription-backend-service-flowz" | jq '.data[].id' | tr -d '"'`
3143
echo $SERVICE_ID
3244

3345
echo "waiting for service to upgrade "
3446
while true; do
3547

36-
case `curl -u ""$RANCHER_USER":"$RANCHER_PASS"" \
48+
case `curl -u ""$RANCHER_ACCESSKEY":"$RANCHER_SECRETKEY"" \
3749
-X GET \
3850
-H 'Accept: application/json' \
3951
-H 'Content-Type: application/json' \
40-
"http://rancher.flowz.com:8080/v2-beta/projects/$ENV_ID/services/$SERVICE_ID/" | jq '.state'` in
52+
"$RANCHER_URL/v2-beta/projects/$ENV_ID/services/$SERVICE_ID/" | jq '.state'` in
4153
"\"upgraded\"" )
4254
echo "completing service upgrade"
43-
curl -u ""$RANCHER_USER":"$RANCHER_PASS"" \
55+
curl -u ""$RANCHER_ACCESSKEY":"$RANCHER_SECRETKEY"" \
4456
-X POST \
4557
-H 'Accept: application/json' \
4658
-H 'Content-Type: application/json' \
47-
"http://rancher.flowz.com:8080/v2-beta/projects/$ENV_ID/services/$SERVICE_ID?action=finishupgrade"
59+
"$RANCHER_URL/v2-beta/projects/$ENV_ID/services/$SERVICE_ID?action=finishupgrade"
4860
break ;;
4961
"\"upgrading\"" )
5062
echo "still upgrading"

‎service/src/services/checkout/checkout.class.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ var createFunction = async (function(data,params, app) {
164164
var packageObj = await (makePackageObj(thisSubscription, checkout_res.id, null, userDetail))
165165
var u_id = userDetail.data._id
166166
// axios.post(config1.api_url + 'user-subscription', packageObj)
167+
packageObj.createdAt = new Date()
167168
app.service('user-subscription').create(packageObj)
168169
.then(res => {
169170
let planName = res.id.substr(res.id.length - 5) + "-" + packageObj.name + "-" + moment(packageObj.expiredOn).format('MM-DD-YYYY')

‎service/src/services/config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var rethinkdb = {
1919
x_api_token: process.env.x_api_token,
2020
pay_url: "http://api." + process.env.domainKey + "/payment/payment",
2121
update_user_url: "http://api." + process.env.domainKey + "/user/updateuserdetails/",
22-
user_detail_url: "http://auth." + process.env.domainKey + "/api/userdetails",
22+
user_detail_url: "http://api." + process.env.domainKey + "/auth/api/userdetails",
2323
};
2424

2525
module.exports = rethinkdb;

‎service/src/services/register-resource/register-resource.hooks.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ module.exports = {
4444
};
4545

4646
var modify = async(function(hook){
47-
// console.log("***********hook",hook.data)
48-
// console.log("***********hook",hook.params)
47+
console.log("***********hook",hook.data)
48+
console.log("***********hook",hook.params)
4949
let obj = {}
5050
let action_obj = {}
5151
let id = ''
@@ -63,7 +63,10 @@ var modify = async(function(hook){
6363
}
6464
obj["actions"].push(action_obj)
6565

66-
var tdata = await(hook.app.service('/register-resource').find())
66+
console.log('module======', module)
67+
var tdata = await(hook.app.service('/register-resource').find({
68+
'query':{'module': module}
69+
}))
6770

6871
console.log('tdata', tdata)
6972

‎upgrade.sh‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,62 @@ if [ "$TRAVIS_BRANCH" = "master" ]
22
then
33
{
44
echo "call $TRAVIS_BRANCH branch"
5-
ENV_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects?name=Production" | jq '.data[].id' | tr -d '"'`
5+
ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_MASTER":"$RANCHER_SECRETKEY_MASTER"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_MASTER/v2-beta/projects?name=Production" | jq '.data[].id' | tr -d '"'`
66
echo $ENV_ID
77
USERNAME="$DOCKER_USERNAME_FLOWZ";
88
TAG="latest";
99
DOMAINKEY="$DOMAINKEY_MASTER";
10+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_MASTER";
11+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_MASTER";
12+
RANCHER_URL="$RANCHER_URL_MASTER";
1013
}
1114
elif [ "$TRAVIS_BRANCH" = "develop" ]
1215
then
1316
{
1417
echo "call $TRAVIS_BRANCH branch"
15-
ENV_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects?name=Develop" | jq '.data[].id' | tr -d '"'`
18+
ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_DEVELOP":"$RANCHER_SECRETKEY_DEVELOP"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_DEVELOP/v2-beta/projects?name=Develop" | jq '.data[].id' | tr -d '"'`
1619
echo $ENV_ID
1720
USERNAME="$DOCKER_USERNAME";
1821
TAG="dev";
1922
DOMAINKEY="$DOMAINKEY_DEVELOP";
23+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_DEVELOP";
24+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_DEVELOP";
25+
RANCHER_URL="$RANCHER_URL_DEVELOP";
2026
}
2127
elif [ "$TRAVIS_BRANCH" = "staging" ]
2228
then
2329
{
2430
echo "call $TRAVIS_BRANCH branch"
25-
ENV_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects?name=Staging" | jq '.data[].id' | tr -d '"'`
31+
ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_STAGING":"$RANCHER_SECRETKEY_STAGING"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_STAGING/v2-beta/projects?name=Staging" | jq '.data[].id' | tr -d '"'`
2632
echo $ENV_ID
2733
USERNAME="$DOCKER_USERNAME";
2834
TAG="staging";
2935
DOMAINKEY="$DOMAINKEY_STAGING";
36+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_STAGING";
37+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_STAGING";
38+
RANCHER_URL="$RANCHER_URL_STAGING";
3039
}
3140
else
3241
{
3342
echo "call $TRAVIS_BRANCH branch"
34-
ENV_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects?name=QA" | jq '.data[].id' | tr -d '"'`
43+
ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_QA":"$RANCHER_SECRETKEY_QA"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_QA/v2-beta/projects?name=QA" | jq '.data[].id' | tr -d '"'`
3544
echo $ENV_ID
3645
USERNAME="$DOCKER_USERNAME";
3746
TAG="qa";
3847
DOMAINKEY="$DOMAINKEY_QA";
39-
}
48+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_QA";
49+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_QA";
50+
RANCHER_URL="$RANCHER_URL_QA";
51+
}
4052
fi
4153

42-
SERVICE_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects/$ENV_ID/services?name=subscription-backend-service-flowz" | jq '.data[].id' | tr -d '"'`
54+
SERVICE_ID=`curl -u ""$RANCHER_ACCESSKEY":"$RANCHER_SECRETKEY"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL/v2-beta/projects/$ENV_ID/services?name=subscription-backend-service-flowz" | jq '.data[].id' | tr -d '"'`
4355
echo $SERVICE_ID
4456

45-
curl -u ""$RANCHER_USER":"$RANCHER_PASS"" \
57+
curl -u ""$RANCHER_ACCESSKEY":"$RANCHER_SECRETKEY"" \
4658
-X POST \
4759
-H 'Accept: application/json' \
4860
-H 'Content-Type: application/json' \
4961
-d '{
5062
"inServiceStrategy":{"launchConfig": {"imageUuid":"docker:'$USERNAME'/subscription_backend_service_flowz:'$TAG'","kind": "container","labels":{"io.rancher.container.pull_image": "always","io.rancher.scheduler.affinity:host_label": "machine=cluster-flowz"},"ports": ["3039:3039/tcp","4039:4039/tcp"],"environment": {"RDBHost": "'"$RDBHost"'","RDBPort": "'"$RDBPort"'","rdb":"'"$rdb"'","x_api_token":"'"$x_api_token"'","domainKey":"'"$DOMAINKEY"'"},"healthCheck": {"type": "instanceHealthCheck","healthyThreshold": 2,"initializingTimeout": 60000,"interval": 2000,"name": null,"port": 3039,"recreateOnQuorumStrategyConfig": {"type": "recreateOnQuorumStrategyConfig","quorum": 1},"reinitializingTimeout": 60000,"responseTimeout": 60000,"strategy": "recreateOnQuorum","unhealthyThreshold": 3},"networkMode": "managed"}},"toServiceStrategy":null}' \
51-
http://rancher.flowz.com:8080/v2-beta/projects/$ENV_ID/services/$SERVICE_ID?action=upgrade
63+
$RANCHER_URL/v2-beta/projects/$ENV_ID/services/$SERVICE_ID?action=upgrade

0 commit comments

Comments
 (0)