Prepare NPM references and mutation API
This commit is contained in:
@@ -7,6 +7,7 @@ from dns_sync.adapters import (
|
||||
PROXY_HOSTS,
|
||||
Capability,
|
||||
CapabilityOperation,
|
||||
ObjectReference,
|
||||
)
|
||||
from dns_sync.config import AppConfig
|
||||
from dns_sync.registry import load_adapter
|
||||
@@ -110,6 +111,38 @@ class NpmAdapterTests(unittest.TestCase):
|
||||
discovered[0].payload,
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
discovered[0].references,
|
||||
(
|
||||
ObjectReference(
|
||||
relation="certificate",
|
||||
object_type=CERTIFICATES,
|
||||
local_key="67",
|
||||
),
|
||||
),
|
||||
)
|
||||
|
||||
def test_proxy_host_without_certificate_has_no_reference(self):
|
||||
client = Mock()
|
||||
client.proxy_hosts.return_value = [
|
||||
{
|
||||
"id": 13,
|
||||
"domain_names": ["plain.example.com"],
|
||||
"forward_scheme": "http",
|
||||
"forward_host": "192.168.1.20",
|
||||
"forward_port": 8080,
|
||||
"certificate_id": 0,
|
||||
"enabled": 1,
|
||||
}
|
||||
]
|
||||
adapter = self.adapter(client)
|
||||
|
||||
discovered = adapter.discover(PROXY_HOSTS)
|
||||
|
||||
self.assertEqual(len(discovered), 1)
|
||||
self.assertEqual(discovered[0].references, ())
|
||||
|
||||
|
||||
def test_certificate_discovery_excludes_secret_material(self):
|
||||
client = Mock()
|
||||
client.certificates.return_value = [
|
||||
|
||||
+197
-1
@@ -1,6 +1,6 @@
|
||||
import os
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
from unittest.mock import Mock, patch
|
||||
|
||||
from dns_sync.adapters import Endpoint
|
||||
from dns_sync.config import AppConfig
|
||||
@@ -71,5 +71,201 @@ class NpmClientEndpointTests(unittest.TestCase):
|
||||
NpmClient(config, endpoint)
|
||||
|
||||
|
||||
|
||||
|
||||
class NpmClientMutationTests(unittest.TestCase):
|
||||
def client(self):
|
||||
with patch.dict(
|
||||
os.environ,
|
||||
{
|
||||
"NPM_ENDPOINTS": "192.168.1.3",
|
||||
"DNS_TARGET_IP": "192.168.1.101",
|
||||
"NPM_IDENTITY": "test@example.com",
|
||||
"NPM_SECRET": "not-a-real-secret",
|
||||
},
|
||||
clear=True,
|
||||
):
|
||||
config = AppConfig.from_env()
|
||||
return NpmClient(
|
||||
config,
|
||||
config.npm_endpoints[0],
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def response(data):
|
||||
response = Mock()
|
||||
response.json.return_value = data
|
||||
return response
|
||||
|
||||
def test_gets_one_proxy_host_by_endpoint_local_id(self):
|
||||
client = self.client()
|
||||
client.get_json = Mock(
|
||||
return_value={
|
||||
"id": 12,
|
||||
"domain_names": ["app.example.com"],
|
||||
}
|
||||
)
|
||||
|
||||
result = client.proxy_host("12")
|
||||
|
||||
client.get_json.assert_called_once_with(
|
||||
"/nginx/proxy-hosts/12"
|
||||
)
|
||||
self.assertEqual(result["id"], 12)
|
||||
|
||||
def test_creates_proxy_host_with_json_payload(self):
|
||||
client = self.client()
|
||||
payload = {
|
||||
"domain_names": ["app.example.com"],
|
||||
"forward_scheme": "http",
|
||||
"forward_host": "192.168.1.20",
|
||||
"forward_port": 8080,
|
||||
"certificate_id": 67,
|
||||
}
|
||||
client.request = Mock(
|
||||
return_value=self.response({"id": 12})
|
||||
)
|
||||
|
||||
result = client.create_proxy_host(payload)
|
||||
|
||||
client.request.assert_called_once_with(
|
||||
"POST",
|
||||
"/nginx/proxy-hosts",
|
||||
expected_status=201,
|
||||
json=payload,
|
||||
)
|
||||
self.assertEqual(result["id"], 12)
|
||||
|
||||
def test_updates_proxy_host_with_json_payload(self):
|
||||
client = self.client()
|
||||
payload = {
|
||||
"forward_host": "192.168.1.30",
|
||||
}
|
||||
client.request = Mock(
|
||||
return_value=self.response({"id": 12})
|
||||
)
|
||||
|
||||
result = client.update_proxy_host(
|
||||
"12",
|
||||
payload,
|
||||
)
|
||||
|
||||
client.request.assert_called_once_with(
|
||||
"PUT",
|
||||
"/nginx/proxy-hosts/12",
|
||||
expected_status=200,
|
||||
json=payload,
|
||||
)
|
||||
self.assertEqual(result["id"], 12)
|
||||
|
||||
def test_gets_one_certificate_by_endpoint_local_id(self):
|
||||
client = self.client()
|
||||
client.get_json = Mock(
|
||||
return_value={
|
||||
"id": 67,
|
||||
"domain_names": ["app.example.com"],
|
||||
}
|
||||
)
|
||||
|
||||
result = client.certificate("67")
|
||||
|
||||
client.get_json.assert_called_once_with(
|
||||
"/nginx/certificates/67"
|
||||
)
|
||||
self.assertEqual(result["id"], 67)
|
||||
|
||||
def test_creates_certificate_metadata_with_json_payload(self):
|
||||
client = self.client()
|
||||
payload = {
|
||||
"provider": "other",
|
||||
"nice_name": "cluster copy",
|
||||
"domain_names": ["app.example.com"],
|
||||
"meta": {
|
||||
"cluster_managed": True,
|
||||
},
|
||||
}
|
||||
client.request = Mock(
|
||||
return_value=self.response({"id": 84})
|
||||
)
|
||||
|
||||
result = client.create_certificate(payload)
|
||||
|
||||
client.request.assert_called_once_with(
|
||||
"POST",
|
||||
"/nginx/certificates",
|
||||
expected_status=201,
|
||||
json=payload,
|
||||
)
|
||||
self.assertEqual(result["id"], 84)
|
||||
|
||||
def test_uploads_certificate_material_as_multipart(self):
|
||||
client = self.client()
|
||||
client.request = Mock(
|
||||
return_value=self.response({"id": 84})
|
||||
)
|
||||
|
||||
result = client.upload_certificate(
|
||||
"84",
|
||||
certificate=b"CERTIFICATE",
|
||||
certificate_key=b"PRIVATE-KEY",
|
||||
intermediate_certificate=b"INTERMEDIATE",
|
||||
)
|
||||
|
||||
client.request.assert_called_once_with(
|
||||
"POST",
|
||||
"/nginx/certificates/84/upload",
|
||||
expected_status=200,
|
||||
files={
|
||||
"certificate": (
|
||||
"certificate.pem",
|
||||
b"CERTIFICATE",
|
||||
),
|
||||
"certificate_key": (
|
||||
"certificate_key.pem",
|
||||
b"PRIVATE-KEY",
|
||||
),
|
||||
"intermediate_certificate": (
|
||||
"intermediate_certificate.pem",
|
||||
b"INTERMEDIATE",
|
||||
),
|
||||
},
|
||||
)
|
||||
self.assertEqual(result["id"], 84)
|
||||
|
||||
def test_certificate_upload_requires_both_required_parts(self):
|
||||
client = self.client()
|
||||
|
||||
with self.assertRaisesRegex(
|
||||
RuntimeError,
|
||||
"requires certificate data",
|
||||
):
|
||||
client.upload_certificate(
|
||||
"84",
|
||||
certificate=b"",
|
||||
certificate_key=b"PRIVATE-KEY",
|
||||
)
|
||||
|
||||
with self.assertRaisesRegex(
|
||||
RuntimeError,
|
||||
"requires certificate key data",
|
||||
):
|
||||
client.upload_certificate(
|
||||
"84",
|
||||
certificate=b"CERTIFICATE",
|
||||
certificate_key=b"",
|
||||
)
|
||||
|
||||
def test_rejects_invalid_endpoint_local_ids(self):
|
||||
client = self.client()
|
||||
|
||||
for local_id in ("", "abc", True, -1):
|
||||
with self.subTest(local_id=local_id):
|
||||
with self.assertRaisesRegex(
|
||||
RuntimeError,
|
||||
"id is invalid",
|
||||
):
|
||||
client.certificate(local_id)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
||||
@@ -6,6 +6,7 @@ from dns_sync.adapters import (
|
||||
DNS_RECORDS,
|
||||
PROXY_HOSTS,
|
||||
DiscoveredObject,
|
||||
ObjectReference,
|
||||
)
|
||||
from dns_sync.object_normalizer import (
|
||||
normalize_discovered_object,
|
||||
@@ -83,6 +84,13 @@ class ProxyHostNormalizationTests(unittest.TestCase):
|
||||
"ssl_forced": 1,
|
||||
"enabled": True,
|
||||
},
|
||||
references=(
|
||||
ObjectReference(
|
||||
relation="certificate",
|
||||
object_type=CERTIFICATES,
|
||||
local_key="67",
|
||||
),
|
||||
),
|
||||
)
|
||||
|
||||
normalized = normalize_discovered_object(discovered)
|
||||
@@ -97,9 +105,23 @@ class ProxyHostNormalizationTests(unittest.TestCase):
|
||||
)
|
||||
self.assertEqual(normalized.payload["forward_scheme"], "http")
|
||||
self.assertEqual(normalized.payload["forward_port"], 8080)
|
||||
self.assertNotIn(
|
||||
"certificate_local_key",
|
||||
normalized.payload,
|
||||
)
|
||||
self.assertNotIn(
|
||||
"certificate_id",
|
||||
normalized.payload,
|
||||
)
|
||||
self.assertEqual(
|
||||
normalized.payload["certificate_local_key"],
|
||||
"67",
|
||||
normalized.references,
|
||||
(
|
||||
ObjectReference(
|
||||
relation="certificate",
|
||||
object_type=CERTIFICATES,
|
||||
local_key="67",
|
||||
),
|
||||
),
|
||||
)
|
||||
self.assertTrue(normalized.payload["ssl_forced"])
|
||||
self.assertTrue(normalized.payload["enabled"])
|
||||
|
||||
Reference in New Issue
Block a user