Knot::Subtypes::Size may also be an Integer

REFERENCE.md

@@ -3115,7 +3115,6 @@ The following parameters are available in the `knot_zone_private` type.
 * [`local_subzones`](#-knot_zone_private--local_subzones)
 * [`manage_records`](#-knot_zone_private--manage_records)
 * [`name`](#-knot_zone_private--name)
-* [`provider`](#-knot_zone_private--provider)
 * [`serial_policy`](#-knot_zone_private--serial_policy)
 * [`show_diff`](#-knot_zone_private--show_diff)
 
@@ -3146,11 +3145,6 @@ namevar
 
 name of the zone name as namevar
 
-##### <a name="-knot_zone_private--provider"></a>`provider`
-
-The specific backend to use for this `knot_zone_private` resource. You will seldom need to specify this --- Puppet will
-usually discover the appropriate provider for your platform.
-
 ##### <a name="-knot_zone_private--serial_policy"></a>`serial_policy`
 
 Valid values: `increment`, `unixtime`
@@ -3966,7 +3960,7 @@ Alias of `String[1]`
 subtype: Number of bytes, an integer with a
 possible size multiplier suffix (B ~ 1, K ~ 1024, M ~ 1024^2 or G ~ 1024^3)
 
-Alias of `String[1]`
+Alias of `Variant[String[1], Integer]`
 
 ### <a name="Knot--Subtypes--Time"></a>`Knot::Subtypes::Time`
 

lib/puppet/provider/knot_zone_private/knotc.rb

@@ -4,7 +4,7 @@
 #
 require 'tempfile'
 Puppet::Type.type(:knot_zone_private).provide(
-  :knotc
+  :knotc,
 ) do
   desc "A provider for the resource type `knot_zone`,
         which manages a zone on knot dns
@@ -108,7 +108,7 @@ def content
       end
     end).compact
     glues = glue_records
-    if (glues & @records) == glues
+    if @records.allbits?(glues)
       "#{(@records - glues).sort.join("\n")}\n"
     else
       "#{((@records - glues) + ['changing glue records']).sort.join("\n")}\n"

lib/puppet/type/knot_zone_private.rb

@@ -82,7 +82,7 @@
     def change_to_s(current, desire)
       if @resource[:show_diff]
         ['', ((desire.split(%r{\n+}) - current.split(%r{\n+})).map { |k| "#{k}+" } +
-        (current.split(%r{\n+}) - desire.split(%r{\n+})).map { |k| "#{k}-" }).sort.map { |k| " #{k[-1]} #{k[0..-2]} " }, ''].join("\n")
+        (current.split(%r{\n+}) - desire.split(%r{\n+})).map { |k| "#{k}-" }).sort.map { |k| " #{k[-1]} #{k[0..-2]} " }, '',].join("\n")
       else
         "{md5}#{Digest::MD5.hexdigest(current.to_s)} to: {md5}#{Digest::MD5.hexdigest(desire.to_s)}"
       end

spec/classes/backup_spec.rb

@@ -10,7 +10,7 @@
       group: 'knot',
       mode: '0700',
       timer: ['OnCalendar=*-*-* 01:00:00', 'Persistent=true'],
-      key_stati_file: '/var/lib/knot-backup/current-key-list.txt'
+      key_stati_file: '/var/lib/knot-backup/current-key-list.txt',
     }
   end
 
@@ -69,7 +69,7 @@
             timer: ['OnCalender=\never'],
             list_keys_script: '/usr/local/bin/script',
             enable: true,
-            active: true
+            active: true,
           )
         end
 

spec/classes/knot_spec.rb

@@ -53,7 +53,7 @@
     }
 
     it {
-      params[:domains].each do |dom, _vals|
+      params[:domains].each_key do |dom|
         is_expected.to contain_knot__domain(dom)
       end
     }
@@ -74,7 +74,7 @@
       context 'with non defaults' do
         let :params do
           default_params.merge(
-            domains: { 'example.net' => {} }
+            domains: { 'example.net' => {} },
           )
         end
 

spec/defines/add_conf_spec.rb

@@ -6,7 +6,7 @@
   let :default_params do
     { ensure: 'present',
       filename: 'example.net.conf',
-      config_dir: '/etc/knot/conf.d' }
+      config_dir: '/etc/knot/conf.d', }
   end
 
   shared_examples 'knot::add_conf shared examples' do

spec/defines/domain_spec.rb

@@ -97,7 +97,7 @@
               .with_rttl(0)
               .with_rcontent("\"#{g}\"")
           end
-        else     # params[:ensure] != 'present'
+        else # params[:ensure] != 'present'
           params[:zone_records].each do |r|
             is_expected.not_to contain_knot_record("record #{r[:rname]}.#{params[:domain]} (#{i})")
           end
@@ -179,7 +179,7 @@
                                  zone_records: [{ rname: 'test', rcontent: '1.1.1.1' }, { rname: 'test', rtype: 'AAAA', rcontent: '::1' }],
                                  zone_nameservers: ['ns1.example.org.', 'ns2.example.org.'],
                                  zone_subzones: { 'sub' => { 'nameservers' => ['ns1.example.org'], 'trust_ds' => ['1 1 1 ttt'] } },
-                                 local_subzones: %w[blah fasel] })
+                                 local_subzones: %w[blah fasel], })
         end
 
         it_behaves_like 'knot::domain shared examples'
@@ -193,7 +193,7 @@
                                  zone_records: [{ rname: 'verision', rtype: 'TXT', rcontent: '2' }],
                                  zone_nameservers: ['ns1.example.org.'],
                                  catalog_entries: { 'example.org' => 'secondary' },
-                                 catalog_salt: '42' })
+                                 catalog_salt: '42', })
         end
 
         it_behaves_like 'knot::domain shared examples'

spec/defines/records/caa_spec.rb

@@ -19,7 +19,7 @@
           .with_target_zone(params[:target_zone])
           .with_rname(params[:rname])
           .with_rttl(params[:ttl])
-          .with_rcontent("#{caa[:flags]} #{caa[:tag]} \"#{caa[:value]}\" ")  # space at the end is needed !
+          .with_rcontent("#{caa[:flags]} #{caa[:tag]} \"#{caa[:value]}\" ") # space at the end is needed !
         i += 1
       end
     }

spec/defines/records/mail_spec.rb

@@ -245,7 +245,7 @@
             dkim_policy: 'dkim=all; t=s',
             adsp_policy: 'o=-',
             dmarc_policy: ['p=quarantine', 'adkim=s', 'aspf=s', 'ruf=mailto:dmarc@somewhere.org'],
-            dmarc_authorization: { 'target_zone' => 'somewhere.org', 'record' => 'v=DMARC1' }
+            dmarc_authorization: { 'target_zone' => 'somewhere.org', 'record' => 'v=DMARC1' },
           )
         end
 
@@ -273,7 +273,7 @@
             dkim_policy: 'dkim=all; t=s',
             adsp_policy: 'o=-',
             dmarc_policy: ['p=quarantine', 'adkim=s', 'aspf=s', 'ruf=mailto:dmarc@somewhere.org'],
-            dmarc_authorization: { 'target_zone' => 'somewhere.org', 'record' => 'v=DMARC1' }
+            dmarc_authorization: { 'target_zone' => 'somewhere.org', 'record' => 'v=DMARC1' },
           )
         end
 

spec/defines/records/network_spec.rb

@@ -72,7 +72,7 @@
             target_zone: 'example.org',
             hostlist: { 'host' => { ipv4: '1.1.1.1', ipv6: '::1' } },
             rev4_target_split: 1,
-            rev6_target_split: 21
+            rev6_target_split: 21,
           )
         end
 

spec/defines/records/srv_spec.rb

@@ -58,7 +58,7 @@
             target_zone: 'example.org',
             srv: [{ priority: 10, weight: 10, target_port: 10, target: 'test.test.com' }],
             service: [{ port: 111, proto: 'tcp' }],
-            rname: 'test'
+            rname: 'test',
           )
         end
 
@@ -72,7 +72,7 @@
             target_zone: 'example.org',
             srv: [{ priority: 10, weight: 10, target_port: 10, target: 'test.test.com' }],
             service: [{ port: 111, proto: 'tcp' }],
-            rname: '.'
+            rname: '.',
           )
         end
 

spec/defines/records/tlsa_spec.rb

@@ -58,7 +58,7 @@
             target_zone: 'example.org',
             tlsa: [{ usage: 3, selector: 1, matching: 1, value: 'abc34' }],
             service: [{ port: 111, proto: 'tcp' }],
-            rname: 'test'
+            rname: 'test',
           )
         end
 
@@ -72,7 +72,7 @@
             target_zone: 'example.org',
             tlsa: [{ usage: 3, selector: 1, matching: 1, value: 'abc34' }],
             service: [{ port: 111, proto: 'tcp' }],
-            rname: '.'
+            rname: '.',
           )
         end
 

spec/defines/records/webserver_spec.rb

@@ -87,7 +87,7 @@
             ttl: 4242,
             caa: [{ 'flags' => 0, 'tag' => 'issue', 'value' => 'letsencrypt.org' }],
             tlsa: [{ 'usage' => 3, 'selector' => 1, 'matching' => 1, 'value' => 'abc34' }],
-            tlsa_service: [{ 'port' => 443, 'proto' => 'tcp' }]
+            tlsa_service: [{ 'port' => 443, 'proto' => 'tcp' }],
           )
         end
 

types/subtypes/size.pp

@@ -1,3 +1,3 @@
 # subtype: Number of bytes, an integer with a 
 # possible size multiplier suffix (B ~ 1, K ~ 1024, M ~ 1024^2 or G ~ 1024^3)
-type Knot::Subtypes::Size = String[1]
+type Knot::Subtypes::Size = Variant[String[1], Integer]