Merge pull request #705 from donoghuc/PE-36344

(PE-36344) Stop using fork of ntlm gem
puppetlabs · Jul 20, 2023 · 17416f1 · 17416f1
2 parents 6f987a9 + 7bff91e
commit 17416f1
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 25 deletions.
diff --git a/configs/components/rubygem-rubyntlm-fork.rb b/configs/components/rubygem-rubyntlm-fork.rb
diff --git a/configs/projects/_shared-pe-bolt-server.rb b/configs/projects/_shared-pe-bolt-server.rb
@@ -140,6 +140,7 @@
 proj.component('rubygem-net-scp')
 proj.component('rubygem-net-ssh')
 proj.component('rubygem-net-ssh-krb')
+proj.component('rubygem-rubyntlm')
 proj.component('rubygem-nori')
 proj.component('rubygem-orchestrator_client')
 proj.component('rubygem-public_suffix')

diff --git a/configs/projects/_shared-pe-bolt-server_with_ruby.rb b/configs/projects/_shared-pe-bolt-server_with_ruby.rb
@@ -176,6 +176,7 @@
 proj.component('rubygem-net-ssh')
 proj.component('rubygem-net-ssh-krb')
 proj.component('rubygem-nori')
+proj.component('rubygem-rubyntlm')
 proj.component('rubygem-orchestrator_client')
 proj.component('rubygem-public_suffix')
 proj.component('rubygem-paint')

diff --git a/configs/projects/pe-bolt-server-runtime-2021.7.x.rb b/configs/projects/pe-bolt-server-runtime-2021.7.x.rb
@@ -8,7 +8,5 @@
   proj.setting(:no_doc, true)
 
   instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-bolt-server.rb'))
-  # TODO: Move ntml back to shared runtime when PE-36078 is done
-  proj.component('rubygem-rubyntlm')
   proj.component 'rubygem-prime'
 end
diff --git a/configs/projects/pe-bolt-server-runtime-main.rb b/configs/projects/pe-bolt-server-runtime-main.rb
@@ -11,9 +11,6 @@
   proj.setting(:openssl_version, '3.0')
 
   instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-bolt-server_with_ruby.rb'))
-
-  # TODO: Work around PE-36078 by using forked non-optimal solution
-  proj.component('rubygem-rubyntlm-fork')
   proj.component 'rubygem-prime'
   proj.component 'rubygem-rexml'
 end
diff --git a/configs/projects/pe-installer-runtime-main.rb b/configs/projects/pe-installer-runtime-main.rb
@@ -36,6 +36,8 @@
   ruby_base_version = proj.ruby_version.gsub(/(\d+)\.(\d+)\.(\d+)/, '\1.\2.0')
   proj.setting(:gem_home, File.join(proj.libdir, 'ruby', 'gems', ruby_base_version))
   proj.setting(:gem_install, "#{proj.host_gem} install --no-document --local --bindir=#{proj.ruby_bindir}")
+  # Enable legacy openssl agls for wirnm
+  proj.setting(:use_legacy_openssl_algos, true)
 
   proj.setting(:artifactory_url, "https://artifactory.delivery.puppetlabs.net/artifactory")
   proj.setting(:buildsources_url, "#{proj.artifactory_url}/generic/buildsources")