Skip to content

test: use current secret management workspace field #419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SaladDay merged 1 commit into from
Sep 10, 2026
Merged

test: use current secret management workspace field #419

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions server/internal/dev/capability_import_routes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ func TestCapabilityImportCommit_InlineSecretLandsInSecretsTable(t *testing.T) {
// payload is genuinely encrypted (cleartext bytes must NOT appear in
// the column).
row := lookupImportedSecret(t, db, secretID)
if row.workspaceID != store.DefaultDevFixtureIDs().WorkspaceID {
t.Fatalf("secret.workspace_id = %q, want %q", row.workspaceID, store.DefaultDevFixtureIDs().WorkspaceID)
if row.managementWorkspaceID != store.DefaultDevFixtureIDs().WorkspaceID {
t.Fatalf("secret.management_workspace_id = %q, want %q", row.managementWorkspaceID, store.DefaultDevFixtureIDs().WorkspaceID)
}
if row.kind != "capability_inline" {
t.Fatalf("secret.kind = %q, want capability_inline", row.kind)
Expand Down Expand Up @@ -322,23 +322,23 @@ func TestCapabilityImportCommit_CustomCredentialKind(t *testing.T) {
// commit assertion. Pulled into a struct so the test body reads as plain
// `row.kind` rather than multi-return Scan acrobatics.
type importedSecretRow struct {
workspaceID string
kind string
provider string
authType string
encryptedPayload []byte
metadata []byte
status string
managementWorkspaceID string
kind string
provider string
authType string
encryptedPayload []byte
metadata []byte
status string
}

func lookupImportedSecret(t *testing.T, db *pgxpool.Pool, secretID string) importedSecretRow {
t.Helper()
var r importedSecretRow
if err := db.QueryRow(context.Background(),
`select workspace_id::text, kind, provider, auth_type, encrypted_payload, metadata, status
`select management_workspace_id::text, kind, provider, auth_type, encrypted_payload, metadata, status
from secrets where id = $1 and deleted_at is null`,
secretID,
).Scan(&r.workspaceID, &r.kind, &r.provider, &r.authType, &r.encryptedPayload, &r.metadata, &r.status); err != nil {
).Scan(&r.managementWorkspaceID, &r.kind, &r.provider, &r.authType, &r.encryptedPayload, &r.metadata, &r.status); err != nil {
t.Fatalf("lookup secret %s: %v", secretID, err)
}
return r
Expand Down