From d06389ab39290ca20ffd0176dc050de5febc7787 Mon Sep 17 00:00:00 2001 From: Amit Karsale Date: Thu, 10 Sep 2026 16:34:15 +0530 Subject: [PATCH] Pin puppet_litmus unconditionally; drop the no-token litmus 1.x fallback Mend's CI-upload scan resolves this Gemfile without PUPPET_FORGE_TOKEN set, so it walks the `if ENV["PUPPET_FORGE_TOKEN"].to_s.empty?` branch and reports ancient litmus 1.x (and its old transitive deps) as the real dependency tree, even though every real bundle install (which has the token) resolves current litmus 2.x. Same root cause and fix puppet_agent applied in PA-7824 (https://github.com/puppetlabs/puppetlabs-puppet_agent/commit/7b8e24efc911679f0d72b83e8dea2ec2310139a2): drop the token-gated fallback and pin unconditionally. .sync.yml override added so a future `pdk update` doesn't regenerate the fallback from the shared pdk-templates default. Co-Authored-By: WOZCODE --- .sync.yml | 4 ++++ Gemfile | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.sync.yml b/.sync.yml index afecd940..3ccc24bf 100644 --- a/.sync.yml +++ b/.sync.yml @@ -22,3 +22,7 @@ spec/spec_helper.rb: unmanaged: false .travis.yml: delete: true +Gemfile: + overrides: + - gem: 'puppet_litmus' + version: '~> 2.0' diff --git a/Gemfile b/Gemfile index 4d58393e..4c99a4d5 100644 --- a/Gemfile +++ b/Gemfile @@ -64,8 +64,7 @@ group :development, :release_prep do gem "puppet-blacksmith", '~> 7.0', require: false end group :system_tests do - gem "puppet_litmus", '~> 2.0', require: false, platforms: [:ruby, :x64_mingw] if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty? - gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] if ENV['PUPPET_FORGE_TOKEN'].to_s.empty? + gem "puppet_litmus", '~> 2.0', require: false, platforms: [:ruby, :x64_mingw] gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "serverspec", '~> 2.41', require: false end