Merge pull request MicrosoftDocs#1826 from Fogolan/tools

Tools

Author: kenwith

tools/office-cmdlet-updater/config/default.json

@@ -3,10 +3,18 @@
 		"docs": [
 			{
 				"name": "teams",
-				"path": "..\\..\\teams\\teams-ps\\teams"
+				"path": "..\\..\\teams\\teams-ps\\teams",
+				"metaTags": []
+			},
+			{
+				"name": "skype",
+				"path": "..\\..\\skype\\skype-ps\\skype",
+				"metaTags": ["Skype for Business Online"]
 			}
 		],
-		"ignoreFiles": []
+		"ignoreFiles": [
+			"..\\..\\teams\\teams-ps\\teams\\teams.md"
+		]
 	},
 	"sendgrid": {
 		"sendMailNotification": false,

tools/office-cmdlet-updater/constants/commands.js

@@ -2,7 +2,12 @@ module.exports = {
 	GET_TEAM: 'Get-Team',
 	INSTALL_MICROSOFT_TEAM: 'Install-Module MicrosoftTeams -SkipPublisherCheck',
 	CONNECT_MICROSOFT_TEAM: 'Connect-MicrosoftTeams',
-	INSTALL_PLATYPS: 'Install-Module -Name platyPS -Scope CurrentUser',
+	INSTALL_PLATYPS: 'Install-Module -Name platyPS -SkipPublisherCheck -Scope CurrentUser',
 	IMPORT_PLATYPS: 'Import-Module platyPS',
-	UPDATE_MARKDOWN: 'Update-MarkdownHelp -Path "{}" -LogPath "{}"'
+	UPDATE_MARKDOWN: 'Update-MarkdownHelp -Path "{}" -LogPath "{}"',
+	SKYPE_SET_POLICY: 'Set-ExecutionPolicy RemoteSigned ',
+	SKYPE_INSTALL_MODULE: 'Import-Module "C:\\\\Program Files\\\\Common Files\\\\Skype for Business Online\\\\Modules\\\\SkypeOnlineConnector\\\\SkypeOnlineConnector.psd1" -Force',
+	SKYPE_GET_CRED: '$cred = Get-Credential',
+	SKYPE_CREATE_SESSION: '$session = New-CsOnlineSession -Credential $cred -Verbose',
+	SKYPE_IMPORT_SESSION: 'Import-PSSession -Session $session'
 };

tools/office-cmdlet-updater/db/index.js

@@ -4,7 +4,11 @@ const Memory = require('lowdb/adapters/Memory');
 module.exports = () => {
 	const db = low(new Memory());
 
-	db.defaults({ logs: [], errors: [] }).write();
+	db.defaults({
+		logs: new Map(),
+		errors: new Map(),
+		tempFolders: new Map()
+	}).write();
 
 	return db;
 };

tools/office-cmdlet-updater/services/log.parse.service.js

@@ -39,16 +39,19 @@ class LogParseService {
 	}
 
 	parseAll() {
-		const logs = this.logStoreService.getAllLogs();
-		const logObjs = [];
+		const parseLogs = []
+		const logs = [...this.logStoreService.getAllLogs().values()].reduce(
+			(acc, cur) => [...acc, ...cur],
+			[]
+		);
 
 		logs.forEach((log) => {
 			const logObj = this.parse(log);
 
-			logObjs.push(logObj);
+			parseLogs.push(logObj);
 		});
 
-		const msg = this.generateMailText(logObjs);
+		const msg = this.generateMailText(parseLogs);
 
 		if (msg) {
 			const outputText = msg.replace(new RegExp('<br>', 'g'), '\n');

tools/office-cmdlet-updater/services/log.store.service.js

@@ -7,12 +7,16 @@ class LogStoreService {
 		this.db = db;
 	}
 
-	addLog(log) {
-		this._add('logs', log);
+	addLog(log, name) {
+		this._addMap('logs', log, name);
 	}
 
-	addError(err) {
-		this._add('errors', err);
+	addError(err, name) {
+		this._addMap('errors', err, name);
+	}
+
+	addTempFolder(name, tempFolderName) {
+		this._addMap('tempFolders', name, tempFolderName);
 	}
 
 	getAllLogs() {
@@ -23,27 +27,45 @@ class LogStoreService {
 		return this._getAll('errors');
 	}
 
-	_add(collection, obj) {
-		this.db
-			.get(collection)
-			.push(obj)
-			.write();
+	getAllTempFolders() {
+		return this._getAll('tempFolders');
+	}
+
+	_addMap(collection, obj, name) {
+		const map = this.db.get(collection).value();
+
+		if (!map.has(name)) {
+			map.set(name, []);
+		}
+
+		const arr = [...map.get(name), obj];
+
+		map.set(name, arr);
+
+		this.db.set(collection, map).write();
 	}
 
 	_getAll(collection) {
 		return this.db.get(collection).value();
 	}
 
 	saveInFs() {
-		const fileName = `${this._getLogName()}.log`;
-		const filePath = path.join('.local', 'logs', fileName);
+		const logs = this.getAllLogs();
+
+		for (const key of logs.keys()) {
+			const fileName = `${this._getLogName()}.log`;
+			const filePath = path.join('.local', 'logs', key, fileName);
+
+			fs.ensureFileSync(filePath);
 
-		fs.ensureFileSync(filePath);
+			const logs = this.getAllLogs().get(key);
+			const logsContent = logs ? logs.join('\n') : '';
 
-		const logs = this.getAllLogs().join('\n') || '';
-		const errors = this.getAllErrors().join('\n') || '';
+			const errors = this.getAllErrors().get(key);
+			const errorContent = errors ? errors.join('\n') : '';
 
-		return fs.writeFile(filePath, logs + errors);
+			fs.writeFile(filePath, logsContent + errorContent);
+		}
 	}
 
 	_getLogName() {

tools/office-cmdlet-updater/services/markdown.service.js

@@ -23,48 +23,83 @@ class MarkdownService {
 
 		this.queue = new Queue(this.processQueue);
 		this.queue.on('empty', this.queueEmptyHandler);
-
-		this.tempFolderPath = null;
 	}
 
 	async updateMd(doc) {
-		const { path } = doc;
-
-		this.tempFolderPath = `${path}\\${shortId()}`;
-
-		await this.addMdFilesInQueue(path);
+		return this.addMdFilesInQueue(doc);
 	}
 
-	async addMdFilesInQueue(folderPath) {
+	async addMdFilesInQueue(doc) {
 		const mdExt = '.md';
 		const { ignoreFiles } = this.config.get('platyPS');
 		const ignoreAbsolutePathsArr = ignoreFiles.map((f) => path.resolve(f));
+		const metaTagRegex = /(?<=applicable: ).+/gmu;
 
 		const isFileIgnore = (fileName) => {
 			const absoluteFilePath = path.resolve(fileName);
 
 			return ignoreAbsolutePathsArr.includes(absoluteFilePath);
 		};
 
-		const mdFiles = (await fs.readdir(folderPath))
-			.map((f) => path.resolve(folderPath, f))
-			.filter((fn) => fn.endsWith(mdExt) && !isFileIgnore(fn));
+		const isContainTag = (filePath) => {
+			if (!doc.metaTags.length) {
+				return true;
+			}
+
+			const groups = fs
+				.readFileSync(filePath, 'utf8')
+				.toString()
+				.match(metaTagRegex);
+
+			if (!groups) {
+				return false;
+			}
+
+			for (const metaTag of doc.metaTags) {
+				if (groups[0].indexOf(metaTag) !== -1) {
+					return true;
+				}
+			}
+
+			return false;
+		};
+
+		const mdFiles = (await fs.readdir(doc.path))
+			.map((f) => path.resolve(doc.path, f))
+			.filter(
+				(fn) =>
+					fn.endsWith(mdExt) && !isFileIgnore(fn) && isContainTag(fn)
+			);
 
 		mdFiles.forEach((file) => {
 			this.queue
-				.push(file)
+				.push({ file, doc })
 				.on('failed', this.queueFailedHandler)
 				.on('finish', this.queueFinishHandler);
 		});
 	}
 
-	async processQueue(input, cb) {
+	async processQueue({ file, doc }, cb) {
 		let result, err;
-		const logFilePath = `${this.tempFolderPath}\\${shortId()}.log`;
 
-		[result, err] = await of(
-			this.copyMdInTempFolder(input, this.tempFolderPath)
-		);
+		const getTempFolderName = () => {
+			let tempFolders = this.logStoreService.getAllTempFolders();
+
+			if (!tempFolders.has(doc.name)) {
+				const tempFolderPath = `${doc.path}\\${shortId()}`;
+
+				this.logStoreService.addTempFolder(tempFolderPath, doc.name);
+
+				tempFolders = this.logStoreService.getAllTempFolders();
+			}
+
+			return tempFolders.get(doc.name);
+		};
+
+		const [tempFolderPath] = getTempFolderName();
+		const logFilePath = `${tempFolderPath}\\${shortId()}.log`;
+
+		[result, err] = await of(this.copyMdInTempFolder(file, tempFolderPath));
 
 		if (err) {
 			return cb(err, null);
@@ -77,7 +112,7 @@ class MarkdownService {
 		if (err) {
 			console.error(err);
 
-			this.logStoreService.addError(err);
+			this.logStoreService.addError(err, doc.name);
 
 			return cb(null, '');
 		}
@@ -92,34 +127,36 @@ class MarkdownService {
 			return cb(err, null);
 		}
 
-		return cb(null, result);
+		return cb(null, { result, doc });
 	}
 
 	async queueFailedHandler(err) {
 		throw new Error(err);
 	}
 
-	queueFinishHandler(result) {
+	queueFinishHandler({ result, doc }) {
 		if (!result) {
 			return;
 		}
-		this.logStoreService.addLog(result);
+		this.logStoreService.addLog(result, doc.name);
 	}
 
 	async queueEmptyHandler() {
 		this.powerShellService.dispose();
 
-		const [, err] = await of(this.logStoreService.saveInFs());
+		this.logStoreService.saveInFs();
 
-		if (err) {
-			throw new Error(err);
-		}
+		const tempFolders = [
+			...this.logStoreService.getAllTempFolders().values()
+		].map((path) => path[0]);
 
-		if (fs.pathExists(this.tempFolderPath)) {
-			const [, fsError] = await of(this.clearTempFolder());
+		for (const path of tempFolders) {
+			if (fs.pathExists(path)) {
+				const [, fsError] = await of(fs.remove(path));
 
-			if (fsError) {
-				throw new Error(fsError);
+				if (fsError) {
+					throw new Error(fsError);
+				}
 			}
 		}
 
@@ -158,10 +195,6 @@ class MarkdownService {
 
 		return (await fs.readFile(logFilePath)).toString();
 	}
-
-	clearTempFolder() {
-		return fs.remove(this.tempFolderPath);
-	}
 }
 
 module.exports = MarkdownService;

tools/office-cmdlet-updater/services/power.shell.service.js

@@ -25,7 +25,7 @@ class PowerShellService {
 
 		result += output;
 
-		[output, err] = await of(this.authIfNeeded());
+		[output, err] = await of(this.preInstallTeams());
 
 		if (err) {
 			await this.dispose();
@@ -34,17 +34,47 @@ class PowerShellService {
 
 		result += output;
 
+		[output, err] = await of(this.preInstallSkype());
+
+		if (err) {
+			await this.dispose();
+			throw new Error(err);
+		}
+
+		result += output;
+
+		return result;
+	}
+
+	async preInstallSkype() {
+		let result;
+
+		//result += await this._invokeCommand(commands.SKYPE_SET_POLICY);
+
+		result += await this._invokeCommand(commands.SKYPE_INSTALL_MODULE);
+
+		result += await this._invokeCommand(commands.SKYPE_GET_CRED);
+
+		result += await this._invokeCommand(commands.SKYPE_CREATE_SESSION);
+
+		result += await this._invokeCommand(commands.SKYPE_IMPORT_SESSION);
+
 		return result;
 	}
 
-	async authIfNeeded() {
+	async _invokeCommand(command) {
+		const [output, err] = await of(this.invokeCommand(command));
+
+		if (err) {
+			throw new Error(err);
+		}
+
+		return output;
+	}
+
+	async preInstallTeams() {
 		let output, err, result;
 
-		// const checkAuthCommand = commands.GET_TEAM;
-		//
-		// [output, err] = await of(this.invokeCommand(checkAuthCommand));
-		//
-		// result += output;
 		// TODO: check if user already auth
 
 		const installModule = commands.INSTALL_MICROSOFT_TEAM;