Merge branch 'main' into bwitt/ubuntu-24.04

Author: bwitt

CHANGELOG.md

@@ -5,7 +5,32 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v10.0.1](https://github.com/puppetlabs/puppetlabs-apt/tree/v10.0.1) - 2025-01-24
+## [v11.1.0](https://github.com/puppetlabs/puppetlabs-apt/tree/v11.1.0) - 2025-09-22
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v11.0.0...v11.1.0)
+
+### Added
+
+- add auth.conf.d resources [#1087](https://github.com/puppetlabs/puppetlabs-apt/pull/1087) ([aba-rechsteiner](https://github.com/aba-rechsteiner))
+
+## [v11.0.0](https://github.com/puppetlabs/puppetlabs-apt/tree/v11.0.0) - 2025-09-05
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v10.0.1...v11.0.0)
+
+### Changed
+
+- (CAT-2354) Puppetcore update [#1240](https://github.com/puppetlabs/puppetlabs-apt/pull/1240) ([LukasAud](https://github.com/LukasAud))
+
+### Fixed
+
+- join key dir and key filename/name with slash "/" [#1233](https://github.com/puppetlabs/puppetlabs-apt/pull/1233) ([wolfaba](https://github.com/wolfaba))
+- Suites with a path don't get components [#1229](https://github.com/puppetlabs/puppetlabs-apt/pull/1229) ([jstraw](https://github.com/jstraw))
+
+### Other
+
+- (MODULES-11617) Replace apt with apt-cache when using with grep [#1248](https://github.com/puppetlabs/puppetlabs-apt/pull/1248) ([shubhamshinde360](https://github.com/shubhamshinde360))
+
+## [v10.0.1](https://github.com/puppetlabs/puppetlabs-apt/tree/v10.0.1) - 2025-01-27
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v10.0.0...v10.0.1)
 

REFERENCE.md

@@ -17,6 +17,7 @@
 
 ### Defined types
 
+* [`apt::auth`](#apt--auth)
 * [`apt::conf`](#apt--conf): Specifies a custom Apt configuration file.
 * [`apt::key`](#apt--key): Manages the GPG keys that Apt uses to authenticate packages.
 * [`apt::keyring`](#apt--keyring): Manage GPG keyrings for apt repositories
@@ -72,6 +73,7 @@ The following parameters are available in the `apt` class:
 * [`proxy`](#-apt--proxy)
 * [`proxy_defaults`](#-apt--proxy_defaults)
 * [`sources`](#-apt--sources)
+* [`auths`](#-apt--auths)
 * [`keys`](#-apt--keys)
 * [`keyrings`](#-apt--keyrings)
 * [`ppas`](#-apt--ppas)
@@ -90,6 +92,7 @@ The following parameters are available in the `apt` class:
 * [`sources_list_force`](#-apt--sources_list_force)
 * [`include_defaults`](#-apt--include_defaults)
 * [`apt_conf_d`](#-apt--apt_conf_d)
+* [`auth_conf_d`](#-apt--auth_conf_d)
 * [`source_key_defaults`](#-apt--source_key_defaults)
 
 ##### <a name="-apt--provider"></a>`provider`
@@ -226,6 +229,7 @@ Default value:
     'preferences'    => false,
     'preferences.d'  => false,
     'apt.conf.d'     => false,
+    'auth.conf.d'    => false,
   }
 ```
 
@@ -264,6 +268,14 @@ Hash of `apt::source` resources.
 
 Default value: `{}`
 
+##### <a name="-apt--auths"></a>`auths`
+
+Data type: `Hash`
+
+Creates new `apt::auth` resources. Valid options: a hash to be passed to the create_resources function linked above.
+
+Default value: `{}`
+
 ##### <a name="-apt--keys"></a>`keys`
 
 Data type: `Hash`
@@ -440,6 +452,14 @@ The path to the file `apt.conf.d`
 
 Default value: `"${root}/apt.conf.d"`
 
+##### <a name="-apt--auth_conf_d"></a>`auth_conf_d`
+
+Data type: `Stdlib::Absolutepath`
+
+The path to the file `auth_conf.d`
+
+Default value: `"${root}/auth.conf.d"`
+
 ##### <a name="-apt--source_key_defaults"></a>`source_key_defaults`
 
 Data type: `Hash`
@@ -555,6 +575,51 @@ Default value: `{}`
 
 ## Defined types
 
+### <a name="apt--auth"></a>`apt::auth`
+
+The apt::auth class.
+
+#### Parameters
+
+The following parameters are available in the `apt::auth` defined type:
+
+* [`ensure`](#-apt--auth--ensure)
+* [`machine`](#-apt--auth--machine)
+* [`login`](#-apt--auth--login)
+* [`password`](#-apt--auth--password)
+
+##### <a name="-apt--auth--ensure"></a>`ensure`
+
+Data type: `String`
+
+
+
+Default value: `'present'`
+
+##### <a name="-apt--auth--machine"></a>`machine`
+
+Data type: `String`
+
+
+
+Default value: `$name`
+
+##### <a name="-apt--auth--login"></a>`login`
+
+Data type: `String`
+
+
+
+Default value: `undef`
+
+##### <a name="-apt--auth--password"></a>`password`
+
+Data type: `String`
+
+
+
+Default value: `undef`
+
 ### <a name="apt--conf"></a>`apt::conf`
 
 Specifies a custom Apt configuration file.

data/os/Debian/11.yaml

@@ -0,0 +1,3 @@
+apt::backports:
+  location: http://archive.debian.org/debian
+  repos: main contrib non-free

manifests/auth.pp

@@ -0,0 +1,43 @@
+# @summary Manages the Apt auth conf in /etc/apt/auth.conf.d/.
+#
+# @example Install the puppetlabs apt auth
+#   apt::auth { 'puppetlabs':
+#     machine  => 'apt.puppetlabs.com',
+#     login    => 'apt',
+#     password => 'password',
+#   }
+#
+# @param ensure
+#   Specifies whether the Apt auth file should exist. Valid options: 'present' and 'absent'.
+#
+# @param machine
+#   The machine entry specifies the auth URI.
+#
+# @param login
+#   The username to be used.
+#
+# @param password
+#   The password to be used.
+#
+
+define apt::auth (
+  String $ensure   = 'present',
+  String $machine  = $name,
+  String $login    = undef,
+  String $password = undef,
+) {
+  $content = epp('apt/auth_conf.d.epp',
+    machine  => $machine,
+    login    => $login,
+    password => $password
+  )
+
+  file { "${apt::auth_conf_d}/${name}.conf":
+    ensure  => $ensure,
+    owner   => $apt::auth_conf_owner,
+    group   => 'root',
+    mode    => '0600',
+    content => Sensitive($content),
+    notify  => Class['apt::update'],
+  }
+}

manifests/init.pp

@@ -87,6 +87,9 @@
 # @param sources
 #   Hash of `apt::source` resources.
 #
+# @param auths
+#   Creates new `apt::auth` resources. Valid options: a hash to be passed to the create_resources function linked above.
+#
 # @param keys
 #   Hash of `apt::key` resources.
 #
@@ -145,6 +148,9 @@
 # @param apt_conf_d
 #   The path to the file `apt.conf.d`
 #
+# @param auth_conf_d
+#   The path to the file `auth_conf.d`
+#
 # @param source_key_defaults
 #   The fault `source_key` settings
 #
@@ -161,6 +167,7 @@
     'preferences'    => false,
     'preferences.d'  => false,
     'apt.conf.d'     => false,
+    'auth.conf.d'    => false,
   },
   Hash $proxy_defaults = {
     'ensure'     => undef,
@@ -185,6 +192,7 @@
   Hash $purge = {},
   Apt::Proxy $proxy = {},
   Hash $sources = {},
+  Hash $auths = {},
   Hash $keys = {},
   Hash $keyrings = {},
   Hash $ppas = {},
@@ -200,6 +208,7 @@
   Stdlib::Absolutepath $preferences = "${root}/preferences",
   Stdlib::Absolutepath $preferences_d = "${root}/preferences.d",
   Stdlib::Absolutepath $apt_conf_d = "${root}/apt.conf.d",
+  Stdlib::Absolutepath $auth_conf_d = "${root}/auth.conf.d",
   Hash $config_files = {
     'conf'   => {
       'path' => $conf_d,
@@ -264,6 +273,9 @@
   if $purge['apt.conf.d'] {
     assert_type(Boolean, $purge['apt.conf.d'])
   }
+  if $purge['auth.conf.d'] {
+    assert_type(Boolean, $purge['auth.conf.d'])
+  }
 
   $_purge = $apt::purge_defaults + $purge
 
@@ -379,6 +391,16 @@
     notify  => Class['apt::update'],
   }
 
+  file { 'auth.conf.d':
+    ensure  => directory,
+    path    => $apt::auth_conf_d,
+    owner   => root,
+    group   => root,
+    purge   => $_purge['auth.conf.d'],
+    recurse => $_purge['auth.conf.d'],
+    notify  => Class['apt::update'],
+  }
+
   $confs.each |$key, $value| {
     apt::conf { $key:
       * => $value,
@@ -391,6 +413,12 @@
     }
   }
 
+  $auths.each |$key, $value| {
+    apt::auth { $key:
+      * => $value,
+    }
+  }
+
   $keys.each |$key, $value| {
     apt::key { $key:
       * => $value,

manifests/source.pp

@@ -217,11 +217,11 @@
           }
 
           $_list_keyring = if $_key['dir'] and $_key['filename'] {
-            "${_key['dir']}${_key['filename']}"
+            "${_key['dir']}/${_key['filename']}"
           } elsif $_key['filename'] {
             "/etc/apt/keyrings/${_key['filename']}"
           } elsif $_key['dir'] {
-            "${_key['dir']}${_key['name']}"
+            "${_key['dir']}/${_key['name']}"
           } else {
             "/etc/apt/keyrings/${_key['name']}"
           }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apt",
-  "version": "10.0.1",
+  "version": "11.1.0",
   "author": "puppetlabs",
   "summary": "Provides an interface for managing Apt source, key, and definitions with Puppet",
   "license": "Apache-2.0",

spec/acceptance/apt_backports_spec.rb

@@ -17,7 +17,7 @@
     end
 
     it 'provides backports apt sources' do
-      run_shell('apt policy | grep --quiet backports')
+      run_shell('apt-cache policy | grep --quiet backports')
     end
   end
 end

spec/classes/apt_spec.rb

@@ -38,6 +38,14 @@
                   recurse: false,
                   notify: 'Class[Apt::Update]' }
 
+auth_conf_d = {   ensure: 'directory',
+                  path: '/etc/apt/auth.conf.d',
+                  owner: 'root',
+                  group: 'root',
+                  purge: false,
+                  recurse: false,
+                  notify: 'Class[Apt::Update]' }
+
 describe 'apt' do
   let(:facts) do
     {
@@ -77,6 +85,10 @@
       expect(subject).to contain_file('apt.conf.d').that_notifies('Class[Apt::Update]').only_with(apt_conf_d)
     }
 
+    it {
+      is_expected.to contain_file('auth.conf.d').that_notifies('Class[Apt::Update]').only_with(auth_conf_d)
+    }
+
     it { is_expected.to contain_file('/etc/apt/auth.conf').with_ensure('absent') }
 
     it 'lays down /etc/apt/apt.conf.d/15update-stamp' do

templates/auth_conf.d.epp

@@ -0,0 +1,3 @@
+machine <%= $machine %>
+login <%= $login %>
+password <%= $password %>