artin/exportarr
1
0
Fork 0
mirror of https://github.com/onedr0p/exportarr.git synced 2026-02-06 10:57:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #128: Get ApiVersion from defaults, not XMLConfig (#131)

Browse Source 
Signed-off-by: Russell Troxel <russelltroxel@gmail.com>
This commit is contained in:
Russell Troxel 2023-03-21 09:16:53 -07:00 committed by GitHub
parent 3874defbb3
commit ba4b336dfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
internal/config/config_test.go
View File

@ -109,6 +109,32 @@ func TestLoadConfig_Environment(t *testing.T) {
require.Equal("v3", config.ApiVersion)
}
func TestLoadConfig_PartialEnvironment(t *testing.T) {
flags := testFlagSet()
flags.Set("url", "http://localhost:8989")
flags.Set("interface", "1.2.3.4")
t.Setenv("API_KEY", "abcdef0123456789abcdef0123456789")
t.Setenv("PORT", "1234")
require := require.New(t)
config, err := LoadConfig(flags)
require.NoError(err)
// Env
require.Equal("http://localhost:8989", config.URL)
require.Equal("1.2.3.4", config.Interface)
// Flags
require.Equal("abcdef0123456789abcdef0123456789", config.ApiKey)
require.Equal(1234, config.Port)
// Defaults
require.Equal("v3", config.ApiVersion)
require.Equal("info", config.LogLevel)
require.Equal("console", config.LogFormat)
}
func TestLoadConfig_BackwardsCompatibility_ApiKeyFile(t *testing.T) {
require := require.New(t)
@ -151,6 +177,14 @@ func TestLoadConfig_XMLConfig(t *testing.T) {
require.Equal("http://localhost:7878/asdf", config.URL)
require.Equal("abcdef0123456789abcdef0123456789", config.ApiKey)
// test defaults survive when not set in config
require.Equal("info", config.LogLevel)
require.Equal("console", config.LogFormat)
require.Equal("v3", config.ApiVersion)
require.Equal(8081, config.Port)
require.Equal("0.0.0.0", config.Interface)
}
func TestLoadConfig_ApiKeyFile(t *testing.T) {

1
internal/config/xml_parser.go
View File

@ -38,7 +38,6 @@ func (p *XML) Marshal(o map[string]interface{}) ([]byte, error) {
func (p *XML) Merge(src, dest map[string]interface{}) error {
dest["api-key"] = src["api-key"]
dest["api-version"] = src["api-version"]
u, err := url.Parse(dest["url"].(string))
if err != nil {