@oisincoveney/pipeline 3.24.0 → 3.24.1

package/dist/argo-submit.js

@@ -137,22 +137,22 @@ function submitRunnerArgoWorkflowEffect(rawOptions, dependencies) {
 	});
 	return Effect.gen(function* () {
 		const graph = yield* graphEffect;
-		const createdConfigMapNames = yield* createRunConfigMaps({
-			configMaps: staticRunConfigMaps({
-				labels,
+		return yield* submitWorkflowWithRunConfigMaps({
+			configMapNames: yield* createRunConfigMaps({
+				configMaps: staticRunConfigMaps({
+					labels,
+					namespace: options.namespace,
+					payloadConfigMapName,
+					payloadJson,
+					scheduleConfigMapName: scheduleArtifactConfigMapName,
+					scheduleYaml: options.scheduleYaml,
+					taskDescriptorConfigMapName,
+					tasks: graph.tasks
+				}),
+				dependencies,
 				namespace: options.namespace,
-				payloadConfigMapName,
-				payloadJson,
-				scheduleConfigMapName: scheduleArtifactConfigMapName,
-				scheduleYaml: options.scheduleYaml,
-				taskDescriptorConfigMapName,
-				tasks: graph.tasks
+				options
 			}),
-			dependencies,
-			namespace: options.namespace,
-			options
-		});
-		return yield* submitWorkflowManifest({
 			dependencies,
 			namespace: options.namespace,
 			options,
@@ -163,19 +163,7 @@ function submitRunnerArgoWorkflowEffect(rawOptions, dependencies) {
 			},
 			workflow,
 			workflowFieldOverrides: { podGC: options.podGC }
-		}).pipe(Effect.flatMap((result) => ownRunConfigMaps({
-			configMapNames: createdConfigMapNames,
-			dependencies,
-			namespace: options.namespace,
-			options,
-			result
-		})), Effect.catch((error) => cleanupRunConfigMapsOnFailure({
-			configMapNames: createdConfigMapNames,
-			dependencies,
-			error,
-			namespace: options.namespace,
-			options
-		})));
+		});
 	});
 }
 function submitDynamicRunnerArgoWorkflowEffect(rawOptions, dependencies) {
@@ -222,37 +210,25 @@ function submitDynamicRunnerArgoWorkflowEffect(rawOptions, dependencies) {
 		workflowId: options.workflowId
 	});
 	return Effect.gen(function* () {
-		const createdConfigMapNames = yield* createRunConfigMaps({
-			configMaps: dynamicRunConfigMaps({
-				labels,
+		return yield* submitWorkflowWithRunConfigMaps({
+			configMapNames: yield* createRunConfigMaps({
+				configMaps: dynamicRunConfigMaps({
+					labels,
+					namespace: options.namespace,
+					payloadConfigMapName,
+					payloadJson
+				}),
+				dependencies,
 				namespace: options.namespace,
-				payloadConfigMapName,
-				payloadJson
+				options
 			}),
-			dependencies,
-			namespace: options.namespace,
-			options
-		});
-		return yield* submitWorkflowManifest({
 			dependencies,
 			namespace: options.namespace,
 			options,
 			resultExtras: { payloadConfigMapName },
 			workflow,
 			workflowFieldOverrides: { podGC: options.podGC }
-		}).pipe(Effect.flatMap((result) => ownRunConfigMaps({
-			configMapNames: createdConfigMapNames,
-			dependencies,
-			namespace: options.namespace,
-			options,
-			result
-		})), Effect.catch((error) => cleanupRunConfigMapsOnFailure({
-			configMapNames: createdConfigMapNames,
-			dependencies,
-			error,
-			namespace: options.namespace,
-			options
-		})));
+		});
 	});
 }
 function staticRunConfigMaps(input) {
@@ -322,14 +298,32 @@ function createRunConfigMaps(input) {
 	})));
 }
 function ownRunConfigMaps(input) {
+	const ownerReference = workflowOwnerReference(input.result);
+	if (ownerReference === void 0) return warnRunConfigMapOwnershipSkipped({
+		error: new Error(missingWorkflowUidMessage(input.result)),
+		result: input.result
+	}).pipe(Effect.as(input.result));
 	return patchRunConfigMapOwnerReferences({
-		body: configMapOwnerReferencesPatch(workflowOwnerReference(input.result)),
+		body: configMapOwnerReferencesPatch(ownerReference),
 		configMapNames: input.configMapNames,
 		dependencies: input.dependencies,
 		namespace: input.namespace,
 		options: input.options
 	}).pipe(Effect.as(input.result));
 }
+function ownRunConfigMapsBestEffort(input) {
+	return ownRunConfigMaps(input).pipe(Effect.catch((error) => warnRunConfigMapOwnershipSkipped({
+		error,
+		result: input.result
+	}).pipe(Effect.as(input.result))));
+}
+function warnRunConfigMapOwnershipSkipped(input) {
+	return Effect.sync(() => {
+		const reason = errorMessage(input.error);
+		const message = `moka submit: failed to set Workflow ownerReference for ConfigMaps after Argo Workflow '${input.result.workflowName}' was created; leaving ConfigMaps for TTL/sweeper cleanup: ${reason}\n`;
+		process.stderr.write(message);
+	});
+}
 function cleanupRunConfigMapsOnFailure(input) {
 	return deleteRunConfigMaps({
 		configMapNames: input.configMapNames,
@@ -362,7 +356,7 @@ function deleteRunConfigMaps(input) {
 	});
 }
 function workflowOwnerReference(result) {
-	if (result.workflowUid === void 0) throw new Error(`Created Argo Workflow '${result.workflowName}' did not include metadata.uid; cannot own ConfigMaps`);
+	if (result.workflowUid === void 0) return;
 	return workflowOwnerReferenceSchema.parse({
 		apiVersion: "argoproj.io/v1alpha1",
 		kind: "Workflow",
@@ -370,6 +364,9 @@ function workflowOwnerReference(result) {
 		uid: result.workflowUid
 	});
 }
+function missingWorkflowUidMessage(result) {
+	return `Created Argo Workflow '${result.workflowName}' did not include metadata.uid; cannot own ConfigMaps`;
+}
 function configMapOwnerReferencesPatch(ownerReference) {
 	return configMapOwnerReferencesPatchSchema.parse({ metadata: { ownerReferences: [ownerReference] } });
 }
@@ -391,6 +388,28 @@ function submitWorkflowManifest(input) {
 		});
 	});
 }
+function submitWorkflowWithRunConfigMaps(input) {
+	return submitWorkflowManifest({
+		dependencies: input.dependencies,
+		namespace: input.namespace,
+		options: input.options,
+		resultExtras: input.resultExtras,
+		workflow: input.workflow,
+		workflowFieldOverrides: input.workflowFieldOverrides
+	}).pipe(Effect.catch((error) => cleanupRunConfigMapsOnFailure({
+		configMapNames: input.configMapNames,
+		dependencies: input.dependencies,
+		error,
+		namespace: input.namespace,
+		options: input.options
+	})), Effect.flatMap((result) => ownRunConfigMapsBestEffort({
+		configMapNames: input.configMapNames,
+		dependencies: input.dependencies,
+		namespace: input.namespace,
+		options: input.options,
+		result
+	})));
+}
 function applyWorkflowFieldOverrides(workflow, overrides) {
 	if (overrides?.podGC === void 0) return workflow;
 	return runnerArgoWorkflowManifestSchema.parse({

package/package.json

@@ -146,7 +146,7 @@
     "prepack": "nub run build:cli"
   },
   "type": "module",
-  "version": "3.24.0",
+  "version": "3.24.1",
   "description": "Config-driven multi-agent pipeline runner for repository work",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",