external vault providers - live probing secrets when editing stack

This commit is contained in:
jarek committed 2026-08-14 10:40:02 +02:00
1 parent 9a416e165f
commit 344ad4aadc
3 files changed
+29 -6

No files matched your search

+15 -6
View File
@@ -8,6 +8,7 @@
import * as Tooltip from '$lib/components/ui/tooltip'; import * as Tooltip from '$lib/components/ui/tooltip';
import { getProviderIcon } from '$lib/components/provider-icons'; import { getProviderIcon } from '$lib/components/provider-icons';
import { providerTypeLabel } from '../../routes/settings/secrets/ProviderModal.svelte'; import { providerTypeLabel } from '../../routes/settings/secrets/ProviderModal.svelte';
import { effectiveMissing } from '$lib/utils/invault-markers';
interface Props { interface Props {
variables: EnvVar[]; // Bindable - ALL variables (secrets + non-secrets) variables: EnvVar[]; // Bindable - ALL variables (secrets + non-secrets)
@@ -27,6 +28,9 @@
providerName?: string | null; providerName?: string | null;
/** Set when the live provider probe failed - shown as an amber line. */ /** Set when the live provider probe failed - shown as an amber line. */
probeError?: string | null; probeError?: string | null;
/** Key NAMES the live probe found in the bound provider (present RIGHT NOW).
* These are not "missing" even without a local value. Empty on probe failure. */
providerKeySet?: Set<string>;
showInterpolationHint?: boolean; showInterpolationHint?: boolean;
theme?: 'light' | 'dark'; theme?: 'light' | 'dark';
class?: string; class?: string;
@@ -49,6 +53,7 @@
providerType = null, providerType = null,
providerName = null, providerName = null,
probeError = null, probeError = null,
providerKeySet = new Set<string>(),
showInterpolationHint = false, showInterpolationHint = false,
theme = 'dark', theme = 'dark',
class: className = '', class: className = '',
@@ -57,13 +62,17 @@
}: Props = $props(); }: Props = $props();
// Provider-injected keys are supplied at deploy from the bound secret provider, so // A ${VAR} the bound provider currently supplies (LIVE probe) is NOT "missing" even
// they are NOT "missing" even when a ${VAR} in compose has no local value. Drop them // without a local value. Drop those from the panel's missing count / "Add missing"
// from the missing set (and expose them separately so the editor can mark them). // list so the panel matches the editor's IN VAULT markers - same source, one truth.
const injectedSet = $derived(new Set(injectedSecretKeys)); // This is purely live: the last-deploy injected names drive only the banner, never
// this set. A failed probe leaves providerKeySet empty, so those keys stay missing.
const effectiveValidation = $derived.by<ValidationResult | null>(() => { const effectiveValidation = $derived.by<ValidationResult | null>(() => {
if (!validation || injectedSet.size === 0) return validation; if (!validation || providerKeySet.size === 0) return validation;
return { ...validation, missing: validation.missing.filter((k) => !injectedSet.has(k)) }; return {
...validation,
missing: effectiveMissing(validation.missing, providerKeySet)
};
}); });
const STORAGE_KEY_VIEW_MODE = 'dockhand-env-vars-view-mode'; const STORAGE_KEY_VIEW_MODE = 'dockhand-env-vars-view-mode';
+13
View File
@@ -25,6 +25,19 @@ export function classifyMarker(
return 'missing'; return 'missing';
} }
/**
* The panel's "missing" set: compose-required vars with no local value, MINUS the
* ones the bound provider currently supplies (the LIVE probe set). This is the SAME
* source the editor's IN VAULT markers use, so panel and editor always agree. The
* last-deploy injected names are deliberately NOT consulted here - a var is dropped
* from "missing" only because the provider has it RIGHT NOW, never because it was
* injected at a past deploy (a failed probe leaves the set empty -> stays missing,
* never a false green).
*/
export function effectiveMissing(missing: string[], providerKeys: Set<string>): string[] {
return missing.filter((k) => !providerKeys.has(k));
}
/** /**
* Given the inline op:// (or other provider) references the client submitted as * Given the inline op:// (or other provider) references the client submitted as
* `{ varName, ref }` pairs and the SUBSET of ref STRINGS the provider resolved, * `{ varName, ref }` pairs and the SUBSET of ref STRINGS the provider resolved,
+1
View File
@@ -1862,6 +1862,7 @@
providerType={selectedProviderType} providerType={selectedProviderType}
providerName={selectedProviderName} providerName={selectedProviderName}
{probeError} {probeError}
{providerKeySet}
{readonly} {readonly}
onchange={() => { markDirty(); debouncedValidate(); }} onchange={() => { markDirty(); debouncedValidate(); }}
theme={editorTheme} theme={editorTheme}