fix(medic#8038): use builds url from env var

Author: garethbowen

admin/src/js/controllers/upgrade.js

@@ -1,4 +1,4 @@
-const BUILDS_DB = 'https://staging.dev.medicmobile.org/_couch/builds_4';
+const DEFAULT_BUILDS_URL = 'https://staging.dev.medicmobile.org/_couch/builds_4';
 
 angular.module('controllers').controller('UpgradeCtrl',
   function(
@@ -20,14 +20,15 @@ angular.module('controllers').controller('UpgradeCtrl',
     $scope.loading = true;
     $scope.versions = {};
     $scope.upgraded = $state.params.upgraded;
-    const buildsDb = pouchDB(BUILDS_DB);
 
     const UPGRADE_URL = '/api/v2/upgrade';
     const POLL_URL = '/setup/poll';
     const UPGRADE_POLL_FREQ = 2000;
     const BUILD_LIST_LIMIT = 50;
     const UPGRADE_CONTAINER_WAIT_PERIOD = 3 * 60 * 1000; // 3 minutes
+
     let containerWaitPeriodTimeout;
+    let apiBuildsUrl;
 
     const logError = (error, key) => {
       return $translate
@@ -68,14 +69,15 @@ angular.module('controllers').controller('UpgradeCtrl',
     const getCurrentUpgrade = () => {
       return $http
         .get(UPGRADE_URL)
-        .then(({ data: { upgradeDoc, indexers } }) => {
+        .then(({ data: { upgradeDoc, indexers, buildsUrl } }) => {
           if ($scope.upgradeDoc && !upgradeDoc) {
             const expectedVersion = $scope.upgradeDoc.to && $scope.upgradeDoc.to.build;
             getExistingDeployment(true, expectedVersion);
           }
 
           $scope.upgradeDoc = upgradeDoc;
           $scope.indexerProgress = indexers;
+          apiBuildsUrl = buildsUrl;
 
           if (upgradeDoc) {
             $timeout(getCurrentUpgrade, UPGRADE_POLL_FREQ);
@@ -109,6 +111,7 @@ angular.module('controllers').controller('UpgradeCtrl',
 
     const loadBuilds = () => {
       const minVersion = Version.minimumNextRelease($scope.currentDeploy.version);
+      const buildsDb = pouchDB(apiBuildsUrl || DEFAULT_BUILDS_URL);
 
       // NB: Once our build server is on CouchDB 2.0 we can combine these three calls
       //     See: http://docs.couchdb.org/en/2.0.0/api/ddoc/views.html#sending-multiple-queries-to-a-view
@@ -141,6 +144,11 @@ angular.module('controllers').controller('UpgradeCtrl',
         ])
         .then(([ branches, betas, releases, featureReleases ]) => {
           $scope.versions = { branches, betas, releases, featureReleases };
+          buildsDb.close();
+        })
+        .catch(err => {
+          buildsDb.close();
+          throw err;
         });
     };
 

admin/tests/unit/controllers/upgrade.spec.js

@@ -12,6 +12,7 @@ describe('UpgradeCtrl controller', () => {
   let timeout;
   let translate;
   let state;
+  let pouchDb;
 
   const nextTick = () => new Promise(r => setTimeout(r));
 
@@ -27,8 +28,10 @@ describe('UpgradeCtrl controller', () => {
 
     buildsDb = {
       query: sinon.stub(),
+      close: sinon.stub()
     };
-    const pouchDb = sinon.stub().returns(buildsDb);
+    pouchDb = sinon.stub();
+    pouchDb.returns(buildsDb);
     modal = sinon.stub();
     http = {
       get: sinon.stub(),
@@ -126,6 +129,8 @@ describe('UpgradeCtrl controller', () => {
     createController();
     await scope.setupPromise;
 
+    expect(pouchDb.callCount).to.equal(1);
+    expect(pouchDb.args[0][0]).to.equal('https://staging.dev.medicmobile.org/_couch/builds_4');
     expect(scope.loading).to.equal(false);
     expect(scope.versions).to.deep.equal({
       branches: [{ version: 'branch1' }, { version: 'branch2' }],
@@ -161,6 +166,77 @@ describe('UpgradeCtrl controller', () => {
         limit: 50,
       }
     ]);
+    expect(buildsDb.close.callCount).to.equal(1);
+  });
+
+  it('should load builds from configured builds url', async () => {
+    const deployInfo = { the: 'deplopy info', version: '4.1.0' };
+    Object.freeze(deployInfo);
+
+    http.get.withArgs('/api/deploy-info').resolves({ data: deployInfo });
+    http.get.withArgs('/api/v2/upgrade').resolves({ data: { upgradeDoc: undefined, indexers: [], buildsUrl: 'https://mybuildurl.com' } });
+    version.minimumNextRelease.returns({ major: 4, minor: 1, patch: 1, beta: 0 });
+
+    buildsDb.query.onCall(0).resolves({
+      rows: [
+        { id: 'medic:medic:branch1', value: { version: 'branch1' } },
+        { id: 'medic:medic:branch2', value: { version: 'branch2' } },
+      ],
+    });
+    buildsDb.query.onCall(1).resolves({
+      rows: [
+        { id: 'medic:medic:beta1', value: { version: 'beta1' } },
+        { id: 'medic:medic:beta2', value: { version: 'beta2' } },
+      ],
+    });
+    buildsDb.query.onCall(2).resolves({
+      rows: [
+        { id: 'medic:medic:release1', value: { version: 'release1' } },
+        { id: 'medic:medic:release2', value: { version: 'release2' } },
+      ],
+    });
+
+    createController();
+    await scope.setupPromise;
+
+    expect(pouchDb.callCount).to.equal(1);
+    expect(pouchDb.args[0][0]).to.equal('https://mybuildurl.com');
+    expect(scope.loading).to.equal(false);
+    expect(scope.versions).to.deep.equal({
+      branches: [{ version: 'branch1' }, { version: 'branch2' }],
+      betas: [{ version: 'beta1' }, { version: 'beta2' }],
+      releases: [{ version: 'release1' }, { version: 'release2' }],
+      featureReleases: [],
+    });
+    expect(buildsDb.query.callCount).to.equal(3);
+    expect(buildsDb.query.args[0]).to.deep.equal([
+      'builds/releases',
+      {
+        startkey: [ 'branch', 'medic', 'medic', {}],
+        endkey: [ 'branch', 'medic', 'medic'],
+        descending: true,
+        limit: 50,
+      }
+    ]);
+    expect(buildsDb.query.args[1]).to.deep.equal([
+      'builds/releases',
+      {
+        startkey: [ 'beta', 'medic', 'medic', {}],
+        endkey: [ 'beta', 'medic', 'medic', 4, 1, 1, 0 ],
+        descending: true,
+        limit: 50,
+      }
+    ]);
+    expect(buildsDb.query.args[2]).to.deep.equal([
+      'builds/releases',
+      {
+        startkey: [ 'release', 'medic', 'medic', {}],
+        endkey: [ 'release', 'medic', 'medic', 4, 1, 1 ],
+        descending: true,
+        limit: 50,
+      }
+    ]);
+    expect(buildsDb.close.callCount).to.equal(1);
   });
 
   it('should catch couch query errors', async () => {
@@ -185,6 +261,7 @@ describe('UpgradeCtrl controller', () => {
 
     expect(scope.loading).to.equal(false);
     expect(scope.versions).to.deep.equal({});
+    expect(buildsDb.close.callCount).to.equal(1);
   });
 
   it('should follow upgrade if already in progress', async () => {

api/src/controllers/upgrade.js

@@ -1,3 +1,4 @@
+const environment = require('../environment');
 const auth = require('../auth');
 const serverUtils = require('../server-utils');
 
@@ -40,7 +41,7 @@ const upgradeInProgress = (req, res) => {
       service.indexerProgress(),
     ]))
     .then(([upgradeDoc, indexers]) => {
-      res.json({ upgradeDoc, indexers });
+      res.json({ upgradeDoc, indexers, buildsUrl: environment.buildsUrl });
     })
     .catch(err => {
       if (err && err.error && err.error.code === 'ECONNREFUSED') {

api/tests/mocha/controllers/upgrade.spec.js

@@ -1,6 +1,7 @@
 const should = require('chai').should();
 
 const sinon = require('sinon');
+const environment = require('../../../src/environment');
 const auth = require('../../../src/auth');
 const serverUtils = require('../../../src/server-utils');
 
@@ -27,9 +28,14 @@ describe('Upgrade controller', () => {
     sinon.stub(serverUtils, 'error');
     sinon.stub(service, 'upgrade').resolves();
     sinon.stub(service, 'complete').resolves();
+
+    environment.buildsUrl = 'https://mybuild.com';
   });
 
-  afterEach(() => sinon.restore());
+  afterEach(() => {
+    environment.buildsUrl = '';
+    sinon.restore();
+  });
 
   describe('Upgrade', () => {
     it('checks that user has the right permissions', () => {
@@ -193,6 +199,7 @@ describe('Upgrade controller', () => {
       service.indexerProgress.callCount.should.equal(1);
       res.json.callCount.should.equal(1);
       res.json.args[0].should.deep.equal([ {
+        buildsUrl: 'https://mybuild.com',
         upgradeDoc: { the: 'upgrade' },
         indexers: ['indexers'],
       }]);

api/tests/mocha/routing.spec.js

@@ -14,7 +14,7 @@ describe('Routing', () => {
     const environment = rewire('./../../src/environment');
     const adminUpgrade = rewire('./../../../admin/src/js/controllers/upgrade');
     const cspBuildDb = environment.__get__('DEFAULT_BUILDS_URL');
-    const actualBuildDb = adminUpgrade.__get__('BUILDS_DB');
+    const actualBuildDb = adminUpgrade.__get__('DEFAULT_BUILDS_URL');
     chai.expect(cspBuildDb).to.not.eq(undefined);
     chai.expect(cspBuildDb).to.include(actualBuildDb);
   });