Merge pull request #2641 from joshcooper/order_dependent_17181

Revert "Merge pull request #2531 from buzzdeee/master"
puppetlabs · Nov 18, 2023 · 9fc23c5 · 9fc23c5
2 parents c813235 + cce8166
commit 9fc23c5
Show file tree

Hide file tree

Showing 130 changed files with 22 additions and 3,370 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -55,10 +55,27 @@ Metrics/AbcSize:
   Enabled: false
 
 Metrics/PerceivedComplexity:
-  Enabled: false
+  Exclude:
+    - 'lib/facter/custom_facts/util/values.rb'
+    - 'lib/facter/custom_facts/util/confine.rb'
+    - 'lib/facter/custom_facts/core/execution/windows.rb'
+    - 'lib/facter/custom_facts/core/execution/posix.rb'
+    - 'install.rb'
+    - 'lib/facter/resolvers/aix/ffi/ffi_helper.rb'
 
 Metrics/CyclomaticComplexity:
-  Enabled: false
+  Exclude:
+    - 'lib/facter/resolvers/windows/product_release.rb'
+    - 'lib/facter/custom_facts/util/values.rb'
+    - 'lib/facter/custom_facts/util/confine.rb'
+    - 'lib/facter/custom_facts/core/execution/windows.rb'
+    - 'lib/facter/custom_facts/core/execution/posix.rb'
+    - 'lib/facter/facts/linux/cloud/provider.rb'
+    - 'lib/facter/facts/windows/cloud/provider.rb'
+    - 'lib/facter/framework/detector/os_detector.rb'
+    - 'install.rb'
+    - 'scripts/generate_changelog.rb'
+    - 'lib/facter/resolvers/aix/ffi/ffi_helper.rb'
 
 Metrics/ClassLength:
   Enabled: false

diff --git a/lib/facter/config.rb b/lib/facter/config.rb
@@ -44,9 +44,8 @@ module Config
           ]
         },
         {
-          'Bsd' => %w[
-            Freebsd
-            Openbsd
+          'Bsd' => [
+            'Freebsd'
           ]
         },
         'Solaris',

diff --git a/lib/facter/facts/openbsd/augeas/version.rb b/lib/facter/facts/openbsd/augeas/version.rb
diff --git a/lib/facter/facts/openbsd/dmi/bios/vendor.rb b/lib/facter/facts/openbsd/dmi/bios/vendor.rb
diff --git a/lib/facter/facts/openbsd/dmi/bios/version.rb b/lib/facter/facts/openbsd/dmi/bios/version.rb
diff --git a/lib/facter/facts/openbsd/dmi/manufacturer.rb b/lib/facter/facts/openbsd/dmi/manufacturer.rb
diff --git a/lib/facter/facts/openbsd/dmi/product/name.rb b/lib/facter/facts/openbsd/dmi/product/name.rb
diff --git a/lib/facter/facts/openbsd/dmi/product/serial_number.rb b/lib/facter/facts/openbsd/dmi/product/serial_number.rb
diff --git a/lib/facter/facts/openbsd/dmi/product/uuid.rb b/lib/facter/facts/openbsd/dmi/product/uuid.rb
diff --git a/lib/facter/facts/openbsd/ec2_metadata.rb b/lib/facter/facts/openbsd/ec2_metadata.rb
diff --git a/lib/facter/facts/openbsd/ec2_userdata.rb b/lib/facter/facts/openbsd/ec2_userdata.rb
diff --git a/lib/facter/facts/openbsd/facterversion.rb b/lib/facter/facts/openbsd/facterversion.rb
diff --git a/lib/facter/facts/openbsd/identity/gid.rb b/lib/facter/facts/openbsd/identity/gid.rb
diff --git a/lib/facter/facts/openbsd/identity/group.rb b/lib/facter/facts/openbsd/identity/group.rb
diff --git a/lib/facter/facts/openbsd/identity/privileged.rb b/lib/facter/facts/openbsd/identity/privileged.rb
diff --git a/lib/facter/facts/openbsd/identity/uid.rb b/lib/facter/facts/openbsd/identity/uid.rb
diff --git a/lib/facter/facts/openbsd/identity/user.rb b/lib/facter/facts/openbsd/identity/user.rb
diff --git a/lib/facter/facts/openbsd/ipaddress6_interfaces.rb b/lib/facter/facts/openbsd/ipaddress6_interfaces.rb
diff --git a/lib/facter/facts/openbsd/ipaddress_interfaces.rb b/lib/facter/facts/openbsd/ipaddress_interfaces.rb
diff --git a/lib/facter/facts/openbsd/is_virtual.rb b/lib/facter/facts/openbsd/is_virtual.rb