Skip to content

Commit fcd3eec

Browse files
committed
Fix
Signed-off-by: Pavol Loffay <[email protected]>
1 parent e85b902 commit fcd3eec

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

internal/fips/fipscheck.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@ type fipsCheck struct {
3232
}
3333

3434
// NewFipsCheck creates new FipsCheck.
35-
func NewFipsCheck(FIPSEnabled bool, receivers, exporters, processors, extensions []string) FIPSCheck {
36-
if !FIPSEnabled {
37-
return nil
38-
}
39-
35+
func NewFipsCheck(receivers, exporters, processors, extensions []string) FIPSCheck {
4036
return &fipsCheck{
4137
receivers: listToMap(receivers),
4238
exporters: listToMap(exporters),

internal/fips/fipscheck_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
)
2222

2323
func TestFipsCheck(t *testing.T) {
24-
fipsCheck := NewFipsCheck(true, []string{"rec1", "rec2"}, []string{"exp1"}, []string{"processor"}, []string{"ext1"})
24+
fipsCheck := NewFipsCheck([]string{"rec1", "rec2"}, []string{"exp1"}, []string{"processor"}, []string{"ext1"})
2525
blocked := fipsCheck.DisabledComponents(
2626
map[string]interface{}{"otlp": true, "rec1/my": true},
2727
map[string]interface{}{"exp1": true},

main.go

+6-3
Original file line numberDiff line numberDiff line change
@@ -441,9 +441,12 @@ func main() {
441441
return warnings
442442
}
443443

444-
receivers, exporters, processors, extensions := parseFipsFlag(fipsDisabledComponents)
445-
logger.Info("Fips disabled components", "receivers", receivers, "exporters", exporters, "processors", processors, "extensions", extensions)
446-
fipsCheck := fips.NewFipsCheck(ad.FIPSEnabled(ctx), receivers, exporters, processors, extensions)
444+
var fipsCheck fips.FIPSCheck
445+
if ad.FIPSEnabled(ctx) {
446+
receivers, exporters, processors, extensions := parseFipsFlag(fipsDisabledComponents)
447+
logger.Info("Fips disabled components", "receivers", receivers, "exporters", exporters, "processors", processors, "extensions", extensions)
448+
fipsCheck = fips.NewFipsCheck(receivers, exporters, processors, extensions)
449+
}
447450
if err = otelv1beta1.SetupCollectorWebhook(mgr, cfg, reviewer, crdMetrics, bv, fipsCheck); err != nil {
448451
setupLog.Error(err, "unable to create webhook", "webhook", "OpenTelemetryCollector")
449452
os.Exit(1)

0 commit comments

Comments
 (0)