Skip to content

Commit 8bd1099

Browse files
committed
Run cookstyle and markdownlint
Signed-off-by: Dan Webb <[email protected]>
1 parent d596b96 commit 8bd1099

File tree

4 files changed

+28
-27
lines changed

4 files changed

+28
-27
lines changed

CHANGELOG.md

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
Standardise files with files in sous-chefs/repo-management
44
Standardise files with files in sous-chefs/repo-management
5+
56
## 5.1.17 - *2024-11-18*
67

78
Standardise files with files in sous-chefs/repo-management
@@ -40,33 +41,33 @@ See below for possible breaking changes.
4041
* Remove rubocop ignore files
4142
* Remove the test that checked if a recipe was run
4243
* Update Chef spec tested platforms to:
43-
- Ubuntu: 18.04, 20.04
44-
- CentOS: 7.8.2003, 8
44+
* Ubuntu: 18.04, 20.04
45+
* CentOS: 7.8.2003, 8
4546
* Sous-Chefs standardization
46-
- Change test cookbook name to test
47-
- Add GitHub Actions pipelines
48-
- Add Dokken configuration
49-
- Add support for testing on non-EOL Operating systems
50-
- Update Chef ignore
51-
- Update .gitignore
52-
- Update CHANGELOG format
53-
- Update CONTRIBUTING format
54-
- Add renovate configuration
55-
- **[BREAKING] Support Chef 15.3+**
56-
- Remove Rakefile
57-
- Remove Gemfile (replaced by Chef Workstation)
58-
- Move rspec files from test/unit/spec to spec
59-
- Remove: .rubocop.yml exceptions
60-
- Remove Rakefile, Gemfile, and Gemfile.lock
61-
- Move .kitchen.yml to kitchen.yml
62-
- Change test cookbook name to test
63-
- Add Dangerfile
47+
* Change test cookbook name to test
48+
* Add GitHub Actions pipelines
49+
* Add Dokken configuration
50+
* Add support for testing on non-EOL Operating systems
51+
* Update Chef ignore
52+
* Update .gitignore
53+
* Update CHANGELOG format
54+
* Update CONTRIBUTING format
55+
* Add renovate configuration
56+
* **[BREAKING] Support Chef 15.3+**
57+
* Remove Rakefile
58+
* Remove Gemfile (replaced by Chef Workstation)
59+
* Move rspec files from test/unit/spec to spec
60+
* Remove: .rubocop.yml exceptions
61+
* Remove Rakefile, Gemfile, and Gemfile.lock
62+
* Move .kitchen.yml to kitchen.yml
63+
* Change test cookbook name to test
64+
* Add Dangerfile
6465
* Migrate library files to custom resources
6566
**[BREAKING] Remove default recipe**
6667
**[BREAKING] Remove default attributes**
67-
- For usage please see testing cookbook
68+
* For usage please see testing cookbook
6869
**[BREAKING] Remove support for tarball installation**
69-
- Tarball installation does not support running in systemd
70+
* Tarball installation does not support running in systemd
7071
* Use the Elasticsearch public key to verify the package rather than downloading the key from the internet on every run
7172
* Use the execute resource over shellout where possible. As this correctly triggers notifications
7273
* Stop depending on yum and apt cookbooks as they are not required

libraries/versions.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,21 +181,21 @@ def default_download_checksum(version)
181181
{
182182
'debian_x86_64' => '03992d97930b734155981076b3cd250c22742f3876f5f135f374940d1cb3ae2e',
183183
'debian_arm64' => 'c383e5b45eb070e1b6d53b9dc56218634794e2e0b27ea42a7d4a12650eec2b70',
184-
'rpm_aarch64' => 'f833e86db87240bcdc822ea40fc6103f019c35bafcfd7ac6063ef01d5b588e1c',
184+
'rpm_aarch64' => 'f833e86db87240bcdc822ea40fc6103f019c35bafcfd7ac6063ef01d5b588e1c',
185185
'rpm_x86_64' => '9edf142b9a25b9000a9bf8638bc0590916f367b66e4abb3ce80d8f00f9de0c9c',
186186
}
187187
when '7.17.8'
188188
{
189189
'debian_x86_64' => 'd4875477129214519f6150aaf35374103f075886913307d6ed7c138d04ae6fa1',
190190
'debian_arm64' => '7dd69704b8d6d71aa58bb05f86d63fb34c00f2fcabdff244e9dab37226ca48af',
191-
'rpm_aarch64' => 'bb151d40c7979e5c5c6b9b1a227d494bb463642af938a6b21ae46a4eae767c74',
191+
'rpm_aarch64' => 'bb151d40c7979e5c5c6b9b1a227d494bb463642af938a6b21ae46a4eae767c74',
192192
'rpm_x86_64' => 'd1d1cf15143029c658224d39ebf174f8da802bb26800cd88f974ad2a0ee16484',
193193
}
194194
when '7.17.9'
195195
{
196196
'debian_x86_64' => '7832e13c0b67239370058b729d321af1a12f0b329c0a3828c57d2fd4a9cb6555',
197197
'debian_arm64' => 'ec7064982bd3601280478b5d1ea01b8b8d95cbaaffad441e7bef194c53e8cccd',
198-
'rpm_aarch64' => '16a6e97440b0a4542d9d69168287fe143d40db138e9a3fd3e6348e60abe77175',
198+
'rpm_aarch64' => '16a6e97440b0a4542d9d69168287fe143d40db138e9a3fd3e6348e60abe77175',
199199
'rpm_x86_64' => '751beebbe28ebefcd451796c1075208421b109bdae752383122142fd00a04559',
200200
}
201201
when '8.6.1'

resources/install_repository.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
include ElasticsearchCookbook::Helpers
66

77
action :install do
8-
major_version = new_resource.version.split('.')[0]
8+
major_version = new_resource.version.split('.').first
99

1010
es_user = find_es_resource(Chef.run_context, :elasticsearch_user, new_resource)
1111

resources/service.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
'ES_SD_NOTIFY=true',
5050
],
5151
EnvironmentFile: "-#{default_conf_dir}/#{new_resource.service_name}",
52-
WorkingDirectory: "#{es_conf.path_home}",
52+
WorkingDirectory: es_conf.path_home.to_s,
5353
User: es_user.username,
5454
Group: es_user.groupname,
5555
ExecStart: "#{es_conf.path_home}/bin/systemd-entrypoint -p ${PID_DIR}/elasticsearch.pid --quiet",

0 commit comments

Comments
 (0)