Skip to content

Allow config env vars to be empty #1794

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

Merged
carolynvs merged 1 commit into from
Oct 13, 2021
Merged

Allow config env vars to be empty #1794

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions cmd/porter/bundle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,10 @@ func TestBuildValidate_Driver(t *testing.T) {

for _, tc := range testcases {
t.Run(tc.name, func(t *testing.T) {
os.Setenv("PORTER_BUILD_DRIVER", tc.configDriver)
defer os.Unsetenv("PORTER_BUILD_DRIVER")
if tc.configDriver != "" {
os.Setenv("PORTER_BUILD_DRIVER", tc.configDriver)
defer os.Unsetenv("PORTER_BUILD_DRIVER")
}

p := porter.NewTestPorter(t)
defer p.Teardown()
Expand Down
4 changes: 4 additions & 0 deletions pkg/config/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ func LoadFromViper(viperCfg func(v *viper.Viper)) DataStoreLoaderFunc {
v := viper.New()
v.SetFs(cfg.FileSystem)

// Consider an empty environment variable as "set", so that you can do things like
// PORTER_DEFAULT_STORAGE="" and have that override what's in the config file.
v.AllowEmptyEnv(true)

// Initialize empty config
err := v.SetDefaultsFrom(cfg.Data)
if err != nil {
Expand Down
6 changes: 6 additions & 0 deletions pkg/config/loader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
package config

import (
"os"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestFromConfigFile(t *testing.T) {
// Do not run in parallel, it sets environment variables
os.Setenv("PORTER_DEFAULT_STORAGE", "")
defer os.Unsetenv("PORTER_DEFAULT_STORAGE")

c := NewTestConfig(t)
c.SetHomeDir("/root/.porter")

Expand All @@ -17,6 +22,7 @@ func TestFromConfigFile(t *testing.T) {
err := c.LoadData()
require.NoError(t, err, "dataloader failed")
assert.True(t, c.Debug, "config.Debug was not set correctly")
assert.Empty(t, c.Data.DefaultStorage, "The config file value should be overridden by an empty env var")
}

func TestData_Marshal(t *testing.T) {
Expand Down