Ivan/commento
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

api: use COMMENTO_ prefix on errors

Browse Source 
Closes https://gitlab.com/commento/commento-ce/issues/44
This commit is contained in:
Adhityaa 2018-06-13 00:22:06 +05:30
parent 0ee43ae52a
commit a3a6f2ba68
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/config.go
View File

@ -47,7 +47,7 @@ func parseConfig() error {
// Mandatory config parameters // Mandatory config parameters
for _, env := range []string{"POSTGRES", "PORT", "ORIGIN"} { for _, env := range []string{"POSTGRES", "PORT", "ORIGIN"} {
if os.Getenv(env) == "" { if os.Getenv(env) == "" {
logger.Errorf("missing %s environment variable", env) logger.Errorf("missing COMMENTO_%s environment variable", env)
return errorMissingConfig return errorMissingConfig
} }
} }

4
api/config_test.go
View File

@ -15,7 +15,7 @@ func TestParseConfigBasics(t *testing.T) {
} }
if os.Getenv("BIND_ADDRESS") != "127.0.0.1" { if os.Getenv("BIND_ADDRESS") != "127.0.0.1" {
t.Errorf("expected BIND_ADDRESS=127.0.0.1, but BIND_ADDRESS=%s instead", os.Getenv("BIND_ADDRESS")) t.Errorf("expected COMMENTO_BIND_ADDRESS=127.0.0.1, but COMMENTO_BIND_ADDRESS=%s instead", os.Getenv("BIND_ADDRESS"))
return return
} }
@ -27,7 +27,7 @@ func TestParseConfigBasics(t *testing.T) {
} }
if os.Getenv("BIND_ADDRESS") != "192.168.1.100" { if os.Getenv("BIND_ADDRESS") != "192.168.1.100" {
t.Errorf("expected BIND_ADDRESS=192.168.1.100, but BIND_ADDRESS=%s instead", os.Getenv("BIND_ADDRESS")) t.Errorf("expected COMMENTO_BIND_ADDRESS=192.168.1.100, but COMMENTO_BIND_ADDRESS=%s instead", os.Getenv("BIND_ADDRESS"))
return return
} }

4
api/oauth_google.go
View File

@ -15,12 +15,12 @@ func googleOauthConfigure() error {
} }
if os.Getenv("GOOGLE_KEY") == "" { if os.Getenv("GOOGLE_KEY") == "" {
logger.Errorf("GOOGLE_KEY not configured, but GOOGLE_SECRET is set") logger.Errorf("COMMENTO_GOOGLE_KEY not configured, but COMMENTO_GOOGLE_SECRET is set")
return errorOauthMisconfigured return errorOauthMisconfigured
} }
if os.Getenv("GOOGLE_SECRET") == "" { if os.Getenv("GOOGLE_SECRET") == "" {
logger.Errorf("GOOGLE_SECRET not configured, but GOOGLE_KEY is set") logger.Errorf("COMMENTO_GOOGLE_SECRET not configured, but COMMENTO_GOOGLE_KEY is set")
return errorOauthMisconfigured return errorOauthMisconfigured
} }

2
api/oauth_google_test.go
View File

@ -34,7 +34,7 @@ func TestGoogleOauthConfigureEmpty(t *testing.T) {
os.Setenv("GOOGLE_KEY", "google-key") os.Setenv("GOOGLE_KEY", "google-key")
if err := googleOauthConfigure(); err == nil { if err := googleOauthConfigure(); err == nil {
t.Errorf("expected error not found when configuring google oauth with empty GOOGLE_SECRET") t.Errorf("expected error not found when configuring google oauth with empty COMMENTO_GOOGLE_SECRET")
return return
} }

2
api/smtp_configure.go
View File

@ -20,7 +20,7 @@ func smtpConfigure() error {
} }
if os.Getenv("SMTP_FROM_ADDRESS") == "" { if os.Getenv("SMTP_FROM_ADDRESS") == "" {
logger.Errorf("SMTP_FROM_ADDRESS not set") logger.Errorf("COMMENTO_SMTP_FROM_ADDRESS not set")
smtpConfigured = false smtpConfigured = false
return errorMissingSmtpAddress return errorMissingSmtpAddress
} }

4
api/smtp_configure_test.go
View File

@ -40,7 +40,7 @@ func TestSmtpConfigureEmptyHost(t *testing.T) {
} }
if smtpConfigured { if smtpConfigured {
t.Errorf("SMTP configured when it should not be due to empty SMTP_HOST") t.Errorf("SMTP configured when it should not be due to empty COMMENTO_SMTP_HOST")
return return
} }
@ -56,7 +56,7 @@ func TestSmtpConfigureEmptyAddress(t *testing.T) {
os.Setenv("SMTP_PORT", "25") os.Setenv("SMTP_PORT", "25")
if err := smtpConfigure(); err == nil { if err := smtpConfigure(); err == nil {
t.Errorf("expected error not found; SMTP should not be configured when SMTP_FROM_ADDRESS is empty") t.Errorf("expected error not found; SMTP should not be configured when COMMENTO_SMTP_FROM_ADDRESS is empty")
return return
} }