Skip to content

Commit bd59a61

Browse files
committed
oscap: drop dead code
The code here was replaced by having the default datastreams in the distro configuration inside the YAML. This code was left over and it's confusing to keep carrying it. Signed-off-by: Simon de Vlieger <cmdr@supakeen.com>
1 parent 3805e2b commit bd59a61

1 file changed

Lines changed: 0 additions & 34 deletions

File tree

pkg/customizations/oscap/oscap.go

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,6 @@ const (
3737
Stig Profile = "xccdf_org.ssgproject.content_profile_stig"
3838
StigGui Profile = "xccdf_org.ssgproject.content_profile_stig_gui"
3939

40-
// datastream fallbacks
41-
defaultFedoraDatastream string = "/usr/share/xml/scap/ssg/content/ssg-fedora-ds.xml"
42-
defaultCentos8Datastream string = "/usr/share/xml/scap/ssg/content/ssg-centos8-ds.xml"
43-
defaultCentos9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-cs9-ds.xml"
44-
defaultCentos10Datastream string = "/usr/share/xml/scap/ssg/content/ssg-cs10-ds.xml"
45-
defaultRHEL8Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel8-ds.xml"
46-
defaultRHEL9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel9-ds.xml"
47-
defaultRHEL10Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel10-ds.xml"
48-
4940
// oscap related directories
5041
DataDir string = "/oscap_data"
5142
)
@@ -124,31 +115,6 @@ func NewConfigs(oscapConfig blueprint.OpenSCAPCustomization, defaultDatastream *
124115
}
125116
}
126117

127-
func DefaultFedoraDatastream() string {
128-
return defaultFedoraDatastream
129-
}
130-
131-
func DefaultRHEL8Datastream(isRHEL bool) string {
132-
if isRHEL {
133-
return defaultRHEL8Datastream
134-
}
135-
return defaultCentos8Datastream
136-
}
137-
138-
func DefaultRHEL9Datastream(isRHEL bool) string {
139-
if isRHEL {
140-
return defaultRHEL9Datastream
141-
}
142-
return defaultCentos9Datastream
143-
}
144-
145-
func DefaultRHEL10Datastream(isRHEL bool) string {
146-
if isRHEL {
147-
return defaultRHEL10Datastream
148-
}
149-
return defaultCentos10Datastream
150-
}
151-
152118
func IsProfileAllowed(profile string, allowlist []Profile) bool {
153119
for _, a := range allowlist {
154120
if a.String() == profile {

0 commit comments

Comments
 (0)