fet: show Gitea and woodpecker URIs in view instance page

pull/14/head
Aravinth Manivannan 2022-06-30 13:05:57 +05:30
parent f00746a36d
commit 9d89bc071c
Signed by: realaravinth
GPG Key ID: AD9F0F08E855ED88
3 changed files with 10 additions and 3 deletions

View File

@ -12,6 +12,7 @@
</ul>
<p>Created On: {{ instance.created_at }}</p>
<p><a href="{{gitea_uri}}">Gitea Instance</a>|<a href="{{woodpecker}}">Woodpecker CI</a></p>
<form
action="{% url 'dash.instances.delete' name=instance.name %}"

View File

@ -22,6 +22,7 @@ from django.views.decorators.csrf import csrf_protect
from django.urls import reverse
from accounts.decorators import confirm_access
from infrastructure.utils import Infra
from .models import Instance, InstanceConfiguration
from .utils import create_instance as create_instance_util, VmErrors, VmException
@ -113,7 +114,12 @@ def view_instance(request, name: str):
instance = get_object_or_404(Instance, owned_by=user, name=name)
ctx = default_ctx(title=PAGE_TITLE, username=user.username)
instance.configuration = instance.configuration_id
gitea_uri = Infra.get_gitea_uri(instance=instance)
woodpecker = Infra.get_woodpecker_uri(instance=instance)
ctx["instance"] = instance
ctx["woodpecker"] = woodpecker
ctx["gitea_uri"] = gitea_uri
return render(request, "dash/instances/view/index.html", context=ctx)

View File

@ -41,7 +41,7 @@ class Worker(Thread):
def run(self):
gitea_uri = Infra.get_gitea_uri(instance=self.job.instance)
woodpecker = Infra.get_woodpecker_hostname(instance=self.job.instance)
woodpecker = Infra.get_woodpecker_uri(instance=self.job.instance)
while True:
try:
print(f"[ping] Trying to reach {gitea_uri}")
@ -147,10 +147,10 @@ class Infra:
"""
Get Woodpecker hostname of an instance
"""
return (f"{instance.name}-ci",)
return f"{instance.name}-ci"
@classmethod
def get_woodpecker_hostname(cls, instance: Instance) -> str:
def get_woodpecker_uri(cls, instance: Instance) -> str:
"""
Get an instance's Gitea URI
"""