From cd1d6e7ba847c09293e3c99b96108efba3932676 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 5 Aug 2024 15:00:21 +0200
Subject: [PATCH] Drop EL7 support

---
 data/os/CentOS/7.yaml                      |  5 -----
 data/os/RedHat/7.yaml                      |  5 -----
 metadata.json                              |  2 --
 spec/classes/plugin/dns_cloudflare_spec.rb |  7 +------
 spec/classes/plugin/dns_rfc2136_spec.rb    | 11 +++--------
 spec/classes/plugin/dns_route53_spec.rb    | 11 +++--------
 spec/classes/plugin/nginx_spec.rb          |  6 +-----
 7 files changed, 8 insertions(+), 39 deletions(-)
 delete mode 100644 data/os/CentOS/7.yaml
 delete mode 100644 data/os/RedHat/7.yaml

diff --git a/data/os/CentOS/7.yaml b/data/os/CentOS/7.yaml
deleted file mode 100644
index 3920067f..00000000
--- a/data/os/CentOS/7.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-letsencrypt::plugin::dns_rfc2136::package_name: 'python2-certbot-dns-rfc2136'
-letsencrypt::plugin::dns_route53::package_name: 'python2-certbot-dns-route53'
-letsencrypt::plugin::dns_cloudflare::package_name: 'python2-certbot-dns-cloudflare'
-letsencrypt::plugin::nginx::package_name: 'python2-certbot-nginx'
diff --git a/data/os/RedHat/7.yaml b/data/os/RedHat/7.yaml
deleted file mode 100644
index 3920067f..00000000
--- a/data/os/RedHat/7.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-letsencrypt::plugin::dns_rfc2136::package_name: 'python2-certbot-dns-rfc2136'
-letsencrypt::plugin::dns_route53::package_name: 'python2-certbot-dns-route53'
-letsencrypt::plugin::dns_cloudflare::package_name: 'python2-certbot-dns-cloudflare'
-letsencrypt::plugin::nginx::package_name: 'python2-certbot-nginx'
diff --git a/metadata.json b/metadata.json
index 254ced5e..f4defece 100644
--- a/metadata.json
+++ b/metadata.json
@@ -24,7 +24,6 @@
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
@@ -32,7 +31,6 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
diff --git a/spec/classes/plugin/dns_cloudflare_spec.rb b/spec/classes/plugin/dns_cloudflare_spec.rb
index 72ec9a68..bfe4cf1c 100644
--- a/spec/classes/plugin/dns_cloudflare_spec.rb
+++ b/spec/classes/plugin/dns_cloudflare_spec.rb
@@ -15,12 +15,7 @@ class { 'letsencrypt':
         PUPPET
       end
       let(:package_name) do
-        osname = facts[:os]['name']
-        osrelease = facts[:os]['release']['major']
-        osfull = "#{osname}-#{osrelease}"
-        if %w[RedHat-7 CentOS-7].include?(osfull)
-          'python2-certbot-dns-cloudflare'
-        elsif %w[Debian RedHat].include?(facts[:os]['family'])
+        if %w[Debian RedHat].include?(facts[:os]['family'])
           'python3-certbot-dns-cloudflare'
         elsif %w[FreeBSD].include?(facts[:os]['family'])
           'py39-certbot-dns-cloudflare'
diff --git a/spec/classes/plugin/dns_rfc2136_spec.rb b/spec/classes/plugin/dns_rfc2136_spec.rb
index 700c056b..e9e7ddfe 100644
--- a/spec/classes/plugin/dns_rfc2136_spec.rb
+++ b/spec/classes/plugin/dns_rfc2136_spec.rb
@@ -15,15 +15,10 @@ class { 'letsencrypt':
         PUPPET
       end
       let(:package_name) do
-        osname = facts[:os]['name']
-        osrelease = facts[:os]['release']['major']
-        osfull = "#{osname}-#{osrelease}"
-        case osfull
-        when 'RedHat-7', 'CentOS-7'
-          'python2-certbot-dns-rfc2136'
-        when 'FreeBSD-12', 'FreeBSD-13'
+        case facts[:os]['family']
+        when 'FreeBSD'
           'py39-certbot-dns-rfc2136'
-        when %r{OpenBSD}
+        when 'OpenBSD'
           ''
         else
           'python3-certbot-dns-rfc2136'
diff --git a/spec/classes/plugin/dns_route53_spec.rb b/spec/classes/plugin/dns_route53_spec.rb
index 8d459497..89beef5d 100644
--- a/spec/classes/plugin/dns_route53_spec.rb
+++ b/spec/classes/plugin/dns_route53_spec.rb
@@ -15,15 +15,10 @@ class { 'letsencrypt':
         PUPPET
       end
       let(:package_name) do
-        osname = facts[:os]['name']
-        osrelease = facts[:os]['release']['major']
-        osfull = "#{osname}-#{osrelease}"
-        case osfull
-        when 'RedHat-7', 'CentOS-7'
-          'python2-certbot-dns-route53'
-        when 'FreeBSD-12', 'FreeBSD-13'
+        case facts[:os]['family']
+        when 'FreeBSD'
           'py39-certbot-dns-route53'
-        when %r{OpenBSD}
+        when 'OpenBSD'
           ''
         else
           'python3-certbot-dns-route53'
diff --git a/spec/classes/plugin/nginx_spec.rb b/spec/classes/plugin/nginx_spec.rb
index d3b80e6b..090b5f9b 100644
--- a/spec/classes/plugin/nginx_spec.rb
+++ b/spec/classes/plugin/nginx_spec.rb
@@ -15,11 +15,7 @@ class { 'letsencrypt':
         PUPPET
       end
       let(:package_name) do
-        if facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'] == '7'
-          'python2-certbot-nginx'
-        else
-          'python3-certbot-nginx'
-        end
+        'python3-certbot-nginx'
       end
 
       context 'with default parameters' do