From 7c1b9c4b96eb0b8bb483dd44d549b0ebd3db3b2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C4=93teris=20Caune?= Date: Fri, 22 Nov 2019 10:40:57 +0200 Subject: [PATCH] Rename "add_pd" to "add_pdc" (PagerDuty Connect). --- hc/front/tests/{test_add_pd.py => test_add_pdc.py} | 10 +++++----- hc/front/urls.py | 4 ++-- hc/front/views.py | 6 +++--- templates/front/channels.html | 2 +- templates/integrations/{add_pd.html => add_pdc.html} | 0 5 files changed, 11 insertions(+), 11 deletions(-) rename hc/front/tests/{test_add_pd.py => test_add_pdc.py} (83%) rename templates/integrations/{add_pd.html => add_pdc.html} (100%) diff --git a/hc/front/tests/test_add_pd.py b/hc/front/tests/test_add_pdc.py similarity index 83% rename from hc/front/tests/test_add_pd.py rename to hc/front/tests/test_add_pdc.py index 0f6c863a..01e962b2 100644 --- a/hc/front/tests/test_add_pd.py +++ b/hc/front/tests/test_add_pdc.py @@ -4,8 +4,8 @@ from hc.test import BaseTestCase @override_settings(PD_VENDOR_KEY="foo") -class AddPdTestCase(BaseTestCase): - url = "/integrations/add_pd/" +class AddPdConnectTestCase(BaseTestCase): + url = "/integrations/add_pdc/" def test_instructions_work(self): self.client.login(username="alice@example.org", password="password") @@ -18,7 +18,7 @@ class AddPdTestCase(BaseTestCase): session.save() self.client.login(username="alice@example.org", password="password") - url = "/integrations/add_pd/1234567890AB/?service_key=123" + url = self.url + "1234567890AB/?service_key=123" r = self.client.get(url) self.assertEqual(r.status_code, 302) @@ -33,11 +33,11 @@ class AddPdTestCase(BaseTestCase): session.save() self.client.login(username="alice@example.org", password="password") - url = "/integrations/add_pd/XXXXXXXXXXXX/?service_key=123" + url = self.url + "XXXXXXXXXXXX/?service_key=123" r = self.client.get(url) self.assertEqual(r.status_code, 400) @override_settings(PD_VENDOR_KEY=None) def test_it_requires_vendor_key(self): - r = self.client.get("/integrations/add_pd/") + r = self.client.get(self.url) self.assertEqual(r.status_code, 404) diff --git a/hc/front/urls.py b/hc/front/urls.py index 9d31d2e2..8e5c57b1 100644 --- a/hc/front/urls.py +++ b/hc/front/urls.py @@ -27,8 +27,8 @@ channel_urls = [ path("add_email/", views.add_email, name="hc-add-email"), path("add_webhook/", views.add_webhook, name="hc-add-webhook"), path("add_shell/", views.add_shell, name="hc-add-shell"), - path("add_pd/", views.add_pd, name="hc-add-pd"), - path("add_pd//", views.add_pd, name="hc-add-pd-state"), + path("add_pdc/", views.add_pdc, name="hc-add-pdc"), + path("add_pdc//", views.add_pdc, name="hc-add-pdc-state"), path("add_pagertree/", views.add_pagertree, name="hc-add-pagertree"), path("add_pagerteam/", views.add_pagerteam, name="hc-add-pagerteam"), path("add_slack/", views.add_slack, name="hc-add-slack"), diff --git a/hc/front/views.py b/hc/front/views.py index 75f5412b..53b5beb7 100644 --- a/hc/front/views.py +++ b/hc/front/views.py @@ -863,7 +863,7 @@ def _get_validated_code(request, session_key, key="code"): return request.GET.get(key) -def add_pd(request, state=None): +def add_pdc(request, state=None): if settings.PD_VENDOR_KEY is None: raise Http404("pagerduty integration is not available") @@ -893,13 +893,13 @@ def add_pd(request, state=None): return redirect("hc-channels") state = _prepare_state(request, "pd") - callback = settings.SITE_ROOT + reverse("hc-add-pd-state", args=[state]) + callback = settings.SITE_ROOT + reverse("hc-add-pdc-state", args=[state]) connect_url = "https://connect.pagerduty.com/connect?" + urlencode( {"vendor": settings.PD_VENDOR_KEY, "callback": callback} ) ctx = {"page": "channels", "project": request.project, "connect_url": connect_url} - return render(request, "integrations/add_pd.html", ctx) + return render(request, "integrations/add_pdc.html", ctx) @login_required diff --git a/templates/front/channels.html b/templates/front/channels.html index 7a570a12..72d72637 100644 --- a/templates/front/channels.html +++ b/templates/front/channels.html @@ -259,7 +259,7 @@

PagerDuty

On-call scheduling, alerting, and incident tracking.

- Add Integration + Add Integration {% endif %} diff --git a/templates/integrations/add_pd.html b/templates/integrations/add_pdc.html similarity index 100% rename from templates/integrations/add_pd.html rename to templates/integrations/add_pdc.html