Upstream sync

This commit is contained in:
Senad Uka
2018-06-01 10:39:46 +02:00
parent f1ac874276
commit 69853b026b
20 changed files with 427 additions and 594 deletions

View File

@@ -25,14 +25,15 @@ type Config struct {
Blue365 Blue365Config
Email EmailConfig
GoogleShortener GoogleShortenerConfig
Eligibility EligibilityConfig
Eligibility EligibilityConfig
}
// AppConfig represents the configuration values about the application.
type AppConfig struct {
Name string
Debug bool
Docs DocsConfig
Name string
Debug bool
Docs DocsConfig
DisableZipValidation bool
}
// TwilioConfig represents the configuration values about the twilio.
@@ -139,7 +140,7 @@ type GoogleShortenerConfig struct {
}
type EligibilityConfig struct {
Url string
Url string
}
// Read returns the configuration values,
@@ -160,8 +161,9 @@ func Read() (*Config, error) {
return &Config{
App: AppConfig{
Name: viper.GetString("app.name"),
Debug: viper.GetBool("app.debug"),
Name: viper.GetString("app.name"),
Debug: viper.GetBool("app.debug"),
DisableZipValidation: viper.GetBool("app.disable-zip-validation"),
Docs: DocsConfig{
YAMLPath: viper.GetString("app.docs.yaml-path"),
SwaggerPath: viper.GetString("app.docs.swagger-path"),
@@ -243,8 +245,8 @@ func Read() (*Config, error) {
ClientID: viper.GetString("google-shortener.client-id"),
SecretKey: viper.GetString("google-shortener.secret-key"),
},
Eligibility : EligibilityConfig{
Url : viper.GetString("eligibility.url"),
Eligibility: EligibilityConfig{
Url: viper.GetString("eligibility.url"),
},
}, nil
}