@clickview/ship-it 0.0.28 → 0.0.30

package/config.json

@@ -1,6 +1,6 @@
 {
   "gitLab": {
-    "accessToken": "glpat-YK8GmVgXRRf3zBe3JQze",
+    "accessToken": "glpat-jSuUhgadw3YgSZGvB4mb",
     "url": "https://gitlab.cvinternal.net"
   },
   "teamCity": {

package/lib/config.json

@@ -1,6 +1,6 @@
 {
     "gitLab": {
-        "accessToken": "glpat-YK8GmVgXRRf3zBe3JQze",
+        "accessToken": "glpat-jSuUhgadw3YgSZGvB4mb",
         "url": "https://gitlab.cvinternal.net"
     },
     "teamCity": {

package/lib/src/api-clients/git-lab/GitLabApiClient.js

@@ -67,15 +67,18 @@ var GitLabApiClient = /** @class */ (function () {
     }
     GitLabApiClient.prototype.getMergeRequests = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var milestone, projectIds, mergeRequests;
+            var milestone, projectIds, createdAfter, mergeRequests;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         milestone = options.milestone, projectIds = options.projectIds;
                         if (!milestone && !(projectIds === null || projectIds === void 0 ? void 0 : projectIds.length))
                             throw new errors_1.ShipItError('Must specify one of the following: Milestone or ProjectIds');
+                        createdAfter = new Date();
+                        createdAfter.setMonth(createdAfter.getMonth() - 3);
                         return [4 /*yield*/, this.client.MergeRequests.all({
                                 milestone: milestone,
+                                createdAfter: createdAfter.toISOString(),
                                 scope: 'all'
                             })];
                     case 1:
@@ -312,6 +315,19 @@ var GitLabApiClient = /** @class */ (function () {
             });
         });
     };
+    GitLabApiClient.prototype.AcceptMergeRequest = function (projectId, mergerequestIId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var mergeRequest;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.client.MergeRequests.accept(projectId, mergerequestIId)];
+                    case 1:
+                        mergeRequest = _a.sent();
+                        return [2 /*return*/, GitLabMapper_1.GitLabMapper.mergeRequest(mergeRequest)];
+                }
+            });
+        });
+    };
     GitLabApiClient.prototype.getFile = function (projectId, filePath, branchName) {
         return __awaiter(this, void 0, void 0, function () {
             var file, _a;

package/lib/src/services/GitLabService.js

@@ -264,7 +264,7 @@ var GitLabService = /** @class */ (function () {
             throw new errors_1.ShipItError("MergeRequest Id must be a number: ".concat(mergeRequestId));
         return this.apiClient.getMergeRequestById(projectId, +mergeRequestId);
     };
-    GitLabService.prototype.createMergeRequest = function (projectId, branchName, description, milestoneName) {
+    GitLabService.prototype.createMergeRequest = function (projectId, branchName, targetBranch, title, description, milestoneName) {
         return __awaiter(this, void 0, void 0, function () {
             var milestone;
             return __generator(this, function (_a) {
@@ -272,11 +272,14 @@ var GitLabService = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.getMilestone(milestoneName, projectId)];
                     case 1:
                         milestone = _a.sent();
-                        return [2 /*return*/, this.apiClient.createMergeRequest(projectId, branchName, 'master', branchName, description, milestone)];
+                        return [2 /*return*/, this.apiClient.createMergeRequest(projectId, branchName, targetBranch, title, description, milestone)];
                 }
             });
         });
     };
+    GitLabService.prototype.AcceptMergeRequest = function (projectId, mergerequestIId) {
+        return this.apiClient.AcceptMergeRequest(projectId, mergerequestIId);
+    };
     GitLabService.prototype.getMilestone = function (milestoneName, projectId) {
         return this.apiClient.getMilestone(milestoneName, projectId);
     };

package/lib/src/startup/AddMilestoneCommand.js

@@ -75,6 +75,7 @@ var getAddMilestoneCommand = function (program, getAction) {
             .requiredOption('-m, --milestone <milestone>')
             .option('-p, --projectIds <projectIds...>')
             .option('-o, --omit <omittedProjectIds...>')
+            .option('--slack-notifier')
             .option('--hotfix')
             .option('--major')
             .action(function (opts) { return __awaiter(_this, void 0, void 0, function () {

package/lib/src/tasks/CreateMergeRequestTask.js

@@ -94,7 +94,7 @@ var CreateMergeRequestTask = /** @class */ (function () {
                         description = projectConfig.monorepo.enabled ?
                             utils_1.Descriptions.getMonorepoCombinedDescription(project.mergeRequests) :
                             utils_1.Descriptions.getCombinedDescription(project.mergeRequests);
-                        return [4 /*yield*/, this.service.createMergeRequest(project.id, branchName, description, options.milestone)];
+                        return [4 /*yield*/, this.service.createMergeRequest(project.id, branchName, 'master', branchName, description, options.milestone)];
                     case 6:
                         mergeRequest = _b.sent();
                         utils_1.Logger.logMessage("[".concat(project.title, "]: MR created"));

package/lib/src/tasks/MergeMasterToDevTask.js

@@ -0,0 +1,147 @@
+"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); }
+};
+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.MergeMasterToDevTask = void 0;
+require("reflect-metadata");
+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 MergeMasterToDevTask = /** @class */ (function () {
+    function MergeMasterToDevTask(service, slackService) {
+        this.service = service;
+        this.slackService = slackService;
+    }
+    MergeMasterToDevTask.prototype.run = function (options) {
+        return __awaiter(this, void 0, void 0, function () {
+            var projects, delay, logMessageSlack, _i, projects_1, project, _a, branchName, nextVersion, mergeRequest, updatedMergeRequest, acceptMr, threadLabel, statusCleanMessage;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        Logger_1.Logger.logTask('Merging Master Into Dev');
+                        return [4 /*yield*/, this.service.getProjects(options)];
+                    case 1:
+                        projects = _b.sent();
+                        Logger_1.Logger.logMessage(projects.length);
+                        delay = (0, util_1.promisify)(setTimeout);
+                        logMessageSlack = '';
+                        _i = 0, projects_1 = projects;
+                        _b.label = 2;
+                    case 2:
+                        if (!(_i < projects_1.length)) return [3 /*break*/, 12];
+                        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;
+                        Logger_1.Logger.logMessage(branchName);
+                        return [4 /*yield*/, this.service.createMergeRequest(project.id, 'varun-ship-it', 'varun_qa_test', 'Merge master into dev testing', 'Merging master into dev', options.milestone)];
+                    case 4:
+                        mergeRequest = _b.sent();
+                        Logger_1.Logger.logMessage(mergeRequest.url);
+                        Logger_1.Logger.logMessage(project.title);
+                        Logger_1.Logger.logMessage(mergeRequest.hasConflicts);
+                        Logger_1.Logger.logMessage(mergeRequest.status);
+                        return [4 /*yield*/, delay(5000)];
+                    case 5:
+                        _b.sent();
+                        return [4 /*yield*/, this.service.getMergeRequestById(project.id, mergeRequest.iid)];
+                    case 6:
+                        updatedMergeRequest = _b.sent();
+                        if (!updatedMergeRequest) return [3 /*break*/, 10];
+                        Logger_1.Logger.logMessage(updatedMergeRequest.hasConflicts);
+                        if (!updatedMergeRequest.hasConflicts) return [3 /*break*/, 7];
+                        Logger_1.Logger.logMessage("Sack, send slack!");
+                        Logger_1.Logger.logError("[".concat(project.title, "]: Requires cherrypicking. Merge conflicts found when trying to merge master into dev."));
+                        logMessageSlack += "[".concat(project.title, "]: Requires cherrypicking. Requires cherrypicking. Merge conflicts found when trying to merge master into dev.\n");
+                        logMessageSlack += "  - ".concat(updatedMergeRequest.url, "\n");
+                        return [3 /*break*/, 9];
+                    case 7:
+                        Logger_1.Logger.logMessage("Mergeing MR!");
+                        return [4 /*yield*/, this.service.AcceptMergeRequest(project.id, mergeRequest.iid)];
+                    case 8:
+                        acceptMr = _b.sent();
+                        Logger_1.Logger.logMessage(acceptMr.status);
+                        _b.label = 9;
+                    case 9: return [3 /*break*/, 11];
+                    case 10:
+                        Logger_1.Logger.logMessage("Could not find merge request!");
+                        _b.label = 11;
+                    case 11:
+                        _i++;
+                        return [3 /*break*/, 2];
+                    case 12:
+                        if (!(options.slackNotifier && logMessageSlack !== '')) return [3 /*break*/, 14];
+                        threadLabel = "".concat(options.milestone, " merge conflicts found when merging master into dev.");
+                        statusCleanMessage = 'No projects require cherrypicking';
+                        return [4 /*yield*/, this.slackService.sendSlackStatusMessage({
+                                emailList: [],
+                                threadLabel: threadLabel,
+                                statusMessage: logMessageSlack,
+                                statusCleanMessage: statusCleanMessage
+                            })];
+                    case 13:
+                        _b.sent();
+                        _b.label = 14;
+                    case 14: return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    MergeMasterToDevTask = __decorate([
+        (0, inversify_1.injectable)(),
+        __param(0, (0, inversify_1.inject)(types_1.SERVICES.GitLabService)),
+        __param(1, (0, inversify_1.inject)(types_1.SERVICES.SlackService)),
+        __metadata("design:paramtypes", [services_1.GitLabService,
+            services_1.SlackService])
+    ], MergeMasterToDevTask);
+    return MergeMasterToDevTask;
+}());
+exports.MergeMasterToDevTask = MergeMasterToDevTask;

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,72 @@ 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, logMessageSlack)];
                     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, logMessageSlack) {
+        return __awaiter(this, void 0, void 0, function () {
+            var delay, mergeRequest, updatedMergeRequest, acceptMr;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        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 +176,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.28",
+  "version": "0.0.30",
   "description": "Release Manager",
   "main": "./lib/index.js",
   "bin": {