update apt source to deb822 format

README.md

@@ -107,7 +107,7 @@ class { 'nodejs':
 ### Forcing the installation of NodeSource packages over native packages
 
 When the native package version and NodeSource version are the same, you may
-need to use `repo_pin` or `repo_priority` (depending on your operating system).
+need to use `repo_priority` (depending on your operating system).
 This ensures that the version in the NodeSource repository takes precedence
 when Puppet invokes Apt/Yum.
 

manifests/init.pp

@@ -16,7 +16,6 @@
   Optional[Hash] $npmrc_config                         = $nodejs::params::npmrc_config,
   $repo_class                                          = $nodejs::params::repo_class,
   $repo_ensure                                         = $nodejs::params::repo_ensure,
-  $repo_pin                                            = $nodejs::params::repo_pin,
   $repo_priority                                       = $nodejs::params::repo_priority,
   $repo_proxy                                          = $nodejs::params::repo_proxy,
   $repo_proxy_password                                 = $nodejs::params::repo_proxy_password,

manifests/install.pp

@@ -20,7 +20,7 @@
   Package { provider => $nodejs::package_provider }
 
   # nodejs
-  if $nodejs::manage_nodejs_package {
+  if $nodejs::manage_nodejs_package and $nodejs::nodejs_package_name {
     package { $nodejs::nodejs_package_name:
       ensure => $nodejs::nodejs_package_ensure,
       tag    => 'nodesource_repo',
@@ -36,7 +36,7 @@
   }
 
   # nodejs-debug
-  if $nodejs::nodejs_debug_package_name {
+  if $nodejs::manage_nodejs_package and $nodejs::nodejs_debug_package_name {
     package { $nodejs::nodejs_debug_package_name:
       ensure => $nodejs::nodejs_debug_package_ensure,
       tag    => 'nodesource_repo',

manifests/params.pp

@@ -4,8 +4,7 @@
   $nodejs_debug_package_ensure = 'absent'
   $nodejs_package_ensure       = 'installed'
   $repo_ensure                 = 'present'
-  $repo_pin                    = undef
-  $repo_priority               = 'absent'
+  $repo_priority               = ($facts['os']['family'] == 'Debian') ? { true => '990', default => 'absent' }
   $repo_proxy                  = 'absent'
   $repo_proxy_password         = 'absent'
   $repo_proxy_username         = 'absent'

manifests/repo/nodesource.pp

@@ -1,7 +1,6 @@
 # PRIVATE CLASS: Do not use directly
 class nodejs::repo::nodesource {
   $ensure         = $nodejs::repo_ensure
-  $pin            = $nodejs::repo_pin
   $priority       = $nodejs::repo_priority
   $proxy          = $nodejs::repo_proxy
   $proxy_password = $nodejs::repo_proxy_password

manifests/repo/nodesource/apt.pp

@@ -1,21 +1,31 @@
 # PRIVATE CLASS: Do not use directly.
 class nodejs::repo::nodesource::apt {
   $ensure     = $nodejs::repo::nodesource::ensure
-  $pin        = $nodejs::repo::nodesource::pin
+  $priority   = $nodejs::repo::nodesource::priority
   $url_suffix = $nodejs::repo::nodesource::url_suffix
 
   include apt
 
   if ($ensure != 'absent') {
+    apt::keyring { 'nodesource':
+      source   => 'https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key',
+      dir      => '/usr/share/keyrings',
+      filename => 'nodesource-repo.gpg.key.asc',
+    }
+
     apt::source { 'nodesource':
-      key      => {
-        'name'   => 'nodesource-repo.gpg.key.asc',
-        'source' => 'https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key',
-      },
-      location => "https://deb.nodesource.com/node_${url_suffix}",
-      pin      => $pin,
-      release  => 'nodistro',
-      repos    => 'main',
+      source_format => 'sources',
+      location      => ["https://deb.nodesource.com/node_${url_suffix}",],
+      keyring       => '/usr/share/keyrings/nodesource-repo.gpg.key.asc',
+      release       => ['nodistro',],
+      repos         => ['main',],
+      types         => ['deb',],
+      require       => Apt::Keyring['nodesource'],
+    }
+
+    apt::pin { 'nodesource':
+      origin   => 'deb.nodesource.com',
+      priority => $priority,
     }
 
     Apt::Source['nodesource'] -> Package<| tag == 'nodesource_repo' |>
@@ -26,5 +36,17 @@
     apt::source { 'nodesource':
       ensure => 'absent',
     }
+    apt::pin { 'nodesource':
+      ensure => 'absent',
+    }
+    apt::keyring { 'nodesource':
+      ensure   => 'absent',
+      dir      => '/usr/share/keyrings',
+      filename => 'nodesource-repo.gpg.key.asc',
+    }
+    file { '/etc/apt/sources.list.d/nodesource.sources':
+      ensure => 'absent',
+      notify => Class['Apt::Update'],
+    }
   }
 }

spec/acceptance/class_spec.rb

@@ -42,36 +42,36 @@
 
     # Debian 12 contains NodeJS 18, when we test 16 and 18, we need to force the nodesource version
     # as Debians versions *can* be newer
-    repo_pin =
-      if %w[16 18].include?(nodejs_version) && fact('os.family') == 'Debian' && %w[12 13].include?(fact('os.release.major'))
-        '1000'
+    repo_priority =
+      if fact('os.family') == 'Debian'
+        '990'
       else
-        'undef'
+        'absent'
       end
 
     it_behaves_like 'an idempotent resource' do
       let(:manifest) do
         <<-PUPPET
         class { 'nodejs':
           repo_version => '#{nodejs_version}',
-          repo_pin => #{repo_pin},
+          repo_priority => '#{repo_priority}',
         }
         PUPPET
       end
     end
 
     describe package('nodejs') do
       it { is_expected.to be_installed }
 
       it 'comes from the expected source' do
         pkg_output = shell(pkg_cmd)
         expect(pkg_output.stdout).to match 'nodesource'
       end
     end
 
     describe command('node --version') do
       its(:exit_status) { is_expected.to eq 0 }
       its(:stdout) { is_expected.to match(%r{^v#{nodejs_version}}) }
     end
   end
 
@@ -105,7 +105,7 @@
       nodejs-devel
     ].each do |pkg|
       describe package(pkg) do
         it do
           pending('nodejs-devel and nodejs not installable together on EL9') if fact('os.release.major') == '9' && pkg == 'nodejs-devel'
           is_expected.to be_installed
         end
@@ -173,6 +173,7 @@
 
     %w[
       libnode-dev
+      nodejs
       npm
     ].each do |pkg|
       describe package(pkg) do
@@ -201,7 +202,7 @@
 
     describe 'npm config' do
       it 'contains the global_config_entry secret' do
-        npm_output = shell('cat $(/usr/bin/npm config get globalconfig)')
+        npm_output = shell('cat $(/usr/bin/npm config get globalconfig || echo /dev/null)')
         expect(npm_output.stdout).to match '//path.to.registry/:_authToken="cGFzc3dvcmQ="'
       end
     end
@@ -227,7 +228,7 @@
 
     describe 'npm config' do
       it 'contains the global_config_entry secret' do
-        npm_output = shell('cat $(/usr/bin/npm config get globalconfig)')
+        npm_output = shell('cat $(/usr/bin/npm config get globalconfig || echo /dev/null)')
         expect(npm_output.stdout).to match '//path.to.registry/:_authToken=cGFzc3dvcmQ'
       end
     end

spec/classes/nodejs_spec.rb

@@ -84,23 +84,23 @@
           end
         end
 
-        context 'and repo_pin set to 10' do
+        context 'and repo_priority set to 10' do
           let :params do
-            default_params.merge!(repo_pin: '10')
+            default_params.merge!(repo_priority: '10')
           end
 
           it 'the repo apt::source resource should contain pin = 10' do
-            is_expected.to contain_apt__source('nodesource').with('pin' => '10')
+            is_expected.to contain_apt__pin('nodesource').with('priority' => '10')
           end
         end
 
-        context 'and repo_pin not set' do
+        context 'and repo_priority not set' do
           let :params do
-            default_params.merge!(repo_pin: :undef)
+            default_params.merge!(repo_priority: :undef)
           end
 
-          it 'the repo apt::source resource should contain pin = undef' do
-            is_expected.to contain_apt__source('nodesource').with('pin' => nil)
+          it 'the repo apt::source resource should contain priority = 990' do
+            is_expected.to contain_apt__pin('nodesource').with('priority' => 990)
           end
         end
 
@@ -109,8 +109,8 @@
             default_params.merge!(repo_version: '9')
           end
 
-          it 'the repo apt::source resource should contain location = https://deb.nodesource.com/node_9.x' do
-            is_expected.to contain_apt__source('nodesource').with('location' => 'https://deb.nodesource.com/node_9.x')
+          it 'the repo apt::source resource should contain location = [https://deb.nodesource.com/node_9.x]' do
+            is_expected.to contain_apt__source('nodesource').with('location' => ['https://deb.nodesource.com/node_9.x'])
           end
         end