From 0bfacf21cdbfd19a3a9ca9b27cc9ae3871f1a6e2 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Fri, 7 Apr 2023 17:59:22 +0200 Subject: [PATCH 1/2] chore: clidocgen: ensure same generated docs --- cli/config/file.go | 6 +++++- codersdk/deployment.go | 4 +++- scripts/clidocgen/main.go | 15 +++++++++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/cli/config/file.go b/cli/config/file.go index 59b7b74a862d2..9d8b8b34a03e6 100644 --- a/cli/config/file.go +++ b/cli/config/file.go @@ -125,5 +125,9 @@ func read(path string) ([]byte, error) { } func DefaultDir() string { - return configdir.LocalConfig("coderv2") + configDir := configdir.LocalConfig("coderv2") + if dir := os.Getenv("CLIDOCGEN_CONFIG_DIRECTORY"); dir != "" { + configDir = dir + } + return configDir } diff --git a/codersdk/deployment.go b/codersdk/deployment.go index 8f9537729d013..a0546894b4bf2 100644 --- a/codersdk/deployment.go +++ b/codersdk/deployment.go @@ -348,7 +348,9 @@ func DefaultCacheDir() string { // For compatibility with systemd. defaultCacheDir = dir } - + if dir := os.Getenv("CLIDOCGEN_CACHE_DIRECTORY"); dir != "" { + defaultCacheDir = dir + } return filepath.Join(defaultCacheDir, "coder") } diff --git a/scripts/clidocgen/main.go b/scripts/clidocgen/main.go index 098c6147addb6..8586e4d522e1a 100644 --- a/scripts/clidocgen/main.go +++ b/scripts/clidocgen/main.go @@ -28,7 +28,8 @@ type manifest struct { Routes []route `json:"routes,omitempty"` } -func unsetCoderEnv() { +func prepareEnv() { + // Unset CODER_ environment variables for _, env := range os.Environ() { if strings.HasPrefix(env, "CODER_") { split := strings.SplitN(env, "=", 2) @@ -37,6 +38,16 @@ func unsetCoderEnv() { } } } + + // Override default OS values to ensure the same generated results. + err := os.Setenv("CLIDOCGEN_CACHE_DIRECTORY", "~/.cache") + if err != nil { + panic(err) + } + _ = os.Setenv("CLIDOCGEN_CONFIG_DIRECTORY", "~/.config/coderv2") + if err != nil { + panic(err) + } } func deleteEmptyDirs(dir string) error { @@ -63,7 +74,7 @@ func deleteEmptyDirs(dir string) error { } func main() { - unsetCoderEnv() + prepareEnv() workdir, err := os.Getwd() if err != nil { From a2e8b76b592581dae86b3892b4f6443c9ef0c348 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Fri, 7 Apr 2023 18:06:59 +0200 Subject: [PATCH 2/2] fix --- scripts/clidocgen/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/clidocgen/main.go b/scripts/clidocgen/main.go index 8586e4d522e1a..7d6f6d9c7f7b2 100644 --- a/scripts/clidocgen/main.go +++ b/scripts/clidocgen/main.go @@ -44,7 +44,7 @@ func prepareEnv() { if err != nil { panic(err) } - _ = os.Setenv("CLIDOCGEN_CONFIG_DIRECTORY", "~/.config/coderv2") + err = os.Setenv("CLIDOCGEN_CONFIG_DIRECTORY", "~/.config/coderv2") if err != nil { panic(err) }