From c50fa91cd6e390841170b67013fde53094f0a4c5 Mon Sep 17 00:00:00 2001
From: Steven Fairchild <sfairchi@redhat.com>
Date: Fri, 14 Jun 2024 09:44:39 -0400
Subject: [PATCH] Add constants for common settings

---
 pkg/cluster/install_metrics.go | 37 ++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/pkg/cluster/install_metrics.go b/pkg/cluster/install_metrics.go
index 81a43085494..8e407a993f7 100644
--- a/pkg/cluster/install_metrics.go
+++ b/pkg/cluster/install_metrics.go
@@ -14,12 +14,13 @@ import (
 const (
 	metricPackage = "backend.openshiftcluster"
 	metricInstall = metricPackage + ".installphase"
+	enabled = "Enabled"
+	disabled = "Disabled"
+	custom = "Custom"
+	defaultSet = "Default"
 )
 
 func (m *manager) emitFeatures(ctx context.Context) error {
-	// TODO capture if client-id and client-secret are set before they are created by RP
-	// TODO capture if the vnet is non default sooner
-	// TODO break these up into separate functions
 	dimensions := map[string]string{
 		"resourceid":     m.doc.ResourceID,
 		"subscriptionid": m.env.SubscriptionID(),
@@ -35,9 +36,9 @@ func (m *manager) emitFeatures(ctx context.Context) error {
 	}
 
 	if m.doc.OpenShiftCluster.Tags != nil {
-		dimensions["tags"] = "Enabled"
+		dimensions["tags"] = enabled
 	} else {
-		dimensions["tags"] = "Disabled"
+		dimensions["tags"] = disabled
 	}
 
 	err := m.gatherAuthMetrics(dimensions)
@@ -62,7 +63,9 @@ func (m *manager) emitFeatures(ctx context.Context) error {
 
 func (m *manager) gatherNodeMetrics(dimensions map[string]string) error {
 	if m.doc.OpenShiftCluster.Properties.MasterProfile.DiskEncryptionSetID != "" {
-		dimensions["masterprofile.diskencryptionsetid"] = "Enabled"
+		dimensions["masterprofile.diskencryptionsetid"] = enabled
+	} else {
+		dimensions["masterprofile.diskencryptionsetid"] = disabled
 	}
 
 	if m.doc.OpenShiftCluster.Properties.MasterProfile.EncryptionAtHost == api.EncryptionAtHostEnabled {
@@ -104,17 +107,17 @@ func (m *manager) gatherNodeMetrics(dimensions map[string]string) error {
 
 func (m *manager) gatherAuthMetrics(dimensions map[string]string) error {
 	if m.doc.OpenShiftCluster.Properties.PlatformWorkloadIdentityProfile != nil {
-		dimensions["workloadidentity"] = "Enabled"
+		dimensions["workloadidentity"] = enabled
 	} else if m.doc.OpenShiftCluster.Properties.ServicePrincipalProfile != nil {
-		dimensions["serviceprincipal"] = "Enabled"
+		dimensions["serviceprincipal"] = disabled
 	} else {
 		return fmt.Errorf("no authentication type found")
 	}
 
 	if m.doc.OpenShiftCluster.Properties.ClusterProfile.PullSecret != "" {
-		dimensions["pullsecret"] = "Enabled"
+		dimensions["pullsecret"] = enabled
 	} else {
-		dimensions["pullsecret"] = "Disabled"
+		dimensions["pullsecret"] = disabled
 	}
 
 	return nil
@@ -140,19 +143,19 @@ func (m *manager) gatherNetworkMetrics(dimensions map[string]string) error {
 	}
 
 	if m.doc.OpenShiftCluster.Properties.NetworkProfile.PodCIDR != "10.128.0.0/14" {
-		dimensions["podcidr"] = "Custom"
+		dimensions["podcidr"] = custom
 	} else {
-		dimensions["podcidr"] = "Default"
+		dimensions["podcidr"] = defaultSet
 	}
 
 	if m.doc.OpenShiftCluster.Properties.NetworkProfile.ServiceCIDR != "172.30.0.0/16" {
-		dimensions["servicecidr"] = "Custom"
+		dimensions["servicecidr"] = custom
 	} else {
-		dimensions["servicecidr"] = "Default"
+		dimensions["servicecidr"] = defaultSet
 	}
 
 	if m.doc.OpenShiftCluster.Properties.ClusterProfile.Domain != "" {
-		dimensions["domain"] = "Enabled"
+		dimensions["domain"] = enabled
 	}
 
 	if m.doc.OpenShiftCluster.Properties.NetworkProfile.LoadBalancerProfile.ManagedOutboundIPs != nil {
@@ -168,9 +171,9 @@ func (m *manager) gatherNetworkMetrics(dimensions map[string]string) error {
 	}
 
 	if m.doc.OpenShiftCluster.Properties.FeatureProfile.GatewayEnabled {
-		dimensions["gatewayenabled"] = "Enabled"
+		dimensions["gatewayenabled"] = enabled
 	} else {
-		dimensions["gatewayenabled"] = "Disabled"
+		dimensions["gatewayenabled"] = disabled
 	}
 
 	return nil