Fix the merge mess I made with the DS merge (#754)

* DS: More cleanups

* Added DS for cloudflare provider with tests

* Merge

* Added generated files

* Regenerated documentation matrix

* rebased and regenerated

* Updated integration tests

* Rebase and regenerate

* More cleanups

Co-authored-by: Robert Koch <robert@kochie.io>
Co-authored-by: Nicolai Ehemann <nicolai.ehemann@enerko-informatik.de>

docs/_includes/matrix.html

@@ -826,6 +826,9 @@
 		<td><i class="fa fa-minus dim"></i></td>
 		<td><i class="fa fa-minus dim"></i></td>
 		<td><i class="fa fa-minus dim"></i></td>
+		<td class="success">
+			<i class="fa fa-check text-success" aria-hidden="true"></i>
+		</td>
 		<td><i class="fa fa-minus dim"></i></td>
 		<td><i class="fa fa-minus dim"></i></td>
 		<td><i class="fa fa-minus dim"></i></td>
@@ -844,6 +847,39 @@
 		<td><i class="fa fa-minus dim"></i></td>
 		<td><i class="fa fa-minus dim"></i></td>
 		<td><i class="fa fa-minus dim"></i></td>
+		</tr>
+	<tr>
+		<th class="row-header" style="text-decoration: underline;" data-toggle="tooltip" data-container="body" data-placement="top" title="Provider supports adding DS records">DS</th>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td class="success">
+			<i class="fa fa-check text-success" aria-hidden="true"></i>
+		</td>
+		<td class="success">
+			<i class="fa fa-check text-success" aria-hidden="true"></i>
+		</td>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td class="success">
+			<i class="fa fa-check text-success" aria-hidden="true"></i>
+		</td>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td><i class="fa fa-minus dim"></i></td>
+		<td><i class="fa fa-minus dim"></i></td>
 		<td><i class="fa fa-minus dim"></i></td>
 		<td><i class="fa fa-minus dim"></i></td>
 		</tr>

integrationTest/integration_test.go

@@ -839,7 +839,7 @@ func makeTests(t *testing.T) []*TestGroup {
 		),
 
 		testgroup("DS",
-			requires(providers.canUseDS),
+			requires(providers.CanUseDS),
 			tc("create DS", ds("@", 1, 13, 1, "ADIGEST")),
 			tc("modify field 1", ds("@", 65535, 13, 1, "ADIGEST")),
 			tc("modify field 3", ds("@", 65535, 13, 2, "ADIGEST")),

integrationTest/providers.json

@@ -28,7 +28,8 @@
   "CLOUDFLAREAPI_OLD": {
     "apikey": "$CF_KEY",
     "apiuser": "$CF_USER",
-    "domain": "$CF_DOMAIN"
+    "domain": "$CF_DOMAIN",
+    "knownFailures": "54"
   },
   "CLOUDNS": {
     "auth-id": "$CLOUDNS_AUTH_ID",

integrationTest/testing.txt

@@ -1,22 +0,0 @@
-
-
-go test -v -verbose -provider BIND
-go test -v -verbose -provider AZURE_DNS
-go test -v -verbose -provider ROUTE53
-go test -v -verbose -provider GCLOUD
-go test -v -verbose -provider DIGITALOCEAN
-go test -v -verbose -provider GANDI_V5
-
--run TestDNSProviders -start 5 -end 6
-
-DONE   go test -v -provider BIND
-DONE   go test -v -provider AZURE_DNS
-DONE   go test -v -provider ROUTE53
-DONE   go test -v -provider GCLOUD
-REPORTED go test -v -provider NAMEDOTCOM
-REPORTED go test -v -provider CLOUDFLAREAPI
-DONE   go test -v -provider DIGITALOCEAN
-DONE   go test -v -provider GANDI_V5
-
-go test -v -verbose -provider NAMEDOTCOM -run TestDNSProviders -start 5 -end 6
-go test -v -verbose -provider CLOUDFLAREAPI -run TestDNSProviders -start 5 -end 6

pkg/normalize/validate.go

@@ -461,6 +461,7 @@ func init() {
 		{"ALIAS", providers.CanUseAlias},
 		{"AUTODNSSEC", providers.CanAutoDNSSEC},
 		{"CAA", providers.CanUseCAA},
+		{"DS", providers.CanUseDS},
 		{"NAPTR", providers.CanUseNAPTR},
 		{"PTR", providers.CanUsePTR},
 		{"R53_ALIAS", providers.CanUseRoute53Alias},