Update build.sh

.circleci/config.yml

@@ -2,10 +2,12 @@ version: 2.1
 jobs:
   build:
     docker:
-      - image: circleci/node:10.0.0
-    working_directory: ~/project/src
+      - image: circleci/node:12.13.0 
+    parallelism: 2
+    working_directory: ~/project/src 
     steps:
       - checkout
+      - run: npm cache clean --force 
       - run: git submodule update --init --recursive src/libs
       - run: mkdir -p opt/content && cp -r src/* opt/content/
       - restore_cache:
@@ -21,15 +23,12 @@ jobs:
       - run:
           name: Run test cases
           command: 'cd src && npm install --unsafe-perm && npm run coverage'     
-      - run: 
-          name: Install sonar scanner
-          command: 'sudo npm install -g sonarqube-scanner'
-
-      - run: 
-          name: Sonar scanner
-          command: |
-                  sonar-scanner
-
+      - run:
+          name: install sonar scanner
+          command: sudo npm install -g [email protected]
+      - run:
+          name: Run SonarScan
+          command: sonar-scanner
 
 workflows:
   version: 2.1

README.md

@@ -36,10 +36,13 @@ The code in this repository is licensed under MIT unless otherwise noted. Please
 * sunbird_telemetry_sync_batch_size e.g: 20
 * sunbird_learner_service_local_base_url e.g: 'http://learner-service:9000'
 * sunbird_content_service_local_base_url e.g: 'http://localhost:5000'
+* sunbird_content_upload_data_limit: Content upload data limit e.g.: 50mb (string)
 
 ## Setup Instructions
 * Clone the project.eg .(git clone --recursive  url)
-* Run "git submodule update --init --recursive" to pull the latest sunbird-js-utils sub module
+* Run "git submodule init"
+* Run "git submodule update"
+* Run "git submodule update --init --recursive" to pull the latest sunbird-js-utils sub module (if you want to pull from specific branch, "git submodule foreach git pull origin 'branch_name'" )
 * Change to src folder
 * Run `npm install`
 * Run `node app.js`

build.sh

@@ -6,6 +6,6 @@ name=knowledge-mw-service
 node=$2
 org=$3
 
-[[ -f ImageMagick-i386-pc-solaris2.11.tar.gz ]] || wget https://www.imagemagick.org/download/binaries/ImageMagick-i386-pc-solaris2.11.tar.gz
+[[ -f ImageMagick-i386-pc-solaris2.11.tar.gz ]] || wget https://imagemagick.org/archive/binaries/ImageMagick-i386-pc-solaris2.11.tar.gz
 docker build -f ./Dockerfile --label commitHash=$(git rev-parse --short HEAD) -t ${org}/${name}:${build_tag} .
 echo {\"image_name\" : \"${name}\", \"image_tag\" : \"${build_tag}\", \"node_name\" : \"$node\"} > metadata.json

setup.md

@@ -25,7 +25,8 @@
 
 ##Setup Instructions
 * Clone the project.
-* Run "git submodule foreach git pull origin master" to pull the latest sunbird-js-utils sub module
+* RUN "git submodule init" followed by "git submodule update" to load submodules to the latest version.
+* Run "git submodule foreach git pull origin master" to pull the latest sunbird-js-utils sub module. Rename `master` to specific remote branch name if you want to load from specific branch.
 * Change to src folder
 * Run `npm install`
 * Run `node app.js`

sonar-project.properties

@@ -2,7 +2,7 @@ sonar.projectName=sunbird-content-service
 sonar.language=js
 sonar.projectKey=project-sunbird_sunbird-content-service
 sonar.host.url=https://sonarcloud.io
-sonar.exclusions=src/test/**
+sonar.exclusions=src/test/**, **/node_modules/**
 sonar.javascript.lcov.reportPaths=src/coverage/lcov.info
 sonar.organization=project-sunbird
 sonar.projectVersion=1.0

src/app.js

@@ -20,7 +20,7 @@ const contentProviderConfigPath = path.join(__dirname, '/config/contentProviderA
 var contentProviderApiConfig = JSON.parse(fs.readFileSync(contentProviderConfigPath))
 const telemtryEventConfig = JSON.parse(fs.readFileSync(path.join(__dirname, 'config/telemetryEventConfig.json')))
 
-var reqDataLimitOfContentUpload = '50mb'
+var reqDataLimitOfContentUpload = process.env.sunbird_content_upload_data_limit || '50mb'
 
 const port = process.env.sunbird_content_service_port ? process.env.sunbird_content_service_port : 5000
 const defaultChannel = process.env.sunbird_default_channel || 'sunbird'

src/config/contentProviderApiConfig.json

@@ -28,6 +28,8 @@
         "GENERATE_DIALCODE_URI": "/dialcode/v3/generate",
         "GET_DIALCODE_URI": "/dialcode/v3/read",
         "UPDATE_DIALCODE_URI": "/dialcode/v3/update",
+        "GET_DIALCODEV4_URI": "/dialcode/v4/read",
+        "UPDATE_DIALCODEV4_URI": "/dialcode/v4/update",
         "LIST_DIALCODE_URI": "/dialcode/v3/list",
         "CONTENT_LINK_DIALCODE_URI": "/content/v3/dialcode/link",
         "SEARCH_DIALCODE_URI": "/dialcode/v3/search",
@@ -38,25 +40,25 @@
         "UPDATE_COLLABORATOR": "/content/v1/collaborator/update",
         "RESERVE_DIALCODE": "/content/v3/dialcode/reserve",
         "RELEASE_DIALCODE": "/content/v3/dialcode/release",
-        
+
         "CHANNEL_URI": "/channel/v3/read",
         "CHANNEL_LIST_URI": "/channel/v3/list",
         "CHANNEL_SEARCH_URI": "/channel/v3/search",
         "CHANNEL_CREATE_URI": "/channel/v3/create",
         "CHANNEL_UPDATE_URI": "/channel/v3/update",
-      
+
         "FRAMEWORK_URI": "/framework/v3/read",
         "FRAMEWORK_LIST_URI": "/framework/v3/list",
         "FRAMEWORK_CREATE_URI": "/framework/v3/create",
         "FRAMEWORK_UPDATE_URI": "/framework/v3/update",
         "FRAMEWORK_COPY_URI": "/framework/v3/copy",
         "FRAMEWORK_PUBLISH_URI":"/framework/v3/publish",
-      
+
         "FRAMEWORK_TERM_URI": "/framework/v3/term/read",
         "FRAMEWORK_TERM_SEARCH_URI": "/framework/v3/term/search",
         "FRAMEWORK_TERM_CREATE_URI": "/framework/v3/term/create",
         "FRAMEWORK_TERM_UPDATE_URI": "/framework/v3/term/update",
-      
+
         "FRAMEWORK_CATEGORY_INSTANCE_URI": "/framework/v3/category/read",
         "FRAMEWORK_CATEGORY_INSTANCE_SEARCH_URI": "/framework/v3/category/search",
         "FRAMEWORK_CATEGORY_INSTANCE_CREATE_URI": "/framework/v3/category/create",