Update main.go

Author: hhftechnology

main.go

@@ -29,6 +29,8 @@ import (
 // - CLOUDFLARE_ZONE_ID: Cloudflare zone ID for DNS records
 // - TRAEFIK_API_ENDPOINT: Traefik API endpoint URL (e.g., http://localhost:8080)
 // - TRAEFIK_ENTRYPOINTS: Comma-separated list of Traefik entrypoints to watch (e.g., "web,websecure")
+//   OR
+// - TRAEFIK_ENTRYPOINT: (Legacy) Single Traefik entrypoint to watch (e.g., "web")
 // - TRAEFIK_SERVICE_ENDPOINT: Service endpoint for tunnel traffic
 
 // Config holds application configuration loaded from environment variables
@@ -85,6 +87,12 @@ func loadConfig() (*Config, error) {
 		for _, ep := range strings.Split(entrypointsStr, ",") {
 			entrypoints = append(entrypoints, strings.TrimSpace(ep))
 		}
+	} else {
+		// Backward compatibility for TRAEFIK_ENTRYPOINT
+		singleEntrypoint := os.Getenv("TRAEFIK_ENTRYPOINT")
+		if singleEntrypoint != "" {
+			entrypoints = append(entrypoints, singleEntrypoint)
+		}
 	}
 
 	config := &Config{
@@ -116,7 +124,7 @@ func loadConfig() (*Config, error) {
 		missing = append(missing, "TRAEFIK_API_ENDPOINT")
 	}
 	if len(config.TraefikEntrypoints) == 0 {
-		missing = append(missing, "TRAEFIK_ENTRYPOINTS")
+		missing = append(missing, "TRAEFIK_ENTRYPOINTS or TRAEFIK_ENTRYPOINT")
 	}
 	if config.TraefikServiceEndpoint == "" {
 		missing = append(missing, "TRAEFIK_SERVICE_ENDPOINT")
@@ -252,8 +260,8 @@ func buildIngressRules(routers []Router, config *Config) ([]cloudflare.Unvalidat
 			continue
 		}
 
-		// Only use routes with the specified entrypoint
-		if !containsEntrypoint(router.EntryPoints, config.TraefikEntrypoint) {
+		// Only use routes with one of the specified entrypoints
+		if !hasMatchingEntrypoint(router.EntryPoints, config.TraefikEntrypoints) {
 			continue
 		}
 
@@ -306,15 +314,15 @@ func hasTLSEnabled(router Router) bool {
 func syncTunnelConfig(ctx context.Context, cloudflareClient *cloudflare.API, config *Config, ingress []cloudflare.UnvalidatedIngressRule) error {
 	return retryOperation(3, func() error {
 		// Get Current tunnel config
-		accountIdentifier := cloudflare.AccountIdentifier(config.CloudflareAccountID)
-		tunnelConfig, err := cloudflareClient.GetTunnelConfiguration(ctx, accountIdentifier, config.CloudflareTunnelID)
+		accountRC := cloudflare.AccountIdentifier(config.CloudflareAccountID)
+		tunnelConfig, err := cloudflareClient.GetTunnelConfiguration(ctx, accountRC, config.CloudflareTunnelID)
 		if err != nil {
 			return fmt.Errorf("failed to get current tunnel configuration: %w", err)
 		}
 
 		// Update config with new ingress rules
 		tunnelConfig.Config.Ingress = ingress
-		_, err = cloudflareClient.UpdateTunnelConfiguration(ctx, accountIdentifier, cloudflare.TunnelConfigurationParams{
+		_, err = cloudflareClient.UpdateTunnelConfiguration(ctx, accountRC, cloudflare.TunnelConfigurationParams{
 			TunnelID: config.CloudflareTunnelID,
 			Config:   tunnelConfig.Config,
 		})
@@ -345,7 +353,7 @@ func syncDNSRecords(ctx context.Context, cloudflareClient *cloudflare.API, confi
 }
 
 // ensureDNSRecord ensures that a DNS record exists and is correctly configured
-func ensureDNSRecord(ctx context.Context, cloudflareClient *cloudflare.API, zoneIdentifier cloudflare.ZoneIdentifier, domain, tunnelDomain string) error {
+func ensureDNSRecord(ctx context.Context, cloudflareClient *cloudflare.API, zoneIdentifier *cloudflare.ResourceContainer, domain, tunnelDomain string) error {
 	return retryOperation(3, func() error {
 		// Create record template
 		var proxied bool = true
@@ -447,11 +455,18 @@ func pollTraefikRouters(ctx context.Context, client *resty.Client, interval time
 	return ch
 }
 
-// containsEntrypoint checks if a slice of strings contains a specific entrypoint
-func containsEntrypoint(entrypoints []string, targetEntrypoint string) bool {
-	for _, entrypoint := range entrypoints {
-		if entrypoint == targetEntrypoint {
-			return true
+// hasMatchingEntrypoint checks if any of the router's entrypoints match our allowed list
+func hasMatchingEntrypoint(routerEntrypoints []string, allowedEntrypoints []string) bool {
+	// If no allowed entrypoints specified, accept all
+	if len(allowedEntrypoints) == 0 {
+		return true
+	}
+	
+	for _, routerEP := range routerEntrypoints {
+		for _, allowedEP := range allowedEntrypoints {
+			if routerEP == allowedEP {
+				return true
+			}
 		}
 	}
 	return false