injector: Simplify check for metrics annotations (#2205)

Signed-off-by: Delyan Raychev <delyan.raychev@microsoft.com>

Co-authored-by: Edu Serra <eduser25@gmail.com>

pkg/injector/metrics.go

@@ -8,23 +8,14 @@ import (
 	"github.com/openservicemesh/osm/pkg/constants"
 )
 
-func (wh *webhook) isMetricsEnabled(namespace string) (bool, error) {
+func (wh *webhook) isMetricsEnabled(namespace string) (enabled bool, err error) {
 	ns := wh.kubeController.GetNamespace(namespace)
 	if ns == nil {
 		log.Error().Err(errNamespaceNotFound).Msgf("Error retrieving namespace %s", namespace)
 		return false, errNamespaceNotFound
 	}
 
-	enabled, err := isAnnotatedForMetrics(ns.Annotations)
-	if err != nil {
-		return false, err
-	}
-
-	return enabled, nil
-}
-
-func isAnnotatedForMetrics(annotations map[string]string) (enabled bool, err error) {
-	metrics, ok := annotations[constants.MetricsAnnotation]
+	metrics, ok := ns.Annotations[constants.MetricsAnnotation]
 	if !ok {
 		return false, nil
 	}

pkg/injector/metrics_test.go

@@ -86,26 +86,3 @@ func TestIsMetricsEnabled(t *testing.T) {
 		})
 	}
 }
-
-func TestIsAnnotatedForMetrics(t *testing.T) {
-	assert := assert.New(t)
-
-	testCases := []struct {
-		annotations              map[string]string
-		expectMetricsToBeEnabled bool // set to true if metrics is expected to be enabled
-		expectedErr              bool // set to true if error is expected
-	}{
-		{map[string]string{constants.MetricsAnnotation: "enabled"}, true, false},
-		{map[string]string{constants.MetricsAnnotation: "disabled"}, false, false},
-		{nil, false, false},
-		{map[string]string{constants.MetricsAnnotation: "invalid"}, false, true},
-	}
-
-	for _, tc := range testCases {
-		t.Run(fmt.Sprintf("Annotation %v", tc.annotations), func(t *testing.T) {
-			enabled, err := isAnnotatedForMetrics(tc.annotations)
-			assert.Equal(enabled, tc.expectMetricsToBeEnabled)
-			assert.Equal(err != nil, tc.expectedErr)
-		})
-	}
-}