Compare commits

..

2 commits

Author SHA1 Message Date
db665a30fa fix: allow setting client/secret id for a new backend
Some checks failed
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/push/deploy Pipeline failed
2024-01-03 17:32:58 +01:00
088f4faf82 fix: allow setting the issuer from environment variables 2024-01-03 17:32:58 +01:00
2 changed files with 6 additions and 0 deletions

View file

@ -129,6 +129,9 @@ func (ac *AppConfig) UnmarshalJSON(data []byte) error {
return fmt.Errorf("failed to read JSON: %w", err) return fmt.Errorf("failed to read JSON: %w", err)
} }
ac.OpenConnectConfig = jsonConf.OpenConnectConfig ac.OpenConnectConfig = jsonConf.OpenConnectConfig
if ac.OpenConnectConfig == nil {
ac.OpenConnectConfig = &OpenConnectConfig{}
}
return nil return nil
} }

View file

@ -29,6 +29,9 @@ var defaultConfig = AppConfig{
CaFile string CaFile string
}{Mode: defaultStorageSSLMode, CaFile: defaultStorageSSLCaFile}, }{Mode: defaultStorageSSLMode, CaFile: defaultStorageSSLCaFile},
}, },
OpenConnectConfig: &OpenConnectConfig{
Issuer: defaultIssuer,
},
} }
func initJson(t *testing.T, content string) string { func initJson(t *testing.T, content string) string {