Merge pull request #1647 from bastelfreak/debian11

Debian 11: Use correct package name for python bindings

Author: bastelfreak

data/os/Debian/11.yaml

@@ -161,9 +161,9 @@
       $plpython_package_name  = pick($plpython_package_name, "postgresql-plpython-${version}")
 
       $_ubuntu_2204 = ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['full'], '22.04') >= 0)
-      $_debian_12 = ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['full'], '12') >= 0)
+      $_debian_11 = ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['full'], '11') >= 0)
 
-      if $_ubuntu_2204 or $_debian_12 {
+      if $_ubuntu_2204 or $_debian_11 {
         $python_package_name = pick($python_package_name, 'python3-psycopg2')
       } else {
         $python_package_name = pick($python_package_name, 'python-psycopg2')

manifests/params.pp

@@ -14,11 +14,11 @@
     },
     {
       "name": "puppetlabs/apt",
-      "version_requirement": ">= 9.2.0 < 11.0.0"
+      "version_requirement": ">= 9.2.0 < 12.0.0"
     },
     {
       "name": "puppet/systemd",
-      "version_requirement": ">= 4.0.1 < 9.0.0"
+      "version_requirement": ">= 4.0.1 < 10.0.0"
     },
     {
       "name": "puppetlabs/concat",

metadata.json

@@ -30,7 +30,18 @@
 
     it {
       expect(subject).to contain_package('python-psycopg2').with(
-        name: 'python-psycopg2',
+        name: 'python3-psycopg2',
+        ensure: 'present',
+      )
+    }
+  end
+
+  describe 'on debian 12' do
+    include_examples 'Debian 12'
+
+    it {
+      expect(subject).to contain_package('python-psycopg2').with(
+        name: 'python3-psycopg2',
         ensure: 'present',
       )
     }

spec/classes/lib/python_spec.rb

@@ -184,6 +184,10 @@ def param(type, title, param)
   let(:facts) { on_supported_os['debian-11-x86_64'] }
 end
 
+shared_context 'Debian 12' do
+  let(:facts) { on_supported_os['debian-12-x86_64'] }
+end
+
 shared_context 'Ubuntu 18.04' do
   let(:facts) { on_supported_os['ubuntu-18.04-x86_64'] }
 end