@clickview/ship-it 0.0.4-rc.0 → 0.0.5-rc.1

package/lib/src/inversify.config.js

@@ -13,14 +13,17 @@ function createContainer(config) {
      * Misc
      */
     container.bind(types_1.MISC.GitLabConfig).toConstantValue(config.gitLab);
+    container.bind(types_1.MISC.TeamCityConfig).toConstantValue(config.teamCity);
     /**
      * Clients
      */
     container.bind(types_1.API_CLIENTS.GitLabApiClient).to(api_clients_1.GitLabApiClient);
+    container.bind(types_1.API_CLIENTS.TeamCityApiClient).to(api_clients_1.TeamCityApiClient);
     /**
      * Services
      */
     container.bind(types_1.SERVICES.GitLabService).to(services_1.GitLabService).inSingletonScope();
+    container.bind(types_1.SERVICES.TeamCityService).to(services_1.TeamCityService).inSingletonScope();
     /**
      * Tasks
      */
@@ -36,6 +39,10 @@ function createContainer(config) {
     container.bind(types_1.TASKS.BumpPackagesTask).to(tasks_1.BumpPackagesTask);
     container.bind(types_1.TASKS.CommitPackageVersionsTask).to(tasks_1.CommitPackageVersionsTask);
     container.bind(types_1.TASKS.ValidateMergeRequestTask).to(tasks_1.ValidateMergeRequestTask);
+    container.bind(types_1.TASKS.StartMonorepoBuildTask).to(tasks_1.StartMonorepoBuildTask);
+    container.bind(types_1.TASKS.TagMasterTask).to(tasks_1.TagMasterTask);
+    container.bind(types_1.TASKS.StartConsumingProjectBuildsTask)
+        .to(tasks_1.StartConsumingProjectBuildsTask);
     /**
      * Commands
      */
@@ -48,6 +55,9 @@ function createContainer(config) {
     container.bind(types_1.COMMANDS.InstallPackagesCommand).to(commands_1.InstallPackagesCommand);
     container.bind(types_1.COMMANDS.BumpPackagesCommand).to(commands_1.BumpPackagesCommand);
     container.bind(types_1.COMMANDS.ValidateMergeRequestCommand).to(commands_1.ValidateMergeRequestCommand);
+    container.bind(types_1.COMMANDS.TagMasterCommand).to(commands_1.TagMasterCommand);
+    container.bind(types_1.COMMANDS.StartConsumingProjectBuildsCommand)
+        .to(commands_1.StartConsumingProjectBuildsCommand);
     return container;
 }
 exports.createContainer = createContainer;

package/lib/src/services/GitLabService.js

@@ -71,30 +71,113 @@ var types_1 = require("../types");
 var api_clients_1 = require("../api-clients");
 var errors_1 = require("../errors");
 var utils_1 = require("../utils");
+/**
+ * These are projects that will try to use tags to pull in extra projects
+ */
+var MONOREPO_IDS = [
+    utils_1.ProjectIds.MONOREPO_PROJECT_ID
+];
 var GitLabService = /** @class */ (function () {
     function GitLabService(apiClient) {
         this.apiClient = apiClient;
     }
     GitLabService.prototype.getProjects = function (options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var mergeRequests, projectIds, projects;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var allMergeRequests, mergeRequests, projectIds, projects, mappedProjects, _i, mappedProjects_1, mappedProject, extraProjects;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         if (this.projects)
                             return [2 /*return*/, this.projects];
                         return [4 /*yield*/, this.apiClient.getMergeRequests(options)];
                     case 1:
-                        mergeRequests = _a.sent();
+                        allMergeRequests = _b.sent();
+                        mergeRequests = allMergeRequests.filter(function (mr) { return mr.targetBranch !== 'master'; });
                         if (!(mergeRequests === null || mergeRequests === void 0 ? void 0 : mergeRequests.length))
                             throw new errors_1.ShipItError('Could not find any merge requests for the specified options');
                         projectIds = lodash_1.default.uniqBy(mergeRequests, function (m) { return m.projectId; }).map(function (m) { return m.projectId; });
                         return [4 /*yield*/, this.apiClient.getProjectsByIds(projectIds)];
                     case 2:
-                        projects = _a.sent();
+                        projects = _b.sent();
                         if (!(projects === null || projects === void 0 ? void 0 : projects.length) || projects.length !== projectIds.length)
                             throw new errors_1.ShipItError('Could not find all projects for the found merge requests');
-                        return [2 /*return*/, (this.projects = projects.map(function (p) { return (__assign(__assign({}, p), { mergeRequests: mergeRequests.filter(function (mr) { return mr.projectId === p.id; }) })); }))];
+                        mappedProjects = projects.map(function (p) { return (__assign(__assign({}, p), { mergeRequests: mergeRequests.filter(function (mr) { return mr.projectId === p.id; }) })); });
+                        _i = 0, mappedProjects_1 = mappedProjects;
+                        _b.label = 3;
+                    case 3:
+                        if (!(_i < mappedProjects_1.length)) return [3 /*break*/, 6];
+                        mappedProject = mappedProjects_1[_i];
+                        return [4 /*yield*/, this.getExtraProjects(mappedProject, projectIds)];
+                    case 4:
+                        extraProjects = _b.sent();
+                        Array.prototype.push.apply(mappedProjects, extraProjects.map(function (p) { return (__assign(__assign({}, p), { mergeRequests: [] })); }));
+                        _b.label = 5;
+                    case 5:
+                        _i++;
+                        return [3 /*break*/, 3];
+                    case 6:
+                        /**
+                         * We need to filter our relevant projects after we've added extra projects via tags
+                         */
+                        if ((_a = options.projectIds) === null || _a === void 0 ? void 0 : _a.length) {
+                            mappedProjects = mappedProjects.filter(function (p) {
+                                var _a;
+                                return (_a = options.projectIds) === null || _a === void 0 ? void 0 : _a.some(function (pid) { return p.id.toString() === pid; });
+                            });
+                        }
+                        return [2 /*return*/, (this.projects = mappedProjects)];
+                }
+            });
+        });
+    };
+    /**
+     * Fetches any projects that are not already included via MRs by checking the project labels.
+     * We only do this for a whitelist of projects
+     */
+    GitLabService.prototype.getExtraProjects = function (project, existingProjectIds) {
+        return __awaiter(this, void 0, void 0, function () {
+            var labels, mrLabelNames, mrLabels, projectIds, extraProjectIds;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!MONOREPO_IDS.includes(project.id.toString()))
+                            return [2 /*return*/, []];
+                        return [4 /*yield*/, this.getProjectLabels(project.id)];
+                    case 1:
+                        labels = _a.sent();
+                        mrLabelNames = lodash_1.default.chain(project.mergeRequests)
+                            .map(function (m) { return m.labels; })
+                            .flatten()
+                            .uniq()
+                            .value();
+                        mrLabels = lodash_1.default.intersection(labels.map(function (l) { return l.name; }), mrLabelNames);
+                        projectIds = mrLabels.map(function (m) { var _a; return (_a = labels.find(function (l) { return l.name === m; })) === null || _a === void 0 ? void 0 : _a.description; });
+                        extraProjectIds = lodash_1.default.difference(projectIds, existingProjectIds.map(function (p) { return p.toString(); }));
+                        return [4 /*yield*/, this.apiClient.getProjectsByIds(extraProjectIds)];
+                    case 2: 
+                    // fetches and returns the extra projects
+                    return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    /**
+     * Gets labels that have a projectId as their description
+     */
+    GitLabService.prototype.getProjectLabels = function (projectId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var labels;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.apiClient.getLabels(projectId)];
+                    case 1:
+                        labels = _a.sent();
+                        return [2 /*return*/, labels.filter(function (l) {
+                                if (!l.description)
+                                    return false;
+                                return !isNaN(+l.description);
+                            })];
                 }
             });
         });
@@ -129,8 +212,13 @@ var GitLabService = /** @class */ (function () {
                             (title === null || title === void 0 ? void 0 : title.includes('dev'))) {
                             commits.pop();
                         }
-                        if (!(commits === null || commits === void 0 ? void 0 : commits.length))
-                            throw new errors_1.ShipItError("Could not find any commits in dev for projectId: ".concat(projectId, " since ").concat(sinceSha));
+                        /**
+                         * This is commented out right now because of a problem with the logic of this approach of validating MRs.
+                         * We need to find a way to fetch all commits that will be included in this release. Leaving this commented
+                         * until we figure that out - Sha
+                         */
+                        // if (!commits?.length)
+                        //   throw new ShipItError(`Could not find any commits in dev for projectId: ${projectId} since ${sinceSha}`);
                         return [2 /*return*/, commits];
                 }
             });
@@ -177,14 +265,13 @@ var GitLabService = /** @class */ (function () {
             });
         });
     };
-    GitLabService.prototype.getMergeRequest = function (projectId, branchName) {
-        return this.apiClient.getMergeRequest(projectId, branchName, 'master');
+    GitLabService.prototype.getMergeRequest = function (projectId, branchName, state) {
+        return this.apiClient.getMergeRequest(projectId, branchName, 'master', state);
     };
     GitLabService.prototype.getMergeRequestById = function (projectId, mergeRequestId) {
-        var idAsNumber = lodash_1.default.toNumber(mergeRequestId);
-        if (!lodash_1.default.isNumber(idAsNumber))
+        if (isNaN(+mergeRequestId))
             throw new errors_1.ShipItError("MergeRequest Id must be a number: ".concat(mergeRequestId));
-        return this.apiClient.getMergeRequestById(projectId, idAsNumber);
+        return this.apiClient.getMergeRequestById(projectId, +mergeRequestId);
     };
     GitLabService.prototype.createMergeRequest = function (projectId, branchName, description, milestoneName) {
         return __awaiter(this, void 0, void 0, function () {
@@ -202,6 +289,39 @@ var GitLabService = /** @class */ (function () {
     GitLabService.prototype.getMilestone = function (projectId, milestoneName) {
         return this.apiClient.getMilestone(projectId, milestoneName);
     };
+    GitLabService.prototype.getReleaseBranchNameMilestone = function (projectId, milestone) {
+        return __awaiter(this, void 0, void 0, function () {
+            var releaseMR;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.apiClient.getReleaseMergeRequest(projectId, milestone)];
+                    case 1:
+                        releaseMR = _a.sent();
+                        if (!releaseMR)
+                            return [2 /*return*/, null];
+                        return [2 /*return*/, releaseMR.sourceBranch];
+                }
+            });
+        });
+    };
+    GitLabService.prototype.getMilestoneByBranchName = function (projectId, branchName) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function () {
+            var mergeRequest;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0: return [4 /*yield*/, this.getMergeRequest(projectId, branchName, 'opened')];
+                    case 1:
+                        mergeRequest = _c.sent();
+                        if (!mergeRequest)
+                            throw new errors_1.ShipItError("No merge request in project \"monorepo\" with branch name \"".concat(branchName, "\" could be found."));
+                        if (!mergeRequest.milestone)
+                            throw new errors_1.ShipItError("No milestone could be found on merge request \"".concat(mergeRequest.title, "\". Please attach a milestone then try again: ").concat(mergeRequest.url));
+                        return [2 /*return*/, (_b = (_a = mergeRequest.milestone) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : ''];
+                }
+            });
+        });
+    };
     GitLabService.prototype.bumpVersionTxt = function (projectId, branchName, newVersion) {
         return __awaiter(this, void 0, void 0, function () {
             var versionTxt, buff, text;
@@ -249,6 +369,36 @@ var GitLabService = /** @class */ (function () {
             });
         });
     };
+    GitLabService.prototype.getTag = function (projectId, tagName) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.apiClient.getTag(projectId, tagName)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    GitLabService.prototype.createTag = function (projectId, tagName, sha) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.apiClient.createTag(projectId, tagName, sha)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    GitLabService.prototype.createRelease = function (projectId, release) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.apiClient.createRelease(projectId, release)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
     /**
      * We use the latest valid semver tag in master to determine what the current version
      * of a project is

package/lib/src/services/TeamCityService.js

@@ -0,0 +1,34 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TeamCityService = void 0;
+require("reflect-metadata");
+var inversify_1 = require("inversify");
+var types_1 = require("../types");
+var api_clients_1 = require("../api-clients");
+var TeamCityService = /** @class */ (function () {
+    function TeamCityService(apiClient) {
+        this.apiClient = apiClient;
+    }
+    TeamCityService.prototype.startBuild = function (buildId, branchName) {
+        return this.apiClient.startBuild(buildId, branchName);
+    };
+    TeamCityService = __decorate([
+        (0, inversify_1.injectable)(),
+        __param(0, (0, inversify_1.inject)(types_1.API_CLIENTS.TeamCityApiClient)),
+        __metadata("design:paramtypes", [api_clients_1.TeamCityApiClient])
+    ], TeamCityService);
+    return TeamCityService;
+}());
+exports.TeamCityService = TeamCityService;

package/lib/src/services/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./GitLabService"), exports);
+__exportStar(require("./TeamCityService"), exports);

package/lib/src/startup/AddMilestoneCommand.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -36,13 +47,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAddMilestoneCommand = void 0;
+exports.processMilestoneCommandOptions = exports.getAddMilestoneCommand = void 0;
 var utils_1 = require("../utils");
 function processOptions(options) {
-    var opts = {
-        milestone: options.milestone,
-        version: 'minor'
-    };
+    var opts = __assign(__assign({}, options), { version: 'minor' });
     if (options.projectIds)
         opts.projectIds = utils_1.ProjectIds.getProjectIds(options.projectIds);
     if (options.hotfix && options.major)
@@ -53,6 +61,7 @@ function processOptions(options) {
         opts.version = 'patch';
     return opts;
 }
+exports.processMilestoneCommandOptions = processOptions;
 var getAddMilestoneCommand = function (program, getAction) {
     return function addMilestoneCommand(name, description) {
         var _this = this;

package/lib/src/startup/SetupCommands.js

@@ -1,9 +1,46 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupCommands = void 0;
 var AddMilestoneCommand_1 = require("./AddMilestoneCommand");
 var GetAction_1 = require("./GetAction");
 function setupCommands(program, container) {
+    var _this = this;
     var getAction = (0, GetAction_1.getActionBuilder)(program, container);
     var addMilestoneCommand = (0, AddMilestoneCommand_1.getAddMilestoneCommand)(program, getAction);
     // All commands below accept the same options
@@ -12,7 +49,27 @@ function setupCommands(program, container) {
     addMilestoneCommand('create-branches', 'Create release branches for all projects that are part of a milestone');
     addMilestoneCommand('create-mrs', 'Create merge requests for all projects that are part of a milestone');
     addMilestoneCommand('create-notes', 'Builds descriptions for all projects that are part of a milestone');
-    addMilestoneCommand('release', 'Create releases for all projects that are part of a milestone');
+    addMilestoneCommand('tag-master', 'Tags master for all release MRs that are part of a milestone');
+    program.command('release')
+        .description('Create releases for all projects that are part of a milestone')
+        .requiredOption('-m, --milestone <milestone>')
+        .option('-p, --projectIds <projectIds...>')
+        .option('--hotfix')
+        .option('--major')
+        .option('--trigger-monorepo-build')
+        .action(function (opts) { return __awaiter(_this, void 0, void 0, function () {
+        var options;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    options = (0, AddMilestoneCommand_1.processMilestoneCommandOptions)(opts);
+                    return [4 /*yield*/, getAction('release')(options)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     program.command('bump-packages')
         .description('Bump clickview npm package versions in monorepo to their next version')
         .requiredOption('-b, --branchName <branchName>')
@@ -21,13 +78,43 @@ function setupCommands(program, container) {
     program.command('install-packages')
         .description('Install the latest clickview npm packages in all consuming projects that are part of a milestone')
         .option('-m, --milestone <milestone>')
-        .option('-b, --branchName <branchName>')
+        .option('-b, --monorepoBranchName <monorepoBranchName>')
         .option('-p, --projectIds <projectIds...>')
-        .action(getAction('install-packages'));
+        .action(function (opts) { return __awaiter(_this, void 0, void 0, function () {
+        var options;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    options = (0, AddMilestoneCommand_1.processMilestoneCommandOptions)(opts);
+                    return [4 /*yield*/, getAction('install-packages')(options)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     program.command('validate-mr')
         .description('Validate a merge request in a single project, ensuring it has a milestone and valid description')
         .option('-p, --projectId <projectId>')
         .option('-b, --branchName <branchName>')
         .action(getAction('validate-mr'));
+    program.command('start-consuming-project-builds')
+        .description('Trigger TeamCity builds in all consuming projects that are a part of a milestone')
+        .option('-m, --milestone <milestone>')
+        .option('--monorepoBranchName <monorepoBranchName>')
+        .option('-p, --projectIds <projectIds...>')
+        .action(function (opts) { return __awaiter(_this, void 0, void 0, function () {
+        var options;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    options = (0, AddMilestoneCommand_1.processMilestoneCommandOptions)(opts);
+                    return [4 /*yield*/, getAction('start-consuming-project-builds')(options)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
 }
 exports.setupCommands = setupCommands;

package/lib/src/tasks/CommitPackageVersionsTask.js

@@ -88,9 +88,20 @@ var CommitPackageVersionsTask = /** @class */ (function () {
         var commitFiles = [];
         for (var _i = 0, MONOREPO_PACKAGE_JSON_FILES_1 = MonorepoPackageJsonFiles_1.MONOREPO_PACKAGE_JSON_FILES; _i < MONOREPO_PACKAGE_JSON_FILES_1.length; _i++) {
             var filePath = MONOREPO_PACKAGE_JSON_FILES_1[_i];
+            var content = '';
+            try {
+                content = (0, fs_1.readFileSync)(filePath, { encoding: 'utf8' });
+            }
+            catch (_a) {
+                /**
+                 * If the file doesn't exist, ignore the error.
+                 * This will occur when TC Docker runs this script as it doesn't copy over @clickview/tooling
+                 */
+                continue;
+            }
             commitFiles.push({
                 filePath: filePath,
-                content: (0, fs_1.readFileSync)(filePath, { encoding: 'utf8' })
+                content: content
             });
         }
         return commitFiles;

package/lib/src/tasks/CreateMergeRequestTask.js

@@ -80,7 +80,7 @@ var CreateMergeRequestTask = /** @class */ (function () {
                             utils_1.Logger.logError("[".concat(project.title, "]: [").concat(branchName, "] does not exist"));
                             return [3 /*break*/, 6];
                         }
-                        return [4 /*yield*/, this.service.getMergeRequest(project.id, branchName)];
+                        return [4 /*yield*/, this.service.getMergeRequest(project.id, branchName, 'opened')];
                     case 4:
                         mergeRequest = _b.sent();
                         if (mergeRequest) {

package/lib/src/tasks/InstallPackagesTask.js

@@ -84,18 +84,28 @@ var InstallPackagesTask = /** @class */ (function () {
                 switch (_c.label) {
                     case 0:
                         utils_1.Logger.logTask('Installing npm packages');
-                        return [4 /*yield*/, this.getMilestone(_options)];
+                        if (!_options.monorepoBranchName && !_options.milestone) {
+                            utils_1.Logger.logError('Please provide either a milestone or branch name argument.');
+                            return [2 /*return*/, false];
+                        }
+                        milestone = _options.milestone;
+                        if (!!milestone) return [3 /*break*/, 2];
+                        utils_1.Logger.logInfo("Searching for a merge request in project \"monorepo\" with branch name \"".concat(_options.monorepoBranchName, "\"..."));
+                        return [4 /*yield*/, this.service.getMilestoneByBranchName(utils_1.ProjectIds.MONOREPO_PROJECT_ID, _options.monorepoBranchName)];
                     case 1:
                         milestone = _c.sent();
+                        _c.label = 2;
+                    case 2:
                         if (!milestone)
                             return [2 /*return*/, false];
+                        utils_1.Logger.logInfo("Found milestone \"".concat(milestone, "\". Proceeding to install packages in consuming projects..."));
                         options = {
                             version: _options.version,
                             projectIds: _options.projectIds,
                             milestone: milestone
                         };
                         return [4 /*yield*/, this.service.getProjects(options)];
-                    case 2:
+                    case 3:
                         projects = _c.sent();
                         monorepo = projects.find(function (p) { return p.id.toString() === utils_1.ProjectIds.MONOREPO_PROJECT_ID; });
                         consumingProjects = projects.filter(function (p) { return p.id.toString() !== utils_1.ProjectIds.MONOREPO_PROJECT_ID; });
@@ -108,14 +118,14 @@ var InstallPackagesTask = /** @class */ (function () {
                             return [2 /*return*/, false];
                         }
                         return [4 /*yield*/, this.service.getNextBranchInfo(monorepo.id, options.version)];
-                    case 3:
+                    case 4:
                         _a = _c.sent(), monorepoBranch = _a.branch, monorepoBranchName = _a.branchName;
                         if (!monorepoBranch) {
                             utils_1.Logger.logError("[".concat(monorepo.title, "]: [").concat(monorepoBranchName, "] branch does not exist"));
                             return [2 /*return*/, false];
                         }
                         return [4 /*yield*/, this.getPackageVersions(monorepoBranchName)];
-                    case 4:
+                    case 5:
                         versions = _c.sent();
                         utils_1.Logger.logMessage("Versions identified for ".concat(monorepoBranchName));
                         Object.keys(versions).forEach(function (key) {
@@ -123,26 +133,26 @@ var InstallPackagesTask = /** @class */ (function () {
                         });
                         utils_1.Logger.logMessage('\nInstalling packages:\n');
                         _i = 0, consumingProjects_1 = consumingProjects;
-                        _c.label = 5;
-                    case 5:
-                        if (!(_i < consumingProjects_1.length)) return [3 /*break*/, 10];
+                        _c.label = 6;
+                    case 6:
+                        if (!(_i < consumingProjects_1.length)) return [3 /*break*/, 11];
                         project = consumingProjects_1[_i];
                         return [4 /*yield*/, this.service.getNextBranchInfo(project.id, options.version)];
-                    case 6:
+                    case 7:
                         _b = _c.sent(), branch = _b.branch, branchName = _b.branchName;
                         if (!branch) {
                             utils_1.Logger.logError("[".concat(project.title, "]: [").concat(branchName, "] does not exist"));
-                            return [3 /*break*/, 9];
+                            return [3 /*break*/, 10];
                         }
                         return [4 /*yield*/, this.updateAndSavePackageFiles(project, options.milestone, branchName, versions)];
-                    case 7:
+                    case 8:
                         hasUpdates = _c.sent();
                         /**
                          * If there are no changes to the versions, we're done here
                          */
                         if (!hasUpdates) {
                             utils_1.Logger.logWarning("[".concat(project.title, "]: [").concat(branchName, "] does not require any updates"));
-                            return [3 /*break*/, 9];
+                            return [3 /*break*/, 10];
                         }
                         /**
                          * Run npm i to update our package log file
@@ -154,48 +164,17 @@ var InstallPackagesTask = /** @class */ (function () {
                          * Commit our updated package.json and package-lock.json
                          */
                         return [4 /*yield*/, this.commitUpdatedFiles(project, options.milestone, branchName)];
-                    case 8:
+                    case 9:
                         /**
                          * Commit our updated package.json and package-lock.json
                          */
                         _c.sent();
                         utils_1.Logger.logMessage("[".concat(project.title, "]: File changes committed"));
-                        _c.label = 9;
-                    case 9:
+                        _c.label = 10;
+                    case 10:
                         _i++;
-                        return [3 /*break*/, 5];
-                    case 10: return [2 /*return*/, true];
-                }
-            });
-        });
-    };
-    InstallPackagesTask.prototype.getMilestone = function (options) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function () {
-            var mergeRequest;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        if (options.milestone)
-                            return [2 /*return*/, options.milestone];
-                        if (!options.branchName) {
-                            utils_1.Logger.logError('Please provide either a milestone or branch name argument.');
-                            return [2 /*return*/, ''];
-                        }
-                        utils_1.Logger.logInfo("Searching for a merge request in project \"monorepo\" with branch name \"".concat(options.branchName, "\"..."));
-                        return [4 /*yield*/, this.service.getMergeRequest(utils_1.ProjectIds.MONOREPO_PROJECT_ID, options.branchName)];
-                    case 1:
-                        mergeRequest = _c.sent();
-                        if (!mergeRequest) {
-                            utils_1.Logger.logError("No merge request in project \"monorepo\" with branch name \"".concat(options.branchName, "\" could be found."));
-                            return [2 /*return*/, ''];
-                        }
-                        if (!mergeRequest.milestone) {
-                            utils_1.Logger.logError("No milestone could be found on merge request \"".concat(mergeRequest.title, "\". Please attach a milestone then try again: ").concat(mergeRequest.url));
-                            return [2 /*return*/, ''];
-                        }
-                        utils_1.Logger.logInfo("Found milestone \"".concat(mergeRequest.milestone.name, "\". Proceeding to install packages in consuming projects..."));
-                        return [2 /*return*/, (_b = (_a = mergeRequest.milestone) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : ''];
+                        return [3 /*break*/, 6];
+                    case 11: return [2 /*return*/, true];
                 }
             });
         });
@@ -246,6 +225,8 @@ var InstallPackagesTask = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         rootDir = ROOT_DIRECTORIES[project.id];
+                        if (!rootDir)
+                            return [2 /*return*/, false];
                         return [4 /*yield*/, this.getFileText(project.id, branchName, "".concat(rootDir, "/package.json"))];
                     case 1:
                         packageJson = _a.sent();