Skip to content

feat: support environment variables in YAML configuration #790

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
mvanhorn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: support environment variables in YAML configuration #790

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
23 changes: 19 additions & 4 deletions cmd/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package config

import (
"bytes"
"fmt"
"os"
"path/filepath"
Expand Down Expand Up @@ -31,18 +32,30 @@ func LoadFile(file string) error {
return nil
}
fmt.Printf("using config file: %s\n", file) //nolint:forbidigo //logger hasn't been configured yet
buf, err := os.ReadFile(file)
if err != nil {
return fmt.Errorf("reading config file: %w", err)
}
buf = []byte(os.ExpandEnv(string(buf)))

viper.SetConfigFile(file)
viper.SetConfigType(filepath.Ext(file)[1:])
if err := viper.ReadInConfig(); err != nil {
return fmt.Errorf("reading config: %w", err)
if err := viper.ReadConfig(bytes.NewReader(buf)); err != nil {
return fmt.Errorf("parsing config: %w", err)
}

transformerRulesFile := viper.GetString("PGSTREAM_TRANSFORMER_RULES_FILE")
if transformerRulesFile != "" {
trBuf, err := os.ReadFile(transformerRulesFile)
if err != nil {
return fmt.Errorf("reading transformer rules config file: %w", err)
}
trBuf = []byte(os.ExpandEnv(string(trBuf)))

viper.SetConfigFile(transformerRulesFile)
viper.SetConfigType(filepath.Ext(transformerRulesFile)[1:])
if err := viper.MergeInConfig(); err != nil {
return fmt.Errorf("reading transformer rules config: %w", err)
if err := viper.MergeConfig(bytes.NewReader(trBuf)); err != nil {
return fmt.Errorf("parsing transformer rules config: %w", err)
}
// reset after merge
viper.SetConfigFile(file)
Expand Down Expand Up @@ -82,6 +95,7 @@ func ParseStreamConfig() (*stream.Config, error) {
if err != nil {
return nil, err
}
buf = []byte(os.ExpandEnv(string(buf)))
// yaml.Unmarshal is used to override the viper.Umarshal to be able to
// parse the transformers configuration with support for case sensitive
// keys.
Expand All @@ -108,6 +122,7 @@ func ParseTransformerConfig(filename string) (*transformer.Config, error) {
if err != nil {
return nil, err
}
buf = []byte(os.ExpandEnv(string(buf)))

yamlConfig := struct {
Transformations TransformationsConfig `mapstructure:"transformations" yaml:"transformations"`
Expand Down