@prisma/composer-prisma-cloud 0.11.0-dev.4 → 0.11.0-dev.5

package/dist/control.d.mts

@@ -1,15 +1,6 @@
 import { t as ProviderParamEntry } from "./serializer-BD_6nkr4-DWn5NNTC.mjs";
-import "effect/Context";
-import "effect/Effect";
-import "effect/Layer";
-import "effect/Config";
-import { createManagementApiClient } from "@prisma/management-api-sdk";
-import "effect/Redacted";
-import "alchemy/Provider";
-import { Resource } from "alchemy";
 import * as Output from "alchemy/Output";
 import * as AlchemyPrisma from "alchemy/Prisma";
-import { EnvironmentVariable } from "alchemy/Prisma";
 import { ExtensionDescriptor, StateDescriptor } from "@prisma/composer/config";
 //#region ../../1-prisma-cloud/1-extensions/target/dist/control.d.mts
 //#region src/descriptors/shared.d.ts

package/dist/control.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"control.d.mts","names":[],"sources":["../../../1-prisma-cloud/1-extensions/target/dist/control.d.mts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAqBU,sBAAsB;;;;;;;;WAQrB,QAAQ,6BAA6B,OAAO;;;;;;;;UAQ7C;WACC,gBAAgB,OAAO;;;;;;;;;;;;UAYxB,6BAA6B;WAC5B,kBAAkB,aAAa,8BAA8B,oBAAoB,OAAO;;;;;cAKrF,mBAAmB;UACvB;;EAER;;EAEA,SAAS,cAAc,MAAM;;;;;;;;KAQ1B,qBAAqB,KAAK,0BAA0B,KAAK;;;;;;;;;;iBAU7C,oBAAoB,kBAAkB,sBAAsB,QAAQ,oBAAoB,sBAAsB,oBAAoB,gBAAgB;cACrJ,iBAAiB,oBAAoB,gBAAgB;;cAErD,cAAc,OAAO,uBAAuB"}
+{"version":3,"file":"control.d.mts","names":[],"sources":["../../../1-prisma-cloud/1-extensions/target/dist/control.d.mts"],"mappings":";;;;;;;;;;;;;;;;;;;;;UAoBU,sBAAsB;;;;;;;;WAQrB,QAAQ,6BAA6B,OAAO;;;;;;;;UAQ7C;WACC,gBAAgB,OAAO;;;;;;;;;;;;UAYxB,6BAA6B;WAC5B,kBAAkB,aAAa,8BAA8B,oBAAoB,OAAO;;;;;cAKrF,mBAAmB;UACvB;;EAER;;EAEA,SAAS,cAAc,MAAM;;;;;;;;KAQ1B,qBAAqB,KAAK,0BAA0B,KAAK;;;;;;;;;;iBAU7C,oBAAoB,kBAAkB,sBAAsB,QAAQ,oBAAoB,sBAAsB,oBAAoB,gBAAgB;cACrJ,iBAAiB,oBAAoB,gBAAgB;;cAErD,cAAc,OAAO,uBAAuB"}

package/dist/control.mjs

@@ -2,7 +2,7 @@ import { o as paramBindingFor, s as paramName } from "./secret-Dgyg1WyG-Dzz95fGI
 import { a as encode, c as paramEntries, d as serializeInput, n as configKey, o as encodeParamPointer, r as decodeParamPointer, s as isParamPointerRow } from "./serializer-DTCrRl7S-CN0q1ZFB.mjs";
 import { a as provisionedEdges, n as SELF_ORIGIN, r as STREAMS_API_KEY, t as RESERVED_PROVIDER_PARAMS } from "./provisioned-edges-DKsBi7uK-BmsYKWZI.mjs";
 import { n as requiredPackHeadOf } from "./required-pack-head-BrrJarzc-DeP50pBu.mjs";
-import { A as claimDatabaseUrlKeys, B as managementApiBaseUrl, C as appAfterEnvironment, D as Bucket, E as isWithin, F as PrismaApiError, I as call, L as layer, M as drivePagesAsync, N as resolveDefaultBranchId, O as BucketKey, P as ManagementClient, R as PrismaCredentials, S as ServiceKeyProvider, T as fingerprintedArtifactPath, _ as resolveTargetRef, a as PgWarmProvider, b as providers, d as collectPreflightNames, f as containerDescriptor, g as resolvePrismaNextConfig, h as prismaCloudContainerOf, i as PgWarm, j as collectPages, k as RESERVED_DATABASE_URL_KEYS, l as S3Credentials, m as packHeadRefHashes, n as GeneratedParamProvider, o as PnMigration, r as PRISMA_CLOUD_EXTENSION_ID, s as PnMigrationProvider, t as GeneratedParam, u as S3CredentialsProvider, w as deployEnvFingerprint, x as ServiceKey, z as fromEnv } from "./s3-credentials-resource-BUsjCFtj-C-nS9rK-.mjs";
+import { A as collectPages, C as appAfterEnvironment, D as RESERVED_DATABASE_URL_KEYS, E as PrismaApiError, F as fromEnv, I as managementApiBaseUrl, M as layer, N as resolveDefaultBranchId, O as call, P as PrismaCredentials, S as ServiceKeyProvider, T as ManagementClient, _ as resolveTargetRef, a as PgWarmProvider, b as providers, d as collectPreflightNames, f as containerDescriptor, g as resolvePrismaNextConfig, h as prismaCloudContainerOf, i as PgWarm, j as drivePagesAsync, k as claimDatabaseUrlKeys, l as S3Credentials, m as packHeadRefHashes, n as GeneratedParamProvider, o as PnMigration, r as PRISMA_CLOUD_EXTENSION_ID, s as PnMigrationProvider, t as GeneratedParam, u as S3CredentialsProvider, w as isWithin, x as ServiceKey } from "./s3-credentials-resource-BUsjCFtj-BzHGBAmT.mjs";
 import { n as isPnPostgresResourceNode } from "./prisma-next-hB3CQxKI-BYVc-k-F.mjs";
 import { isParamSource } from "@prisma/composer";
 import { blindCast } from "@prisma/composer/casts";
@@ -12,7 +12,6 @@ import * as Layer from "effect/Layer";
 import { createManagementApiClient } from "@prisma/management-api-sdk";
 import * as Redacted from "effect/Redacted";
 import * as Data from "effect/Data";
-import { Stack } from "alchemy";
 import * as crypto from "node:crypto";
 import { createHash } from "node:crypto";
 import * as fs$1 from "node:fs";
@@ -20,7 +19,8 @@ import * as os$1 from "node:os";
 import * as path$1 from "node:path";
 import * as zlib from "node:zlib";
 import * as Output from "alchemy/Output";
-import * as Prisma from "alchemy/Prisma";
+import { Stack } from "alchemy";
+import * as Prisma$1 from "alchemy/Prisma";
 import { State, makeHttpStateStore } from "alchemy/State";
 import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
 import * as HttpClientRequest from "effect/unstable/http/HttpClientRequest";
@@ -286,7 +286,7 @@ await main.run(boot.address, () => import(boot.appEntrypoint));
 	};
 }
 //#endregion
-//#region ../../1-prisma-cloud/0-lowering/lowering/dist/resources-rlwsFefZ.mjs
+//#region ../../1-prisma-cloud/0-lowering/lowering/dist/resources-CXUKkcyA.mjs
 /**
 * Reporting is observability, so no call may stall the deploy: every request
 * carries this deadline, and an expired one is warned and dropped like any
@@ -349,12 +349,14 @@ function buildsApi(options) {
 /** Names the build a run belongs to. Set by the CLI on the alchemy child, or by a CI runner that created the build itself. */
 const BUILD_ID_ENV = "PRISMA_BUILD_ID";
 /**
-* Alchemy resource type → platform resource type.
+* Alchemy resource type → platform resource type, keyed by upstream
+* `alchemy/Prisma`'s type-ids and attribute names — the shapes the state
+* store actually writes since the upstream provider adoption.
 *
-* Two of this package's resources are deliberately absent. `Prisma.BucketKey`
-* has no platform resource type to map onto. `PrismaCloud.ServiceKey` is a
-* value this deploy mints locally, not a platform resource at all — the
-* platform's `service_key` is what `Prisma.Connection` creates.
+* Two resources are deliberately absent. `Prisma.BucketAccessKey` has no
+* platform resource type to map onto. `PrismaCloud.ServiceKey` is a value
+* this deploy mints locally, not a platform resource at all — the platform's
+* `service_key` is what `Prisma.Connection` creates.
 *
 * Anything not listed — `PgWarm`, and every resource another extension
 * contributes — is not a Prisma Cloud resource and is not reported.
@@ -362,23 +364,23 @@ const BUILD_ID_ENV = "PRISMA_BUILD_ID";
 const PLATFORM_RESOURCES = {
 	"Prisma.Project": {
 		type: "project",
-		idField: "id"
+		idField: "projectId"
 	},
 	"Prisma.Database": {
 		type: "database",
-		idField: "id"
+		idField: "databaseId"
 	},
 	"Prisma.Connection": {
 		type: "service_key",
-		idField: "id"
+		idField: "connectionId"
 	},
 	"Prisma.Bucket": {
 		type: "bucket",
-		idField: "id"
+		idField: "bucketId"
 	},
-	"Prisma.ComputeService": {
+	"Prisma.App": {
 		type: "app",
-		idField: "id"
+		idField: "appId"
 	},
 	"Prisma.Deployment": {
 		type: "deployment",
@@ -386,7 +388,7 @@ const PLATFORM_RESOURCES = {
 	},
 	"Prisma.EnvironmentVariable": {
 		type: "config_variable",
-		idField: "id"
+		idField: "environmentVariableId"
 	}
 };
 /**
@@ -700,12 +702,16 @@ const FAMILY_BY_LEGACY_TYPE = {
 	"Prisma.ComputeService": "App",
 	"Prisma.Deployment": "Deployment",
 	"Prisma.EnvironmentVariable": "EnvironmentVariable",
+	"Prisma.Bucket": "Bucket",
+	"Prisma.BucketKey": "BucketAccessKey",
 	"PrismaComposer.Project": "Project",
 	"PrismaComposer.Database": "Database",
 	"PrismaComposer.Connection": "Connection",
 	"PrismaComposer.ComputeService": "App",
 	"PrismaComposer.Deployment": "Deployment",
-	"PrismaComposer.EnvironmentVariable": "EnvironmentVariable"
+	"PrismaComposer.EnvironmentVariable": "EnvironmentVariable",
+	"PrismaComposer.Bucket": "Bucket",
+	"PrismaComposer.BucketKey": "BucketAccessKey"
 };
 /** The type-id upstream registers each family under. */
 const UPSTREAM_TYPE = {
@@ -714,7 +720,9 @@ const UPSTREAM_TYPE = {
 	Connection: "Prisma.Connection",
 	App: "Prisma.App",
 	Deployment: "Prisma.Deployment",
-	EnvironmentVariable: "Prisma.EnvironmentVariable"
+	EnvironmentVariable: "Prisma.EnvironmentVariable",
+	Bucket: "Prisma.Bucket",
+	BucketAccessKey: "Prisma.BucketAccessKey"
 };
 /**
 * Four of the six families keep the type-id they always had, so the type-id
@@ -730,6 +738,8 @@ const isLegacyProps = (family, props) => {
 		case "App": return "projectId" in props && !("project" in props);
 		case "Deployment": return "computeServiceId" in props;
 		case "EnvironmentVariable": return "projectId" in props && !("project" in props);
+		case "Bucket": return "projectId" in props && !("project" in props);
+		case "BucketAccessKey": return "bucketId" in props && !("bucket" in props);
 	}
 };
 const migrateProps = (family, props) => {
@@ -770,6 +780,16 @@ const migrateProps = (family, props) => {
 				...props["branchId"] !== void 0 ? { branchId: props["branchId"] } : {}
 			};
 		}
+		case "Bucket": return {
+			project: props["projectId"],
+			name: props["name"],
+			...props["branchId"] !== void 0 ? { branchId: props["branchId"] } : {}
+		};
+		case "BucketAccessKey": return {
+			bucket: props["bucketId"],
+			name: props["name"],
+			role: props["role"]
+		};
 	}
 };
 /**
@@ -889,6 +909,26 @@ const migrateAttr = (family, attr, props) => {
 				createdAt: EPOCH,
 				updatedAt: EPOCH
 			};
+		case "Bucket":
+			if (typeof attr["id"] !== "string" || "bucketId" in attr) return attr;
+			return {
+				bucketId: attr["id"],
+				name: attr["name"],
+				projectId: oldProps["projectId"],
+				createdAt: EPOCH
+			};
+		case "BucketAccessKey": {
+			if (typeof attr["id"] !== "string" || "bucketAccessKeyId" in attr) return attr;
+			const secret = attr["secretAccessKey"];
+			return {
+				bucketAccessKeyId: attr["id"],
+				bucketId: attr["bucketId"],
+				accessKeyId: attr["accessKeyId"],
+				secretAccessKey: Redacted.isRedacted(secret) ? secret : Redacted.make(String(secret ?? "")),
+				endpoint: attr["endpoint"],
+				bucketName: attr["bucketName"]
+			};
+		}
 	}
 };
 const migrateResourceRow = (row) => {
@@ -1425,21 +1465,21 @@ function projectIdOf(application) {
 /**
 * One Bucket per module-provisioned bucket resource — `id` is the module
 * provision id, so a resource shared by several consumers is created exactly
-* once. A BucketKey is minted for the bucket: it is the reveal-once credential
-* carrier, and its attributes (endpoint, bucketName, accessKeyId,
+* once. A BucketAccessKey is minted for the bucket: it is the reveal-once
+* credential carrier, and its attributes (endpoint, bucketName, accessKeyId,
 * secretAccessKey) become the four S3Config outputs consumers resolve by name.
 */
 function bucketDescriptor(_o) {
 	const lowering = ({ id, application }) => Effect.gen(function* () {
 		validateName(id, "resource name (from provision id)");
 		const branchId = cloudApplicationOf(application).branchId;
-		const bkt = yield* Bucket(`${id}-bucket`, {
-			projectId: projectIdOf(application),
+		const bkt = yield* Prisma$1.Bucket(`${id}-bucket`, {
+			project: projectIdOf(application),
 			name: id,
 			...branchId !== void 0 ? { branchId } : {}
 		});
-		const key = yield* BucketKey(`${id}-key`, {
-			bucketId: bkt.id,
+		const key = yield* Prisma$1.BucketAccessKey(`${id}-key`, {
+			bucket: bkt.bucketId,
 			name: id,
 			role: "read_write"
 		});
@@ -1453,7 +1493,7 @@ function bucketDescriptor(_o) {
 			},
 			entities: [{
 				kind: "bucket",
-				id: bkt.id
+				id: bkt.bucketId
 			}]
 		};
 	});
@@ -1469,15 +1509,6 @@ function bucketDescriptor(_o) {
 */
 const envValue = (value) => Output.isOutput(value) ? Output.map(value, Redacted.make) : Redacted.make(value);
 /**
-* The fingerprint stand-in for a row whose text this descriptor must NOT hash:
-* `kind` says which channel the row came from, and the sorted names of the
-* resources the value is built from say what produces it, so rewiring the row
-* to a different resource moves the fingerprint. `Output.upstreamAny` is the
-* same walker Alchemy builds its dependency graph with, so the names are the
-* planner's own — no guessing at what a reference points to.
-*/
-const withheldSource = (kind, upstream) => `${kind}:${Object.keys(upstream).sort().join(",")}`;
-/**
 * Returns the PRECISE descriptor type, not the erased `NodeDescriptor`: the
 * registry in control.ts erases it on assignment anyway (method bivariance),
 * but s3-store composes over these hooks and needs their P/S to stay visible.
@@ -1490,7 +1521,7 @@ function computeDescriptor(o) {
 			validateName(id, "service name (from provision id)");
 			const projectId = projectIdOf(application);
 			const branchId = cloudApplicationOf(application).branchId;
-			const svc = yield* Prisma.App(`${id}-svc`, {
+			const svc = yield* Prisma$1.App(`${id}-svc`, {
 				project: projectId,
 				displayName: id,
 				regionId: o().region ?? "us-east-1",
@@ -1515,68 +1546,50 @@ function computeDescriptor(o) {
 				if (value === void 0) continue;
 				const key = configKey(address, d);
 				const rowValue = d.owner === "service" && isParamSource(value) ? encodeParamPointer(paramName(paramBindingFor(graph.params, address, d.name))) : encode(d.owner, value);
-				const record = yield* Prisma.EnvironmentVariable(`${key}-var`, {
+				const wrapped = envValue(rowValue);
+				const record = yield* Prisma$1.EnvironmentVariable(`${key}-var`, {
 					project: projectId,
 					key,
-					value: envValue(rowValue),
+					value: wrapped,
 					class: cls,
 					...branch
 				});
-				if (d.owner === "service") {
-					const pointer = isParamPointerRow(rowValue) ? decodeParamPointer(rowValue) : void 0;
-					rows.push({
-						record,
-						entry: {
-							key,
-							value: rowValue,
-							...pointer !== void 0 ? { pointers: [pointer] } : {}
-						}
-					});
-				} else if (Output.isOutput(value) || Object.keys(Output.upstreamAny(value)).length > 0) rows.push({
-					record,
-					entry: {
-						key,
-						withheld: withheldSource(`input.${d.owner.input}`, Output.upstreamAny(value))
-					}
-				});
-				else rows.push({
+				const pointer = d.owner === "service" && isParamPointerRow(rowValue) ? decodeParamPointer(rowValue) : void 0;
+				rows.push({
 					record,
-					entry: {
-						key,
-						value: rowValue
-					}
+					key,
+					value: wrapped,
+					...pointer !== void 0 ? { pointers: [pointer] } : {}
 				});
 			}
 			const inputRow = serializeInput(svc, address, graph.inputBindings.find((b) => b.serviceAddress === address)?.binding);
 			if (inputRow !== void 0) {
+				const inputValue = envValue(inputRow.value);
 				rows.push({
-					record: yield* Prisma.EnvironmentVariable(`${inputRow.key}-var`, {
+					record: yield* Prisma$1.EnvironmentVariable(`${inputRow.key}-var`, {
 						project: projectId,
 						key: inputRow.key,
-						value: envValue(inputRow.value),
+						value: inputValue,
 						class: cls,
 						...branch
 					}),
-					entry: {
-						key: inputRow.key,
-						value: inputRow.value,
-						pointers: inputRow.secrets
-					}
+					key: inputRow.key,
+					value: inputValue,
+					pointers: inputRow.secrets
 				});
 				for (const leaf of inputRow.generated) {
 					const resource = yield* GeneratedParam(`${inputRow.key}:${leaf.path}-generated`, { bytes: leaf.bytes });
+					const generatedValue = envValue(resource.value);
 					rows.push({
-						record: yield* Prisma.EnvironmentVariable(`${leaf.varName}-var`, {
+						record: yield* Prisma$1.EnvironmentVariable(`${leaf.varName}-var`, {
 							project: projectId,
 							key: leaf.varName,
-							value: envValue(resource.value),
+							value: generatedValue,
 							class: cls,
 							...branch
 						}),
-						entry: {
-							key: leaf.varName,
-							withheld: `generated:${String(leaf.bytes)}:${String(leaf.redacted)}`
-						}
+						key: leaf.varName,
+						value: generatedValue
 					});
 				}
 			}
@@ -1598,24 +1611,24 @@ function computeDescriptor(o) {
 					name: entry.name
 				});
 				const value = Output.isOutput(raw) ? Output.map(raw, (v) => encode("service", v)) : encode("service", raw);
+				const providerValue = envValue(value);
 				rows.push({
-					record: yield* Prisma.EnvironmentVariable(`${key}-var`, {
+					record: yield* Prisma$1.EnvironmentVariable(`${key}-var`, {
 						project: projectId,
 						key,
-						value: envValue(value),
+						value: providerValue,
 						class: cls,
 						...branch
 					}),
-					entry: {
-						key,
-						withheld: withheldSource(`provider.${entry.name}`, Output.upstreamAny(raw))
-					}
+					key,
+					value: providerValue
 				});
 			}
 			const port = typeof config.service["port"] === "number" ? config.service["port"] : 3e3;
 			return {
 				environment: rows.map((r) => r.record),
-				envFingerprint: rows.map((r) => r.entry),
+				triggers: Object.fromEntries(rows.map((r) => [r.key, r.value])),
+				pointers: [...new Set(rows.flatMap((r) => r.pointers ?? []))],
 				port,
 				...inputRow !== void 0 ? { input: inputRow } : {}
 			};
@@ -1628,11 +1641,15 @@ function computeDescriptor(o) {
 		})),
 		deploy: ({ id }, provisioned, artifact, serialized) => Effect.gen(function* () {
 			const pointerUpdatedAt = o().pointerUpdatedAt;
-			const artifactPath = yield* Effect.try(() => fingerprintedArtifactPath(artifact.path, deployEnvFingerprint(serialized.envFingerprint, pointerUpdatedAt)));
-			const deployment = yield* Prisma.Deployment(`${id}-deploy`, {
+			const triggers = {
+				...serialized.triggers,
+				...Object.fromEntries(serialized.pointers.map((name) => [`${name}:updatedAt`, pointerUpdatedAt(name) ?? "?"]))
+			};
+			const deployment = yield* Prisma$1.Deployment(`${id}-deploy`, {
 				app: appAfterEnvironment(provisioned.serviceId, serialized.environment),
-				artifactPath,
+				artifactPath: artifact.path,
 				artifactContentType: ARTIFACT_CONTENT_TYPE,
+				triggers,
 				portMapping: { http: serialized.port },
 				start: true,
 				promote: true
@@ -1665,12 +1682,12 @@ function postgresDescriptor(o) {
 	const lowering = ({ id, application }) => Effect.gen(function* () {
 		validateName(id, "resource name (from provision id)");
 		const branchId = cloudApplicationOf(application).branchId;
-		const db = yield* Prisma.Database(`${id}-db`, {
+		const db = yield* Prisma$1.Database(`${id}-db`, {
 			project: projectIdOf(application),
 			region: o().region ?? "us-east-1",
 			...branchId !== void 0 ? { branchId } : { name: id }
 		});
-		const conn = yield* Prisma.Connection(`${id}-conn`, {
+		const conn = yield* Prisma$1.Connection(`${id}-conn`, {
 			database: db,
 			name: id
 		});
@@ -1860,12 +1877,12 @@ function prismaNextDescriptor(o) {
 	const lowering = ({ id, node, application, graph }) => Effect.gen(function* () {
 		validateName(id, "resource name (from provision id)");
 		const branchId = cloudApplicationOf(application).branchId;
-		const db = yield* Prisma.Database(`${id}-db`, {
+		const db = yield* Prisma$1.Database(`${id}-db`, {
 			project: projectIdOf(application),
 			region: o().region ?? "us-east-1",
 			...branchId !== void 0 ? { branchId } : { name: id }
 		});
-		const conn = yield* Prisma.Connection(`${id}-conn`, {
+		const conn = yield* Prisma$1.Connection(`${id}-conn`, {
 			database: db,
 			name: id
 		});
@@ -2115,7 +2132,7 @@ const prismaState = () => ({
 		});
 	}
 });
-const KNOWN_REGION_SET = new Set(Prisma.KNOWN_REGION_IDS);
+const KNOWN_REGION_SET = new Set(Prisma$1.KNOWN_REGION_IDS);
 function isComputeRegion(value) {
 	return KNOWN_REGION_SET.has(value);
 }
@@ -2196,7 +2213,7 @@ function resolveOptions(opts) {
 		workspaceId,
 		providerParams: PROVIDER_PARAMS
 	};
-	if (!isComputeRegion(region)) throw new Error(`prismaCloud(): environment variable PRISMA_REGION="${region}" is not a known region (expected one of: ${Prisma.KNOWN_REGION_IDS.join(", ")}).`);
+	if (!isComputeRegion(region)) throw new Error(`prismaCloud(): environment variable PRISMA_REGION="${region}" is not a known region (expected one of: ${Prisma$1.KNOWN_REGION_IDS.join(", ")}).`);
 	return {
 		workspaceId,
 		region,