Skip to content

Commit 5191877

Browse files
committed
pkg/customizations: Add Oracle Linux OSCAP definitions
Signed-off-by: Laurence Rochfort <laurence.rochfort@oracle.com> Reviewed-by: Alex Burmashev <alexander.burmashev@oracle.com>
1 parent 5b6fabf commit 5191877

1 file changed

Lines changed: 21 additions & 9 deletions

File tree

pkg/customizations/oscap/oscap.go

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ const (
4242
defaultCentos8Datastream string = "/usr/share/xml/scap/ssg/content/ssg-centos8-ds.xml"
4343
defaultCentos9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-cs9-ds.xml"
4444
defaultCentos10Datastream string = "/usr/share/xml/scap/ssg/content/ssg-cs10-ds.xml"
45+
defaultOL9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-ol9-ds.xml"
46+
defaultOL10Datastream string = "/usr/share/xml/scap/ssg/content/ssg-ol10-ds.xml"
4547
defaultRHEL8Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel8-ds.xml"
4648
defaultRHEL9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel9-ds.xml"
4749
defaultRHEL10Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel10-ds.xml"
@@ -128,25 +130,35 @@ func DefaultFedoraDatastream() string {
128130
return defaultFedoraDatastream
129131
}
130132

131-
func DefaultRHEL8Datastream(isRHEL bool) string {
132-
if isRHEL {
133+
func DefaultRHEL8Datastream(name string) string {
134+
switch {
135+
case strings.HasPrefix(name, "rhel"):
133136
return defaultRHEL8Datastream
137+
default:
138+
return defaultCentos8Datastream
134139
}
135-
return defaultCentos8Datastream
136140
}
137141

138-
func DefaultRHEL9Datastream(isRHEL bool) string {
139-
if isRHEL {
142+
func DefaultRHEL9Datastream(name string) string {
143+
switch {
144+
case strings.HasPrefix(name, "rhel"):
140145
return defaultRHEL9Datastream
146+
case strings.HasPrefix(name, "ol"):
147+
return defaultOL9Datastream
148+
default:
149+
return defaultCentos9Datastream
141150
}
142-
return defaultCentos9Datastream
143151
}
144152

145-
func DefaultRHEL10Datastream(isRHEL bool) string {
146-
if isRHEL {
153+
func DefaultRHEL10Datastream(name string) string {
154+
switch {
155+
case strings.HasPrefix(name, "rhel"):
147156
return defaultRHEL10Datastream
157+
case strings.HasPrefix(name, "ol"):
158+
return defaultOL10Datastream
159+
default:
160+
return defaultCentos10Datastream
148161
}
149-
return defaultCentos10Datastream
150162
}
151163

152164
func IsProfileAllowed(profile string, allowlist []Profile) bool {

0 commit comments

Comments
 (0)