Skip service principal enrichment for MIWI clusters

pkg/util/clusterdata/clusterdata.go

@@ -98,10 +98,17 @@ func (p ParallelEnricher) enrichOne(ctx context.Context, log *logrus.Entry, oc *
 		return
 	}
 
-	errors := make(chan error, len(p.enrichers))
+	numEnrichers := len(p.enrichers)
+
+	// We skip the service principal enricher for workload identity clusters
+	if oc.UsesWorkloadIdentity() {
+		numEnrichers = numEnrichers - 1
+	}
+
+	errors := make(chan error, numEnrichers)
 	expectedResults := 0
 	for name, enricher := range p.enrichers {
-		if unsuccessfulEnrichers[name] || enricher == nil {
+		if unsuccessfulEnrichers[name] || enricher == nil || (name == servicePrincipal && oc.UsesWorkloadIdentity()) {
 			continue
 		}
 		p.emitter.EmitGauge("enricher.tasks.count", 1, nil)

pkg/util/clusterdata/clusterdata_test.go

@@ -23,52 +23,69 @@ func TestEnrichOne(t *testing.T) {
 	enricherName := "enricherName"
 
 	for _, tt := range []struct {
-		name                string
-		failedEnrichers     map[string]bool
-		taskCount           int
-		taskDuration        int
-		timeoutCount        int
-		errorCount          int
-		enricherCallCount   int
-		enricherReturnValue error
-		enricherIsNil       bool
+		name                 string
+		failedEnrichers      map[string]bool
+		taskCount            int
+		taskDuration         int
+		timeoutCount         int
+		errorCount           int
+		enricherCallCount    int
+		enricherReturnValue  error
+		enricherIsNil        bool
+		usesWorkloadIdentity bool
 	}{
 		{
-			name:                "enricher called",
-			enricherCallCount:   1,
+			name:                "all enrichers called for service principal cluster",
+			enricherCallCount:   2,
 			enricherReturnValue: nil,
-			taskCount:           1,
-			taskDuration:        1,
+			taskCount:           2,
+			taskDuration:        2,
 			failedEnrichers:     map[string]bool{enricherName: false},
 		},
 		{
-			name:              "enricher not called because failed",
-			enricherCallCount: 0,
-			failedEnrichers:   map[string]bool{enricherName: true},
+			name:                 "service principal enricher skipped for workload identity cluster",
+			enricherCallCount:    1,
+			enricherReturnValue:  nil,
+			taskCount:            1,
+			taskDuration:         1,
+			failedEnrichers:      map[string]bool{enricherName: false},
+			usesWorkloadIdentity: true,
+		},
+		{
+			name:                "enricher not called because failed",
+			enricherCallCount:   1,
+			enricherReturnValue: nil,
+			taskCount:           1,
+			taskDuration:        1,
+			failedEnrichers:     map[string]bool{enricherName: true},
 		},
 		{
 			//should just not panic
-			name:            "enricher not called because nil",
-			failedEnrichers: map[string]bool{enricherName: false},
-			enricherIsNil:   true,
+			name:                "enricher not called because nil",
+			enricherCallCount:   1,
+			enricherReturnValue: nil,
+			taskCount:           1,
+			taskDuration:        1,
+			failedEnrichers:     map[string]bool{enricherName: false},
+			enricherIsNil:       true,
 		},
 		{
 			name:                "enricher timeout",
-			enricherCallCount:   1,
+			enricherCallCount:   2,
 			enricherReturnValue: context.DeadlineExceeded,
 			failedEnrichers:     map[string]bool{enricherName: false},
-			taskCount:           1,
-			taskDuration:        1,
+			taskCount:           2,
+			taskDuration:        2,
 			timeoutCount:        1,
 		},
 		{
 			name:                "enricher error",
-			enricherCallCount:   1,
+			enricherCallCount:   2,
 			enricherReturnValue: errors.New("some error"),
 			failedEnrichers:     map[string]bool{enricherName: false},
-			taskCount:           1,
-			taskDuration:        1,
-			errorCount:          1,
+			taskCount:           2,
+			taskDuration:        2,
+			errorCount:          2,
 		},
 	} {
 		t.Run(tt.name, func(t *testing.T) {
@@ -89,16 +106,24 @@ func TestEnrichOne(t *testing.T) {
 			e := ParallelEnricher{
 				emitter: metricsMock,
 				enrichers: map[string]ClusterEnricher{
-					enricherName: enricherMock,
+					enricherName:     enricherMock,
+					servicePrincipal: enricherMock,
 				},
 				metricsWG: &sync.WaitGroup{},
 			}
 			if tt.enricherIsNil {
 				e.enrichers[enricherName] = nil
 			}
 
+			oc := &api.OpenShiftCluster{}
+			if tt.usesWorkloadIdentity {
+				oc.Properties.PlatformWorkloadIdentityProfile = &api.PlatformWorkloadIdentityProfile{}
+			} else {
+				oc.Properties.ServicePrincipalProfile = &api.ServicePrincipalProfile{}
+			}
+
 			ctx := context.Background()
-			e.enrichOne(ctx, log, &api.OpenShiftCluster{}, clients{}, tt.failedEnrichers)
+			e.enrichOne(ctx, log, oc, clients{}, tt.failedEnrichers)
 
 			e.metricsWG.Wait()
 		})