From 159ed53103505d41b9f4e5e07395e16dc862a937 Mon Sep 17 00:00:00 2001 From: jochen Date: Sun, 4 Oct 2026 02:45:13 +0200 Subject: [PATCH] Rebased onto main: ADR 0188 renumbered to 0201, and minio takes the sdk at 0.1.7 The bundles refactor took ADR 0188 on main, so minio's comments cite 0201. The sdk is 0.1.7 after the same rebase, and minio needs the `derived` field it carries. --- modules/minio/client.ts | 2 +- modules/minio/package.json | 2 +- modules/minio/provisioner/index.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/minio/client.ts b/modules/minio/client.ts index 999f753..f40edf4 100644 --- a/modules/minio/client.ts +++ b/modules/minio/client.ts @@ -305,7 +305,7 @@ export class MinioClient { // **Neither the access key nor the bucket is derived here any more.** `accessKeyFor` minted an id // of its own until the mesh took that over (ADR 0048: the login is the mesh's, handed to both -// ends), and `bucketFor` derived the bucket until the mesh took that over too (ADR 0188: the rule +// ends), and `bucketFor` derived the bucket until the mesh took that over too (ADR 0201: the rule // is a line of this module's manifest, filled per consumer and delivered to both ends). Both // survived with no callers, which is the state a rule comes back from; they are gone. diff --git a/modules/minio/package.json b/modules/minio/package.json index 175a93d..892b097 100644 --- a/modules/minio/package.json +++ b/modules/minio/package.json @@ -5,7 +5,7 @@ "type": "module", "private": true, "dependencies": { - "@novox/mesh-sdk": "^0.1.2" + "@novox/mesh-sdk": "^0.1.7" }, "devDependencies": { "@types/node": "^22.0.0", diff --git a/modules/minio/provisioner/index.ts b/modules/minio/provisioner/index.ts index dfaf2d2..fca498d 100644 --- a/modules/minio/provisioner/index.ts +++ b/modules/minio/provisioner/index.ts @@ -12,7 +12,7 @@ // creates the service account under exactly that access key with exactly that secret — a credential // the provisioner invented is one the consumer could never present. // -// **The bucket name is the mesh's too (ADR 0188).** It used to be computed here, from the login, +// **The bucket name is the mesh's too (ADR 0201).** It used to be computed here, from the login, // and every consumer transcribed the same rule into its own definition by hand — two copies of // one rule with nothing comparing them, and one of three was wrong for months. Now the rule is a // line of this module's manifest (`serves.s3-bucket.bucket: ${consumer:as:dns}`), the mesh fills @@ -79,7 +79,7 @@ function bucketNamed(derived: Readonly>): string { if (typeof bucket !== "string" || bucket === "") { throw new Error( "the mesh did not say which bucket this consumer gets: minio's manifest must serve " + - "`bucket` under s3-bucket (novox/hq ADR 0188)", + "`bucket` under s3-bucket (novox/hq ADR 0201)", ); } return bucket;