Skip to content
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
5 changes: 1 addition & 4 deletions gitops_server/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

from gitops_server import settings
from gitops_server.app import app
from gitops_server.workers import DeploymentStatusWorker, DeployQueueWorker
from gitops_server.workers import DeployQueueWorker

manually_instrument_logging()
manually_instrument_fastapi()
Expand Down Expand Up @@ -64,9 +64,6 @@ async def startup_event():
deploy_queue_worker = DeployQueueWorker.get_worker()
deploy_queue_worker.task = asyncio.ensure_future(deploy_queue_worker.run(), loop=loop)

deployment_status_worker = DeploymentStatusWorker.get_worker()
deployment_status_worker.task = asyncio.ensure_future(deployment_status_worker.run(), loop=loop)


def get_digest(data: bytes) -> str:
"""Calculate the digest of a webhook body.
Expand Down
1 change: 0 additions & 1 deletion gitops_server/workers/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
from .deployer import DeployQueueWorker # NOQA
from .status_updater import DeploymentStatusWorker # NOQA
5 changes: 4 additions & 1 deletion gitops_server/workers/deployer/hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,13 @@ async def update_issue_from_deployment_url(app: App, deployment_url: str, **kwar

async def handle_successful_deploy(app: App, result, deployer, **kwargs) -> UpdateAppResult:
github_deployment_url = str(app.values.get("github/deployment_url", ""))
# I know this shouldn't be uptick specific but for now it is.
environment_url = app.values.get("github/environment_url", "") or f"https://{app.name}.onuptick.com"
await github.update_deployment(
github_deployment_url,
status=github.STATUSES.in_progress,
status=github.STATUSES.success,
description="Helm installed app into cluster. Waiting for pods to deploy.",
environment_url=environment_url,
)
return result

Expand Down
1 change: 0 additions & 1 deletion gitops_server/workers/status_updater/__init__.py

This file was deleted.

126 changes: 0 additions & 126 deletions gitops_server/workers/status_updater/worker.py

This file was deleted.

11 changes: 0 additions & 11 deletions tests/test_gitops_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,3 @@ def test_webhook_returns_200_if_hmac_is_correct():

assert response.status_code == 200
get_worker_mock.assert_called()


@patch("gitops_server.main.settings.GITHUB_WEBHOOK_KEY", "test_key")
def test_webhook_returns_400_if_hmac_is_invalid():
sha_encoding = "INVALID HMAC ENCODING"
headers["X-Hub-Signature"] = f"sha1={sha_encoding}"

with patch.object(gitops_server.workers.DeploymentStatusWorker, "get_worker", AsyncMock):
response = client.post("/webhook", headers=headers, json=payload)

assert response.status_code == 400
Loading