chore: Export validation function (#1301)

config/config.go

@@ -300,61 +300,61 @@ func parseAndValidateConfigBytes(yamlBytes []byte) (config *Config, err error) {
 			logr.Warn("WARNING: Please use the GATUS_LOG_LEVEL environment variable instead")
 		}
 		// XXX: End of v6.0.0 removals
-		validateAlertingConfig(config.Alerting, config.Endpoints, config.ExternalEndpoints)
-		if err := validateSecurityConfig(config); err != nil {
+		ValidateAlertingConfig(config.Alerting, config.Endpoints, config.ExternalEndpoints)
+		if err := ValidateSecurityConfig(config); err != nil {
 			return nil, err
 		}
-		if err := validateEndpointsConfig(config); err != nil {
+		if err := ValidateEndpointsConfig(config); err != nil {
 			return nil, err
 		}
-		if err := validateWebConfig(config); err != nil {
+		if err := ValidateWebConfig(config); err != nil {
 			return nil, err
 		}
-		if err := validateUIConfig(config); err != nil {
+		if err := ValidateUIConfig(config); err != nil {
 			return nil, err
 		}
-		if err := validateMaintenanceConfig(config); err != nil {
+		if err := ValidateMaintenanceConfig(config); err != nil {
 			return nil, err
 		}
-		if err := validateStorageConfig(config); err != nil {
+		if err := ValidateStorageConfig(config); err != nil {
 			return nil, err
 		}
-		if err := validateRemoteConfig(config); err != nil {
+		if err := ValidateRemoteConfig(config); err != nil {
 			return nil, err
 		}
-		if err := validateConnectivityConfig(config); err != nil {
+		if err := ValidateConnectivityConfig(config); err != nil {
 			return nil, err
 		}
-		if err := validateTunnelingConfig(config); err != nil {
+		if err := ValidateTunnelingConfig(config); err != nil {
 			return nil, err
 		}
-		if err := validateAnnouncementsConfig(config); err != nil {
+		if err := ValidateAnnouncementsConfig(config); err != nil {
 			return nil, err
 		}
-		if err := validateSuitesConfig(config); err != nil {
+		if err := ValidateSuitesConfig(config); err != nil {
 			return nil, err
 		}
-		if err := validateUniqueKeys(config); err != nil {
+		if err := ValidateUniqueKeys(config); err != nil {
 			return nil, err
 		}
-		validateAndSetConcurrencyDefaults(config)
+		ValidateAndSetConcurrencyDefaults(config)
 		// Cross-config changes
 		config.UI.MaximumNumberOfResults = config.Storage.MaximumNumberOfResults
 	}
 	return
 }
 
-func validateConnectivityConfig(config *Config) error {
+func ValidateConnectivityConfig(config *Config) error {
 	if config.Connectivity != nil {
 		return config.Connectivity.ValidateAndSetDefaults()
 	}
 	return nil
 }
 
-// validateTunnelingConfig validates the tunneling configuration and resolves tunnel references
-// NOTE: This must be called after validateEndpointsConfig and validateSuitesConfig
+// ValidateTunnelingConfig validates the tunneling configuration and resolves tunnel references
+// NOTE: This must be called after ValidateEndpointsConfig and ValidateSuitesConfig
 // because it resolves tunnel references in endpoint and suite client configurations
-func validateTunnelingConfig(config *Config) error {
+func ValidateTunnelingConfig(config *Config) error {
 	if config.Tunneling != nil {
 		if err := config.Tunneling.ValidateAndSetDefaults(); err != nil {
 			return err
@@ -404,7 +404,7 @@ func resolveTunnelForClientConfig(config *Config, clientConfig *client.Config) e
 	return nil
 }
 
-func validateAnnouncementsConfig(config *Config) error {
+func ValidateAnnouncementsConfig(config *Config) error {
 	if config.Announcements != nil {
 		if err := announcement.ValidateAndSetDefaults(config.Announcements); err != nil {
 			return err
@@ -415,7 +415,7 @@ func validateAnnouncementsConfig(config *Config) error {
 	return nil
 }
 
-func validateRemoteConfig(config *Config) error {
+func ValidateRemoteConfig(config *Config) error {
 	if config.Remote != nil {
 		if err := config.Remote.ValidateAndSetDefaults(); err != nil {
 			return err
@@ -424,7 +424,7 @@ func validateRemoteConfig(config *Config) error {
 	return nil
 }
 
-func validateStorageConfig(config *Config) error {
+func ValidateStorageConfig(config *Config) error {
 	if config.Storage == nil {
 		config.Storage = &storage.Config{
 			Type:                   storage.TypeMemory,
@@ -439,7 +439,7 @@ func validateStorageConfig(config *Config) error {
 	return nil
 }
 
-func validateMaintenanceConfig(config *Config) error {
+func ValidateMaintenanceConfig(config *Config) error {
 	if config.Maintenance == nil {
 		config.Maintenance = maintenance.GetDefaultConfig()
 	} else {
@@ -450,7 +450,7 @@ func validateMaintenanceConfig(config *Config) error {
 	return nil
 }
 
-func validateUIConfig(config *Config) error {
+func ValidateUIConfig(config *Config) error {
 	if config.UI == nil {
 		config.UI = ui.GetDefaultConfig()
 	} else {
@@ -461,7 +461,7 @@ func validateUIConfig(config *Config) error {
 	return nil
 }
 
-func validateWebConfig(config *Config) error {
+func ValidateWebConfig(config *Config) error {
 	if config.Web == nil {
 		config.Web = web.GetDefaultConfig()
 	} else {
@@ -470,11 +470,11 @@ func validateWebConfig(config *Config) error {
 	return nil
 }
 
-func validateEndpointsConfig(config *Config) error {
+func ValidateEndpointsConfig(config *Config) error {
 	duplicateValidationMap := make(map[string]bool)
 	// Validate endpoints
 	for _, ep := range config.Endpoints {
-		logr.Debugf("[config.validateEndpointsConfig] Validating endpoint with key %s", ep.Key())
+		logr.Debugf("[config.ValidateEndpointsConfig] Validating endpoint with key %s", ep.Key())
 		if endpointKey := ep.Key(); duplicateValidationMap[endpointKey] {
 			return fmt.Errorf("invalid endpoint %s: name and group combination must be unique", ep.Key())
 		} else {
@@ -484,10 +484,10 @@ func validateEndpointsConfig(config *Config) error {
 			return fmt.Errorf("invalid endpoint %s: %w", ep.Key(), err)
 		}
 	}
-	logr.Infof("[config.validateEndpointsConfig] Validated %d endpoints", len(config.Endpoints))
+	logr.Infof("[config.ValidateEndpointsConfig] Validated %d endpoints", len(config.Endpoints))
 	// Validate external endpoints
 	for _, ee := range config.ExternalEndpoints {
-		logr.Debugf("[config.validateEndpointsConfig] Validating external endpoint '%s'", ee.Key())
+		logr.Debugf("[config.ValidateEndpointsConfig] Validating external endpoint '%s'", ee.Key())
 		if endpointKey := ee.Key(); duplicateValidationMap[endpointKey] {
 			return fmt.Errorf("invalid external endpoint %s: name and group combination must be unique", ee.Key())
 		} else {
@@ -497,13 +497,13 @@ func validateEndpointsConfig(config *Config) error {
 			return fmt.Errorf("invalid external endpoint %s: %w", ee.Key(), err)
 		}
 	}
-	logr.Infof("[config.validateEndpointsConfig] Validated %d external endpoints", len(config.ExternalEndpoints))
+	logr.Infof("[config.ValidateEndpointsConfig] Validated %d external endpoints", len(config.ExternalEndpoints))
 	return nil
 }
 
-func validateSuitesConfig(config *Config) error {
+func ValidateSuitesConfig(config *Config) error {
 	if config.Suites == nil || len(config.Suites) == 0 {
-		logr.Info("[config.validateSuitesConfig] No suites configured")
+		logr.Info("[config.ValidateSuitesConfig] No suites configured")
 		return nil
 	}
 	suiteNames := make(map[string]bool)
@@ -532,11 +532,11 @@ func validateSuitesConfig(config *Config) error {
 			}
 		}
 	}
-	logr.Infof("[config.validateSuitesConfig] Validated %d suite(s)", len(config.Suites))
+	logr.Infof("[config.ValidateSuitesConfig] Validated %d suite(s)", len(config.Suites))
 	return nil
 }
 
-func validateUniqueKeys(config *Config) error {
+func ValidateUniqueKeys(config *Config) error {
 	keyMap := make(map[string]string) // key -> description for error messages
 	// Check all endpoints
 	for _, ep := range config.Endpoints {
@@ -573,10 +573,10 @@ func validateUniqueKeys(config *Config) error {
 	return nil
 }
 
-func validateSecurityConfig(config *Config) error {
+func ValidateSecurityConfig(config *Config) error {
 	if config.Security != nil {
 		if config.Security.ValidateAndSetDefaults() {
-			logr.Debug("[config.validateSecurityConfig] Basic security configuration has been validated")
+			logr.Debug("[config.ValidateSecurityConfig] Basic security configuration has been validated")
 		} else {
 			// If there was an attempt to configure security, then it must mean that some confidential or private
 			// data are exposed. As a result, we'll force a panic because it's better to be safe than sorry.
@@ -586,13 +586,13 @@ func validateSecurityConfig(config *Config) error {
 	return nil
 }
 
-// validateAlertingConfig validates the alerting configuration
+// ValidateAlertingConfig validates the alerting configuration
 // Note that the alerting configuration has to be validated before the endpoint configuration, because the default alert
 // returned by provider.AlertProvider.GetDefaultAlert() must be parsed before endpoint.Endpoint.ValidateAndSetDefaults()
 // sets the default alert values when none are set.
-func validateAlertingConfig(alertingConfig *alerting.Config, endpoints []*endpoint.Endpoint, externalEndpoints []*endpoint.ExternalEndpoint) {
+func ValidateAlertingConfig(alertingConfig *alerting.Config, endpoints []*endpoint.Endpoint, externalEndpoints []*endpoint.ExternalEndpoint) {
 	if alertingConfig == nil {
-		logr.Info("[config.validateAlertingConfig] Alerting is not configured")
+		logr.Info("[config.ValidateAlertingConfig] Alerting is not configured")
 		return
 	}
 	alertTypes := []alert.Type{
@@ -647,12 +647,12 @@ func validateAlertingConfig(alertingConfig *alerting.Config, endpoints []*endpoi
 					for _, ep := range endpoints {
 						for alertIndex, endpointAlert := range ep.Alerts {
 							if alertType == endpointAlert.Type {
-								logr.Debugf("[config.validateAlertingConfig] Parsing alert %d with default alert for provider=%s in endpoint with key=%s", alertIndex, alertType, ep.Key())
+								logr.Debugf("[config.ValidateAlertingConfig] Parsing alert %d with default alert for provider=%s in endpoint with key=%s", alertIndex, alertType, ep.Key())
 								provider.MergeProviderDefaultAlertIntoEndpointAlert(alertProvider.GetDefaultAlert(), endpointAlert)
 								// Validate the endpoint alert's overrides, if applicable
 								if len(endpointAlert.ProviderOverride) > 0 {
 									if err = alertProvider.ValidateOverrides(ep.Group, endpointAlert); err != nil {
-										logr.Warnf("[config.validateAlertingConfig] endpoint with key=%s has invalid overrides for provider=%s: %s", ep.Key(), alertType, err.Error())
+										logr.Warnf("[config.ValidateAlertingConfig] endpoint with key=%s has invalid overrides for provider=%s: %s", ep.Key(), alertType, err.Error())
 									}
 								}
 							}
@@ -661,12 +661,12 @@ func validateAlertingConfig(alertingConfig *alerting.Config, endpoints []*endpoi
 					for _, ee := range externalEndpoints {
 						for alertIndex, endpointAlert := range ee.Alerts {
 							if alertType == endpointAlert.Type {
-								logr.Debugf("[config.validateAlertingConfig] Parsing alert %d with default alert for provider=%s in endpoint with key=%s", alertIndex, alertType, ee.Key())
+								logr.Debugf("[config.ValidateAlertingConfig] Parsing alert %d with default alert for provider=%s in endpoint with key=%s", alertIndex, alertType, ee.Key())
 								provider.MergeProviderDefaultAlertIntoEndpointAlert(alertProvider.GetDefaultAlert(), endpointAlert)
 								// Validate the endpoint alert's overrides, if applicable
 								if len(endpointAlert.ProviderOverride) > 0 {
 									if err = alertProvider.ValidateOverrides(ee.Group, endpointAlert); err != nil {
-										logr.Warnf("[config.validateAlertingConfig] endpoint with key=%s has invalid overrides for provider=%s: %s", ee.Key(), alertType, err.Error())
+										logr.Warnf("[config.ValidateAlertingConfig] endpoint with key=%s has invalid overrides for provider=%s: %s", ee.Key(), alertType, err.Error())
 									}
 								}
 							}
@@ -675,7 +675,7 @@ func validateAlertingConfig(alertingConfig *alerting.Config, endpoints []*endpoi
 				}
 				validProviders = append(validProviders, alertType)
 			} else {
-				logr.Warnf("[config.validateAlertingConfig] Ignoring provider=%s due to error=%s", alertType, err.Error())
+				logr.Warnf("[config.ValidateAlertingConfig] Ignoring provider=%s due to error=%s", alertType, err.Error())
 				invalidProviders = append(invalidProviders, alertType)
 				alertingConfig.SetAlertingProviderToNil(alertProvider)
 			}
@@ -683,19 +683,19 @@ func validateAlertingConfig(alertingConfig *alerting.Config, endpoints []*endpoi
 			invalidProviders = append(invalidProviders, alertType)
 		}
 	}
-	logr.Infof("[config.validateAlertingConfig] configuredProviders=%s; ignoredProviders=%s", validProviders, invalidProviders)
+	logr.Infof("[config.ValidateAlertingConfig] configuredProviders=%s; ignoredProviders=%s", validProviders, invalidProviders)
 }
 
-func validateAndSetConcurrencyDefaults(config *Config) {
+func ValidateAndSetConcurrencyDefaults(config *Config) {
 	if config.DisableMonitoringLock {
 		config.Concurrency = 0
 		logr.Warn("WARNING: The 'disable-monitoring-lock' configuration has been deprecated and will be removed in v6.0.0")
 		logr.Warn("WARNING: Please set 'concurrency: 0' instead")
-		logr.Debug("[config.validateAndSetConcurrencyDefaults] DisableMonitoringLock is true, setting unlimited (0) concurrency")
+		logr.Debug("[config.ValidateAndSetConcurrencyDefaults] DisableMonitoringLock is true, setting unlimited (0) concurrency")
 	} else if config.Concurrency <= 0 && !config.DisableMonitoringLock {
 		config.Concurrency = DefaultConcurrency
-		logr.Debugf("[config.validateAndSetConcurrencyDefaults] Setting default concurrency to %d", config.Concurrency)
+		logr.Debugf("[config.ValidateAndSetConcurrencyDefaults] Setting default concurrency to %d", config.Concurrency)
 	} else {
-		logr.Debugf("[config.validateAndSetConcurrencyDefaults] Using configured concurrency of %d", config.Concurrency)
+		logr.Debugf("[config.ValidateAndSetConcurrencyDefaults] Using configured concurrency of %d", config.Concurrency)
 	}
 }

config/config_test.go

@@ -2596,19 +2596,19 @@ func TestValidateTunnelingConfig(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			err := validateTunnelingConfig(tt.config)
+			err := ValidateTunnelingConfig(tt.config)
 			if tt.wantErr {
 				if err == nil {
-					t.Error("validateTunnelingConfig() expected error but got none")
+					t.Error("ValidateTunnelingConfig() expected error but got none")
 					return
 				}
 				if err.Error() != tt.errMsg {
-					t.Errorf("validateTunnelingConfig() error = %v, want %v", err.Error(), tt.errMsg)
+					t.Errorf("ValidateTunnelingConfig() error = %v, want %v", err.Error(), tt.errMsg)
 				}
 				return
 			}
 			if err != nil {
-				t.Errorf("validateTunnelingConfig() unexpected error = %v", err)
+				t.Errorf("ValidateTunnelingConfig() unexpected error = %v", err)
 			}
 		})
 	}

web/app/src/components/EndpointCard.vue

@@ -15,7 +15,7 @@
               {{ endpoint.name }}
             </span>
           </CardTitle>
-          <div class="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground">
+          <div class="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground min-h-[1.25rem]">
             <span v-if="endpoint.group" class="truncate" :title="endpoint.group">{{ endpoint.group }}</span>
             <span v-if="endpoint.group && hostname">•</span>
             <span v-if="hostname" class="truncate" :title="hostname">{{ hostname }}</span>