@fabrika/provider-zerops 0.3.1 → 0.3.3

package/src/installation/upgrade-options.ts

@@ -8,6 +8,7 @@
 // The pin is checked BEFORE anything leaves this machine: `assertPinnedTag` refuses a branch or a SHA
 // (ADR-0025) without a network call, so `--to=main` fails on the spot rather than after a clone.
 
+import { describeArgument, readFlag } from '@fabrika/installation-init'
 import { assertPinnedTag, defaultCheckoutDir } from './sidecar'
 
 /** Where the sidecar repository this command edits is found. */
@@ -43,16 +44,6 @@ export const UPGRADE_DRY_RUN_FLAG = '--dry-run'
  */
 const REPO_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]*\/[A-Za-z0-9][A-Za-z0-9._-]*$/
 
-const readFlag = (argv: readonly string[], name: string): string | undefined => {
-	const prefix = `${name}=`
-	const matches = argv.filter((arg) => arg.startsWith(prefix))
-	if (matches.length > 1) {
-		throw new Error(`${name} was given more than once`)
-	}
-	const value = matches[0]?.slice(prefix.length)
-	return value === undefined || value.trim() === '' ? undefined : value.trim()
-}
-
 const assertKnownArguments = (argv: readonly string[]): void => {
 	for (const arg of argv) {
 		if (arg === UPGRADE_DRY_RUN_FLAG || !arg.startsWith('-')) {
@@ -61,7 +52,7 @@ const assertKnownArguments = (argv: readonly string[]): void => {
 		const name = arg.split('=')[0] ?? arg
 		if (!FLAGS.some((flag) => flag === name) || !arg.includes('=')) {
 			throw new Error(
-				`unexpected argument \`${arg}\`. Run \`fabrika platform upgrade --provider=zerops --help\` for the surface`,
+				`unexpected argument ${describeArgument(arg)}. Run \`fabrika platform upgrade --provider=zerops --help\` for the surface`,
 			)
 		}
 	}
@@ -71,7 +62,7 @@ const assertKnownArguments = (argv: readonly string[]): void => {
 const readInstallation = (argv: readonly string[]): string | undefined => {
 	const positional = argv.filter((arg) => !arg.startsWith('-'))
 	if (positional.length > 1) {
-		throw new Error(`unexpected argument \`${positional[1]}\`: name ONE installation`)
+		throw new Error('unexpected second positional argument: name ONE installation')
 	}
 	const installation = positional[0]?.trim()
 	return installation === undefined || installation === '' ? undefined : installation

package/src/managed-env.ts

@@ -1,7 +1,13 @@
 import type { JsonValue } from '@fabrika/provider-contract'
 import { z } from 'zod'
 import { renderYaml } from './compile'
-import { parseZeropsDescriptor, type PreparedZeropsDescriptor, selectZeropsDescriptorSetup } from './descriptor'
+import {
+	assertOwnRunWhenExtending,
+	executionZeropsDocument,
+	parseZeropsDescriptor,
+	type PreparedZeropsDescriptor,
+	selectZeropsDescriptorSetup,
+} from './descriptor'
 
 export type ManagedKey =
 	| 'FABRIKA_RELEASE'
@@ -93,7 +99,9 @@ export function overlayRelease(contents: string, setup: string | undefined, rele
 	const parsed = parseZeropsDescriptor(contents)
 	assertAuthoredManagedDocument(parsed.document)
 	const selected = selectZeropsDescriptorSetup(parsed, setup)
-	const entries = parsed.document['zerops']
+	assertOwnRunWhenExtending(parsed, selected)
+	const execution = executionZeropsDocument(parsed, selected)
+	const entries = execution['zerops']
 	if (!Array.isArray(entries)) throw new Error('zerops: descriptor requires setup entries')
 	const overlaid = release === null ? entries : entries.map((entry) => {
 		if (!isMapping(entry) || entry['setup'] !== selected) return entry
@@ -101,5 +109,5 @@ export function overlayRelease(contents: string, setup: string | undefined, rele
 		const env = isMapping(run['envVariables']) ? run['envVariables'] : {}
 		return { ...entry, run: { ...run, envVariables: { ...env, FABRIKA_RELEASE: release } } }
 	})
-	return { contents: renderYaml({ ...parsed.document, zerops: overlaid }), setup: selected }
+	return { contents: renderYaml({ ...execution, zerops: overlaid }), setup: selected }
 }

package/src/manifest.ts

@@ -4,7 +4,7 @@ import type { JsonValue, ProviderCodec } from '@fabrika/provider-contract'
 import { normalizeGateRule, proxyGateRuleFieldsSchema } from '@fabrika/proxy-core/manifest'
 import { z } from 'zod'
 import { compileImport, ENV_ISOLATION, OVERRIDE, renderYaml } from './compile'
-import { parseZeropsDescriptor, selectZeropsDescriptorSetup } from './descriptor'
+import { assertOwnRunWhenExtending, executionZeropsDocument, parseZeropsDescriptor, selectZeropsDescriptorSetup } from './descriptor'
 import { assertAuthoredManagedDocument, assertAuthoredManagedInputs } from './managed-env'
 import { allowedReferenceHosts, foreignReferenceHost } from './service-references'
 import type { ZeropsAppConfig, ZeropsNamespaceResourceRequirement, ZeropsProxySpec, ZeropsSharedPostgresBinding } from './types'
@@ -288,14 +288,17 @@ export function parseFabrikaManifest(value: unknown, expected: ManifestExpectati
 	if (!serviceHostnames.includes(deployService)) {
 		throw new Error('invalid fabrika manifest Zerops deploy service')
 	}
+	// Only the selected setup and what it extends reach this app's service, so a sibling setup for another
+	// placement may reference services this app does not own.
+	const selectedSetup = selectZeropsDescriptorSetup(parsedDescriptor, zeropsSetup)
+	assertOwnRunWhenExtending(parsedDescriptor, selectedSetup)
 	const foreignInDescriptor = foreignReferenceInValue(
-		parsedDescriptor.document,
+		executionZeropsDocument(parsedDescriptor, selectedSetup),
 		allowedReferenceHosts(serviceHostnames),
 	)
 	if (foreignInDescriptor !== null) {
 		throw new Error(`invalid fabrika manifest: zerops.yaml references service \`${foreignInDescriptor}\`, which this app does not own`)
 	}
-	selectZeropsDescriptorSetup(parsedDescriptor, zeropsSetup)
 	if (proxy !== undefined) {
 		const separator = proxy.upstream.indexOf(':')
 		const upstreamHostname = separator === -1 ? proxy.upstream : proxy.upstream.slice(0, separator)

package/src/provider.ts

@@ -77,8 +77,6 @@ const POLL_INTERVAL_MS = 3000
 /** A run stops waiting for its version this long after it started. Zerops' own pipeline limit is 1 hour. */
 export const ZEROPS_VERSION_DEADLINE_MS = 75 * 60 * 1000
 
-const RELEASE_KEY = 'FABRIKA_RELEASE'
-
 /** Abandon the step if the run was cancelled. Checked before every real mutation and each poll iteration. */
 const assertRunning = (signal: AbortSignal): void => {
 	if (signal.aborted) {
@@ -419,7 +417,7 @@ const writeServiceEnv = async (env: StepEnv): Promise<void> => {
 		const written = SERVICE_MANAGED_KEYS.filter((key) => managedValues[key] !== null)
 		const removed = SERVICE_MANAGED_KEYS.filter((key) => managedValues[key] === null)
 		log(`  [dry-run] would write service variables on ${serviceId}: ${written.join(', ') || '(none)'}`)
-		log(`  [dry-run] would remove service variables on ${serviceId} if present: ${[...removed, RELEASE_KEY].join(', ')}`)
+		log(`  [dry-run] would remove service variables on ${serviceId} if present: ${removed.join(', ') || '(none)'}`)
 		return
 	}
 	assertRunning(signal)
@@ -439,12 +437,6 @@ const writeServiceEnv = async (env: StepEnv): Promise<void> => {
 			log(`  ${key}: unchanged`)
 		}
 	}
-	const strayRelease = records.find((record) => record.key === RELEASE_KEY)
-	if (strayRelease !== undefined) {
-		assertRunning(signal)
-		await zerops.api.deleteServiceEnv({ envId: strayRelease.id, signal })
-		log(`  ${RELEASE_KEY}: removed`)
-	}
 }
 
 /** Run one step's effect. Resolves on success, throws on failure (caught + recorded by `runSteps`). */