Update redhatrelease to detect Rocky Linux and have osrelease ignore it

Author: msierks

ext/featurens/osrelease/osrelease.go

@@ -35,6 +35,7 @@ var (
 		"etc/fedora-release",
 		"etc/oracle-release",
 		"etc/redhat-release",
+		"etc/rocky-release",
 		"usr/lib/centos-release",
 	}
 

ext/featurens/redhatrelease/redhatrelease.go

@@ -34,9 +34,10 @@ var (
 	oracleReleaseRegexp = regexp.MustCompile(`(?P<os>Oracle) (Linux Server release) (?P<version>[\d]+)`)
 	centosReleaseRegexp = regexp.MustCompile(`(?P<os>[^\s]*) (Linux release|release) (?P<version>[\d]+)`)
 	redhatReleaseRegexp = regexp.MustCompile(`(?P<os>Red Hat Enterprise Linux) (Client release|Server release|Workstation release|release) (?P<version>[\d]+)`)
+	rockyReleaseRegexp  = regexp.MustCompile(`(?P<os>Rocky) (Linux release) (?P<version>[\d]+)`)
 
 	// RequiredFilenames defines the names of the files required to identify the RHEL-based release.
-	RequiredFilenames = []string{"etc/oracle-release", "etc/centos-release", "etc/redhat-release", "etc/system-release"}
+	RequiredFilenames = []string{"etc/oracle-release", "etc/centos-release", "etc/redhat-release", "etc/rocky-release", "etc/system-release"}
 )
 
 type detector struct{}
@@ -88,6 +89,15 @@ func (d detector) Detect(files tarutil.LayerFiles, opts *featurens.DetectorOptio
 			return namespace
 		}
 
+		// Attempt to match Rocky.
+		r = rockyReleaseRegexp.FindStringSubmatch(string(f.Contents))
+		if len(r) == 4 {
+			return &database.Namespace{
+				Name:          strings.ToLower(r[1]) + ":" + r[3],
+				VersionFormat: rpm.ParserName,
+			}
+		}
+
 		// Attempt to match CentOS.
 		r = centosReleaseRegexp.FindStringSubmatch(string(f.Contents))
 		if len(r) == 4 {

ext/featurens/redhatrelease/redhatrelease_test.go

@@ -86,6 +86,18 @@ func TestDetector(t *testing.T) {
 				"etc/system-release": {Contents: []byte(`CentOS Linux release 7.1.1503 (Core)`)},
 			}),
 		},
+		{
+			ExpectedNamespace: &database.Namespace{Name: "rocky:8", VersionFormat: rpm.ParserName},
+			Files: tarutil.CreateNewLayerFiles(map[string]tarutil.FileData{
+				"etc/rocky-release": {Contents: []byte(`Rocky Linux release 8.6 (Green Obsidian)`)},
+			}),
+		},
+		{
+			ExpectedNamespace: &database.Namespace{Name: "rocky:9", VersionFormat: rpm.ParserName},
+			Files: tarutil.CreateNewLayerFiles(map[string]tarutil.FileData{
+				"etc/rocky-release": {Contents: []byte(`Rocky Linux release 9.0 (Blue Onyx)`)},
+			}),
+		},
 		{
 			ExpectedNamespace: nil,
 			Files:             tarutil.CreateNewLayerFiles(nil),