Skip to content

refactor(credentials): extract pure credential-mutation planning (477.4) #504

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
rianjs merged 1 commit into from
Jul 11, 2026
Merged

refactor(credentials): extract pure credential-mutation planning (477.4) #504

Show file tree
Hide file tree
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
10 changes: 5 additions & 5 deletions internal/cmd/initcmd/init_reviewer_credential_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ func buildInteractiveInitReviewerCredentialStatuses(opts *root.Options, deps ini

func buildInteractiveInitCredentialStatuses(opts *root.Options, deps initDeps, session initSessionDraft, entries []initCredentialPlanEntry, writes map[string]map[string]string, purpose string) []initReviewerCredentialStatus {
statuses := make([]initReviewerCredentialStatus, 0, len(entries))
stores := map[string]initStore{}
stores := map[credentials.StoreIdentity]initStore{}
defer func() {
for _, store := range stores {
if store != nil {
Expand All @@ -177,7 +177,7 @@ func buildInteractiveInitCredentialStatuses(opts *root.Options, deps initDeps, s
}
existing := map[string]bool{}
unavailable := ""
storeKey := initCredentialStoreKey(entry.SecretsStore)
storeKey := entry.SecretsStore.Identity()
store := stores[storeKey]
if store == nil {
if !canOpenInitStoreForReviewerStatus(deps, entry) {
Expand Down Expand Up @@ -228,7 +228,7 @@ func interactiveInitReviewerCredentialPlanEntries(session initSessionDraft, plan
if currentProfile, ok := session.cfg.Profiles[session.workspace.profileName]; ok {
profile = currentProfile
}
entries, err := planInitCredentialsWithConfig(session.cfg, session.workspace.previousProfile, profile, plannedWriteKeys)
entries, err := credentials.PlanWithConfig(session.cfg, session.workspace.previousProfile, profile, plannedWriteKeys)
if err != nil || !hasInitReviewerCredentialPlanEntry(entries) {
entries = append([]initCredentialPlanEntry(nil), session.workspace.credentialPlan...)
}
Expand Down Expand Up @@ -308,8 +308,8 @@ func appendReviewerCredentialPlanEntry(entries []initCredentialPlanEntry, seen m
KeySpecs: append([]credentials.KeySpec(nil), specs...),
PlannedWriteKeys: append([]string(nil), plannedWriteKeys[ref.Ref]...),
}
entry.MissingRequiredKeys = missingRequiredInitCredentialKeys(entry.KeySpecs, entry.PlannedWriteKeys)
entry.State = classifyInitCredentialPlanEntry(entry)
entry.MissingRequiredKeys = credentials.MissingRequiredPlannedKeys(entry.KeySpecs, entry.PlannedWriteKeys)
entry.State = credentials.ClassifyPlanEntry(entry)
entries = append(entries, entry)
seen[key] = struct{}{}
return entries
Expand Down
Loading
Loading