Skip to content

Commit ee426c7

Browse files
committed
(maint) Update gems as far as possible
This commit updates all of our gem dependencies to latest versions whenever possible, and as new as possible to avoid dependency resolution conflicts besides that. This list plays nicely together. It also removes a few puppet-lint plugins that have since been included in puppet-lint itself. This update required a couple of test changes: * When the `legacy_facts` plugin was incorporated into core puppet-lint, they changed the message it emits when a legacy fact is detected to include the name of the fact. This commit updates the test to match the new message. * There was also a new check added that ensures there is only a single space before an arrow `=>` when there is only a single parameter in a resource. We had a resource with a second param commented out, where we never adjusted the spacing for the one that was left. This now failed the linter, so this commit updates the spacing to make it happy, since that was in the `goodsyntax` test.
1 parent 973b390 commit ee426c7

File tree

3 files changed

+24
-27
lines changed

3 files changed

+24
-27
lines changed

Gemfile

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,27 @@
11
source 'https://rubygems.org'
22

3-
gem 'puppet', '~> 8.4'
3+
gem 'puppet', '~> 8.10'
44
gem 'onceover', '~> 3.22'
5-
gem 'ffi', '~> 1.12', '>= 1.12.2'
6-
gem 'hiera-eyaml', '~> 3.2', '>= 3.2.1'
7-
gem 'json', '~> 2.3'
8-
gem 'nokogiri', '~> 1.10', '>= 1.10.9'
9-
gem 'onceover-codequality', '~> 0.8', '>= 0.8.0'
5+
gem 'ffi', '~> 1.17'
6+
gem 'hiera-eyaml', '~> 4.0'
7+
gem 'json', '~> 2.12'
8+
gem 'nokogiri', '~> 1.18'
9+
gem 'onceover-codequality', '~> 0.13'
1010
gem 'onceover-octocatalog-diff', '~> 0.1', '>= 0.1.8'
1111
gem 'onceover-lookup', '~> 0.1', '>= 0.1.1'
12-
gem 'parallel', '~> 1.20', '>= 1.20.1'
13-
gem 'puppet-lint-classes_and_types_beginning_with_digits-check', '~> 1.0'
14-
gem 'puppet-lint-leading_zero-check', '~> 1.0'
15-
gem 'puppet-lint-legacy_facts-check', '~> 1.0', '>= 1.0.4'
16-
gem 'puppet-lint-top_scope_facts-check', '~> 1.0'
17-
gem 'puppet-lint-trailing_comma-check', '~> 0.4.1'
18-
gem 'puppet-lint-unquoted_string-check', '~> 2.0'
19-
gem 'puppet-lint-variable_contains_upcase', '~> 1.2'
20-
gem 'puppet-lint-version_comparison-check', '~> 1.0'
21-
gem 'puppet-lint', '~> 2.4'
22-
gem 'puppet-strings', '~> 2.6'
23-
gem 'puppet-syntax', '~> 3.2.0'
24-
gem 'puppetlabs_spec_helper', '~> 5.0'
25-
gem 'r10k', '~> 3.8'
26-
gem 'ra10ke', '~> 1.0'
27-
gem 'rspec-puppet', '~> 2.12.0'
28-
gem 'rubocop', '~> 1.12'
29-
gem 'unf_ext', '~> 0.0.8'
12+
gem 'parallel', '~> 1.20', '>= 1.20.1'
13+
gem 'puppet-lint-leading_zero-check', '~> 2.0'
14+
gem 'puppet-lint-trailing_comma-check', '~> 2.0'
15+
gem 'puppet-lint-unquoted_string-check', '~> 3.0'
16+
gem 'puppet-lint-variable_contains_upcase', '~> 2.0'
17+
gem 'puppet-lint-version_comparison-check', '~> 2.0'
18+
gem 'puppet-lint', '~> 4.0'
19+
gem 'puppet-strings', '~> 4.0'
20+
gem 'puppet-syntax', '~> 4.0'
21+
gem 'puppetlabs_spec_helper', '~> 8.0'
22+
gem 'r10k', '~> 5.0'
23+
gem 'ra10ke', '~> 4.0'
24+
gem 'rspec-puppet', '~> 5.0'
25+
gem 'rubocop', '~> 1.75'
26+
gem 'unf_ext', '~> 0.0.9'
3027
gem 'yamllint', '~> 0.0.9'

tests/control-repo/goodsyntax/manifests/site.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
# Define filebucket 'main':
2020
filebucket { 'main':
21-
path => false,
21+
path => false,
2222
#server => $::puppet_server,
2323
}
2424

tests/run_tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function runtest() {
1818

1919
output=$($cmd 2>&1)
2020
exitcode=$?
21-
21+
2222
if [ "$greptext" != "" ]; then
2323
echo -e $output | grep -q "$greptext"
2424

@@ -56,7 +56,7 @@ runtest 'Manifests with good syntax' "docker run -v `pwd`/control-repo/goodsynta
5656
runtest 'Hiera with bad syntax' "docker run -v `pwd`/control-repo/badsyntax:/repo ${DOCKER_IMAGE} rake -f /Rakefile syntax:hiera" 1 "ERROR: Failed to parse data/common.yaml: (data/common.yaml): could not find expected ':' while scanning a simple key at line 4 column 1";
5757
runtest 'Hiera with good syntax' "docker run -v `pwd`/control-repo/goodsyntax:/repo ${DOCKER_IMAGE} rake -f /Rakefile syntax:hiera" 0 '';
5858

59-
runtest 'Linting check catches errors' "docker run -v `pwd`/control-repo/badsyntax:/repo ${DOCKER_IMAGE} rake -f /Rakefile lint syntax yamllint" 1 'site/profile/manifests/common.pp - WARNING: legacy fact on line 5';
59+
runtest 'Linting check catches errors' "docker run -v `pwd`/control-repo/badsyntax:/repo ${DOCKER_IMAGE} rake -f /Rakefile lint syntax yamllint" 1 "site/profile/manifests/common.pp - WARNING: legacy fact 'osfamily' on line 5";
6060
runtest 'Linting check finds no errors' "docker run -v `pwd`/control-repo/goodsyntax:/repo ${DOCKER_IMAGE} rake -f /Rakefile lint syntax yamllint" 0 '';
6161

6262
runtest 'rspec-puppet passes Deferred unwrap test' "docker run -v `pwd`/module/test:/repo ${DOCKER_IMAGE} pdk test unit --tests spec/classes/defer_spec.rb --clean-fixtures" 0

0 commit comments

Comments
 (0)