Merge pull request #156 from puppetlabs/pdk-3.4.0

Magisus · web-flow · commit c451ba395a03 · 2025-06-05T13:17:45.000-07:00
(CDPE-7204) Update to Ruby 3.2, PDK 3.4.0, and Debian bullseye and update tooling gems
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # specifying the platform here allows builds to work
 # correctly on Apple Silicon machines
-FROM --platform=amd64 ruby:3.1.0-slim-buster as base
+FROM --platform=amd64 ruby:3.2.8-slim-bullseye as base
 
 ARG VCS_REF
 ARG GH_USER=puppetlabs
@@ -22,17 +22,13 @@ ENV LC_ALL en_US.UTF-8
 RUN apt-get install -y apt-utils \
   && apt-get update -qq \
   && apt-get upgrade -y \
-  && apt-get install -y --no-install-recommends curl libxml2-dev libxslt1-dev g++ gcc git gnupg2 make openssh-client ruby-dev wget zlib1g-dev libldap-2.4-2 libldap-common libssl1.1 openssl cmake\
-  && wget https://apt.puppet.com/puppet-tools-release-buster.deb \
-  && dpkg -i puppet-tools-release-buster.deb \
+  && apt-get install -y --no-install-recommends curl libxml2-dev libxslt1-dev g++ gcc git gnupg2 make openssh-client ruby-dev wget zlib1g-dev libldap-2.4-2 libldap-common libssl-dev openssl cmake pkg-config \
+  && wget https://apt.puppet.com/puppet-tools-release-bullseye.deb \
+  && dpkg -i puppet-tools-release-bullseye.deb \
   && apt-get update -qq \
-  && apt-get install -y --no-install-recommends pdk=3.2.0.1-1buster \
+  && apt-get install -y --no-install-recommends pdk=3.4.0.1-1bullseye \
   && apt-get autoremove -y \
-  && rm -rf /var/lib/apt/lists/* \
-  && rm -rf /opt/puppetlabs/pdk/private/puppet/ruby/2.5.0/gems/httpclient-2.8.3/sample/ssl/* \
-  && rm -rf /opt/puppetlabs/pdk/private/ruby/2.5.9/lib/ruby/gems/2.5.0/gems/httpclient-2.8.3/sample/ssl/* \
-  && rm -rf /opt/puppetlabs/pdk/private/ruby/2.5.9/lib/ruby/gems/2.5.0/gems/httpclient-2.8.3/test/* \
-  && rm -rf /opt/puppetlabs/pdk/share/cache/ruby/2.7.0/gems/httpclient-2.8.3/sample/ssl/*
+  && rm -rf /var/lib/apt/lists/*
 
 RUN ln -s /bin/mkdir /usr/bin/mkdir
 
@@ -51,7 +47,7 @@ RUN groupadd --gid 1001 puppetdev \
   && useradd --uid 1001 --gid puppetdev --create-home puppetdev
 
 # Prep for non-root user
-RUN gem install bundler -v 2.4.22 \
+RUN gem install bundler -v 2.6.9 \
   && chown -R puppetdev:puppetdev /usr/local/bundle \
   && mkdir /setup \
   && chown -R puppetdev:puppetdev /setup \
@@ -70,7 +66,7 @@ RUN bundle config set system 'true' \
   && bundle config set jobs 3 \
   && bundle install \
   && rm -f /home/puppetdev/.bundle/config \
-  && rm -rf /usr/local/bundle/gems/puppet-7.*.0/spec
+  && rm -rf /usr/local/bundle/gems/puppet-8.*.0/spec
 
 WORKDIR /repo
 
diff --git a/Gemfile b/Gemfile
@@ -1,30 +1,27 @@
 source 'https://rubygems.org'
 
-gem 'puppet',                                                    '~> 8.4'
+gem 'puppet',                                                    '~> 8.10'
 gem 'onceover',                                                  '~> 3.22'
-gem 'ffi',                                                       '~> 1.12', '>= 1.12.2'
-gem 'hiera-eyaml',                                               '~> 3.2', '>= 3.2.1'
-gem 'json',                                                      '~> 2.3'
-gem 'nokogiri',                                                  '~> 1.10', '>= 1.10.9'
-gem 'onceover-codequality',                                      '~> 0.8', '>= 0.8.0'
+gem 'ffi',                                                       '~> 1.17'
+gem 'hiera-eyaml',                                               '~> 4.0'
+gem 'json',                                                      '~> 2.12'
+gem 'nokogiri',                                                  '~> 1.18'
+gem 'onceover-codequality',                                      '~> 0.13'
 gem 'onceover-octocatalog-diff',                                 '~> 0.1', '>= 0.1.8'
 gem 'onceover-lookup',                                           '~> 0.1', '>= 0.1.1'
-gem 'parallel',                                                  '~> 1.20', '>= 1.20.1'               
-gem 'puppet-lint-classes_and_types_beginning_with_digits-check', '~> 1.0'
-gem 'puppet-lint-leading_zero-check',                            '~> 1.0'
-gem 'puppet-lint-legacy_facts-check',                            '~> 1.0', '>= 1.0.4'
-gem 'puppet-lint-top_scope_facts-check',                         '~> 1.0'
-gem 'puppet-lint-trailing_comma-check',                          '~> 0.4.1'
-gem 'puppet-lint-unquoted_string-check',                         '~> 2.0'
-gem 'puppet-lint-variable_contains_upcase',                      '~> 1.2'
-gem 'puppet-lint-version_comparison-check',                      '~> 1.0'
-gem 'puppet-lint',                                               '~> 2.4'
-gem 'puppet-strings',                                            '~> 2.6'
-gem 'puppet-syntax',                                             '~> 3.2.0'
-gem 'puppetlabs_spec_helper',                                    '~> 5.0'
-gem 'r10k',                                                      '~> 3.8'
-gem 'ra10ke',                                                    '~> 1.0'
-gem 'rspec-puppet',                                              '~> 2.12.0'
-gem 'rubocop',                                                   '~> 1.12'
-gem 'unf_ext',                                                   '~> 0.0.8'
+gem 'parallel',                                                  '~> 1.20', '>= 1.20.1'
+gem 'puppet-lint-leading_zero-check',                            '~> 2.0'
+gem 'puppet-lint-trailing_comma-check',                          '~> 2.0'
+gem 'puppet-lint-unquoted_string-check',                         '~> 3.0'
+gem 'puppet-lint-variable_contains_upcase',                      '~> 2.0'
+gem 'puppet-lint-version_comparison-check',                      '~> 2.0'
+gem 'puppet-lint',                                               '~> 4.0'
+gem 'puppet-strings',                                            '~> 4.0'
+gem 'puppet-syntax',                                             '~> 4.0'
+gem 'puppetlabs_spec_helper',                                    '~> 8.0'
+gem 'r10k',                                                      '~> 5.0'
+gem 'ra10ke',                                                    '~> 4.0'
+gem 'rspec-puppet',                                              '~> 5.0'
+gem 'rubocop',                                                   '~> 1.75'
+gem 'unf_ext',                                                   '~> 0.0.9'
 gem 'yamllint',                                                  '~> 0.0.9'
diff --git a/tests/control-repo/goodsyntax/manifests/site.pp b/tests/control-repo/goodsyntax/manifests/site.pp
@@ -18,7 +18,7 @@
 
 # Define filebucket 'main':
 filebucket { 'main':
-  path   => false,
+  path => false,
   #server => $::puppet_server,
 }
 
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
@@ -18,7 +18,7 @@ function runtest() {
 
   output=$($cmd 2>&1)
   exitcode=$?
-  
+
   if [ "$greptext" != "" ]; then
     echo -e $output | grep -q "$greptext"
 
@@ -56,7 +56,7 @@ runtest 'Manifests with good syntax' "docker run -v `pwd`/control-repo/goodsynta
 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";
 runtest 'Hiera with good syntax' "docker run -v `pwd`/control-repo/goodsyntax:/repo ${DOCKER_IMAGE} rake -f /Rakefile syntax:hiera" 0 '';
 
-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';
+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";
 runtest 'Linting check finds no errors' "docker run -v `pwd`/control-repo/goodsyntax:/repo ${DOCKER_IMAGE} rake -f /Rakefile lint syntax yamllint" 0 '';
 
 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

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`# Define filebucket 'main':`
`20`	`20`	`filebucket { 'main':`
`21`		`- path => false,`
	`21`	`+ path => false,`
`22`	`22`	`#server => $::puppet_server,`
`23`	`23`	`}`
`24`	`24`