Skip to content

Commit f8b3ba8

Browse files
author
Matthew Brahms
committed
consolidating APP_URL and API_URL
1 parent f4cd6fd commit f8b3ba8

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
kind: Refactor
2+
body: Consolidated API_URL and APP_URL to be the same!
3+
time: 2022-07-15T13:50:07.900059-05:00

src/cmd/root.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,13 @@ func Execute(v string, commit string) {
3232
func init() {
3333
rootCmd.PersistentFlags().String("log-format", "TEXT", "overrides environment variable 'OPSLEVEL_LOG_FORMAT' (options [\"JSON\", \"TEXT\"])")
3434
rootCmd.PersistentFlags().String("log-level", "INFO", "overrides environment variable 'OPSLEVEL_LOG_LEVEL' (options [\"ERROR\", \"WARN\", \"INFO\", \"DEBUG\"])")
35-
rootCmd.PersistentFlags().String("api-url", "https://api.opslevel.com", "The OpsLevel API Url. Overrides environment variable 'OPSLEVEL_API_URL'")
36-
rootCmd.PersistentFlags().String("app-url", "https://app.opslevel.com", "The OpsLevel App Url. Overrides environment variable 'OPSLEVEL_APP_URL'")
35+
rootCmd.PersistentFlags().String("api-url", "https://app.opslevel.com", "The OpsLevel API Url. Overrides environment variable 'OPSLEVEL_API_URL'")
3736
rootCmd.PersistentFlags().String("api-token", "", "The OpsLevel API Token. Overrides environment variable 'OPSLEVEL_API_TOKEN'")
3837

3938
viper.BindPFlags(rootCmd.PersistentFlags())
4039
viper.BindEnv("log-format", "OPSLEVEL_LOG_FORMAT", "OL_LOG_FORMAT", "OL_LOGFORMAT")
4140
viper.BindEnv("log-level", "OPSLEVEL_LOG_LEVEL", "OL_LOG_LEVEL", "OL_LOGLEVEL")
42-
viper.BindEnv("api-url", "OPSLEVEL_API_URL", "OL_API_URL")
43-
viper.BindEnv("app-url", "OPSLEVEL_APP_URL", "OL_APP_URL")
41+
viper.BindEnv("api-url", "OPSLEVEL_API_URL", "OL_API_URL", "OPSLEVEL_APP_URL", "OL_APP_URL")
4442
viper.BindEnv("api-token", "OPSLEVEL_API_TOKEN", "OL_API_TOKEN", "OL_APITOKEN")
4543
cobra.OnInitialize(initConfig)
4644
}
@@ -76,7 +74,7 @@ func setupLogging() {
7674

7775
func getClientRest() *resty.Client {
7876
if _clientRest == nil {
79-
_clientRest = opslevel.NewRestClient(opslevel.SetURL(viper.GetString("app-url")))
77+
_clientRest = opslevel.NewRestClient(opslevel.SetURL(viper.GetString("api-url")))
8078
}
8179
return _clientRest
8280
}

0 commit comments

Comments
 (0)