Patching resolv.rb to load conditionally #1883

johnmccrae · 2024-03-25T20:29:31Z

Description

We fixed a bug regarding Windows fqdn resolution in Ohai on the 17-stable branch. That Ohai update requires the Resolv class. The 'resolv' class unconditionally loads the Win32::Registry class as a dependency. Chef Infra already loads Win32::Registry and has a monkeypatch for the export_string method. When the Resolv class loads again in Ohai, it overwrites the monkeypatch and that
leads to registry encoding/decoding errors - Base Ruby classes return text encoded in UTF-16LE format and we need UTF-8.
Here we patch the Ruby Win32/Resolv.rb file to make reloading the Win32::Registry class conditional and therefore prevent the monkeypatch from being overwritten.

Related Issue

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)
Chore (non-breaking change that does not add functionality or fix an issue)

Checklist:

I have read the CONTRIBUTING document.
I have run the pre-merge tests locally and they pass.
I have updated the documentation accordingly.
I have added tests to cover my changes.
If Gemfile.lock has changed, I have used --conservative to do it and included the full output in the Description above.
All new and existing tests passed.
All commits have been signed-off for the Developer Certificate of Origin.