@fabrika/provider-zerops 0.0.26 → 0.3.1

package/src/types.ts

@@ -10,6 +10,7 @@ import type {
 	ZeropsYamlSetup,
 } from './schema.generated'
 import type { ZeropsSourceRepository } from './source'
+import type { ZeropsSourcePrivateBinding } from './source/port'
 
 export interface ZeropsResourceContext {
 	env: string
@@ -119,15 +120,15 @@ export interface ZeropsRuntimeSource {
 	runId: string
 	repository: ZeropsSourceRepository
 	commitSha: string
-	githubInstallationId?: number
+	/** Absent for a public repository. */
+	privateBinding?: ZeropsSourcePrivateBinding
 }
 
-/** Credential-free recovery state persisted beside one Zerops app-version id. */
-export type ZeropsRunState =
-	| { appVersionId: string; phase: 'version_created' }
-	| { appVersionId: string; phase: 'source_uploaded' }
-	| { appVersionId: string; phase: 'build_trigger_requested' }
-	| { appVersionId: string; phase: 'build_triggered'; processId?: string }
+/** The run checkpoint (ADR-0044): the reserved version, and whether its build request may have been sent. */
+export interface ZeropsRunState {
+	appVersionId: string
+	triggered: boolean
+}
 
 /** Ephemeral runtime coordinates. This value is encoded only after credentials are composed. */
 export interface ZeropsRuntimeTarget {

package/src/version-attempt.ts

@@ -0,0 +1,18 @@
+import { ZeropsApiError } from './api/errors'
+import type { ZeropsApi } from './api/types'
+
+export const isVersionNotFound = (error: unknown): boolean =>
+	error instanceof ZeropsApiError && error.status === 400 && error.code === 'appVersionNotFound'
+
+/**
+ * Delete a reserved version whose build was never requested. Deletion is the barrier: a later upload to
+ * it leaves nothing buildable and a build request fails `appVersionNotFound` (ADR-0044). An already
+ * absent version counts as deleted. Never call this once a build may have been submitted.
+ */
+export async function deleteVersion(api: Pick<ZeropsApi, 'deleteAppVersion'>, appVersionId: string, signal: AbortSignal): Promise<void> {
+	try {
+		await api.deleteAppVersion({ appVersionId, signal })
+	} catch (error) {
+		if (!isVersionNotFound(error)) throw error
+	}
+}

package/src/codec.ts

@@ -1,108 +0,0 @@
-import type { JsonValue, ProviderCodec } from '@fabrika/provider-contract'
-import type { ZeropsRuntimeSource, ZeropsRuntimeTarget } from './types'
-
-const field = (payload: JsonValue, key: string): JsonValue | undefined => {
-	if (typeof payload !== 'object' || payload === null || Array.isArray(payload)) {
-		throw new Error('Zerops target must be an object')
-	}
-	return payload[key]
-}
-
-const requiredString = (payload: JsonValue, key: string): string => {
-	const value = field(payload, key)
-	if (typeof value !== 'string' || value === '') {
-		throw new Error(`Zerops target ${key} must be a non-empty string`)
-	}
-	return value
-}
-
-const optionalString = (payload: JsonValue, key: string): string | undefined => {
-	const value = field(payload, key)
-	if (value === undefined) {
-		return undefined
-	}
-	if (typeof value !== 'string' || value === '') {
-		throw new Error(`Zerops target ${key} must be a non-empty string when present`)
-	}
-	return value
-}
-
-const IMMUTABLE_GIT_OBJECT = /^(?:[a-f0-9]{40}|[a-f0-9]{64})$/
-
-const object = (value: JsonValue | undefined, label: string): { readonly [key: string]: JsonValue } => {
-	if (typeof value !== 'object' || value === null || Array.isArray(value)) {
-		throw new Error(`${label} must be an object`)
-	}
-	return value
-}
-
-const runtimeSource = (payload: JsonValue): ZeropsRuntimeSource | undefined => {
-	const value = field(payload, 'source')
-	if (value === undefined) return undefined
-	const source = object(value, 'Zerops target source')
-	const repository = object(source['repository'], 'Zerops target source repository')
-	const allowedSourceKeys = ['runId', 'repository', 'commitSha', 'githubInstallationId']
-	const allowedRepositoryKeys = ['owner', 'name']
-	if (Object.keys(source).some((key) => !allowedSourceKeys.includes(key))) {
-		throw new Error('Zerops target source contains an unknown field')
-	}
-	if (Object.keys(repository).some((key) => !allowedRepositoryKeys.includes(key))) {
-		throw new Error('Zerops target source repository contains an unknown field')
-	}
-	const installation = source['githubInstallationId']
-	if (installation !== undefined && (typeof installation !== 'number' || !Number.isSafeInteger(installation) || installation <= 0)) {
-		throw new Error('Zerops target source githubInstallationId must be a positive safe integer')
-	}
-	const commitSha = requiredString(source, 'commitSha')
-	if (!IMMUTABLE_GIT_OBJECT.test(commitSha)) {
-		throw new Error('Zerops target source commitSha must be an exact lowercase Git object id')
-	}
-	return {
-		runId: requiredString(source, 'runId'),
-		repository: {
-			owner: requiredString(repository, 'owner'),
-			name: requiredString(repository, 'name'),
-		},
-		commitSha,
-		...(installation === undefined ? {} : { githubInstallationId: installation }),
-	}
-}
-
-export const zeropsTargetCodec: ProviderCodec<ZeropsRuntimeTarget> = {
-	version: 2,
-	encode: (target) => ({
-		projectId: target.projectId,
-		serviceId: target.serviceId,
-		accessToken: target.accessToken,
-		...(target.source === undefined
-			? {}
-			: {
-				source: {
-					runId: target.source.runId,
-					repository: { owner: target.source.repository.owner, name: target.source.repository.name },
-					commitSha: target.source.commitSha,
-					...(target.source.githubInstallationId === undefined ? {} : { githubInstallationId: target.source.githubInstallationId }),
-				},
-			}),
-		...(target.apiBaseUrl !== undefined ? { apiBaseUrl: target.apiBaseUrl } : {}),
-		...(target.propustkaUrl !== undefined ? { propustkaUrl: target.propustkaUrl } : {}),
-		...(target.adminKey !== undefined ? { adminKey: target.adminKey } : {}),
-	}),
-	decode: (payload) => {
-		const target = object(payload, 'Zerops target')
-		const allowedKeys = ['projectId', 'serviceId', 'accessToken', 'source', 'apiBaseUrl', 'propustkaUrl', 'adminKey']
-		if (Object.keys(target).some((key) => !allowedKeys.includes(key))) {
-			throw new Error('Zerops target contains an unknown field')
-		}
-		const source = runtimeSource(payload)
-		return {
-			projectId: requiredString(payload, 'projectId'),
-			serviceId: requiredString(payload, 'serviceId'),
-			accessToken: requiredString(payload, 'accessToken'),
-			...(source === undefined ? {} : { source }),
-			...(optionalString(payload, 'apiBaseUrl') !== undefined ? { apiBaseUrl: optionalString(payload, 'apiBaseUrl') } : {}),
-			...(optionalString(payload, 'propustkaUrl') !== undefined ? { propustkaUrl: optionalString(payload, 'propustkaUrl') } : {}),
-			...(optionalString(payload, 'adminKey') !== undefined ? { adminKey: optionalString(payload, 'adminKey') } : {}),
-		}
-	},
-}

package/src/namespace-command.ts

@@ -1,209 +0,0 @@
-import type { JsonValue, ProviderDeploymentNamespace, ProviderNamespacePlan } from '@fabrika/provider-contract'
-import type { ZeropsCliArgs } from './cli-args'
-import { createZeropsNamespaceOperator, type ZeropsNamespacePostgres, zeropsNamespaceTargetCodec } from './namespace'
-
-export interface ZeropsNamespaceCommandDependencies {
-	readonly source: Readonly<Record<string, string | undefined>>
-	readonly fetch: (input: string | URL | Request, init?: RequestInit) => Promise<Response>
-	readonly write: (value: string) => void
-}
-
-const required = (value: string | undefined, label: string): string => {
-	if (value === undefined || value.trim() === '') {
-		throw new Error(`${label} is required`)
-	}
-	return value.trim()
-}
-
-const postgres = (args: ZeropsCliArgs): ZeropsNamespacePostgres | undefined => {
-	const type = args.postgresType
-	const profile = args.postgresProfile
-	if (type === undefined && profile === undefined) return undefined
-	if (type === undefined) {
-		throw new Error('--postgres-type is required with --postgres-profile')
-	}
-	if (type === 'postgresql:ha@18') {
-		if (
-			profile !== undefined
-			&& profile !== 'oltp-staging'
-			&& profile !== 'oltp-production'
-			&& profile !== 'oltp-enterprise'
-			&& profile !== 'olap-production'
-			&& profile !== 'writeheavy-production'
-		) {
-			throw new Error(`--postgres-profile ${profile} is not supported by ${type}`)
-		}
-		return profile === undefined ? { type } : { type, profile }
-	}
-	if (type === 'postgresql:single@18') {
-		if (
-			profile !== undefined
-			&& profile !== 'oltp-hobby'
-			&& profile !== 'oltp-staging'
-			&& profile !== 'oltp-production'
-			&& profile !== 'olap-production'
-			&& profile !== 'writeheavy-production'
-		) {
-			throw new Error(`--postgres-profile ${profile} is not supported by ${type}`)
-		}
-		return profile === undefined ? { type } : { type, profile }
-	}
-	throw new Error('--postgres-type must be postgresql:ha@18 or postgresql:single@18')
-}
-
-const planOptions = (args: ZeropsCliArgs): { [key: string]: JsonValue } | undefined => {
-	const values: { [key: string]: JsonValue } = {}
-	if (args.projectName !== undefined) values['projectName'] = required(args.projectName, '--project-name')
-	if (args.corePackage !== undefined) values['corePackage'] = required(args.corePackage, '--core-package')
-	if (args.publicAccess !== undefined) values['publicAccess'] = required(args.publicAccess, '--public-access')
-	const database = postgres(args)
-	if (database !== undefined) {
-		values['postgres'] = database.profile === undefined ? { type: database.type } : { type: database.type, profile: database.profile }
-	}
-	return Object.keys(values).length === 0 ? undefined : values
-}
-
-const namespacePlan = (
-	args: ZeropsCliArgs,
-	source: Readonly<Record<string, string | undefined>>,
-): ProviderNamespacePlan => {
-	// `FABRIKA_ZEROPS_*` because Zerops reserves the bare `ZEROPS_` prefix and refuses to store a custom
-	// variable using it (`userDataZeropsPrefixForbidden`).
-	const proxyBuildFromGit = required(
-		args.proxyBuildFromGit ?? source['FABRIKA_ZEROPS_PROXY_BUILD_FROM_GIT'],
-		'--proxy-build-from-git or FABRIKA_ZEROPS_PROXY_BUILD_FROM_GIT',
-	)
-	const operator = createZeropsNamespaceOperator({ proxyBuildFromGit })
-	const options = planOptions(args)
-	return operator.plan({
-		id: required(args.namespaceId, '--id'),
-		env: required(args.env, '--env'),
-		preset: required(args.preset, '--preset'),
-		...(args.exclusiveAppId === undefined ? {} : { exclusiveAppId: required(args.exclusiveAppId, '--exclusive-app') }),
-		...(options === undefined ? {} : { options }),
-	})
-}
-
-const outputJson = (value: unknown): string => `${JSON.stringify(value, null, '\t')}\n`
-
-const responseText = async (response: Response): Promise<string> => {
-	const text = await response.text()
-	if (response.ok) return text.trim() === '' ? 'null' : text
-	let message = `Control API request failed (${response.status})`
-	try {
-		const body: unknown = JSON.parse(text)
-		if (typeof body === 'object' && body !== null) {
-			const error = Reflect.get(body, 'error')
-			if (typeof error === 'string' && error !== '') message = error
-		}
-	} catch {
-		if (text.trim() !== '' && text.length < 500) message = text
-	}
-	throw new Error(message)
-}
-
-const controlCoordinates = (
-	args: ZeropsCliArgs,
-	source: Readonly<Record<string, string | undefined>>,
-): { baseUrl: URL; token: string } => {
-	const value = required(args.controlUrl ?? source['FABRIKA_CONTROL_URL'], '--control-url or FABRIKA_CONTROL_URL')
-	const token = required(source['FABRIKA_CONTROL_TOKEN'], 'FABRIKA_CONTROL_TOKEN')
-	let baseUrl: URL
-	try {
-		baseUrl = new URL(value)
-	} catch {
-		throw new Error('--control-url or FABRIKA_CONTROL_URL must be an absolute URL')
-	}
-	if (baseUrl.protocol !== 'https:' && baseUrl.protocol !== 'http:') {
-		throw new Error('--control-url or FABRIKA_CONTROL_URL must use http or https')
-	}
-	return { baseUrl, token }
-}
-
-const callControl = async (
-	deps: ZeropsNamespaceCommandDependencies,
-	coordinates: { baseUrl: URL; token: string },
-	path: string,
-	body?: unknown,
-): Promise<void> => {
-	const response = await deps.fetch(new URL(path, coordinates.baseUrl), {
-		method: 'POST',
-		headers: {
-			accept: 'application/json',
-			authorization: `Bearer ${coordinates.token}`,
-			...(body === undefined ? {} : { 'content-type': 'application/json' }),
-		},
-		...(body === undefined ? {} : { body: JSON.stringify(body) }),
-	})
-	const text = await responseText(response)
-	let parsed: unknown
-	try {
-		parsed = JSON.parse(text)
-	} catch {
-		parsed = text
-	}
-	deps.write(outputJson(parsed))
-}
-
-const createBody = (namespace: ProviderDeploymentNamespace): object => ({
-	id: namespace.id,
-	env: namespace.env,
-	...(namespace.exclusiveAppId === undefined ? {} : { exclusiveAppId: namespace.exclusiveAppId }),
-	target: namespace.target,
-})
-
-const adoptBody = (namespace: ProviderDeploymentNamespace): object => ({
-	env: namespace.env,
-	...(namespace.exclusiveAppId === undefined ? {} : { exclusiveAppId: namespace.exclusiveAppId }),
-	target: namespace.target,
-})
-
-/** Execute one namespace command. All command inputs are validated before the first fetch. */
-export const runZeropsNamespaceCommand = async (
-	args: ZeropsCliArgs,
-	deps: ZeropsNamespaceCommandDependencies,
-): Promise<void> => {
-	const subcommand = required(args.subcommand, 'namespace command')
-	if (subcommand === 'plan') {
-		deps.write(outputJson(namespacePlan(args, deps.source)))
-		return
-	}
-	if (subcommand === 'reconcile') {
-		const id = required(args.namespaceId, '--id')
-		const control = controlCoordinates(args, deps.source)
-		await callControl(deps, control, `/api/namespaces/${encodeURIComponent(id)}/reconcile`)
-		return
-	}
-	if (subcommand !== 'create' && subcommand !== 'adopt') {
-		throw new Error(`Unknown namespace command: ${subcommand}`)
-	}
-
-	const planned = namespacePlan(args, deps.source)
-	const control = controlCoordinates(args, deps.source)
-	if (subcommand === 'create') {
-		await callControl(deps, control, '/api/namespaces', createBody(planned.namespace))
-		return
-	}
-
-	const projectId = required(args.projectId, '--project-id')
-	const decoded = zeropsNamespaceTargetCodec.decode(planned.namespace.target.payload)
-	const namespace: ProviderDeploymentNamespace = {
-		...planned.namespace,
-		target: {
-			provider: 'zerops',
-			version: zeropsNamespaceTargetCodec.version,
-			payload: zeropsNamespaceTargetCodec.encode({
-				...decoded,
-				managed: false,
-				projectId,
-				ready: false,
-			}),
-		},
-	}
-	await callControl(
-		deps,
-		control,
-		`/api/namespaces/${encodeURIComponent(namespace.id)}/adopt`,
-		adoptBody(namespace),
-	)
-}