Auto-merge pull request #845 from atomist/sdm

Update schema, remove SkillOutput Pull request auto merged: * Protection rule for branch `main` passed * 1 approved review by @cdupuis * 3 successful checks
atomist · Jan 25, 2021 · fdfa1ec · fdfa1ec
2 parents bb1adeb + 98b9dd9
commit fdfa1ec
Show file tree

Hide file tree

Showing 11 changed files with 50,067 additions and 35,288 deletions.
diff --git a/lib/api/mapping/outputTest.ts b/lib/api/mapping/outputTest.ts
diff --git a/lib/core/goal/skillOutput.ts b/lib/core/goal/skillOutput.ts
diff --git a/lib/core/handlers/events/delivery/goals/SetGoalsOnSkillOutput.ts b/lib/core/handlers/events/delivery/goals/SetGoalsOnSkillOutput.ts
diff --git a/lib/core/machine/HandlerBasedSoftwareDeliveryMachine.ts b/lib/core/machine/HandlerBasedSoftwareDeliveryMachine.ts
@@ -23,13 +23,11 @@ import { AbstractSoftwareDeliveryMachine } from "../../api-helper/machine/Abstra
 import { FunctionalUnit } from "../../api/machine/FunctionalUnit";
 import { SoftwareDeliveryMachineConfiguration } from "../../api/machine/SoftwareDeliveryMachineOptions";
 import { GoalSetter } from "../../api/mapping/GoalSetter";
-import { SkillOutputGoalExecutionListener } from "../goal/skillOutput";
 import { FulfillGoalOnRequested } from "../handlers/events/delivery/goals/FulfillGoalOnRequested";
 import { RequestDownstreamGoalsOnGoalSuccess } from "../handlers/events/delivery/goals/RequestDownstreamGoalsOnGoalSuccess";
 import { RespondOnGoalCompletion } from "../handlers/events/delivery/goals/RespondOnGoalCompletion";
 import { SetGoalsOnGoal } from "../handlers/events/delivery/goals/SetGoalsOnGoal";
 import { SetGoalsOnPush } from "../handlers/events/delivery/goals/SetGoalsOnPush";
-import { SetGoalsOnSkillOutput } from "../handlers/events/delivery/goals/SetGoalsOnSkillOutput";
 import { SkipDownstreamGoalsOnGoalFailure } from "../handlers/events/delivery/goals/SkipDownstreamGoalsOnGoalFailure";
 import { VoteOnGoalApprovalRequest } from "../handlers/events/delivery/goals/VoteOnGoalApprovalRequest";
 import { ClosedIssueHandler } from "../handlers/events/issue/ClosedIssueHandler";
@@ -93,16 +91,7 @@ export class HandlerBasedSoftwareDeliveryMachine extends AbstractSoftwareDeliver
                         this.configuration.sdm.preferenceStoreFactory,
                         this.configuration.sdm.enrichGoal,
                         this.configuration.sdm.tagGoalSet),
-                    () => new SetGoalsOnSkillOutput(
-                        this.configuration.sdm.projectLoader,
-                        this.configuration.sdm.repoRefResolver,
-                        this.pushMapping,
-                        this.goalsSetListeners,
-                        this.goalFulfillmentMapper,
-                        this.configuration.sdm.credentialsResolver,
-                        this.configuration.sdm.preferenceStoreFactory,
-                        this.configuration.sdm.enrichGoal,
-                        this.configuration.sdm.tagGoalSet)],
+                ],
                 commandHandlers: [],
                 ingesters: [],
             };
@@ -251,7 +240,6 @@ export class HandlerBasedSoftwareDeliveryMachine extends AbstractSoftwareDeliver
                 configuration: Configuration & SoftwareDeliveryMachineConfiguration,
                 goalSetters: Array<GoalSetter | GoalSetter[]>) {
         super(name, configuration, goalSetters);
-        this.addGoalExecutionListener(SkillOutputGoalExecutionListener);
     }
 
 }
diff --git a/lib/core/machine/yaml/mapPushTests.ts b/lib/core/machine/yaml/mapPushTests.ts
@@ -19,7 +19,6 @@ import { hasCommit } from "../../../api-helper/pushtest/commit";
 import { isMaterialChange } from "../../../api-helper/pushtest/materialChangeTest";
 import { StatefulPushListenerInvocation } from "../../../api/dsl/goalContribution";
 import { isGoal } from "../../../api/mapping/goalTest";
-import { isOutput } from "../../../api/mapping/outputTest";
 import {
     pushTest,
     PushTest,
@@ -115,18 +114,6 @@ const IsGoal: CreatePushTest = async (test, additionalTests, extensionTests) =>
     return undefined;
 };
 
-const IsOutput: CreatePushTest = async (test, additionalTests, extensionTests) => {
-    const onOutput = test.isOutput || test.onOutput;
-    if (!!onOutput) {
-        return isOutput({
-            classifier: getStringOrRegexp(onOutput.classifier),
-            type: onOutput.type,
-            pushTest: onOutput.test ? await mapTest(onOutput.test, additionalTests, extensionTests) : undefined,
-        });
-    }
-    return undefined;
-};
-
 const IsMaterialChange: CreatePushTest = async test => {
     if (!!test.isMaterialChange) {
         return isMaterialChange({
@@ -223,7 +210,6 @@ export const CreatePushTests = [
     IsBranch,
     IsDefaultBranch,
     IsGoal,
-    IsOutput,
     IsSkillConfigured,
     IsMaterialChange,
     HasFileContaining,

diff --git a/lib/graphql/mutation/CreateKubernetesClusterProvider.graphql b/lib/graphql/mutation/CreateKubernetesClusterProvider.graphql
diff --git a/lib/graphql/mutation/IngestSkillOutput.graphql b/lib/graphql/mutation/IngestSkillOutput.graphql
diff --git a/lib/graphql/query/KubernetesClusterProvider.graphql b/lib/graphql/query/KubernetesClusterProvider.graphql