From ff70a0e44e9ebce01630dd30e4e4656f08f0712b Mon Sep 17 00:00:00 2001 From: Julien Le Goff Date: Thu, 23 Feb 2023 12:06:00 +0100 Subject: [PATCH] Updated and fixed tests using current PowerDNS version --- client.go | 3 +-- client_test.go | 6 +++--- docker-compose.yml | 22 ++-------------------- 3 files changed, 6 insertions(+), 25 deletions(-) diff --git a/client.go b/client.go index 199facc..3b7e2fe 100644 --- a/client.go +++ b/client.go @@ -114,8 +114,7 @@ func removeRecords(rRSet zones.ResourceRecordSet, culls []libdns.Record) zones.R recs := rRSet.Records for i := len(recs) - 1; i >= 0; i-- { if recs[i].Content == item { - copy(recs[i:], recs[:i+1]) - recs = recs[:len(recs)-1] + recs = append(recs[:i], recs[i+1:]...) } } return recs diff --git a/client_test.go b/client_test.go index 44fb9bd..abd0af8 100644 --- a/client_test.go +++ b/client_test.go @@ -222,10 +222,10 @@ func TestPDNSClient(t *testing.T) { { Name: "2", Type: "A", - Value: "127.0.0.7", + Value: "127.0.0.5", }, }, - want: []string{"1:127.0.0.1", "1:127.0.0.2", "1:127.0.0.3", "2:127.0.0.4", "2:127.0.0.5", "2:127.0.0.6"}, + want: []string{"1:127.0.0.1", "1:127.0.0.2", "1:127.0.0.3", "2:127.0.0.4", "2:127.0.0.6", "2:127.0.0.7"}, }, { name: "Test Append and Add Zone", @@ -245,7 +245,7 @@ func TestPDNSClient(t *testing.T) { }, }, want: []string{"1:127.0.0.1", "1:127.0.0.2", "1:127.0.0.3", - "2:127.0.0.4", "2:127.0.0.5", "2:127.0.0.6", "2:127.0.0.8", + "2:127.0.0.4", "2:127.0.0.6", "2:127.0.0.7", "2:127.0.0.8", "3:127.0.0.9"}, }, { diff --git a/docker-compose.yml b/docker-compose.yml index 5d1d8f5..70c2faf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,30 +1,12 @@ version: "3" services: - mysql: - image: mariadb:10.6 - environment: - MYSQL_ROOT_PASSWORD: immelting - MYSQL_USER: powerdns - MYSQL_PASSWORD: secret - MYSQL_DATABASE: powerdns - volumes: - - database:/var/lib/mysql - networks: - - backend powerdns: - image: psitrax/powerdns - environment: - MYSQL_HOST: mysql - MYSQL_USER: powerdns - MYSQL_PASS: secret - MYSQL_DB: powerdns + image: powerdns/pdns-auth-47 networks: - backend volumes: - - ./.docker/pdns:/etc/pdns/conf.d + - ./.docker/pdns:/etc/powerdns/pdns.d ports: - 8081:8081 -volumes: - database: {} networks: backend: {}