@clickview/ship-it 0.0.29-dev.0 → 0.0.31

package/lib/src/tasks/TagMasterTask.js

@@ -54,44 +54,47 @@ var inversify_1 = require("inversify");
 var Logger_1 = require("../utils/Logger");
 var types_1 = require("../types");
 var services_1 = require("../services");
+var util_1 = require("util");
 var TagMasterTask = /** @class */ (function () {
-    function TagMasterTask(service) {
+    function TagMasterTask(service, slackService) {
         this.service = service;
+        this.slackService = slackService;
     }
     TagMasterTask.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var projects, cont, _i, projects_1, project, _a, branchName, nextVersion, mergeRequest, existingTag;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var projects, cont, logMessageSlack, _i, projects_1, project, _a, branchName, nextVersion, mergeRequest, existingTag, _b, threadLabel, statusCleanMessage;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        Logger_1.Logger.logTask('Tagging master');
+                        Logger_1.Logger.logTask('Tagging master and merging into dev');
                         return [4 /*yield*/, this.service.getProjects(options)];
                     case 1:
-                        projects = _b.sent();
+                        projects = _c.sent();
                         cont = true;
+                        logMessageSlack = '';
                         _i = 0, projects_1 = projects;
-                        _b.label = 2;
+                        _c.label = 2;
                     case 2:
-                        if (!(_i < projects_1.length)) return [3 /*break*/, 8];
+                        if (!(_i < projects_1.length)) return [3 /*break*/, 9];
                         project = projects_1[_i];
                         return [4 /*yield*/, this.service.getNextBranchInfo(project.id, options.version)];
                     case 3:
-                        _a = _b.sent(), branchName = _a.branchName, nextVersion = _a.nextVersion;
+                        _a = _c.sent(), branchName = _a.branchName, nextVersion = _a.nextVersion;
                         return [4 /*yield*/, this.service.getMergeRequest(project.id, branchName)];
                     case 4:
-                        mergeRequest = _b.sent();
+                        mergeRequest = _c.sent();
                         if (!(mergeRequest === null || mergeRequest === void 0 ? void 0 : mergeRequest.mergeCommit)) {
                             Logger_1.Logger.logError("[".concat(project.title, "]: [").concat(branchName, "] has not been merged"));
                             cont = false;
-                            return [3 /*break*/, 7];
+                            return [3 /*break*/, 8];
                         }
                         return [4 /*yield*/, this.service.getTag(project.id, nextVersion)];
                     case 5:
-                        existingTag = _b.sent();
+                        existingTag = _c.sent();
                         if (existingTag) {
                             Logger_1.Logger.logWarning("[".concat(project.title, "]: [").concat(existingTag.name, "] tag already exists"));
                             cont = false;
-                            return [3 /*break*/, 7];
+                            return [3 /*break*/, 8];
                         }
                         return [4 /*yield*/, this.service.createRelease(project.id, {
                                 name: nextVersion,
@@ -100,13 +103,73 @@ var TagMasterTask = /** @class */ (function () {
                                 ref: mergeRequest.mergeCommit
                             })];
                     case 6:
-                        _b.sent();
+                        _c.sent();
                         Logger_1.Logger.logWarning("[".concat(project.title, "]: [").concat(nextVersion, "] was created"));
-                        _b.label = 7;
+                        _b = logMessageSlack;
+                        return [4 /*yield*/, this.mergeMasterToDev(project, options.milestone)];
                     case 7:
+                        logMessageSlack = _b + _c.sent();
+                        _c.label = 8;
+                    case 8:
                         _i++;
                         return [3 /*break*/, 2];
-                    case 8: return [2 /*return*/, cont];
+                    case 9:
+                        if (!(options.slackNotifier && logMessageSlack !== '')) return [3 /*break*/, 11];
+                        threadLabel = "".concat(options.milestone, " merge conflicts found when merging master into dev.");
+                        statusCleanMessage = 'No projects require manual merging.';
+                        return [4 /*yield*/, this.slackService.sendSlackStatusMessage({
+                                emailList: [],
+                                threadLabel: threadLabel,
+                                statusMessage: logMessageSlack,
+                                statusCleanMessage: statusCleanMessage
+                            })];
+                    case 10:
+                        _c.sent();
+                        _c.label = 11;
+                    case 11: return [2 /*return*/, cont];
+                }
+            });
+        });
+    };
+    TagMasterTask.prototype.mergeMasterToDev = function (project, milestone) {
+        return __awaiter(this, void 0, void 0, function () {
+            var logMessageSlack, delay, mergeRequest, updatedMergeRequest, acceptMr;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        logMessageSlack = '';
+                        delay = (0, util_1.promisify)(setTimeout);
+                        return [4 /*yield*/, this.service.createMergeRequest(project.id, 'master', 'dev', "Merge ".concat(milestone, " master into dev"), 'Merging master into dev', milestone)];
+                    case 1:
+                        mergeRequest = _a.sent();
+                        // Add delay to give time before we merge created MR
+                        return [4 /*yield*/, delay(5000)];
+                    case 2:
+                        // Add delay to give time before we merge created MR
+                        _a.sent();
+                        return [4 /*yield*/, this.service.getMergeRequestById(project.id, mergeRequest.iid)];
+                    case 3:
+                        updatedMergeRequest = _a.sent();
+                        if (!updatedMergeRequest) {
+                            Logger_1.Logger.logMessage("Could not find merge request!");
+                            return [2 /*return*/, logMessageSlack];
+                        }
+                        if (updatedMergeRequest.hasConflicts) {
+                            Logger_1.Logger.logError("[".concat(project.title, "]: Requires manual merging.. Merge conflicts found when trying to merge master into dev."));
+                            logMessageSlack += "[".concat(project.title, "]: Requires manual merging. Merge conflicts found when trying to merge master into dev.\n");
+                            logMessageSlack += "  - ".concat(updatedMergeRequest.url, "\n");
+                            return [2 /*return*/, logMessageSlack];
+                        }
+                        return [4 /*yield*/, this.service.AcceptMergeRequest(project.id, mergeRequest.iid)];
+                    case 4:
+                        acceptMr = _a.sent();
+                        if (acceptMr.status === 'merged') {
+                            Logger_1.Logger.logSuccess("Successfully merged master into dev!");
+                        }
+                        else {
+                            Logger_1.Logger.logError("Could not merge master into dev.");
+                        }
+                        return [2 /*return*/, logMessageSlack];
                 }
             });
         });
@@ -114,7 +177,9 @@ var TagMasterTask = /** @class */ (function () {
     TagMasterTask = __decorate([
         (0, inversify_1.injectable)(),
         __param(0, (0, inversify_1.inject)(types_1.SERVICES.GitLabService)),
-        __metadata("design:paramtypes", [services_1.GitLabService])
+        __param(1, (0, inversify_1.inject)(types_1.SERVICES.SlackService)),
+        __metadata("design:paramtypes", [services_1.GitLabService,
+            services_1.SlackService])
     ], TagMasterTask);
     return TagMasterTask;
 }());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clickview/ship-it",
-  "version": "0.0.29-dev.0",
+  "version": "0.0.31",
   "description": "Release Manager",
   "main": "./lib/index.js",
   "bin": {