Skip to content

feat: add diagnostic logging for credential persistence #4401

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

Open
myipanta wants to merge 1 commit into
base: main-v2
Choose a base branch
from
+13 −0
Open

feat: add diagnostic logging for credential persistence #4401

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
6 changes: 6 additions & 0 deletions desktop/dotenv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package main

import (
"log/slog"
"os"
"path/filepath"
"strings"
Expand Down Expand Up @@ -85,8 +86,10 @@ func upsertEnvFile(path, key, value string) error {
}
if err := fileutil.ReplaceFile(tmpPath, path); err != nil {
os.Remove(tmpPath)
slog.Warn("dotenv: write failed", "path", path, "key", key, "err", err)
return err
}
slog.Debug("dotenv: upserted", "path", path, "key", key)
return os.Setenv(key, value)
}

Expand Down Expand Up @@ -183,11 +186,14 @@ func promoteProviderKeysToCredentials(cfg *config.Config) {
}
val := os.Getenv(env)
if val == "" {
slog.Debug("promote: key not in env", "env", env)
continue
}
if err := upsertEnvFile(credPath, env, val); err != nil {
slog.Warn("promote: write failed", "env", env, "err", err)
continue
}
slog.Info("promote: key migrated to credentials", "env", env)
have[env] = true
removeHomeEnvKey(env)
}
Expand Down
7 changes: 7 additions & 0 deletions internal/config/dotenv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package config

import (
"bufio"
"log/slog"
"os"
"path/filepath"
"strings"
Expand Down Expand Up @@ -40,10 +41,12 @@ func loadDotEnvForRoot(root string) {
func loadDotEnvFile(path string) {
f, err := os.Open(path)
if err != nil {
slog.Debug("config: dotenv file not loaded", "path", path, "err", err)
return
}
defer f.Close()

count := 0
sc := bufio.NewScanner(f)
for sc.Scan() {
line := strings.TrimSpace(sc.Text())
Expand All @@ -62,6 +65,10 @@ func loadDotEnvFile(path string) {
}
if _, exists := os.LookupEnv(key); !exists {
os.Setenv(key, val)
count++
}
}
if count > 0 {
slog.Info("config: dotenv loaded", "path", path, "keys", count)
}
}
Loading