UNPKG

@broadcom/endevor-for-zowe-cli

Version:

Endevor Plug-in for Zowe CLI

150 lines 18.7 kB
"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()); }); }; Object.defineProperty(exports, "__esModule", { value: true }); exports.EndevorSyncActionConflict = void 0; const RetrieveElement_1 = require("../../elements/RetrieveElement"); const EndevorUtils_1 = require("../../utils/EndevorUtils"); const CacheUtils_1 = require("../CacheUtils"); const IEndevorWorkspaceEnums_1 = require("../doc/IEndevorWorkspaceEnums"); const MergeUtils_1 = require("../MergeUtils"); const EndevorSyncAction_1 = require("./EndevorSyncAction"); const fs = require("fs"); const EndevorSyncActionUtils_1 = require("./EndevorSyncActionUtils"); const HandlerUtils_1 = require("../../../cli/utils/HandlerUtils"); class EndevorSyncActionConflict extends EndevorSyncAction_1.EndevorSyncAction { constructor(element, location, nodeEncoding, endOfLine, workspaceDir, charset) { super(element, location); this.actionType = IEndevorWorkspaceEnums_1.EndevorActionType.CONFLICT; this.actionName = "Conflict Resolution"; this.actionColorANSI = HandlerUtils_1.HandlerUtils.ANSI_COLOR_GREEN; this.nodeEncoding = nodeEncoding; this.endOfLine = endOfLine; this.workspaceDir = workspaceDir; this.charset = charset; } static composeActionsSummaryMsg(state, actions) { EndevorSyncActionUtils_1.EndevorSyncActionUtils.composeActionsSummaryMsgForMerges(state, actions, "element successfully retrieved with unknown merge result", "elements successfully retrieved with unknown merge result", "element successfully auto-merged", "elements successfully auto-merged", "element require manual conflict resolution", "elements require manual conflict resolution", "element retrieve in preparation for conflict resolution failed", "element retrieves in preparation for conflict resolution failed", "element conflict resolution not started", "element conflict resolutions not started"); } performAction(session, instance, ccid, comment, optSignout, optOverrideSignout) { return __awaiter(this, void 0, void 0, function* () { if (this.element.localStatus == IEndevorWorkspaceEnums_1.ElementVersionStatus.CONFLICT_RESOLUTION) { this.status = IEndevorWorkspaceEnums_1.EndevorActionStatus.NOT_RUN; this.statusDetailed = IEndevorWorkspaceEnums_1.EndevorActionStatusDetailed.NOT_RUN_MANUAL_MERGE_IN_PROGRESS; return false; } const retrieveOptions = { path: "log", return: "fir", search: "yes", ccid: ccid, comment: comment, signout: optSignout ? "yes" : "no", oveSign: optOverrideSignout ? "yes" : "no" }; try { const restResponse = yield RetrieveElement_1.RetrieveElement.retrieveElement(session, instance, this.location, retrieveOptions, this.element.fileCharset ? this.element.fileCharset : this.charset, this.element.codePage); if (restResponse.isResponseJSON) { let notFound = false; let stcShortage = false; let oveSignNeeded = false; EndevorUtils_1.EndevorUtils.removeMessageTimestamps(restResponse.body.messages).forEach((message) => { if (message.startsWith("API0000W ELEMENT NOT FOUND")) { notFound = true; } if (message.startsWith("EWS1111E")) { stcShortage = true; } if (message.startsWith("C1G0167E")) { oveSignNeeded = true; } this.errorMessages.push(message); }); if (notFound) { this.status = IEndevorWorkspaceEnums_1.EndevorActionStatus.FAILURE; this.statusDetailed = IEndevorWorkspaceEnums_1.EndevorActionStatusDetailed.FAILURE_NOT_FOUND; return false; } if (stcShortage) { this.status = IEndevorWorkspaceEnums_1.EndevorActionStatus.FAILURE; this.statusDetailed = IEndevorWorkspaceEnums_1.EndevorActionStatusDetailed.FAILURE_STC_SHORTAGE; return false; } if (oveSignNeeded) { this.status = IEndevorWorkspaceEnums_1.EndevorActionStatus.FAILURE; this.statusDetailed = IEndevorWorkspaceEnums_1.EndevorActionStatusDetailed.FAILURE_SIGNOUT; return false; } if (restResponse.body.data[0] == null) { this.status = IEndevorWorkspaceEnums_1.EndevorActionStatus.FAILURE; this.statusDetailed = IEndevorWorkspaceEnums_1.EndevorActionStatusDetailed.FAILURE; this.errorMessages = restResponse.body.messages; return false; } } if (restResponse.body.data[0] == null) { this.status = IEndevorWorkspaceEnums_1.EndevorActionStatus.FAILURE; this.statusDetailed = IEndevorWorkspaceEnums_1.EndevorActionStatusDetailed.FAILURE; return false; } const remoteContent = restResponse.body.data[0]; let fingerprint = restResponse.headers["fingerprint"]; if (fingerprint != null && fingerprint.length > 16) { fingerprint = fingerprint.slice(fingerprint.length - 16); } if (fingerprint != this.element.mergeElmVersion.fingerprint) { this.status = IEndevorWorkspaceEnums_1.EndevorActionStatus.FAILURE; this.statusDetailed = IEndevorWorkspaceEnums_1.EndevorActionStatusDetailed.FAILURE_FINGERPRINT_MISMATCH; if (fingerprint == null || fingerprint.length == 0) { this.errorMessages.push("Retrieve Element didn't return a fingerprint, sync cannot proceed. Contact you Endevor web services administrator."); } return false; } let conflict = false; const remoteDescription = `(vvll ${this.element.mergeElmVersion.vvll} ccid '${this.element.mergeElmVersion.ccid}' created by ${this.element.mergeElmVersion.userId} on ${this.element.mergeElmVersion.date.substring(0, 10)} at ${this.element.mergeElmVersion.date.substring(11, 19)})`; if (this.element.localStatus == IEndevorWorkspaceEnums_1.ElementVersionStatus.NEW) { const localDescription = `(untracked)`; conflict = MergeUtils_1.MergeUtils.perform2WayMerge(fs.readFileSync(this.element.localFile), remoteContent, this.element.localFile, localDescription, remoteDescription, this.nodeEncoding, this.endOfLine); } else { let localDescription = `(based on unknown vvll)`; if (this.element.localElmVersion.vvll != "") { localDescription = `(based on vvll ${this.element.localElmVersion.vvll} ccid '${this.element.localElmVersion.ccid}' created by ${this.element.localElmVersion.userId} on ${this.element.localElmVersion.date.substring(0, 10)} at ${this.element.localElmVersion.date.substring(11, 19)})`; } conflict = MergeUtils_1.MergeUtils.perform3WayMerge(CacheUtils_1.CacheUtils.readSha1File(this.element.localFileVersion), fs.readFileSync(this.element.localFile), remoteContent, this.element.localFile, localDescription, remoteDescription, this.nodeEncoding, this.endOfLine); } this.status = IEndevorWorkspaceEnums_1.EndevorActionStatus.SUCCESS; CacheUtils_1.CacheUtils.removeSha1File(this.element.localFileVersion); yield CacheUtils_1.CacheUtils.addSha1FileFromBuffer(this.workspaceDir, this.location.environment, this.location.stageNumber, this.location.system, this.location.subsystem, this.element.localFileVersion, remoteContent); if (this.element.localFileVersion.sha1File == "") { this.element.localFileVersion.sha1File = "was empty"; } this.element.localElmVersion = this.element.mergeElmVersion; if (conflict) { this.statusDetailed = IEndevorWorkspaceEnums_1.EndevorActionStatusDetailed.SUCCESS_MANUAL_MERGE_STARTED; this.element.localStatus = IEndevorWorkspaceEnums_1.ElementVersionStatus.CONFLICT_RESOLUTION; } else { this.statusDetailed = IEndevorWorkspaceEnums_1.EndevorActionStatusDetailed.SUCCESS_AUTOMERGED; yield MergeUtils_1.MergeUtils.markElementAsMerged(this.element); } return true; } catch (err) { this.status = IEndevorWorkspaceEnums_1.EndevorActionStatus.FAILURE; this.statusDetailed = IEndevorWorkspaceEnums_1.EndevorActionStatusDetailed.FAILURE; this.errorMessages.push(`${err}`); return false; } }); } } exports.EndevorSyncActionConflict = EndevorSyncActionConflict; //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"EndevorSyncActionConflict.js","sourceRoot":"","sources":["../../../../src/api/workspace/actions/EndevorSyncActionConflict.ts"],"names":[],"mappings":"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"}