Skip to content

CM-13317 - change url env var from BASE_URL to CYCODE_API_URL #12

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

Merged
merged 2 commits into from
Jul 30, 2022
Merged

CM-13317 - change url env var from BASE_URL to CYCODE_API_URL #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb51003
change url env var from legacy BASE_URL to CYCODE_API_URL
MichalBor Jul 29, 2022
7aa14fe
Merge branch 'main' into CM-13317
MaorDavidzon Jul 30, 2022
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
4 changes: 2 additions & 2 deletions cli/consts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
'.enc', '.deb', '.obj', '.model'
]

DEFAULT_BASE_URL = "https://api.cycode.com"
DEFAULT_CYCODE_API_URL = "https://api.cycode.com"

# env var names
BASE_URL_ENV_VAR_NAME = "BASE_URL"
CYCODE_API_URL_VAR_NAME = "CYCODE_API_URL"
TIMEOUT_ENV_VAR_NAME = "TIMEOUT"
LOGGING_LEVEL_ENV_VAR_NAME = "LOGGING_LEVEL"
# use only for dev envs locally
Expand Down
8 changes: 4 additions & 4 deletions cli/user_settings/configuration_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
from pathlib import Path
from typing import Optional, Dict
from cli.user_settings.config_file_manager import ConfigFileManager
from cli.consts import DEFAULT_BASE_URL, BASE_URL_ENV_VAR_NAME, VERBOSE_ENV_VAR_NAME
from cli.consts import DEFAULT_CYCODE_API_URL, CYCODE_API_URL_VAR_NAME, VERBOSE_ENV_VAR_NAME


class ConfigurationManager:

global_config_file_manager: ConfigFileManager
local_config_file_manager: ConfigFileManager

Expand All @@ -27,7 +26,7 @@ def get_base_url(self) -> str:
if base_url is not None:
return base_url

return DEFAULT_BASE_URL
return DEFAULT_CYCODE_API_URL

def get_verbose_flag(self) -> bool:
verbose_flag_env_var = self.get_verbose_flag_from_environment_variables()
Expand All @@ -36,7 +35,8 @@ def get_verbose_flag(self) -> bool:
return verbose_flag_env_var or verbose_flag_local_config or verbose_flag_global_config

def get_base_url_from_environment_variables(self) -> Optional[str]:
return self._get_value_from_environment_variables(BASE_URL_ENV_VAR_NAME)
return self._get_value_from_environment_variables(CYCODE_API_URL_VAR_NAME)


def get_verbose_flag_from_environment_variables(self) -> bool:
value = self._get_value_from_environment_variables(VERBOSE_ENV_VAR_NAME, '')
Expand Down
6 changes: 3 additions & 3 deletions cyclient/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import sys
from urllib.parse import urlparse
from cli.user_settings.configuration_manager import ConfigurationManager
from cli.consts import BASE_URL_ENV_VAR_NAME, TIMEOUT_ENV_VAR_NAME, LOGGING_LEVEL_ENV_VAR_NAME, DEV_MODE_ENV_VAR_NAME, \
from cli.consts import DEFAULT_CYCODE_API_URL, TIMEOUT_ENV_VAR_NAME, LOGGING_LEVEL_ENV_VAR_NAME, DEV_MODE_ENV_VAR_NAME, \
BATCH_SIZE_ENV_VAR_NAME, VERBOSE_ENV_VAR_NAME


Expand Down Expand Up @@ -70,8 +70,8 @@ def _get_val_as_int(key):
try:
urlparse(base_url)
except ValueError as e:
logger.warning(f'Invalid BASE_URL: {base_url}, using default value', e)
base_url = DEFAULT_CONFIGURATION.get(BASE_URL_ENV_VAR_NAME)
logger.warning(f'Invalid cycode api url: {base_url}, using default value', e)
base_url = DEFAULT_CYCODE_API_URL

timeout = _get_val_as_int(TIMEOUT_ENV_VAR_NAME)
dev_mode = _get_val_as_bool(DEV_MODE_ENV_VAR_NAME)
Expand Down
4 changes: 2 additions & 2 deletions tests/user_settings/test_configuration_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from mock import Mock
from cli.user_settings.configuration_manager import ConfigurationManager
from cli.consts import DEFAULT_BASE_URL
from cli.consts import DEFAULT_CYCODE_API_URL

"""
we check for base url in the three places, in the following order:
Expand Down Expand Up @@ -56,7 +56,7 @@ def test_get_base_url_not_configured(mocker):
result = configuration_manager.get_base_url()

# Assert
assert result == DEFAULT_BASE_URL
assert result == DEFAULT_CYCODE_API_URL


def _configure_mocks(mocker,
Expand Down