Skip to content
This repository was archived by the owner on Sep 13, 2023. It is now read-only.

Suggest running heroku login on missing creds #503

Merged
merged 2 commits into from
Nov 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions mlem/contrib/heroku/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import requests
from requests import HTTPError

from ...core.errors import DeploymentError, MlemError
from ...core.errors import DeploymentError
from ...ui import EMOJI_BASE, EMOJI_BUILD, EMOJI_STOP, echo
from .config import HEROKU_CONFIG
from .meta import HerokuAppMeta, HerokuDeployment
Expand All @@ -20,7 +20,9 @@ def get_api_key() -> str:
.strip()
)
except subprocess.CalledProcessError as e:
raise MlemError("HEROKU_API_KEY env is not provided") from e
raise DeploymentError(
"Invalid credentials. Please run `heroku login` or set HEROKU_API_KEY env"
) from e


def heroku_api_request(
Expand All @@ -44,6 +46,10 @@ def heroku_api_request(
try:
r.raise_for_status()
except HTTPError as e:
if e.response.reason == "Unauthorized":
raise DeploymentError(
"Invalid credentials. Please run `heroku login` or set HEROKU_API_KEY env"
) from e
raise DeploymentError(r.json()["message"]) from e
return r.json()

Expand Down
21 changes: 20 additions & 1 deletion tests/contrib/test_heroku.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ def test_create_app(heroku_app_name, heroku_env, model):
heroku_deploy = HerokuDeployment(
app_name=name,
env=heroku_env,
model=model.make_link(),
team=HEROKU_TEAM,
)
create_app(heroku_deploy)
Expand Down Expand Up @@ -191,3 +190,23 @@ def test_env_deploy_full(
)
with pytest.raises(DeploymentError):
delete_app(name)


@pytest.fixture
def no_heroku_env():
env_tmp = os.environ.pop("HEROKU_API_KEY")
conf_tmp = HEROKU_CONFIG.API_KEY
HEROKU_CONFIG.API_KEY = None
try:
yield
finally:
os.environ["HEROKU_API_KEY"] = env_tmp
HEROKU_CONFIG.API_KEY = conf_tmp


def test_suggest_login(no_heroku_env, heroku_app_name, heroku_env):
with pytest.raises(
DeploymentError,
match="Invalid credentials. Please run `heroku login` or set HEROKU_API_KEY env",
):
heroku_app_name("no-creds-app")