From 7ef62528d112c2be960c753c8330b98a2b45ff9c Mon Sep 17 00:00:00 2001 From: Livio Amstutz Date: Thu, 19 Mar 2020 08:32:47 +0100 Subject: [PATCH] return error on file not found and added log ids and messages --- internal/config/config.go | 4 +--- pkg/admin/admin.go | 2 +- pkg/auth/auth.go | 2 +- pkg/eventstore/eventstore.go | 2 +- pkg/management/management.go | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/internal/config/config.go b/internal/config/config.go index c4b24a112e..5c524e1525 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -7,7 +7,6 @@ import ( "path/filepath" "github.com/BurntSushi/toml" - "github.com/caos/logging" "github.com/ghodss/yaml" "github.com/caos/zitadel/internal/errors" @@ -62,8 +61,7 @@ func readConfigFile(configReader Reader, configFile string, obj interface{}) err configFile = os.ExpandEnv(configFile) if _, err := os.Stat(configFile); err != nil { - logging.LogWithFields("CONFI-Hs93M", "file", configFile).WithError(err).Warn("config file does not exist") - return nil + return errors.ThrowNotFoundf(err, "CONFI-Hs93M", "config file %s does not exist", configFile) } configStr, err := ioutil.ReadFile(configFile) diff --git a/pkg/admin/admin.go b/pkg/admin/admin.go index fbbcbf4ed6..681fd53646 100644 --- a/pkg/admin/admin.go +++ b/pkg/admin/admin.go @@ -10,5 +10,5 @@ type Config struct { } func Start(ctx context.Context, config Config) error { - return errors.ThrowUnimplemented(nil, "", "") //TODO: implement + return errors.ThrowUnimplemented(nil, "ADMIN-n8vw5", "not implemented yet") //TODO: implement } diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go index 27ab548fa9..0ac10202a3 100644 --- a/pkg/auth/auth.go +++ b/pkg/auth/auth.go @@ -10,5 +10,5 @@ type Config struct { } func Start(ctx context.Context, config Config) error { - return errors.ThrowUnimplemented(nil, "", "") //TODO: implement + return errors.ThrowUnimplemented(nil, "AUTH-l7Hdx", "not implemented yet") //TODO: implement } diff --git a/pkg/eventstore/eventstore.go b/pkg/eventstore/eventstore.go index ef9d8ea6f5..d07f825e44 100644 --- a/pkg/eventstore/eventstore.go +++ b/pkg/eventstore/eventstore.go @@ -10,5 +10,5 @@ type Config struct { } func Start(ctx context.Context, config Config) error { - return errors.ThrowUnimplemented(nil, "", "") //TODO: implement + return errors.ThrowUnimplemented(nil, "EVENT-1hfiu", "not implemented yet") //TODO: implement } diff --git a/pkg/management/management.go b/pkg/management/management.go index 8549042372..23bf517569 100644 --- a/pkg/management/management.go +++ b/pkg/management/management.go @@ -10,5 +10,5 @@ type Config struct { } func Start(ctx context.Context, config Config) error { - return errors.ThrowUnimplemented(nil, "", "") //TODO: implement + return errors.ThrowUnimplemented(nil, "MANAG-h3k3x", "not implemented yet") //TODO: implement }