New: Update new service endpoints

Author: utsavized

azure-pipelines.yml

@@ -25,6 +25,9 @@ jobs:
       GIT_USER_EMAIL: $(GIT_USER_EMAIL)
       GIT_USER_NAME: $(GIT_USER_NAME)
       GIT_PASSWORD: $(GIT_PASSWORD)
+      GIT_SCANNER_USER: $(GIT_SCANNER_USER)
+      GIT_SCANNER_PASSWORD: $(GIT_SCANNER_PASSWORD)
+      BRANCH: variables['Build.SourceBranch']
   - script: npm run test-staging && node helpers/integration-tests/index.js
     displayName: 'Analyze staging with webhint'
     condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))

helpers/update-site.sh

@@ -36,12 +36,31 @@ update_website() {
     # Move to temp folder
     cd "$TMP_DIR"
 
+    declare -r masterBranch="refs/heads/master"
+    declare slot=""
+    declare user=""
+    declare password=""
+    declare message=""
+
+    if [ "$masterBranch" == "$BRANCH" ]; then
+        slot="sonarwhal-staging"
+        user=$GIT_USER_NAME
+        password=$GIT_PASSWORD
+        message="Hey server, this content is for you! ***NO_CI***"
+    else
+        slot="sonarwhal-scanner-staging"
+        user=$GIT_SCANNER_USER
+        password=$GIT_SCANNER_PASSWORD
+        message="Hey staging server, this content is for you! ***NO_CI***"
+    fi
+
+
     git config --global user.email "$GIT_USER_EMAIL" \
-        && git config --global user.name "$GIT_USER_NAME" \
+        && git config --global user.name "$user" \
         && git init \
         && git add -A \
-        && git commit --message "Hey server, this content is for you! ***NO_CI***" \
-        && git push --quiet --force --set-upstream "https://$GIT_USER_NAME:$GIT_PASSWORD@sonarwhal-staging.scm.azurewebsites.net:443/sonarwhal.git" master
+        && git commit --message "$message" \
+        && git push --quiet --force --set-upstream "https://$user:$password@$slot.scm.azurewebsites.net:443/sonarwhal.git" master
 }
 
 remove_sensitive_information() {

package.json

@@ -95,4 +95,4 @@
     "update-site": "node helpers/update-site.js",
     "postinstall": "node helpers/postinstall.js"
   }
-}
+}

src/server/routes/scanner.js

@@ -4,7 +4,7 @@ const promisify = require('util').promisify;
 const _ = require('lodash');
 const moment = require('moment');
 const globby = require('globby');
-const r = require('request').defaults({ headers: { authorization: `Bearer ${process.env.auth}` } }); // eslint-disable-line no-process-env
+const r = require('request').defaults({ headers: { 'x-functions-key': `${process.env.FUNCTIONS_KEY}` } }); // eslint-disable-line no-process-env
 const { getMessage: getMessageUtils } = require('@hint/utils').i18n;
 
 const request = promisify(r);
@@ -42,11 +42,11 @@ const getMessageByLanguage = (language) => {
 };
 
 const sendRequest = (url) => {
-    const formData = { url };
     const options = {
-        formData,
+        body: JSON.stringify({ url }),
+        headers: { 'Content-type': 'application/json' },
         method: 'POST',
-        url: `${serviceEndpoint}`
+        url: `${serviceEndpoint}/createjob`
     };
 
     return request(options);
@@ -55,7 +55,7 @@ const sendRequest = (url) => {
 const queryResult = async (id, tries) => {
     let response;
     const counts = tries || 0;
-    const result = await request(`${serviceEndpoint}${id}`);
+    const result = await request(`${serviceEndpoint}/jobstatus?id=${id}`);
 
     if (!result.body) {
         throw new Error(`No result found for this url. Please scan again.`);