Skip to content

Commit b06e8a5

Browse files
author
Vikas Agarwal
committed
config based file upload in dev env
1 parent e67e265 commit b06e8a5

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

config/custom-environment-variables.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"logLevel": "LOG_LEVEL",
55
"version": "APP_VERSION",
66
"captureLogs": "CAPTURE_LOGS",
7+
"enableFileUpload": "ENABLE_FILE_UPLOAD",
78
"logentriesToken": "LOGENTRIES_TOKEN",
89
"elasticsearchConfig": {
910
"host": "PROJECTS_ES_URL",

config/default.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"logLevel": "info",
55
"version": "v4",
66
"captureLogs": "false",
7+
"enableFileUpload": "true",
78
"logentriesToken": "",
89
"rabbitmqURL": "",
910
"pubsubQueueName": "project.service",

deploy.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ make_task_def(){
6161
"name": "NODE_ENV",
6262
"value": "%s"
6363
},
64+
{
65+
"name": "ENABLE_FILE_UPLOAD",
66+
"value": "%s"
67+
},
6468
{
6569
"name": "LOG_LEVEL",
6670
"value": "%s"
@@ -236,6 +240,7 @@ make_task_def(){
236240
fi
237241
echo "NODE_ENV"
238242
echo $NODE_ENV
243+
ENABLE_FILE_UPLOAD=$(eval "echo \$${ENV}_ENABLE_FILE_UPLOAD")
239244

240245
AUTH0_URL=$(eval "echo \$${ENV}_AUTH0_URL")
241246
AUTH0_AUDIENCE=$(eval "echo \$${ENV}_AUTH0_AUDIENCE")
@@ -248,7 +253,7 @@ make_task_def(){
248253
KAFKA_URL=$(eval "echo \$${ENV}_KAFKA_URL")
249254

250255

251-
task_def=$(printf "$task_template" $family $ACCOUNT_ID $AWS_ECS_CONTAINER_NAME $ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $CIRCLE_SHA1 $NODE_ENV $LOG_LEVEL $CAPTURE_LOGS $LOGENTRIES_TOKEN $API_VERSION $AWS_REGION $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY $AUTH_DOMAIN $AUTH_SECRET $VALID_ISSUERS $DB_MASTER_URL $MEMBER_SERVICE_ENDPOINT $IDENTITY_SERVICE_ENDPOINT $BUS_API_URL $MESSAGE_SERVICE_URL $SYSTEM_USER_CLIENT_ID $SYSTEM_USER_CLIENT_SECRET $PROJECTS_ES_URL $PROJECTS_ES_INDEX_NAME $RABBITMQ_URL $DIRECT_PROJECT_SERVICE_ENDPOINT $FILE_SERVICE_ENDPOINT $CONNECT_PROJECTS_URL $SEGMENT_ANALYTICS_KEY "$AUTH0_URL" "$AUTH0_AUDIENCE" $AUTH0_CLIENT_ID "$AUTH0_CLIENT_SECRET" $TOKEN_CACHE_TIME "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID $KAFKA_URL $PORT $PORT $AWS_ECS_CLUSTER $AWS_REGION $NODE_ENV)
256+
task_def=$(printf "$task_template" $family $ACCOUNT_ID $AWS_ECS_CONTAINER_NAME $ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $CIRCLE_SHA1 $NODE_ENV $ENABLE_FILE_UPLOAD $LOG_LEVEL $CAPTURE_LOGS $LOGENTRIES_TOKEN $API_VERSION $AWS_REGION $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY $AUTH_DOMAIN $AUTH_SECRET $VALID_ISSUERS $DB_MASTER_URL $MEMBER_SERVICE_ENDPOINT $IDENTITY_SERVICE_ENDPOINT $BUS_API_URL $MESSAGE_SERVICE_URL $SYSTEM_USER_CLIENT_ID $SYSTEM_USER_CLIENT_SECRET $PROJECTS_ES_URL $PROJECTS_ES_INDEX_NAME $RABBITMQ_URL $DIRECT_PROJECT_SERVICE_ENDPOINT $FILE_SERVICE_ENDPOINT $CONNECT_PROJECTS_URL $SEGMENT_ANALYTICS_KEY "$AUTH0_URL" "$AUTH0_AUDIENCE" $AUTH0_CLIENT_ID "$AUTH0_CLIENT_SECRET" $TOKEN_CACHE_TIME "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID $KAFKA_URL $PORT $PORT $AWS_ECS_CLUSTER $AWS_REGION $NODE_ENV)
252257
}
253258

254259
push_ecr_image(){

src/routes/attachments/create.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ module.exports = [
6767
}
6868

6969
const fileTransferPromise = new Promise((accept, reject) => {
70-
if (process.env.NODE_ENV !== 'development') {
70+
if (process.env.NODE_ENV !== 'development' || config.get('enableFileUpload') === 'true') {
7171
// get pre-signed Url
7272
req.log.debug('requesting presigned Url');
7373
httpClient.post(`${fileServiceUrl}uploadurl/`, {

0 commit comments

Comments
 (0)