@serve.zone/interfaces 19.8.0 → 20.0.0

package/dist_ts/data/secret.js

@@ -0,0 +1,469 @@
+import { normalizeServiceAbsolutePath } from './service.js';
+/** Retired versions remain usable only through an already-accepted manifest. */
+export const isSecretVersionMaterialIssuable = (lifecycleStateArg) => lifecycleStateArg === 'active' || lifecycleStateArg === 'retired';
+export const resolvedSecretManifestReferencesEqual = (leftArg, rightArg) => (Boolean(leftArg)
+    && Boolean(rightArg)
+    && leftArg?.manifestId === rightArg?.manifestId
+    && leftArg?.manifestDigest === rightArg?.manifestDigest
+    && leftArg?.clusterId === rightArg?.clusterId
+    && leftArg?.secretRolloutId === rightArg?.secretRolloutId
+    && leftArg?.secretRolloutGeneration === rightArg?.secretRolloutGeneration);
+export const isResolvedSecretManifestReferenceAccepted = (stateArg, referenceArg, nowArg) => (resolvedSecretManifestReferencesEqual(stateArg.desiredManifest, referenceArg)
+    || resolvedSecretManifestReferencesEqual(stateArg.appliedManifest, referenceArg)
+    || (Boolean(stateArg.previousAcceptedManifest)
+        && nowArg < stateArg.previousAcceptedManifest.acceptedUntil
+        && resolvedSecretManifestReferencesEqual(stateArg.previousAcceptedManifest.manifest, referenceArg)));
+const secretIdentifierRegex = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
+const secretEnvironmentRegex = /^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/;
+const secretKeyRegex = /^[A-Z_][A-Z0-9_]{0,252}$/;
+const secretDigestRegex = /^sha256:[a-f0-9]{64}$/;
+const secretManagementScopeRegex = /^(appstore|mail|oidc|webpush|platform|system):[A-Za-z0-9][A-Za-z0-9._-]{0,199}$/;
+const isRecord = (valueArg) => (Boolean(valueArg) && typeof valueArg === 'object' && !Array.isArray(valueArg));
+const isSecretIdentifier = (valueArg) => (typeof valueArg === 'string' && secretIdentifierRegex.test(valueArg));
+const isSecretKey = (valueArg) => (typeof valueArg === 'string' && secretKeyRegex.test(valueArg));
+const isSecretEnvironment = (valueArg) => (typeof valueArg === 'string' && secretEnvironmentRegex.test(valueArg));
+export const validateSecretManagementScope = (sourceArg, scopeArg) => {
+    if (scopeArg === 'operator') {
+        return sourceArg === 'operator'
+            ? []
+            : ['operator management scope requires operator source'];
+    }
+    if (scopeArg === 'legacy') {
+        return sourceArg === 'legacy'
+            ? []
+            : ['legacy management scope requires legacy source'];
+    }
+    if (typeof scopeArg !== 'string' || !secretManagementScopeRegex.test(scopeArg)) {
+        return ['management scope must be canonical'];
+    }
+    return scopeArg.startsWith(`${sourceArg}:`)
+        ? []
+        : ['management scope prefix must match management source'];
+};
+export const validateSecretDelivery = (deliveryArg) => {
+    if (!isRecord(deliveryArg))
+        return ['delivery must be an object'];
+    if (deliveryArg.type === 'environment') {
+        return isSecretKey(deliveryArg.variableName)
+            ? []
+            : ['environment delivery variableName must be a canonical environment key'];
+    }
+    if (deliveryArg.type !== 'file') {
+        return ['delivery type must be environment or file'];
+    }
+    const errors = [];
+    if (typeof deliveryArg.targetPath !== 'string'
+        || normalizeServiceAbsolutePath(deliveryArg.targetPath) !== deliveryArg.targetPath
+        || !/^\/run\/secrets\/[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/.test(deliveryArg.targetPath)
+        || deliveryArg.targetPath === '/run/secrets/secret.json') {
+        errors.push('file delivery targetPath must be a canonical file below /run/secrets');
+    }
+    for (const field of ['uid', 'gid']) {
+        const value = deliveryArg[field];
+        if (!Number.isSafeInteger(value)
+            || value < 0
+            || value > 2_147_483_647) {
+            errors.push(`file delivery ${field} must be a bounded numeric identity`);
+        }
+    }
+    if (deliveryArg.mode !== 0o400 && deliveryArg.mode !== 0o440) {
+        errors.push('file delivery mode must be 0400 or 0440');
+    }
+    return errors;
+};
+/**
+ * One shared precedence rule for resolution and runtime verification.
+ * A manifest is authoritative once published; before publication an attachment
+ * override wins over the Secret default.
+ */
+export const resolveSecretDelivery = (deliveryArg) => (deliveryArg.manifestDelivery
+    ?? deliveryArg.attachmentOverride
+    ?? deliveryArg.secretDefault);
+export const validateServiceSecretConfiguration = (configurationArg) => {
+    if (!isRecord(configurationArg)) {
+        return ['secretConfiguration must be an object'];
+    }
+    if (configurationArg.schemaVersion !== 1) {
+        return ['secretConfiguration schemaVersion must be 1'];
+    }
+    if (!Array.isArray(configurationArg.secretSetAttachments)) {
+        return ['secretSetAttachments must be an array'];
+    }
+    if (configurationArg.secretSetAttachments.length > 64) {
+        return ['secretSetAttachments must contain at most 64 entries'];
+    }
+    const errors = [];
+    if (!Number.isSafeInteger(configurationArg.revision)
+        || configurationArg.revision < 0) {
+        errors.push('secretConfiguration revision must be a non-negative integer');
+    }
+    if (!Number.isSafeInteger(configurationArg.secretsRevision)
+        || configurationArg.secretsRevision < 0) {
+        errors.push('secretConfiguration secretsRevision must be a non-negative integer');
+    }
+    const attachmentIds = [];
+    const setEnvironmentKeys = [];
+    for (const [attachmentIndex, candidate] of configurationArg.secretSetAttachments.entries()) {
+        if (!isRecord(candidate)) {
+            errors.push(`secretSetAttachments[${attachmentIndex}] must be an object`);
+            continue;
+        }
+        if (!isSecretIdentifier(candidate.id)) {
+            errors.push(`secretSetAttachments[${attachmentIndex}].id must be a canonical identifier`);
+        }
+        else {
+            attachmentIds.push(candidate.id);
+        }
+        if (!isSecretIdentifier(candidate.secretSetId)) {
+            errors.push(`secretSetAttachments[${attachmentIndex}].secretSetId must be a canonical identifier`);
+        }
+        if (!isSecretEnvironment(candidate.environment)) {
+            errors.push(`secretSetAttachments[${attachmentIndex}].environment must be a canonical environment`);
+        }
+        if (isSecretIdentifier(candidate.secretSetId)
+            && isSecretEnvironment(candidate.environment)) {
+            setEnvironmentKeys.push(`${candidate.secretSetId}\0${candidate.environment}`);
+        }
+        if (candidate.mappings === undefined)
+            continue;
+        if (!Array.isArray(candidate.mappings) || candidate.mappings.length > 128) {
+            errors.push(`secretSetAttachments[${attachmentIndex}].mappings must be a bounded array`);
+            continue;
+        }
+        const sourceKeys = [];
+        const targetKeys = [];
+        for (const [mappingIndex, mappingCandidate] of candidate.mappings.entries()) {
+            if (!isRecord(mappingCandidate)) {
+                errors.push(`secretSetAttachments[${attachmentIndex}].mappings[${mappingIndex}] must be an object`);
+                continue;
+            }
+            if (!isSecretKey(mappingCandidate.sourceKey)) {
+                errors.push(`secretSetAttachments[${attachmentIndex}].mappings[${mappingIndex}].sourceKey must be canonical`);
+            }
+            else {
+                sourceKeys.push(mappingCandidate.sourceKey);
+            }
+            const finalKey = mappingCandidate.targetKey ?? mappingCandidate.sourceKey;
+            if (!isSecretKey(finalKey)) {
+                errors.push(`secretSetAttachments[${attachmentIndex}].mappings[${mappingIndex}].targetKey must be canonical`);
+            }
+            else {
+                targetKeys.push(finalKey);
+            }
+            if (mappingCandidate.delivery !== undefined) {
+                errors.push(...validateSecretDelivery(mappingCandidate.delivery).map((errorArg) => (`secretSetAttachments[${attachmentIndex}].mappings[${mappingIndex}].${errorArg}`)));
+            }
+        }
+        if (new Set(sourceKeys).size !== sourceKeys.length) {
+            errors.push(`secretSetAttachments[${attachmentIndex}] has duplicate source mappings`);
+        }
+        if (new Set(targetKeys).size !== targetKeys.length) {
+            errors.push(`secretSetAttachments[${attachmentIndex}] has duplicate target mappings`);
+        }
+    }
+    if (new Set(attachmentIds).size !== attachmentIds.length) {
+        errors.push('secretSetAttachments ids must be unique');
+    }
+    if (new Set(setEnvironmentKeys).size !== setEnvironmentKeys.length) {
+        errors.push('a SecretSet may be attached only once per environment');
+    }
+    return errors;
+};
+export const validateServiceSecretMode = (serviceDataArg) => {
+    if (!isRecord(serviceDataArg))
+        return ['service data must be an object'];
+    const hasLegacyPrimary = typeof serviceDataArg.secretBundleId === 'string'
+        && serviceDataArg.secretBundleId.length > 0;
+    const hasLegacyAdditional = Array.isArray(serviceDataArg.additionalSecretBundleIds)
+        && serviceDataArg.additionalSecretBundleIds.length > 0;
+    if (serviceDataArg.secretConfiguration !== undefined
+        && (hasLegacyPrimary || hasLegacyAdditional)) {
+        return ['legacy SecretBundle references cannot be mixed with secretConfiguration'];
+    }
+    return serviceDataArg.secretConfiguration === undefined
+        ? []
+        : validateServiceSecretConfiguration(serviceDataArg.secretConfiguration);
+};
+export const validateSecretSetAttachmentOwnership = (configurationArg, serviceOrganizationIdArg, secretSetsArg) => {
+    const errors = validateServiceSecretConfiguration(configurationArg);
+    const secretSetsById = new Map(secretSetsArg.map((secretSetArg) => [
+        secretSetArg.id,
+        secretSetArg,
+    ]));
+    for (const attachment of configurationArg.secretSetAttachments || []) {
+        const secretSet = secretSetsById.get(attachment.secretSetId);
+        if (!secretSet) {
+            errors.push(`SecretSet ${attachment.secretSetId} does not exist`);
+        }
+        else if (secretSet.organizationId !== serviceOrganizationIdArg) {
+            errors.push(`SecretSet ${attachment.secretSetId} belongs to another organization`);
+        }
+        else if (secretSet.lifecycleState !== 'active') {
+            errors.push(`SecretSet ${attachment.secretSetId} is not active`);
+        }
+    }
+    return errors;
+};
+export const createResolvedSecretManifestDigestInput = (manifestArg) => JSON.stringify({
+    schemaVersion: manifestArg.schemaVersion,
+    id: manifestArg.id,
+    organizationId: manifestArg.organizationId,
+    serviceId: manifestArg.serviceId,
+    clusterId: manifestArg.clusterId,
+    secretRolloutId: manifestArg.secretRolloutId,
+    secretRolloutGeneration: manifestArg.secretRolloutGeneration,
+    entries: manifestArg.entries.map((entryArg) => ({
+        secretId: entryArg.secretId,
+        secretVersionId: entryArg.secretVersionId,
+        key: entryArg.key,
+        environment: entryArg.environment,
+        owner: entryArg.owner.kind === 'service'
+            ? {
+                kind: 'service',
+                serviceId: entryArg.owner.serviceId,
+            }
+            : {
+                kind: 'secret-set',
+                secretSetId: entryArg.owner.secretSetId,
+            },
+        delivery: entryArg.delivery.type === 'environment'
+            ? {
+                type: 'environment',
+                variableName: entryArg.delivery.variableName,
+            }
+            : {
+                type: 'file',
+                targetPath: entryArg.delivery.targetPath,
+                uid: entryArg.delivery.uid,
+                gid: entryArg.delivery.gid,
+                mode: entryArg.delivery.mode,
+            },
+    })),
+    createdAt: manifestArg.createdAt,
+});
+/** Shared canonical digest; the digest field itself is excluded from the input. */
+export const computeResolvedSecretManifestDigest = async (manifestArg) => {
+    const encoded = new TextEncoder().encode(createResolvedSecretManifestDigestInput(manifestArg));
+    const digestBuffer = await globalThis.crypto.subtle.digest('SHA-256', encoded);
+    const digestHex = [...new Uint8Array(digestBuffer)]
+        .map((byteArg) => byteArg.toString(16).padStart(2, '0'))
+        .join('');
+    return `sha256:${digestHex}`;
+};
+export const verifyResolvedSecretManifestDigest = async (manifestArg) => (manifestArg.digest === await computeResolvedSecretManifestDigest(manifestArg));
+export const validateResolvedSecretManifest = (manifestArg) => {
+    if (!isRecord(manifestArg))
+        return ['secret manifest must be an object'];
+    const errors = [];
+    if (manifestArg.schemaVersion !== 1)
+        errors.push('secret manifest schemaVersion must be 1');
+    for (const field of [
+        'id',
+        'organizationId',
+        'serviceId',
+        'clusterId',
+        'secretRolloutId',
+    ]) {
+        if (!isSecretIdentifier(manifestArg[field])) {
+            errors.push(`secret manifest ${field} must be a canonical identifier`);
+        }
+    }
+    if (typeof manifestArg.digest !== 'string' || !secretDigestRegex.test(manifestArg.digest)) {
+        errors.push('secret manifest digest must be a canonical sha256 digest');
+    }
+    if (!Number.isSafeInteger(manifestArg.secretRolloutGeneration)
+        || manifestArg.secretRolloutGeneration < 1) {
+        errors.push('secret manifest rollout generation must be a positive integer');
+    }
+    if (!Number.isSafeInteger(manifestArg.createdAt) || manifestArg.createdAt < 0) {
+        errors.push('secret manifest createdAt must be a non-negative integer');
+    }
+    if (!Array.isArray(manifestArg.entries) || manifestArg.entries.length > 256) {
+        errors.push('secret manifest entries must be a bounded array');
+        return errors;
+    }
+    const keyScopes = [];
+    const secretIds = [];
+    const versionIds = [];
+    const environmentDeliveryTargets = [];
+    const fileDeliveryTargets = [];
+    let previousSortKey;
+    for (const [index, candidate] of manifestArg.entries.entries()) {
+        if (!isRecord(candidate)) {
+            errors.push(`secret manifest entries[${index}] must be an object`);
+            continue;
+        }
+        if (!isSecretIdentifier(candidate.secretId)) {
+            errors.push(`secret manifest entries[${index}].secretId must be canonical`);
+        }
+        else {
+            secretIds.push(candidate.secretId);
+        }
+        if (!isSecretIdentifier(candidate.secretVersionId)) {
+            errors.push(`secret manifest entries[${index}].secretVersionId must be canonical`);
+        }
+        else {
+            versionIds.push(candidate.secretVersionId);
+        }
+        if (!isSecretKey(candidate.key)) {
+            errors.push(`secret manifest entries[${index}].key must be canonical`);
+        }
+        if (!isSecretEnvironment(candidate.environment)) {
+            errors.push(`secret manifest entries[${index}].environment must be canonical`);
+        }
+        else if (isSecretKey(candidate.key)) {
+            keyScopes.push(`${candidate.environment}\0${candidate.key}`);
+        }
+        if (!isRecord(candidate.owner)
+            || (candidate.owner.kind !== 'service'
+                && candidate.owner.kind !== 'secret-set')
+            || (candidate.owner.kind === 'service'
+                && !isSecretIdentifier(candidate.owner.serviceId))
+            || (candidate.owner.kind === 'secret-set'
+                && !isSecretIdentifier(candidate.owner.secretSetId))) {
+            errors.push(`secret manifest entries[${index}].owner must be canonical`);
+        }
+        else if (candidate.owner.kind === 'service'
+            && isSecretIdentifier(manifestArg.serviceId)
+            && candidate.owner.serviceId !== manifestArg.serviceId) {
+            errors.push(`secret manifest entries[${index}].owner serviceId must match the manifest serviceId`);
+        }
+        errors.push(...validateSecretDelivery(candidate.delivery).map((errorArg) => `secret manifest entries[${index}].${errorArg}`));
+        if (isRecord(candidate.delivery)) {
+            if (candidate.delivery.type === 'environment'
+                && isSecretKey(candidate.delivery.variableName)) {
+                environmentDeliveryTargets.push(candidate.delivery.variableName);
+            }
+            else if (candidate.delivery.type === 'file'
+                && typeof candidate.delivery.targetPath === 'string'
+                && validateSecretDelivery(candidate.delivery).length === 0) {
+                fileDeliveryTargets.push(candidate.delivery.targetPath);
+            }
+        }
+        if (isSecretKey(candidate.key) && isSecretEnvironment(candidate.environment)) {
+            const sortKey = `${candidate.environment}\0${candidate.key}`;
+            if (previousSortKey !== undefined && sortKey <= previousSortKey) {
+                errors.push('secret manifest entries must be uniquely sorted by environment and key');
+            }
+            previousSortKey = sortKey;
+        }
+    }
+    if (new Set(keyScopes).size !== keyScopes.length) {
+        errors.push('secret manifest final keys must be unique per environment');
+    }
+    if (new Set(secretIds).size !== secretIds.length) {
+        errors.push('secret manifest logical secret references must be unique');
+    }
+    if (new Set(versionIds).size !== versionIds.length) {
+        errors.push('secret manifest version references must be unique');
+    }
+    if (new Set(environmentDeliveryTargets).size !== environmentDeliveryTargets.length) {
+        errors.push('secret manifest environment delivery targets must be globally unique');
+    }
+    if (new Set(fileDeliveryTargets).size !== fileDeliveryTargets.length) {
+        errors.push('secret manifest file delivery targets must be globally unique');
+    }
+    return errors;
+};
+const validateResolvedSecretManifestReference = (referenceArg, expectedClusterIdArg, pathArg) => {
+    if (!isRecord(referenceArg)
+        || !isSecretIdentifier(referenceArg.manifestId)
+        || typeof referenceArg.manifestDigest !== 'string'
+        || !secretDigestRegex.test(referenceArg.manifestDigest)
+        || referenceArg.clusterId !== expectedClusterIdArg
+        || !isSecretIdentifier(referenceArg.secretRolloutId)
+        || !Number.isSafeInteger(referenceArg.secretRolloutGeneration)
+        || referenceArg.secretRolloutGeneration < 1) {
+        return [`${pathArg} must be canonical and match its cluster`];
+    }
+    return [];
+};
+export const validateServiceSecretDeploymentPlan = (planArg, expectedTargetClusterIdsArg) => {
+    if (!isRecord(planArg))
+        return ['secret deployment plan must be an object'];
+    const errors = [];
+    if (planArg.schemaVersion !== 1)
+        errors.push('secret deployment plan schemaVersion must be 1');
+    if (!Number.isSafeInteger(planArg.revision) || planArg.revision < 1) {
+        errors.push('secret deployment plan revision must be a positive integer');
+    }
+    if (!Number.isSafeInteger(planArg.updatedAt) || planArg.updatedAt < 0) {
+        errors.push('secret deployment plan updatedAt must be a non-negative integer');
+    }
+    if (!Array.isArray(planArg.clusterStates)
+        || planArg.clusterStates.length === 0
+        || planArg.clusterStates.length > 128) {
+        errors.push('secret deployment plan clusterStates must be a non-empty bounded array');
+        return errors;
+    }
+    const clusterIds = [];
+    const manifestReferencesById = new Map();
+    const validateAndTrackManifestReference = (referenceArg, expectedClusterIdArg, pathArg) => {
+        const referenceErrors = validateResolvedSecretManifestReference(referenceArg, expectedClusterIdArg, pathArg);
+        errors.push(...referenceErrors);
+        if (referenceErrors.length > 0)
+            return;
+        const reference = referenceArg;
+        const existingReference = manifestReferencesById.get(reference.manifestId);
+        if (existingReference
+            && !resolvedSecretManifestReferencesEqual(existingReference, reference)) {
+            errors.push(`${pathArg}.manifestId must identify one immutable manifest reference throughout the plan`);
+            return;
+        }
+        manifestReferencesById.set(reference.manifestId, reference);
+    };
+    for (const [index, candidate] of planArg.clusterStates.entries()) {
+        const path = `secret deployment plan clusterStates[${index}]`;
+        if (!isRecord(candidate) || !isSecretIdentifier(candidate.clusterId)) {
+            errors.push(`${path}.clusterId must be canonical`);
+            continue;
+        }
+        clusterIds.push(candidate.clusterId);
+        validateAndTrackManifestReference(candidate.desiredManifest, candidate.clusterId, `${path}.desiredManifest`);
+        if (candidate.appliedManifest !== undefined) {
+            validateAndTrackManifestReference(candidate.appliedManifest, candidate.clusterId, `${path}.appliedManifest`);
+        }
+        if (candidate.previousAcceptedManifest !== undefined) {
+            if (!isRecord(candidate.previousAcceptedManifest)
+                || !Number.isSafeInteger(candidate.previousAcceptedManifest.acceptedUntil)
+                || candidate.previousAcceptedManifest.acceptedUntil < 0) {
+                errors.push(`${path}.previousAcceptedManifest acceptedUntil must be non-negative`);
+            }
+            else {
+                validateAndTrackManifestReference(candidate.previousAcceptedManifest.manifest, candidate.clusterId, `${path}.previousAcceptedManifest.manifest`);
+                if (Number.isSafeInteger(candidate.updatedAt)
+                    && candidate.previousAcceptedManifest.acceptedUntil
+                        < candidate.updatedAt) {
+                    errors.push(`${path}.previousAcceptedManifest acceptedUntil predates its state`);
+                }
+            }
+        }
+        if (![
+            'pending',
+            'applying',
+            'applied',
+            'drifted',
+            'failed',
+        ].includes(candidate.status)) {
+            errors.push(`${path}.status must be canonical`);
+        }
+        if (!Number.isSafeInteger(candidate.updatedAt) || candidate.updatedAt < 0) {
+            errors.push(`${path}.updatedAt must be a non-negative integer`);
+        }
+        if (candidate.status === 'applied'
+            && !resolvedSecretManifestReferencesEqual(candidate.appliedManifest, candidate.desiredManifest)) {
+            errors.push(`${path} applied status requires the desired manifest to be applied`);
+        }
+    }
+    if (new Set(clusterIds).size !== clusterIds.length) {
+        errors.push('secret deployment plan clusterStates must contain each cluster once');
+    }
+    if (expectedTargetClusterIdsArg) {
+        const expected = [...new Set(expectedTargetClusterIdsArg)].sort();
+        if (JSON.stringify([...clusterIds].sort()) !== JSON.stringify(expected)) {
+            errors.push('secret deployment plan target clusters do not match the service rollout scope');
+        }
+    }
+    return errors;
+};
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"secret.js","sourceRoot":"","sources":["../../ts/data/secret.ts"],"names":[],"mappings":"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"}

package/dist_ts/data/secretbundle.d.ts

@@ -1,3 +1,7 @@
+/**
+ * @deprecated Compatibility-only persisted shape. Service-owned Secrets and
+ * explicit same-organization SecretSets replace this model.
+ */
 export interface ISecretBundle {
     id: string;
     data: {

package/dist_ts/data/secretgroup.d.ts

@@ -1,3 +1,7 @@
+/**
+ * @deprecated Compatibility-only persisted shape. Migrate to ISecretMetadata
+ * and immutable SecretVersion records; do not create new SecretGroups.
+ */
 export interface ISecretGroup {
     /**
      * the insatnce id. This should be a random id, except for default

package/dist_ts/data/service.d.ts

@@ -6,6 +6,7 @@ import type { IServiceMailConfig } from './mail.js';
 import type { IServiceWebPushConfig } from './webpush.js';
 import type { IImageRolloutStatus, IImmutableImageDeploymentPlan } from './immutableimage.js';
 import type { IServiceDomainRoute, IServicePublicPortMapping, IServiceTargetPort } from './serviceports.js';
+import type { IServiceSecretConfiguration, IServiceSecretDeploymentPlan } from './secret.js';
 export interface IServiceVolume {
     /** Stable Docker volume name. If omitted, Coreflow derives one from service id and mount path. */
     name?: string;
@@ -118,14 +119,22 @@ export interface IService {
             [key: string]: string;
         };
         /**
-         * the main secret bundle id, exclusive to the service
+         * Legacy main SecretBundle ID. New services use secretConfiguration and
+         * the server-managed secretDeployment manifest pointer.
+         *
+         * @deprecated Compatibility-only until the versioned SecretBundle migration completes.
          */
-        secretBundleId: string;
+        secretBundleId?: string;
         /**
-         * those secret bundle ids do not belong to the service itself
-         * and thus live past the service lifecycle
+         * Legacy additional SecretBundle IDs.
+         *
+         * @deprecated Use explicit same-organization SecretSet attachments.
          */
         additionalSecretBundleIds?: string[];
+        /** Value-free, caller-managed SecretSet attachment configuration. */
+        secretConfiguration?: IServiceSecretConfiguration;
+        /** Server-managed immutable manifest authority pointer. */
+        secretDeployment?: IServiceSecretDeploymentPlan;
         /** Exact OCI/Docker argument vector appended after the image entrypoint. */
         containerArgs?: string[];
         /** Secret keys mounted as files and excluded from Env and secret.json. */
@@ -193,8 +202,11 @@ export interface IService {
         deploymentIds: string[];
     };
 }
-/** Caller-writable service data. Immutable policy and rollout fields are server-managed. */
-export type TServiceWritableData = Omit<IService['data'], 'organizationId' | 'immutableImageRequired' | 'imageDeployment' | 'imageRolloutStatus'>;
+/**
+ * Caller-writable service data. Immutable rollout state and SecretSet
+ * attachments are changed only through their dedicated fenced APIs.
+ */
+export type TServiceWritableData = Omit<IService['data'], 'organizationId' | 'immutableImageRequired' | 'imageDeployment' | 'imageRolloutStatus' | 'secretConfiguration' | 'secretDeployment'>;
 /** Caller-writable update data. Null explicitly removes an existing argument vector. */
 export type TServiceUpdateWritableData = Omit<TServiceWritableData, 'containerArgs'> & {
     containerArgs?: string[] | null;

package/dist_ts/data/service.js

@@ -133,4 +133,4 @@ export const validateServiceContainerArgs = (containerArgsArg) => {
     }
     return [];
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2RhdGEvc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFrREEsTUFBTSxDQUFDLE1BQU0seUJBQXlCLEdBQUc7SUFDdkMsV0FBVyxFQUFFLEVBQUU7SUFDZixlQUFlLEVBQUUsSUFBSTtJQUNyQixpQkFBaUIsRUFBRSxFQUFFLEdBQUcsSUFBSTtDQUNwQixDQUFDO0FBRVgsTUFBTSxDQUFDLE1BQU0sdUJBQXVCLEdBQUc7SUFDckMsWUFBWSxFQUFFLEVBQUU7SUFDaEIsaUJBQWlCLEVBQUUsR0FBRyxHQUFHLElBQUk7SUFDN0IsZUFBZSxFQUFFLGFBQWE7Q0FDdEIsQ0FBQztBQUVYLE1BQU0sQ0FBQyxNQUFNLDRCQUE0QixHQUFHLENBQUMsT0FBZSxFQUFzQixFQUFFO0lBQ2xGLElBQUksT0FBTyxPQUFPLEtBQUssUUFBUTtXQUMxQixDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDO1dBQ3hCLE9BQU8sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDO1dBQ3RCLE9BQU8sQ0FBQyxNQUFNLEdBQUcsR0FBRyxFQUFFLENBQUM7UUFDMUIsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUNELE1BQU0sUUFBUSxHQUFhLEVBQUUsQ0FBQztJQUM5QixLQUFLLE1BQU0sT0FBTyxJQUFJLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUN6QyxJQUFJLENBQUMsT0FBTyxJQUFJLE9BQU8sS0FBSyxHQUFHO1lBQUUsU0FBUztRQUMxQyxJQUFJLE9BQU8sS0FBSyxJQUFJLEVBQUUsQ0FBQztZQUNyQixJQUFJLFFBQVEsQ0FBQyxNQUFNLEtBQUssQ0FBQztnQkFBRSxPQUFPLFNBQVMsQ0FBQztZQUM1QyxRQUFRLENBQUMsR0FBRyxFQUFFLENBQUM7WUFDZixTQUFTO1FBQ1gsQ0FBQztRQUNELElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxJ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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2RhdGEvc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFzREEsTUFBTSxDQUFDLE1BQU0seUJBQXlCLEdBQUc7SUFDdkMsV0FBVyxFQUFFLEVBQUU7SUFDZixlQUFlLEVBQUUsSUFBSTtJQUNyQixpQkFBaUIsRUFBRSxFQUFFLEdBQUcsSUFBSTtDQUNwQixDQUFDO0FBRVgsTUFBTSxDQUFDLE1BQU0sdUJBQXVCLEdBQUc7SUFDckMsWUFBWSxFQUFFLEVBQUU7SUFDaEIsaUJBQWlCLEVBQUUsR0FBRyxHQUFHLElBQUk7SUFDN0IsZUFBZSxFQUFFLGFBQWE7Q0FDdEIsQ0FBQztBQUVYLE1BQU0sQ0FBQyxNQUFNLDRCQUE0QixHQUFHLENBQUMsT0FBZSxFQUFzQixFQUFFO0lBQ2xGLElBQUksT0FBTyxPQUFPLEtBQUssUUFBUTtXQUMxQixDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDO1dBQ3hCLE9BQU8sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDO1dBQ3RCLE9BQU8sQ0FBQyxNQUFNLEdBQUcsR0FBRyxFQUFFLENBQUM7UUFDMUIsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUNELE1BQU0sUUFBUSxHQUFhLEVBQUUsQ0FBQztJQUM5QixLQUFLLE1BQU0sT0FBTyxJQUFJLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUN6QyxJQUFJLENBQUMsT0FBTyxJQUFJLE9BQU8sS0FBSyxHQUFHO1lBQUUsU0FBUztRQUMxQyxJQUFJLE9BQU8sS0FBSyxJQUFJLEVBQUUsQ0FBQztZQUNyQixJQUFJLFFBQVEsQ0FBQyxNQUFNLEtBQUssQ0FBQztnQkFBRSxPQUFPLFNBQVMsQ0FBQztZQUM1QyxRQUFRLENBQUMsR0FBRyxFQUFFLENBQUM7WUFDZixTQUFTO1FBQ1gsQ0FBQztRQUNELElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxJ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

package/dist_ts/requests/index.d.ts

@@ -23,6 +23,7 @@ import * as networkRequests from './network.js';
 import * as nodeRequests from './node.js';
 import * as platformRequests from './platform.js';
 import * as routingRequests from './routing.js';
+import * as secretRequests from './secret.js';
 import * as secretBundleRequests from './secretbundle.js';
 import * as secretGroupRequests from './secretgroup.js';
 import * as serverRequests from './server.js';
@@ -32,7 +33,7 @@ import * as statusRequests from './status.js';
 import * as taskRequests from './task.js';
 import * as versionRequests from './version.js';
 import * as webPushRequests from './webpush.js';
-export { adminRequests as admin, appStoreRequests as appstore, baremetalRequests as baremetal, baseOsRequests as baseos, backupRequests as backup, certificateRequests as certificate, clusterRequests as cluster, configRequests as config, corestoreRequests as corestore, deploymentRequests as deployment, dnsRequests as dns, domainRequests as domain, externalRegistryRequests as externalRegistry, gatewayRequests as gateway, hostedAppRequests as hostedapp, identityRequests as identity, imageRequests as image, informRequests as inform, logRequests as log, mailRequests as mail, migrationRequests as migration, networkRequests as network, nodeRequests as node, platformRequests as platform, routingRequests as routing, secretBundleRequests as secretbundle, secretGroupRequests as secretgroup, serverRequests as server, serviceRequests as service, settingsRequests as settings, statusRequests as status, taskRequests as task, versionRequests as version, webPushRequests as webpush, };
+export { adminRequests as admin, appStoreRequests as appstore, baremetalRequests as baremetal, baseOsRequests as baseos, backupRequests as backup, certificateRequests as certificate, clusterRequests as cluster, configRequests as config, corestoreRequests as corestore, deploymentRequests as deployment, dnsRequests as dns, domainRequests as domain, externalRegistryRequests as externalRegistry, gatewayRequests as gateway, hostedAppRequests as hostedapp, identityRequests as identity, imageRequests as image, informRequests as inform, logRequests as log, mailRequests as mail, migrationRequests as migration, networkRequests as network, nodeRequests as node, platformRequests as platform, routingRequests as routing, secretRequests as secret, secretBundleRequests as secretbundle, secretGroupRequests as secretgroup, serverRequests as server, serviceRequests as service, settingsRequests as settings, statusRequests as status, taskRequests as task, versionRequests as version, webPushRequests as webpush, };
 export * from './inform.js';
 export * from './hostedapp.js';
 export * from './mail.js';