Update source install versions

Signed-off-by: Dan Webb <dan.webb@damacus.io>
sous-chefs · Jan 30, 2024 · 184af92 · 184af92
1 parent 3a21015
commit 184af92
Show file tree

Hide file tree

Showing 40 changed files with 121 additions and 148 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,36 +32,26 @@ jobs:
           - "centos-stream-8"
           - "fedora-latest"
         suite:
+          - config-1-userlist
+          - config-1
+          - config-2
+          - config-3
+          - config-4
+          - config-acl
+          - config-array
+          - config-backend-search
+          - config-custom-template
+          - config-fastcgi
+          - config-resolver
+          - config-ssl-redirect
           - "package"
-          - "source-18"
-          - "source-20"
-          - "source-22"
-          - "source-default"
+          - "source-24"
+          - "source-26"
+          - "source-28"
+          - "source-29"
+          - "source-lua"
           - "source-openssl"
-        exclude:
-          # Excluded due to https://github.com/sous-chefs/haproxy/issues/475
-          - os: "fedora-latest"
-            suite: "source-18"
-          - os: "fedora-latest"
-            suite: "source-20"
-          - os: "fedora-latest"
-            suite: "source-22"
-          - os: "fedora-latest"
-            suite: "source-default"
-          - os: "fedora-latest"
-            suite: "source-openssl"
-          - os: "ubuntu-2204"
-            suite: "source-18"
-          - os: "ubuntu-2204"
-            suite: "source-20"
-          - os: "ubuntu-2204"
-            suite: "source-22"
-          - os: "ubuntu-2204"
-            suite: "source-24"
-          - os: "ubuntu-2204"
-            suite: "source-default"
-          - os: "ubuntu-2204"
-            suite: "source-openssl"
+          - "source-default"
       fail-fast: false
 
     steps:
@@ -87,9 +77,10 @@ jobs:
           - "amazonlinux-2"
         suite:
           - "package"
-          - "source-18"
-          - "source-20"
-          - "source-22"
+          - "source-24"
+          - "source-26"
+          - "source-28"
+          - "source-29"
           - "source-default"
       fail-fast: false
 

diff --git a/.rubocop.yml b/.rubocop.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ This file is used to list changes made in each version of the haproxy cookbook.
 
 ## Unreleased
 
+- Update default HAProxy source install verision to 2.8.5
+- Update source install tests to include versions 2.4, 2.6, 2.8, 2.9
+
 ## 12.2.23 - *2023-10-26*
 
 ## 12.2.22 - *2023-09-28*

diff --git a/Dangerfile b/Dangerfile
@@ -37,7 +37,7 @@ if !git.modified_files.include?('CHANGELOG.md') && code_changes?
 end
 
 # Require Major Minor Patch version labels
-unless github.pr_labels.grep /minor|major|patch/i
+unless github.pr_labels.grep(/minor|major|patch/i)
   warn 'Please add a release label to this pull request'
 end
 

diff --git a/Guardfile b/Guardfile
@@ -1,25 +1,25 @@
-require 'cookstyle'
+require "cookstyle"
 
-guard :rubocop, keep_failed: false, cli: '-r finstyle' do
+guard :rubocop, keep_failed: false, cli: "-r finstyle" do
   watch(/.+\.rb$/) { |m| m[0] }
   watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
 end
 
-guard 'foodcritic', cookbook_paths: '.', cli: '-C -t ~FC001' do
+guard "foodcritic", cookbook_paths: ".", cli: "-C -t ~FC001" do
   watch(%r{attributes/.+\.rb$})
   watch(%r{providers/.+\.rb$})
   watch(%r{recipes/.+\.rb$})
   watch(%r{resources/.+\.rb$})
 end
 
-spec_path = 'test/unit'
+spec_path = "test/unit"
 rspec_guard_config = {
   cmd: "bundle exec rspec --color --format progress --default-path=#{spec_path}",
   all_on_start: true,
   spec_paths: [spec_path],
 }
 
-guard 'rspec', rspec_guard_config do
+guard "rspec", rspec_guard_config do
   watch(%r{^#{spec_path}/.+_spec\.rb$})
   watch("#{spec_path}/spec_helper.rb") { spec_path }
   watch(%r{^(libraries|providers|recipes|resources)/(.+)\.rb$}) do |m|

diff --git a/documentation/haproxy_acl.md b/documentation/haproxy_acl.md
@@ -1,9 +1,7 @@
-[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
-
----
-
 # haproxy_acl
 
+[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
+
 Access Control Lists creates a new ACL `<aclname>` or completes an existing one with new tests.
 
 The actions generally consist in blocking a request, selecting a backend, or adding a header.

diff --git a/documentation/haproxy_backend.md b/documentation/haproxy_backend.md
@@ -1,9 +1,7 @@
-[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
-
----
-
 # haproxy_backend
 
+[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
+
 Backend describes a set of servers to which the proxy will connect to forward incoming connections.
 
 Introduced: v4.0.0

diff --git a/documentation/haproxy_cache.md b/documentation/haproxy_cache.md
@@ -1,9 +1,7 @@
-[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
-
----
-
 # haproxy_cache
 
+[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
+
 Cache describes a shared cache for small objects such as CSS, JS and icon files. Useful for web application acceleration. Available in HAProxy version 1.8 and later, and `max_object_size` in 1.9 and later.
 
 Introduced: v6.3.0

diff --git a/documentation/haproxy_config_defaults.md b/documentation/haproxy_config_defaults.md
@@ -1,9 +1,7 @@
-[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
-
----
-
 # haproxy_config_defaults
 
+[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
+
 Defaults sets default parameters for all other sections following its declaration. Those default parameters are reset by the next "defaults" section.
 
 Introduced: v4.0.0

diff --git a/documentation/haproxy_config_global.md b/documentation/haproxy_config_global.md
@@ -1,9 +1,7 @@
-[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
-
----
-
 # haproxy_config_global
 
+[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
+
 Parameters in the "global" section are process-wide and often OS-specific.
 
 They are generally set once for all and do not need being changed once correct.

diff --git a/documentation/haproxy_fastcgi.md b/documentation/haproxy_fastcgi.md
@@ -1,9 +1,7 @@
-[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
-
----
-
 # haproxy_fastcgi
 
+[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
+
 Fastcgi describes a FastCGI applications resource for haproxy to send HTTP requests to Responder FastCGI applications
 
 Resource available when using HAProxy version >= 2.1.

diff --git a/documentation/haproxy_frontend.md b/documentation/haproxy_frontend.md
@@ -1,9 +1,7 @@
-[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
-
----
-
 # haproxy_frontend
 
+[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
+
 Frontend describes a set of listening sockets accepting client connections.
 
 Introduced: v4.0.0

diff --git a/documentation/haproxy_install.md b/documentation/haproxy_install.md
@@ -1,9 +1,7 @@
-[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
-
----
-
 # haproxy_install
 
+[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
+
 Install HAProxy from package or source.
 
 Introduced: v4.0.0

diff --git a/documentation/haproxy_listen.md b/documentation/haproxy_listen.md
@@ -1,9 +1,7 @@
-[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
-
----
-
 # haproxy_listen
 
+[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
+
 Listen defines a complete proxy with its frontend and backend parts combined in one section.
 
 It is generally useful for TCP-only traffic.

diff --git a/documentation/haproxy_mailer.md b/documentation/haproxy_mailer.md
@@ -1,9 +1,7 @@
-[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
-
----
-
 # haproxy_mailer
 
+[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
+
 Mailer describes a mailers resource for sending email alerts on server state changes.
 
 Introduced: v8.0.0

diff --git a/documentation/haproxy_peer.md b/documentation/haproxy_peer.md
@@ -1,9 +1,7 @@
-[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
-
----
-
 # haproxy_peer
 
+[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
+
 Peer describes a peers resource for haproxy to propagate entries of any data-types in stick-tables between several haproxy instances over TCP connections in a multi-master fashion.
 
 Most of the properties are available only when using HAProxy version >= 2.0. To set properties for versions < 2.0, use the `extra_options` hash. See examples below.

diff --git a/documentation/haproxy_resolver.md b/documentation/haproxy_resolver.md
@@ -1,9 +1,7 @@
-[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
-
----
-
 # haproxy_resolver
 
+[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
+
 Configuration related to name resolution in HAProxy. There can be as many as resolver sections as needed.
 
 Each section can contain many name servers.

diff --git a/documentation/haproxy_service.md b/documentation/haproxy_service.md
@@ -1,9 +1,7 @@
-[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
-
----
-
 # haproxy_service
 
+[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
+
 Configures HAProxy as a systemd service.
 To reload HAProxy service add a subscribes option to the resource block. See example below. To reload the HAProxy service add a subscribes option to the resource block. See example below.
 

diff --git a/documentation/haproxy_use_backend.md b/documentation/haproxy_use_backend.md
@@ -1,9 +1,7 @@
-[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
-
----
-
 # haproxy_use_backend
 
+[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
+
 Switch to a specific backend if/unless an ACL-based condition is matched.
 
 Introduced: v4.2.0

diff --git a/documentation/haproxy_userlist.md b/documentation/haproxy_userlist.md
@@ -1,9 +1,7 @@
-[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
-
----
-
 # haproxy_userlist
 
+[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
+
 Control access to frontend/backend/listen sections or to http stats by allowing only authenticated and authorized users.
 
 Introduced: v4.1.0

diff --git a/documentation/partial_config_file.md b/documentation/partial_config_file.md
@@ -1,9 +1,7 @@
-[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
-
----
-
 # Partial Resource - _config_file
 
+[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
+
 Provides properties to control the generation of the HAProxy config file.
 
 Introduced: v11.0.0

diff --git a/documentation/partial_extra_options.md b/documentation/partial_extra_options.md
@@ -1,9 +1,7 @@
-[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
-
----
-
 # Partial Resource - _extra_options
 
+[Back To Resource List](https://github.com/sous-chefs/haproxy#resources)
+
 Provides properties to supply arbitrary parameters to the haproxy configuration template.
 
 Introduced: v11.0.0

diff --git a/kitchen.yml b/kitchen.yml
@@ -19,9 +19,8 @@ platforms:
   - name: centos-7
   - name: centos-8
   - name: centos-stream-8
-  - name: debian-9
-  - name: debian-10
   - name: debian-11
+  - name: debian-12
   - name: ubuntu-20.04
   - name: ubuntu-22.04
   - name: fedora-latest
@@ -30,19 +29,19 @@ suites:
   - name: package
     run_list:
       - recipe[test::package]
-  - name: source-1.8
+  - name: source-2.4
     run_list:
-      - recipe[test::source-18]
-  - name: source-2.0
+      - recipe[test::source_24]
+  - name: source_2.6
     run_list:
-      - recipe[test::source-20]
-  - name: source-2.2
+      - recipe[test::source_26]
+  - name: source_2.8
     run_list:
-      - recipe[test::source-22]
-  - name: source-2.4
+      - recipe[test::source_28]
+  - name: source_2.9
     run_list:
-      - recipe[test::source-24]
-  - name: source-default
+      - recipe[test::source_29]
+  - name: source_default
     run_list:
       - recipe[test::source]
   - name: source_lua

diff --git a/resources/config_global.rb b/resources/config_global.rb
@@ -20,11 +20,11 @@
 
 property :stats, Hash,
           default: lazy {
-                     {
-                       socket: "/var/run/haproxy.sock user #{user} group #{group}",
-                       timeout: '2m',
-                     }
-                   },
+            {
+              socket: "/var/run/haproxy.sock user #{user} group #{group}",
+              timeout: '2m',
+            }
+          },
           description: 'Enable stats with various options'
 
 property :maxconn, [Integer, String],

diff --git a/resources/install.rb b/resources/install.rb
@@ -31,13 +31,13 @@
 
 # Source
 property :source_version, String,
-          default: '2.2.4'
+          default: '2.8.5'
 
 property :source_url, String,
           default: lazy { "https://www.haproxy.org/download/#{source_version.to_f}/src/haproxy-#{source_version}.tar.gz" }
 
 property :source_checksum, String,
-          default: '87a4d9d4ff8dc3094cb61bbed4a8eed2c40b5ac47b9604daebaf036d7b541be2'
+          default: '3f5459c5a58e0b343a32eaef7ed5bed9d3fc29d8aa9e14b36c92c969fc2a60d9'
 
 property :source_target_cpu, String,
           default: lazy { node['kernel']['machine'] }