Merge pull request #332 from microsoft/users/stfrance/task-zip-upload

Add ability to upload a task zip.

Author: stephenmichaelf

app/exec/build/tasks/create.ts

@@ -1,6 +1,4 @@
-import { TfCommand } from "../../../lib/tfcommand";
 import check = require("validator");
-import common = require("../../../lib/common");
 import fs = require("fs");
 
 import path = require("path");

app/exec/build/tasks/default.ts

@@ -1,4 +1,3 @@
-import { TfCommand, CoreArguments } from "../../../lib/tfcommand";
 import args = require("../../../lib/arguments");
 import buildBase = require("../default");
 
@@ -26,7 +25,8 @@ export class BuildTaskBase<T> extends buildBase.BuildBase<TaskArguments, T> {
 
 		this.registerCommandArgument("all", "All Tasks?", "Get all build tasks.", args.BooleanArgument, "false");
 		this.registerCommandArgument("taskId", "Task ID", "Identifies a particular Build Task.", args.StringArgument);
-		this.registerCommandArgument("taskPath", "Task path", "Local path to a Build Task.", args.ExistingDirectoriesArgument);
+		this.registerCommandArgument("taskPath", "Task path", "Local path to a Build Task.", args.ExistingDirectoriesArgument, null);
+		this.registerCommandArgument("taskZipPath", "Task zip path", "Local path to an already zipped task", args.StringArgument, null);
 		this.registerCommandArgument("overwrite", "Overwrite?", "Overwrite existing Build Task.", args.BooleanArgument, "false");
 
 		this.registerCommandArgument("taskName", "Task Name", "Name of the Build Task.", args.StringArgument);

app/exec/build/tasks/delete.ts

@@ -1,6 +1,4 @@
-import { TfCommand } from "../../../lib/tfcommand";
 import agentContracts = require("azure-devops-node-api/interfaces/TaskAgentInterfaces");
-import args = require("../../../lib/arguments");
 import tasksBase = require("./default");
 import trace = require("../../../lib/trace");
 

app/exec/build/tasks/list.ts

@@ -1,6 +1,4 @@
-import { TfCommand } from "../../../lib/tfcommand";
 import agentContracts = require("azure-devops-node-api/interfaces/TaskAgentInterfaces");
-import args = require("../../../lib/arguments");
 import tasksBase = require("./default");
 import trace = require("../../../lib/trace");
 

app/exec/build/tasks/upload.ts

@@ -1,58 +1,85 @@
-import { TfCommand } from "../../../lib/tfcommand";
 import agentContracts = require("azure-devops-node-api/interfaces/TaskAgentInterfaces");
 import archiver = require("archiver");
-import args = require("../../../lib/arguments");
 import fs = require("fs");
 import path = require("path");
 import tasksBase = require("./default");
 import trace = require("../../../lib/trace");
 import vm = require("../../../lib/jsonvalidate");
+import { ITaskAgentApi } from "azure-devops-node-api/TaskAgentApi";
+import zip = require("jszip");
 
 export function getCommand(args: string[]): BuildTaskUpload {
 	return new BuildTaskUpload(args);
 }
 
 var c_taskJsonFile: string = "task.json";
 
+interface TaskJson {
+	id: string;
+}
+
 export class BuildTaskUpload extends tasksBase.BuildTaskBase<agentContracts.TaskDefinition> {
 	protected description = "Upload a Build Task.";
 	protected serverCommand = true;
 
 	protected getHelpArgs(): string[] {
-		return ["taskPath", "overwrite"];
+		return ["taskPath", "taskZipPath", "overwrite"];
 	}
 
 	public async exec(): Promise<agentContracts.TaskDefinition> {
-		return this.commandArgs.taskPath.val().then(taskPaths => {
-			let taskPath = taskPaths[0];
-			return this.commandArgs.overwrite.val().then<agentContracts.TaskDefinition>(overwrite => {
-				vm.exists(taskPath, "specified directory " + taskPath + " does not exist.");
-				//directory is good, check json
-
-				let tp = path.join(taskPath, c_taskJsonFile);
-				return vm.validate(tp, "no " + c_taskJsonFile + " in specified directory").then(async taskJson => {
-					let archive = archiver("zip");
-					archive.on("error", function(error) {
-						trace.debug("Archiving error: " + error.message);
-						error.message = "Archiving error: " + error.message;
-						throw error;
-					});
-					archive.directory(path.resolve(taskPath), false);
-
-					const collectionUrl = this.connection.getCollectionUrl();
-					console.log("Collection URL: " + collectionUrl);
-					let agentApi = await this.webApi.getTaskAgentApi(collectionUrl);
-
-					archive.finalize();
-					return agentApi.uploadTaskDefinition(null, <any>archive, taskJson.id, overwrite).then(() => {
-						trace.debug("Success");
-						return <agentContracts.TaskDefinition>{
-							sourceLocation: taskPath,
-						};
-					});
-				});
+		const taskPaths = await this.commandArgs.taskPath.val();
+		const taskZipPath = await this.commandArgs.taskZipPath.val();
+		const overwrite = await this.commandArgs.overwrite.val();
+
+		let taskStream: NodeJS.ReadableStream = null;
+		let taskId: string = null;
+		let sourceLocation: string = null;
+
+		if (!taskZipPath && !taskPaths) {
+			throw new Error("You must specify either --task-path or --task-zip-path.");
+		}
+
+		if (taskZipPath) {
+			// User provided an already zipped task, upload that.
+			const data: Buffer = fs.readFileSync(taskZipPath);
+			const z: zip = await zip.loadAsync(data);
+
+			// find task.json inside zip, make sure its there then deserialize content
+			const fileContent: string = await z.files[c_taskJsonFile].async('text');
+			const taskJson: TaskJson = JSON.parse(fileContent);
+
+			sourceLocation = taskZipPath;
+			taskId = taskJson.id;
+			taskStream = z.generateNodeStream();
+		} else {
+			// User provided the path to a directory with the task content
+			const taskPath: string = taskPaths[0];
+			vm.exists(taskPath, "specified directory " + taskPath + " does not exist.");
+
+			const taskJsonPath: string = path.join(taskPath, c_taskJsonFile);
+			const taskJson: TaskJson = await vm.validate(taskJsonPath, "no " + c_taskJsonFile + " in specified directory");
+
+			const archive = archiver("zip");
+			archive.on("error", function(error) {
+				trace.debug("Archiving error: " + error.message);
+				error.message = "Archiving error: " + error.message;
+				throw error;
 			});
-		});
+			archive.directory(path.resolve(taskPath), false);
+			archive.finalize();
+
+			sourceLocation = taskPath;
+			taskId = taskJson.id;
+			taskStream = archive;
+		}
+
+		const collectionUrl: string = this.connection.getCollectionUrl();
+		trace.info("Collection URL: " + collectionUrl);
+		const agentApi: ITaskAgentApi = await this.webApi.getTaskAgentApi(collectionUrl);
+
+		await agentApi.uploadTaskDefinition(null, taskStream, taskId, overwrite);
+		trace.debug("Success");
+		return <agentContracts.TaskDefinition> { sourceLocation: sourceLocation, };
 	}
 
 	public friendlyOutput(data: agentContracts.TaskDefinition): void {