Auto merge pull request #656 from atomist/sdm

Make goal launching more pluggable

lib/api/goal/support/IsolatedGoalLauncher.ts → lib/api/goal/support/GoalLauncher.ts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018 Atomist, Inc.
+ * Copyright © 2019 Atomist, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,23 @@
  * limitations under the License.
  */
 
-import {
-    HandlerContext,
-    HandlerResult,
-} from "@atomist/automation-client";
-import { ProgressLog } from "../../../spi/log/ProgressLog";
-import { SdmGoalEvent } from "../SdmGoalEvent";
+import { ExecuteGoalResult } from "../ExecuteGoalResult";
+import { GoalInvocation } from "../GoalInvocation";
 
 /**
- * Launch a goal in an isolated environment (container or process) for fulfillment.
+ * Launch a goal in an environment (container or process) for fulfillment.
  */
-export type IsolatedGoalLauncher = (goal: SdmGoalEvent,
-                                    ctx: HandlerContext,
-                                    progressLog: ProgressLog) => Promise<HandlerResult>;
+export interface GoalLauncher {
+
+    /**
+     * Does this GoalLauncher support launching provided goals
+     * @param gi
+     */
+    supports(gi: GoalInvocation): Promise<boolean>;
+
+    /**
+     * Launch the provided goal
+     * @param gi
+     */
+    launch(gi: GoalInvocation): Promise<ExecuteGoalResult>;
+}

lib/api/machine/SoftwareDeliveryMachineOptions.ts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018 Atomist, Inc.
+ * Copyright © 2019 Atomist, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,13 +27,9 @@ import { ProgressLogFactory } from "../../spi/log/ProgressLog";
 import { ProjectLoader } from "../../spi/project/ProjectLoader";
 import { RepoRefResolver } from "../../spi/repo-ref/RepoRefResolver";
 import { AddressChannels } from "../context/addressChannels";
-import { IsolatedGoalLauncher } from "../goal/support/IsolatedGoalLauncher";
+import { GoalLauncher } from "../goal/support/GoalLauncher";
 import { RepoTargets } from "./RepoTargets";
 
-/**
- * Parameters for targeting transforms or inspections to repos
- */
-
 /**
  * Infrastructure options common to all SoftwareDeliveryMachines.
  * Can be used to control the behavior of an SDM, and
@@ -86,7 +82,7 @@ export interface SoftwareDeliveryMachineOptions {
     /**
      * Strategy for launching goals in different infrastructure
      */
-    goalLauncher?: IsolatedGoalLauncher;
+    goalLauncher?: GoalLauncher | GoalLauncher[];
 
     /**
      * AddressChannels for communicating with system administrator.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomist/sdm",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Atomist Software Delivery Machine API",
   "author": {
     "name": "Atomist",