Add container publishing and env-based runtime
This commit is contained in:
@@ -147,7 +147,7 @@ func loadConfig() (Config, error) {
|
||||
if err != nil {
|
||||
return Config{}, fmt.Errorf("parse ALMA_UPCOMING_DAYS: %w", err)
|
||||
}
|
||||
almaCredsFile, err := readValue("ALMA_CREDS_FILE", "/config/alma.creds", true)
|
||||
almaCredsFile, err := readValue("ALMA_CREDS_FILE", "/config/alma.creds", false)
|
||||
if err != nil {
|
||||
return Config{}, err
|
||||
}
|
||||
@@ -269,6 +269,20 @@ func splitCSV(value string) []string {
|
||||
}
|
||||
|
||||
func loadAlmaCreds(filePath string) (map[string]string, error) {
|
||||
if envUser, _ := readValue("ALMA_USERNAME", "", false); envUser != "" {
|
||||
if envPass, _ := readValue("ALMA_PASSWORD", "", false); envPass != "" {
|
||||
return map[string]string{
|
||||
"username": envUser,
|
||||
"password": envPass,
|
||||
}, nil
|
||||
}
|
||||
return nil, errors.New("ALMA_PASSWORD is required when ALMA_USERNAME is set")
|
||||
}
|
||||
|
||||
if filePath == "" {
|
||||
return nil, errors.New("missing Alma credentials: set ALMA_USERNAME/ALMA_PASSWORD or ALMA_CREDS_FILE")
|
||||
}
|
||||
|
||||
data, err := os.ReadFile(filePath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("read alma creds: %w", err)
|
||||
@@ -291,13 +305,6 @@ func loadAlmaCreds(filePath string) (map[string]string, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if envUser, _ := readValue("ALMA_USERNAME", "", false); envUser != "" {
|
||||
values["username"] = envUser
|
||||
}
|
||||
if envPass, _ := readValue("ALMA_PASSWORD", "", false); envPass != "" {
|
||||
values["password"] = envPass
|
||||
}
|
||||
|
||||
if values["username"] == "" || values["password"] == "" {
|
||||
return nil, errors.New("alma creds file must contain username and password")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user