fix test

Author: richardwxn

pkg/name/name.go

@@ -103,9 +103,9 @@ var (
 		KialiComponentName:              ThirdPartyFeatureName,
 		TracingComponentName:            ThirdPartyFeatureName,
 	}
-	// TODO: merge this with the componentMaps defined in translateConfig
 	// ComponentNameToHelmComponentPath defines mapping from component name to helm component root path.
-	ComponentNameToHelmComponentPath = map[ComponentName]string {
+	// TODO: merge this with the componentMaps defined in translateConfig
+	ComponentNameToHelmComponentPath = map[ComponentName]string{
 		PilotComponentName:           "pilot",
 		GalleyComponentName:          "galley",
 		SidecarInjectorComponentName: "sidecarInjectorWebhook",
@@ -156,9 +156,15 @@ func IsFeatureEnabledInSpec(featureName FeatureName, controlPlaneSpec *v1alpha2.
 // IsComponentEnabledInSpec assumes that controlPlaneSpec has been validated.
 // TODO: remove extra validations when comfort level is high enough.
 func IsComponentEnabledInSpec(featureName FeatureName, componentName ComponentName, controlPlaneSpec *v1alpha2.IstioControlPlaneSpec) (bool, error) {
-	// if component enablement path is defined and found in Values part, return it first, otherwise check from ISCP.
+	// for third Party components, enablement is only defined in values part.
+	if featureName == ThirdPartyFeatureName {
+		enabled, _, err := IsComponentEnabledFromValue(string(componentName), controlPlaneSpec.Values)
+		return enabled, err
+	}
+	// for Istio components, check whether override path exist in values part first then ISCP.
 	valuePath := ComponentNameToHelmComponentPath[componentName]
 	enabled, pathExist, err := IsComponentEnabledFromValue(valuePath, controlPlaneSpec.Values)
+	// only return value when path exists
 	if err == nil && pathExist {
 		return enabled, nil
 	}
@@ -212,7 +218,7 @@ func IsComponentEnabledFromValue(valuePath string, valueSpec map[string]interfac
 			return false, false, err
 		}
 		if found {
-			return true, true, nil
+			return true, false, nil
 		}
 		return false, false, nil
 	}