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

Commit 052f7b0

Browse files
chiragobchiragob
committed
Merge branch 'develop' of https://github.com/FlowzPlatform/subscription into develop
2 parents 8e81f16 + 491844b commit 052f7b0

4 files changed

Lines changed: 58 additions & 16 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: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +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
}
21+
elif [ "$TRAVIS_BRANCH" = "staging" ]
22+
then
23+
{
24+
echo "call $TRAVIS_BRANCH branch"
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 '"'`
26+
echo $ENV_ID
27+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_STAGING";
28+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_STAGING";
29+
RANCHER_URL="$RANCHER_URL_STAGING";
30+
}
1531
else
1632
{
1733
echo "call $TRAVIS_BRANCH branch"
18-
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 '"'`
1935
echo $ENV_ID
36+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_QA";
37+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_QA";
38+
RANCHER_URL="$RANCHER_URL_QA";
2039
}
2140
fi
2241

23-
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 '"'`
2443
echo $SERVICE_ID
2544

2645
echo "waiting for service to upgrade "
2746
while true; do
2847

29-
case `curl -u ""$RANCHER_USER":"$RANCHER_PASS"" \
48+
case `curl -u ""$RANCHER_ACCESSKEY":"$RANCHER_SECRETKEY"" \
3049
-X GET \
3150
-H 'Accept: application/json' \
3251
-H 'Content-Type: application/json' \
33-
"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
3453
"\"upgraded\"" )
3554
echo "completing service upgrade"
36-
curl -u ""$RANCHER_USER":"$RANCHER_PASS"" \
55+
curl -u ""$RANCHER_ACCESSKEY":"$RANCHER_SECRETKEY"" \
3756
-X POST \
3857
-H 'Accept: application/json' \
3958
-H 'Content-Type: application/json' \
40-
"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"
4160
break ;;
4261
"\"upgrading\"" )
4362
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')

‎upgrade.sh‎

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +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
}
27+
elif [ "$TRAVIS_BRANCH" = "staging" ]
28+
then
29+
{
30+
echo "call $TRAVIS_BRANCH branch"
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 '"'`
32+
echo $ENV_ID
33+
USERNAME="$DOCKER_USERNAME";
34+
TAG="staging";
35+
DOMAINKEY="$DOMAINKEY_STAGING";
36+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_STAGING";
37+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_STAGING";
38+
RANCHER_URL="$RANCHER_URL_STAGING";
39+
}
2140
else
2241
{
2342
echo "call $TRAVIS_BRANCH branch"
24-
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 '"'`
2544
echo $ENV_ID
2645
USERNAME="$DOCKER_USERNAME";
2746
TAG="qa";
2847
DOMAINKEY="$DOMAINKEY_QA";
29-
}
48+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_QA";
49+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_QA";
50+
RANCHER_URL="$RANCHER_URL_QA";
51+
}
3052
fi
3153

32-
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 '"'`
3355
echo $SERVICE_ID
3456

35-
curl -u ""$RANCHER_USER":"$RANCHER_PASS"" \
57+
curl -u ""$RANCHER_ACCESSKEY":"$RANCHER_SECRETKEY"" \
3658
-X POST \
3759
-H 'Accept: application/json' \
3860
-H 'Content-Type: application/json' \
3961
-d '{
4062
"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}' \
41-
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)