Skip to content

Feature to use Environment Variables in toml configuration file #6

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feature to use Environment Variables in toml configuration file #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09e5ea9
added expandEnv for toml file
felixbecker Sep 7, 2018
25c98d2
assignment is already defined
felixbecker Sep 7, 2018
ed2a3bf
to byte array missing
felixbecker Sep 7, 2018
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
s3-sftp-proxy
13 changes: 9 additions & 4 deletions config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ package main

import (
"fmt"
"github.com/BurntSushi/toml"
"github.com/pkg/errors"
"io/ioutil"
"net/url"
"os"

"github.com/BurntSushi/toml"
"github.com/pkg/errors"
)

var (
Expand Down Expand Up @@ -194,12 +196,15 @@ func ReadConfig(tomlStr string) (*S3SFTPProxyConfig, error) {
}

func ReadConfigFromFile(tomlFile string) (*S3SFTPProxyConfig, error) {
tomlStr, err := ioutil.ReadFile(tomlFile)
tomlBytes, err := ioutil.ReadFile(tomlFile)
if err != nil {
return nil, errors.Wrapf(err, "failed to open %s", tomlFile)
}

cfg, err := ReadConfig(string(tomlStr))
tomlBytes = []byte(os.ExpandEnv(string(tomlBytes)))

cfg, err := ReadConfig(string(tomlBytes))

if err != nil {
return nil, errors.Wrapf(err, "failed to parse %s", tomlFile)
}
Expand Down