Added defined type for generating deb822 apt sources

Should be roughly drop-in alternative to the existing apt::source type
Does not currently support inline ascii gpg key

Author: jamesps-ebi

manifests/setting.pp

@@ -38,7 +38,7 @@
   $setting_type = $title_array[0]
   $base_name = join(delete_at($title_array, 0), '-')
 
-  assert_type(Pattern[/\Aconf\z/, /\Apref\z/, /\Alist\z/], $setting_type) |$a, $b| {
+  assert_type(Pattern[/\Aconf\z/, /\Apref\z/, /\Alist\z/, /\Asource\z/], $setting_type) |$a, $b| {
     fail("apt::setting resource name/title must start with either 'conf-', 'pref-' or 'list-'")
   }
 

manifests/source_deb822.pp

@@ -5,23 +5,44 @@
 # @example
 #   apt::source_deb822 { 'namevar': }
 define apt::source_deb822 (
-  Array[String] $uris,
-  Array[String] $suites,
-  Array[String] $components,
-  Array[Enum['deb','deb-src'], 1, 2] $types = ['deb'],
-  Enum['present','absent'] $ensure = 'present',
   String $comment = $name,
   Boolean $enabled = true,
+  Array[Enum['deb','deb-src'], 1, 2] $types = ['deb'],
   Boolean $notify_update = true,
+  Enum['present','absent'] $ensure = 'present',
+  Optional[Array[String]] $uris = undef,
+  Optional[Array[String]] $suites = undef,
+  Optional[Array[String]] $components = undef,
   Optional[Array[String]] $architectures = undef,
   Optional[Boolean] $allow_insecure = undef,
-  Optional[Boolean] $trusted = undef,
-  Optional[Variant[Array[Stdlib::AbsolutePath], String]] $signed_by = undef,
+  Optional[Boolean] $repo_trusted = undef,
+  Optional[Variant[Array[Stdlib::AbsolutePath],String]] $signed_by = undef,
   Optional[Boolean] $check_valid_until = undef,
-  Optional[Hash] $options = undef
 ) {
-  $header = epp('apt/_header.epp')
-  $source_content = epp('apt/source_deb822.epp')
+  case $ensure {
+    'present': {
+      $header = epp('apt/_header.epp')
+      $source_content = epp('apt/source_deb822.epp', delete_undef_values({
+            'uris'              => $uris,
+            'suites'            => $suites,
+            'components'        => $components,
+            'types'             => $types,
+            'comment'           => $comment,
+            'enabled'           => $enabled ? { true => 'yes', false => 'no' },
+            'architectures'     => $architectures,
+            'allow_insecure'    => $allow_insecure ? { true => 'yes', false => 'no', default => undef },
+            'repo_trusted'      => $repo_trusted ? { true => 'yes', false => 'no', default => undef },
+            'check_valid_until' => $check_valid_until ? { true => 'yes', false => 'no', default => undef },
+            'signed_by'         => $signed_by,
+          }
+        )
+      )
+    }
+    'absent': {
+      $header = undef
+      $source_content = undef
+    }
+  }
 
   apt::setting { "source-${name}":
     ensure        => $ensure,

templates/source_deb822.epp

@@ -1,6 +1,7 @@
 <% | String $comment,
   Enum['yes','no'] $enabled,
-  Hash $types,Array[String] $uris,
+  Array[String] $types,
+  Array[String] $uris,
   Array[String] $suites,
   Array[String] $components,
   Optional[Array] $architectures = undef,
@@ -10,10 +11,9 @@
   Optional[Variant[Array[String], String]] $signed_by = undef,
   Optional[Hash] $options = undef
 | -%>
-# This file is managed by Puppet. DO NOT EDIT.
 # <%= $comment %>
 Enabled: <%= $enabled %>
-Types:<% if $types['deb'] { %> deb<% } %><% if $types['src'] { %> deb-src<% } %>
+Types: <% $types.each |String $type| { -%> <%= $type %> <% } %>
 URIs: <% $uris.each | String $uri | { -%> <%= $uri %> <% } %>
 Suites: <% $suites.each | String $suite | { -%> <%= $suite %> <% } %>
 Components: <% $components.each | String $component | { -%> <%= $component %> <% } %>
@@ -35,9 +35,3 @@ Signed-By: <% if type($signed_by) =~ Type[Array] { -%><%- $signed_by.each |Strin
 <%- elsif type($signed_by) =~ Type[String] { %>
  <%= $signed_by -%>
 <%- }} -%>
-<% if $options { -%>
-# Additional Options
-<% $options.each |$key, $value| {-%>
-<%= $key -%>: <%= $value %>
-<% } -%>
-<% } -%>