Add custom view options support

Author: magior

README.md

@@ -263,6 +263,30 @@ bind::views:
 
 The defined types `bind::zone::primary` and `bind::zone::secondary` can be used to add zones to this view.
 
+Global options that are not modeled as dedicated class parameters can be
+set with `custom_options`. 
+
+```puppet
+class { 'bind':
+  custom_options => {
+    'minimal-responses' => 'no-auth-recursive',
+  },
+}
+```
+
+The `bind::view` defined type supports the same pattern for per-view options:
+
+```puppet
+bind::view { 'internal':
+  match_clients   => [ 'localnets', ],
+  allow_query     => [ 'localnets', ],
+  allow_recursion => [ 'localnets', ],
+  custom_options  => {
+    'minimal-responses' => true,
+  },
+}
+```
+
 ## Reference
 
 See [REFERENCE.md](https://github.com/smoeding/puppet-bind/blob/master/REFERENCE.md)

REFERENCE.md

@@ -1997,6 +1997,7 @@ The following parameters are available in the `bind::view` defined type:
 * [`view`](#-bind--view--view)
 * [`order`](#-bind--view--order)
 * [`response_policies`](#-bind--view--response_policies)
+* [`custom_options`](#-bind--view--custom_options)
 
 ##### <a name="-bind--view--match_clients"></a>`match_clients`
 
@@ -2156,6 +2157,19 @@ An array of response policy zones.
 
 Default value: `[]`
 
+##### <a name="-bind--view--custom_options"></a>`custom_options`
+
+Data type: `Hash[String,Data]`
+
+Additional config options that are not implemented as parameters of this
+defined type can be set by a hash of custom options. Each key of the hash
+will be added to the view block of the configuration. For string or numeric
+values the value will be added as a normal option value. If the value is a
+hash or an array it will be included as an additional block enclosed in
+braces.
+
+Default value: `{}`
+
 ### <a name="bind--zone--forward"></a>`bind::zone::forward`
 
 Manage a forward zone
@@ -3392,3 +3406,4 @@ Alias of `Enum['critical', 'error', 'warning', 'notice', 'info', 'debug', 'dynam
 Type to match allowed values for the zone class
 
 Alias of `Enum['IN', 'HS', 'CH']`
+

manifests/view.pp

@@ -75,6 +75,14 @@
 # @param response_policies
 #   An array of response policy zones.
 #
+# @param custom_options
+#   Additional config options that are not implemented as parameters of this
+#   defined type can be set by a hash of custom options. Each key of the hash
+#   will be added to the view block of the configuration. For string or numeric
+#   values the value will be added as a normal option value. If the value is a
+#   hash or an array it will be included as an additional block enclosed in
+#   braces.
+#
 #
 define bind::view (
   Array[String]     $match_clients            = ['any',],
@@ -93,6 +101,7 @@
   String            $view                     = $name,
   String            $order                    = '10',
   Array[String]     $response_policies        = [],
+  Hash[String,Data] $custom_options           = {},
   Optional[Boolean] $localhost_forward_enable = undef,
   Optional[Boolean] $localhost_reverse_enable = undef,
 ) {
@@ -120,6 +129,7 @@
     'allow_query_cache_on' => $allow_query_cache_on,
     'allow_transfer'       => $allow_transfer,
     'response_policies'    => $response_policies,
+    'custom_options'       => bind::gencfg($custom_options, 2),
   }
 
   concat::fragment { "named.conf.views-${view}-00":

spec/defines/view_spec.rb

@@ -205,6 +205,48 @@
         }
       end
 
+      context 'with custom_options => { "minimal-responses" => true }' do
+        let(:params) do
+          { custom_options: { 'minimal-responses' => true } }
+        end
+
+        it {
+          is_expected.to contain_concat__fragment('named.conf.views-internal-00')
+            .with_target('named.conf.views')
+            .with_content("\nview \"internal\" {\n  match-clients {\n    any;\n  };\n\n  allow-query {\n    any;\n  };\n\n  recursion yes;\n\n  minimal-responses yes;\n")
+            .with_order('10')
+
+          is_expected.to contain_concat__fragment('named.conf.views-internal-99')
+            .with_content('};')
+        }
+      end
+
+      context 'with custom_options => { "minimal-responses" => "no-auth-recursive" }' do
+        let(:params) do
+          { custom_options: { 'minimal-responses' => 'no-auth-recursive' } }
+        end
+
+        it {
+          is_expected.to contain_concat__fragment('named.conf.views-internal-00')
+            .with_target('named.conf.views')
+            .with_content("\nview \"internal\" {\n  match-clients {\n    any;\n  };\n\n  allow-query {\n    any;\n  };\n\n  recursion yes;\n\n  minimal-responses no-auth-recursive;\n")
+            .with_order('10')
+        }
+      end
+
+      context 'with custom_options => { "sortlist" => ["localnets", "localhost"] }' do
+        let(:params) do
+          { custom_options: { 'sortlist' => ['localnets', 'localhost'] } }
+        end
+
+        it {
+          is_expected.to contain_concat__fragment('named.conf.views-internal-00')
+            .with_target('named.conf.views')
+            .with_content("\nview \"internal\" {\n  match-clients {\n    any;\n  };\n\n  allow-query {\n    any;\n  };\n\n  recursion yes;\n\n  sortlist {\n    localnets;\n    localhost;\n  };\n")
+            .with_order('10')
+        }
+      end
+
       context 'with root_hints_enable => true' do
         let(:params) do
           { root_hints_enable: true }

templates/view.epp

@@ -83,3 +83,7 @@ view "<%= $view -%>" {
 <%   } -%>
   };
 <% } -%>
+<% unless empty($custom_options) { -%>
+
+<%= $custom_options -%>
+<% } -%>