chef-utils 16.12.3 → 16.13.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09748eaf36c064c380d6ffa90cc1145813b652f01eb65d3f67fc8db2ad3999b3'
-  data.tar.gz: 214a03f3540a0ef43e69e600e5abf412944cc4f8df737d843e5bff88294c5132
+  metadata.gz: fd977f2d68a2f68802ebb6319aeb7ead52ef03d2e10f39fbb9ed51ff270640ae
+  data.tar.gz: e1bdb2ea87fc4c50200093fd1932e9417bd1ea90e90b958999f9ce466cb367ef
 SHA512:
-  metadata.gz: 0eda25202543cab86092b31d3ec57640acf19422f1c55938737cdb1018032db6c3bf282c0548867148cac261b77e2a04e721b2804c4dcf6f657c5b6d236d345c
-  data.tar.gz: c9bafaf948e9976dd5d804c9947b244d2dc8543b007a1f58b120f8c0094d145bba3ce03f2377cc0b3d047cebf4526a713a9fc8ab0da2b6bd2aaf0b5020edb61f
+  metadata.gz: ce17f614dd3bf213d6645f9c9aceb12c310ac81098a288185273b9de9154dd000400e7e1775d6924e96f618ee652351ac3a63e66eab4568be23dbfc1883fde4f
+  data.tar.gz: be057d971dfbe2b2f65b026982a71eb465bfa064ec390163f37e9bb006c9ab1f10c2651787bcc5bfe187e618b1dfc3713864db2c106eda1b75d9e829b055f2ee

data/lib/chef-utils/dsl/platform.rb

@@ -123,6 +123,21 @@ module ChefUtils
       # chef-sugar backcompat method
       alias_method :centos?, :centos_platform?
 
+      # Determine if the current node is CentOS Stream.
+      #
+      # @param [Chef::Node] node the node to check
+      # @since 16.13
+      #
+      # @return [Boolean]
+      #
+      def centos_stream_platform?(node = __getnode)
+        if node["os_release"]
+          node.dig("os_release", "name") == "CentOS Stream"
+        else
+          node.dig("lsb", "id") == "CentOSStream"
+        end
+      end
+
       # Determine if the current node is Oracle Linux.
       #
       # @param [Chef::Node] node the node to check

data/lib/chef-utils/version.rb

@@ -16,5 +16,5 @@
 
 module ChefUtils
   CHEFUTILS_ROOT = File.expand_path("..", __dir__)
-  VERSION = "16.12.3"
+  VERSION = "16.13.16"
 end

data/spec/unit/dsl/platform_family_spec.rb

@@ -90,13 +90,13 @@ RSpec.describe ChefUtils::DSL::PlatformFamily do
   end
 
   context "on centos6" do
-    let(:options) { { platform: "centos", version: "6.10" } }
+    let(:options) { { platform: "centos", version: "6" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel6?)
   end
 
   context "on centos7" do
-    let(:options) { { platform: "centos", version: "7.7.1908" } }
+    let(:options) { { platform: "centos", version: "7" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel7?)
   end
@@ -108,7 +108,7 @@ RSpec.describe ChefUtils::DSL::PlatformFamily do
   end
 
   context "on clearos7" do
-    let(:options) { { platform: "clearos", version: "7.4" } }
+    let(:options) { { platform: "clearos", version: "7" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel7?)
   end
@@ -156,25 +156,25 @@ RSpec.describe ChefUtils::DSL::PlatformFamily do
   end
 
   context "on oracle6" do
-    let(:options) { { platform: "oracle", version: "6.10" } }
+    let(:options) { { platform: "oracle", version: "6" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel6?)
   end
 
   context "on oracle7" do
-    let(:options) { { platform: "oracle", version: "7.6" } }
+    let(:options) { { platform: "oracle", version: "7" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel7?)
   end
 
   context "on redhat6" do
-    let(:options) { { platform: "redhat", version: "6.10" } }
+    let(:options) { { platform: "redhat", version: "6" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel6?)
   end
 
   context "on redhat7" do
-    let(:options) { { platform: "redhat", version: "7.6" } }
+    let(:options) { { platform: "redhat", version: "7" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel7?)
   end

data/spec/unit/dsl/platform_spec.rb

@@ -145,6 +145,20 @@ RSpec.describe ChefUtils::DSL::Platform do
     platform_reports_true_for(:centos?, :centos_platform?)
   end
 
+  context "on centos stream w/o os_release" do
+    let(:options) { { platform: "centos" } }
+    let(:node) { { "platform" => "centos", "platform_version" => "8", "platform_family" => "rhel", "os" => "linux", "lsb" => { "id" => "CentOSStream" }, "os_release" => nil } }
+
+    platform_reports_true_for(:centos?, :centos_platform?, :centos_stream_platform?)
+  end
+
+  context "on centos stream w/ os_release" do
+    let(:options) { { platform: "centos" } }
+    let(:node) { { "platform" => "centos", "platform_version" => "8", "platform_family" => "rhel", "os" => "linux", "os_release" => { "name" => "CentOS Stream" } } }
+
+    platform_reports_true_for(:centos?, :centos_platform?, :centos_stream_platform?)
+  end
+
   context "on clearos" do
     let(:options) { { platform: "clearos" } }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-utils
 version: !ruby/object:Gem::Version
-  version: 16.12.3
+  version: 16.13.16
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-03 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Basic utility functions for Core Chef Infra development