bugfix configuration lookup

Argelbargel · Sep 18, 2023 · 2447ba1 · 2447ba1
1 parent 00060cb
commit 2447ba1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/internal/app/vault_raft_snapshot_agent/config/rattlesnake.go b/internal/app/vault_raft_snapshot_agent/config/rattlesnake.go
@@ -3,11 +3,12 @@ package config
 import (
 	"errors"
 	"fmt"
-	"github.com/Argelbargel/vault-raft-snapshot-agent/internal/app/vault_raft_snapshot_agent/secret"
 	"path/filepath"
 	"reflect"
 	"strings"
 
+	"github.com/Argelbargel/vault-raft-snapshot-agent/internal/app/vault_raft_snapshot_agent/secret"
+
 	"github.com/creasty/defaults"
 	"github.com/fsnotify/fsnotify"
 	"github.com/go-playground/validator/v10"

diff --git a/internal/app/vault_raft_snapshot_agent/snapshotter.go b/internal/app/vault_raft_snapshot_agent/snapshotter.go
@@ -56,7 +56,7 @@ type snapshotterVaultAPI interface {
 
 func CreateSnapshotter(options SnapshotterOptions) (*Snapshotter, error) {
 	data := SnapshotterConfig{}
-	parser := config.NewParser[*SnapshotterConfig](options.ConfigFileName, options.EnvPrefix, options.ConfigFileSearchPaths...)
+	parser := config.NewParser[*SnapshotterConfig](options.EnvPrefix, options.ConfigFileName, options.ConfigFileSearchPaths...)
 
 	if err := parser.ReadConfig(&data, options.ConfigFilePath); err != nil {
 		return nil, err

diff --git a/internal/app/vault_raft_snapshot_agent/snapshotter_config_test.go b/internal/app/vault_raft_snapshot_agent/snapshotter_config_test.go
@@ -130,7 +130,7 @@ func TestReadCompleteConfig(t *testing.T) {
 }
 
 func TestReadConfigSetsDefaultValues(t *testing.T) {
-	configFile := "../../../testdata/defaults.yaml"
+	configFile := "../../../testdata/snapshots.yaml"
 
 	expectedConfig := SnapshotterConfig{
 		Vault: vault.ClientConfig{

diff --git a/testdata/defaults.yaml → testdata/snapshots.yaml b/testdata/defaults.yaml → testdata/snapshots.yaml