Skip to content

Commit 5b22902

Browse files
authored
Merge branch 'main' into copilot/fix-503
2 parents 3972734 + 32cc6c2 commit 5b22902

File tree

7 files changed

+48
-5
lines changed

7 files changed

+48
-5
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
7575
- name: Publish to Chef Supermarket
7676
run: |
77-
knife supermarket share haproxy ${{ steps.release.outputs.tag_name }} \
77+
knife supermarket share haproxy \
7878
--supermarket-site https://supermarket.chef.io \
7979
--key ~/.chef/supermarket.pem \
8080
--user ${{ secrets.CHEF_SUPERMARKET_USER }} \

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "12.4.8"
2+
".": "12.4.11"
33
}

CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,27 @@
22

33
This file is used to list changes made in each version of the haproxy cookbook.
44

5+
## [12.4.11](https://github.com/sous-chefs/haproxy/compare/v12.4.10...v12.4.11) (2025-09-15)
6+
7+
8+
### Bug Fixes
9+
10+
* **ci:** Fix share command ([#556](https://github.com/sous-chefs/haproxy/issues/556)) ([f63a220](https://github.com/sous-chefs/haproxy/commit/f63a220b586cd8d6c54f9401f4b42769d2a0239c))
11+
12+
## [12.4.10](https://github.com/sous-chefs/haproxy/compare/v12.4.9...v12.4.10) (2025-09-15)
13+
14+
15+
### Bug Fixes
16+
17+
* **tests:** Add unit test coverage for haproxy_listen option parameter (already implemented) ([#550](https://github.com/sous-chefs/haproxy/issues/550)) ([2be5b18](https://github.com/sous-chefs/haproxy/commit/2be5b18e52fc64949b5ea3824dfd79528b44af70))
18+
19+
## [12.4.9](https://github.com/sous-chefs/haproxy/compare/v12.4.8...v12.4.9) (2025-09-12)
20+
21+
22+
### Bug Fixes
23+
24+
* output reference in workflow ([#552](https://github.com/sous-chefs/haproxy/issues/552)) ([3711253](https://github.com/sous-chefs/haproxy/commit/3711253ace28ae7b979aeb9cebbab3d5e2aa5e96))
25+
526
## [12.4.8](https://github.com/sous-chefs/haproxy/compare/v12.4.7...v12.4.8) (2025-09-11)
627

728

metadata.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
maintainer_email 'help@sous-chefs.org'
44
license 'Apache-2.0'
55
description 'Installs and configures haproxy'
6-
version '12.4.1'
6+
version '12.4.11'
77
source_url 'https://github.com/sous-chefs/haproxy'
88
issues_url 'https://github.com/sous-chefs/haproxy/issues'
99
chef_version '>= 16'

release-please-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"changelog-path": "CHANGELOG.md",
66
"release-type": "ruby",
77
"include-component-in-tag": false,
8-
"version-file": "version.rb"
8+
"version-file": "metadata.rb"
99
}
1010
},
1111
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"

spec/unit/recipes/listen_spec.rb

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,28 @@
3939
it { is_expected.to render_file('/etc/haproxy/haproxy.cfg').with_content(/#{cfg_content.join('\n')}/) }
4040
end
4141

42+
context 'option parameter with array of options' do
43+
recipe do
44+
haproxy_install 'package'
45+
46+
haproxy_listen 'test_options' do
47+
bind '0.0.0.0:1337'
48+
mode 'http'
49+
option %w(dontlog-normal forwardfor)
50+
end
51+
end
52+
53+
cfg_content = [
54+
'listen test_options',
55+
' mode http',
56+
' bind 0.0.0.0:1337',
57+
' option dontlog-normal',
58+
' option forwardfor',
59+
]
60+
61+
it { is_expected.to render_file('/etc/haproxy/haproxy.cfg').with_content(/#{cfg_content.join('\n')}/) }
62+
end
63+
4264
context 'extra options hash with disabled option' do
4365
recipe do
4466
haproxy_install 'package'

version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION = '12.4.8'.freeze
1+
VERSION = '12.4.9'.freeze

0 commit comments

Comments
 (0)