@prisma/composer-prisma-cloud 0.29.1-dev.4 → 0.29.1-dev.6

package/dist/control.d.mts

@@ -10,7 +10,7 @@ import * as Output from "alchemy/Output";
 import { Resource } from "alchemy";
 import { Credentials } from "@distilled.cloud/prisma";
 import { EnvironmentVariable } from "alchemy/Prisma";
-import "effect/unstable/http/HttpClient";
+import "effect/http/HttpClient";
 import { ExtensionDescriptor, StateDescriptor } from "@prisma/composer/config";
 //#region ../../1-prisma-cloud/0-lowering/lowering/dist/index.d.mts
 //#endregion

package/dist/control.mjs

@@ -2,7 +2,7 @@ import { c as paramBindingFor, l as paramName } from "./casts-DpaahrlC-Ykus3kCE.
 import { a as encode, c as paramEntries, d as serializeInput, n as configKey, o as encodeParamPointer, r as decodeParamPointer, s as isParamPointerRow } from "./serializer-CE3hLPYz-DfUFvkm9.mjs";
 import { a as provisionedEdges, n as SELF_ORIGIN, r as STREAMS_API_KEY, t as RESERVED_PROVIDER_PARAMS } from "./provisioned-edges-CPrUiJ1K--R7PIGoz.mjs";
 import { n as requiredPackHeadOf } from "./required-pack-head-CMMJ2LaU-CfWu5JMj.mjs";
-import { A as call, C as ServiceKey, D as ManagementClient, E as isWithin, F as resolveDefaultBranchId, I as PrismaCredentials, L as fromEnv, M as collectPages, N as drivePagesAsync, O as PrismaApiError, P as layer, R as managementApiBaseUrl, S as providers, T as appAfterEnvironment, _ as resolveTargetRef, a as PRISMA_CLOUD_EXTENSION_ID, d as collectPreflightNames, f as containerDescriptor, g as resolveOrmConfig, h as prismaCloudContainerOf, i as OrmMigrationProvider, j as claimDatabaseUrlKeys, k as RESERVED_DATABASE_URL_KEYS, l as S3Credentials, m as packHeadRefHashes, n as GeneratedParamProvider, o as PgWarm, r as OrmMigration, s as PgWarmProvider, t as GeneratedParam, u as S3CredentialsProvider, v as serviceAppName, w as ServiceKeyProvider, y as targetStorageHash } from "./s3-credentials-resource-BZjtuopJ-D8y42HzH.mjs";
+import { A as call, C as ServiceKey, D as ManagementClient, E as isWithin, F as resolveDefaultBranchId, I as PrismaCredentials, L as fromEnv, M as collectPages, N as drivePagesAsync, O as PrismaApiError, P as layer, R as managementApiBaseUrl, S as providers, T as appAfterEnvironment, _ as resolveTargetRef, a as PRISMA_CLOUD_EXTENSION_ID, d as collectPreflightNames, f as containerDescriptor, g as resolveOrmConfig, h as prismaCloudContainerOf, i as OrmMigrationProvider, j as claimDatabaseUrlKeys, k as RESERVED_DATABASE_URL_KEYS, l as S3Credentials, m as packHeadRefHashes, n as GeneratedParamProvider, o as PgWarm, r as OrmMigration, s as PgWarmProvider, t as GeneratedParam, u as S3CredentialsProvider, v as serviceAppName, w as ServiceKeyProvider, y as targetStorageHash } from "./s3-credentials-resource-BZjtuopJ-DA26Duzb.mjs";
 import { r as isPostgresResourceNode } from "./orm-postgres-ChW2Ewj7-Dnas0G3L.mjs";
 import { isParamSource } from "@prisma/composer";
 import { blindCast } from "@prisma/composer/casts";
@@ -21,10 +21,10 @@ import * as zlib from "node:zlib";
 import * as Output from "alchemy/Output";
 import { Stack } from "alchemy";
 import * as Prisma$1 from "alchemy/Prisma";
-import * as HttpClientRequest from "effect/unstable/http/HttpClientRequest";
+import * as HttpClientRequest from "effect/http/HttpClientRequest";
 import { State, makeHttpStateStore } from "alchemy/State";
-import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
-import * as Headers from "effect/unstable/http/Headers";
+import * as FetchHttpClient from "effect/http/FetchHttpClient";
+import * as Headers from "effect/http/Headers";
 import { execFileSync } from "node:child_process";
 import { readPreflightPayload } from "@prisma/composer/config";
 //#region ../../1-prisma-cloud/0-lowering/lowering/dist/artifact-CoKVIyRH.mjs
@@ -1185,12 +1185,17 @@ function applicationTopologyApi(options) {
 		const describe = "record this deploy's application topology";
 		let result;
 		try {
-			result = await blindCast(client.PUT)("/v1/projects/{projectId}/branches/{branchId}/application-topology", {
+			result = await client.PUT("/v1/projects/{projectId}/branches/{branchId}/application-topology", {
 				params: { path: {
 					projectId,
 					branchId
 				} },
-				body: submission,
+				body: {
+					contentHash: submission.contentHash,
+					nodes: [...submission.nodes],
+					ports: [...submission.ports],
+					edges: [...submission.edges]
+				},
 				signal: AbortSignal.timeout(REPORT_DEADLINE_MS)
 			});
 		} catch (error) {
@@ -1475,6 +1480,10 @@ function cloudApplicationOf(application) {
 function projectIdOf(application) {
 	return cloudApplicationOf(application).projectId;
 }
+/** The `logicalId` prop of a node's App, Database or Bucket: its address on every platform deploy, none in branchless dev (ADR-0051). */
+function logicalIdProp(application, address) {
+	return cloudApplicationOf(application).branchless ? {} : { logicalId: address };
+}
 /**
 * The Branch a database attaches to. Upstream treats an omitted branch as
 * desired-unassigned (`branchId` PATCHed back to `null` on reconcile), so a
@@ -1494,12 +1503,13 @@ function attachmentBranchIdOf(application, id) {
 * the `name` arm. The returned `url` is direct, not pooled — PgWarm and the
 * migration flows need a direct connection.
 */
-const stageDatabase = ({ id, application, region }) => Effect.gen(function* () {
+const stageDatabase = ({ id, address, application, region }) => Effect.gen(function* () {
 	const branchId = attachmentBranchIdOf(application, id);
 	const db = yield* Prisma$1.Database(`${id}-db`, {
 		project: projectIdOf(application),
 		region: region ?? "inherit",
-		...branchId !== void 0 ? { branchId } : { name: id }
+		...branchId !== void 0 ? { branchId } : { name: id },
+		...logicalIdProp(application, address)
 	});
 	const conn = yield* Prisma$1.Connection(`${id}-conn`, {
 		database: db,
@@ -1521,13 +1531,14 @@ const stageDatabase = ({ id, application, region }) => Effect.gen(function* () {
 * secretAccessKey) become the four S3Config outputs consumers resolve by name.
 */
 function bucketDescriptor(_o) {
-	const lowering = ({ id, application }) => Effect.gen(function* () {
+	const lowering = ({ id, address, application }) => Effect.gen(function* () {
 		validateName(id, "resource name (from provision id)");
-		const branchId = cloudApplicationOf(application).branchId;
+		const { branchId } = cloudApplicationOf(application);
 		const bkt = yield* Prisma$1.Bucket(`${id}-bucket`, {
 			project: projectIdOf(application),
 			name: id,
-			...branchId !== void 0 ? { branchId } : {}
+			...branchId !== void 0 ? { branchId } : {},
+			...logicalIdProp(application, address)
 		});
 		const key = yield* Prisma$1.BucketAccessKey(`${id}-key`, {
 			bucket: bkt.bucketId,
@@ -1583,15 +1594,16 @@ function isComputeProvisioned(value) {
 function computeDescriptor(o) {
 	return {
 		kind: "service",
-		provision: ({ id, application }) => Effect.gen(function* () {
+		provision: ({ id, address, application }) => Effect.gen(function* () {
 			validateName(id, "service name (from provision id)");
 			const projectId = projectIdOf(application);
-			const branchId = cloudApplicationOf(application).branchId;
+			const { branchId } = cloudApplicationOf(application);
 			const svc = yield* Prisma$1.App(`${id}-svc`, {
 				project: projectId,
 				displayName: serviceAppName(id),
 				...o().region !== void 0 ? { regionId: o().region } : {},
-				...branchId !== void 0 ? { branchId } : {}
+				...branchId !== void 0 ? { branchId } : {},
+				...logicalIdProp(application, address)
 			});
 			return {
 				serviceId: svc.appId,
@@ -1605,6 +1617,7 @@ function computeDescriptor(o) {
 			const cls = branchId ? "preview" : "production";
 			const branch = branchId !== void 0 ? { branchId } : {};
 			const projectId = provisioned.projectId;
+			if (node.kind !== "service") throw new Error(`prisma-cloud: cannot serialize non-service node "${address}".`);
 			const svc = node;
 			const rows = [];
 			for (const d of paramEntries(svc)) {
@@ -1929,10 +1942,11 @@ async function runPackPreflight(graph) {
 * no-op, a contract or ref-invariant change re-migrates.
 */
 function postgresDescriptor(o) {
-	const lowering = ({ id, node, application, graph }) => Effect.gen(function* () {
+	const lowering = ({ id, address, node, application, graph }) => Effect.gen(function* () {
 		validateName(id, "resource name (from provision id)");
 		const { db, url } = yield* stageDatabase({
 			id,
+			address,
 			application,
 			region: o().region
 		});
@@ -1969,10 +1983,11 @@ function postgresDescriptor(o) {
 * exactly once.
 */
 function rawPostgresDescriptor(o) {
-	const lowering = ({ id, application }) => Effect.gen(function* () {
+	const lowering = ({ id, address, application }) => Effect.gen(function* () {
 		validateName(id, "resource name (from provision id)");
 		const { db, url } = yield* stageDatabase({
 			id,
+			address,
 			application,
 			region: o().region
 		});