From c465062673e83bf721c5fd69906445ad035aca05 Mon Sep 17 00:00:00 2001
From: csine-nflx <csine@netflix.com>
Date: Thu, 23 Jan 2020 23:53:38 -0800
Subject: [PATCH] integrated PowerDNS plugin into dns_providers

---
 lemur/dns_providers/service.py                  | 1 +
 lemur/plugins/lemur_acme/plugin.py              | 4 ++--
 lemur/plugins/lemur_acme/powerdns.py            | 8 ++++----
 lemur/plugins/lemur_acme/tests/test_powerdns.py | 5 +----
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/lemur/dns_providers/service.py b/lemur/dns_providers/service.py
index 29f98a5b..7052b55b 100644
--- a/lemur/dns_providers/service.py
+++ b/lemur/dns_providers/service.py
@@ -99,6 +99,7 @@ def get_types():
                 },
                 {"name": "dyn"},
                 {"name": "ultradns"},
+                {"name": "powerdns"},
             ]
         },
     )
diff --git a/lemur/plugins/lemur_acme/plugin.py b/lemur/plugins/lemur_acme/plugin.py
index 93628905..8991efdf 100644
--- a/lemur/plugins/lemur_acme/plugin.py
+++ b/lemur/plugins/lemur_acme/plugin.py
@@ -377,7 +377,7 @@ class AcmeHandler(object):
             "dyn": dyn,
             "route53": route53,
             "ultradns": ultradns,
-            # "powerdns": powerdns,
+            "powerdns": powerdns
         }
         provider = provider_types.get(type)
         if not provider:
@@ -437,7 +437,7 @@ class ACMEIssuerPlugin(IssuerPlugin):
             "dyn": dyn,
             "route53": route53,
             "ultradns": ultradns,
-            # "powerdns": powerdns,
+            "powerdns": powerdns
         }
         provider = provider_types.get(type)
         if not provider:
diff --git a/lemur/plugins/lemur_acme/powerdns.py b/lemur/plugins/lemur_acme/powerdns.py
index 9591cd01..e0a145e6 100644
--- a/lemur/plugins/lemur_acme/powerdns.py
+++ b/lemur/plugins/lemur_acme/powerdns.py
@@ -74,8 +74,8 @@ def create_txt_record(domain, token, account_number):
     """ Create a TXT record for the given domain and token and return a change_id tuple """
     zone_name = _get_zone_name(domain, account_number)
     server_id = current_app.config.get("ACME_POWERDNS_SERVERID", "")
-    zone_id = zone_name.join(".")
-    domain_id = domain.join(".")
+    zone_id = zone_name + "."
+    domain_id = domain + "."
     path = f"/api/v1/servers/{server_id}/zones/{zone_id}"
     payload = {
         "rrsets": [
@@ -170,8 +170,8 @@ def delete_txt_record(change_id, account_number, domain, token):
     """ Delete the TXT record for the given domain and token """
     zone_name = _get_zone_name(domain, account_number)
     server_id = current_app.config.get("ACME_POWERDNS_SERVERID", "")
-    zone_id = zone_name.join(".")
-    domain_id = domain.join(".")
+    zone_id = zone_name + "."
+    domain_id = domain + "."
     path = f"/api/v1/servers/{server_id}/zones/{zone_id}"
     payload = {
         "rrsets": [
diff --git a/lemur/plugins/lemur_acme/tests/test_powerdns.py b/lemur/plugins/lemur_acme/tests/test_powerdns.py
index be3a590a..f1190732 100644
--- a/lemur/plugins/lemur_acme/tests/test_powerdns.py
+++ b/lemur/plugins/lemur_acme/tests/test_powerdns.py
@@ -1,8 +1,5 @@
 import unittest
-from requests.models import Response
-
-from mock import MagicMock, Mock, patch
-
+from mock import Mock, patch
 from lemur.plugins.lemur_acme import plugin, powerdns