📂 Custom .ws dir

Author: bdsoha

cmd/info/version.go

@@ -1,3 +1,3 @@
 package info
 
-var Version = "0.0.48"
+var Version = "0.0.49"

internals/config/defaults.go

@@ -12,7 +12,8 @@ const (
 	EnvMetricsPort       = "WS_METRICS_PORT"
 	EnvMetricsCollectors = "WS_METRICS_COLLECTORS"
 
-	DefaultSecretsKeyPath = "/etc/workspace/master.key"
+	DefaultSecretsKeyPath   = "/etc/workspace/master.key"
+	DefaultSecretsVaultPath = "~/.ws/vault/secrets.yaml"
 	DefaultEnvFilePath    = "~/.zshenv"
 	DefaultLoggingDir     = "/var/log/workspace"
 	DefaultLoggingFile    = "workspace.log"

internals/secrets/vault.go

@@ -139,6 +139,15 @@ func ResolveVaultPath(inputFlag string) (string, error) {
 		return vaultPath, nil
 	}
 
+	defaultPath, err := path.Expand(config.DefaultSecretsVaultPath)
+	if err != nil {
+		return "", fmt.Errorf("failed to resolve default vault path: %w", err)
+	}
+
+	if _, err := os.Stat(defaultPath); err == nil {
+		return defaultPath, nil
+	}
+
 	return "", fmt.Errorf("vault file not specified (use --input or %s)", config.EnvSecretsVault)
 }
 

internals/secrets/vault_test.go

@@ -280,7 +280,22 @@ func TestResolveVaultPath(t *testing.T) {
 		assert.Equal(t, "/env/vault.yaml", path)
 	})
 
+	t.Run("FromDefault", func(t *testing.T) {
+		home := t.TempDir()
+		t.Setenv("HOME", home)
+		t.Setenv("WS_SECRETS_VAULT", "")
+
+		defaultVault := filepath.Join(home, ".ws", "vault", "secrets.yaml")
+		assert.NilError(t, os.MkdirAll(filepath.Dir(defaultVault), 0o755))
+		assert.NilError(t, os.WriteFile(defaultVault, []byte("secrets:\n"), 0o600))
+
+		path, err := ResolveVaultPath("")
+		assert.NilError(t, err)
+		assert.Equal(t, defaultVault, path)
+	})
+
 	t.Run("NotSpecified", func(t *testing.T) {
+		t.Setenv("HOME", t.TempDir())
 		t.Setenv("WS_SECRETS_VAULT", "")
 		_, err := ResolveVaultPath("")
 		assert.ErrorContains(t, err, "vault file not specified")