Skip to content

Fixes 54: Verifies that configuration files exist before trying to lo… #55

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes 54: Verifies that configuration files exist before trying to lo… #55

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
44 changes: 31 additions & 13 deletions pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,19 @@ package config

import (
"encoding/json"
"github.com/micro/go-config/source/env"
"github.com/micro/go-config/source/flag"
"os"

config "github.com/micro/go-config"
"github.com/micro/go-config/source/env"
"github.com/micro/go-config"
"github.com/micro/go-config/source/file"
"github.com/micro/go-config/source/flag"
"github.com/micro/go-config/source/memory"
"github.com/redhat-cop/cert-operator/pkg/certs"
"github.com/sirupsen/logrus"
logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
)

var log = logf.Log.WithName("Config")

type Config struct {
// Notifiers []notifier.Notifier `json:"notifiers"`
Provider certs.ProviderConfig `json:"provider"`
Expand All @@ -44,7 +46,6 @@ type AnnotationConfig struct {

const (
defaultConfigFile = "/etc/cert-operator/config.yaml"
defaultProvider = "self-signed"
defaultConfig = `
{
"general": {
Expand Down Expand Up @@ -74,31 +75,48 @@ func NewConfig() Config {
memorySource := memory.NewSource(
memory.WithData(data),
)
// Load json config file
tmpConfig.Load(

log.Info("Using default configuration.")
_ = tmpConfig.Load(
memorySource,
file.NewSource(
file.WithPath(getConfigFile()),
),
)

configFile := getConfigFile()
if fileExist(configFile) {
log.Info("Loading config file from ", configFile)

_ = tmpConfig.Load(file.NewSource(
file.WithPath(configFile),
))
}

_ = tmpConfig.Load(
env.NewSource(),
flag.NewSource(),
)
var conf Config

tmpConfig.Scan(&conf)
err := tmpConfig.Scan(&conf)

if err != nil {
log.Error(err, "Could not load configurations properly.")
}

return conf
}

func getConfigFile() (configFile string) {
if value, ok := os.LookupEnv("CERT_OP_CONFIG"); ok {
logrus.Infof("Loading custom config file from %v", value)
return value
}
logrus.Infof("Loading default config file from %v", defaultConfigFile)
return defaultConfigFile
}

func fileExist(path string) bool {
_, err := os.Stat(path)
return !os.IsNotExist(err)
}

func (c *Config) String() string {
out, err := json.Marshal(c)
if err != nil {
Expand Down