-
Notifications
You must be signed in to change notification settings - Fork 271
Enable env-backed config writeback and bootstrap missing config file #171
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.
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
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
f3555ae
feat(config): bootstrap config.json when env writeback is enabled
CJackHwang 958e7a0
fix(config): skip writeback bootstrap on invalid env config
CJackHwang 836eaf5
feat(ui): show env mode persistence status and document writeback
CJackHwang 1c5f022
refactor(config): split writeback helpers out of store.go for CI gate
CJackHwang b54b418
fix(sse): globally strip leaked CONTENT_FILTER suffix from output
CJackHwang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package config | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "os" | ||
| "path/filepath" | ||
| "strings" | ||
| ) | ||
|
|
||
| func envWritebackEnabled() bool { | ||
| v := strings.ToLower(strings.TrimSpace(os.Getenv("DS2API_ENV_WRITEBACK"))) | ||
| return v == "1" || v == "true" || v == "yes" || v == "on" | ||
| } | ||
|
|
||
| func (s *Store) IsEnvWritebackEnabled() bool { | ||
| return envWritebackEnabled() | ||
| } | ||
|
|
||
| func (s *Store) HasEnvConfigSource() bool { | ||
| rawCfg := strings.TrimSpace(os.Getenv("DS2API_CONFIG_JSON")) | ||
| if rawCfg == "" { | ||
| rawCfg = strings.TrimSpace(os.Getenv("CONFIG_JSON")) | ||
| } | ||
| return rawCfg != "" | ||
| } | ||
|
|
||
| func (s *Store) ConfigPath() string { | ||
| return s.path | ||
| } | ||
|
|
||
| func writeConfigFile(path string, cfg Config) error { | ||
| persistCfg := cfg.Clone() | ||
| persistCfg.ClearAccountTokens() | ||
| b, err := json.MarshalIndent(persistCfg, "", " ") | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return writeConfigBytes(path, b) | ||
| } | ||
|
|
||
| func writeConfigBytes(path string, b []byte) error { | ||
| dir := filepath.Dir(path) | ||
| if dir == "." || dir == "" { | ||
| return os.WriteFile(path, b, 0o644) | ||
| } | ||
| if err := os.MkdirAll(dir, 0o755); err != nil { | ||
| return fmt.Errorf("mkdir config dir: %w", err) | ||
| } | ||
| return os.WriteFile(path, b, 0o644) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package sse | ||
|
|
||
| import "strings" | ||
|
|
||
| func filterLeakedContentFilterParts(parts []ContentPart) []ContentPart { | ||
| if len(parts) == 0 { | ||
| return parts | ||
| } | ||
| out := make([]ContentPart, 0, len(parts)) | ||
| for _, p := range parts { | ||
| cleaned := stripLeakedContentFilterSuffix(p.Text) | ||
| if strings.TrimSpace(cleaned) == "" { | ||
| continue | ||
| } | ||
| p.Text = cleaned | ||
| out = append(out, p) | ||
| } | ||
| return out | ||
| } | ||
|
|
||
| func stripLeakedContentFilterSuffix(text string) string { | ||
| if text == "" { | ||
| return text | ||
| } | ||
| idx := strings.Index(strings.ToUpper(text), "CONTENT_FILTER") | ||
| if idx < 0 { | ||
| return text | ||
| } | ||
| return strings.TrimRight(text[:idx], " \t\r\n") | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.