refactor: Clean up unused variables and update TODO comments in translators

- Removed redundant `apisixUpstreams` and `adcUpstreams` variables in ApisixRoute translator logic for clarity.
- Streamlined upstream handling and variable naming in traffic-split logic.
- Updated TODO comments to reflect upcoming `.Checks`, `.TLS`, and `.Discovery*` implementations.

Author: dspo

docs/crd/api.md

@@ -1300,8 +1300,6 @@ _Appears in:_
 
 
 
-
-
 #### ApisixTlsSpec
 
 

internal/controller/apisixroute_controller.go

@@ -186,7 +186,6 @@ func (r *ApisixRouteReconciler) processApisixRouteHTTPRule(ctx context.Context,
 	}
 
 	// check vars
-	// todo: cache the result to tctx
 	if _, err := rule.Match.NginxVars.ToVars(); err != nil {
 		return ReasonError{
 			Reason:  string(apiv2.ConditionReasonInvalidSpec),

internal/provider/adc/translator/apisixroute.go

@@ -149,64 +149,50 @@ func (t *Translator) TranslateApisixRoute(tctx *provider.TranslateContext, ar *a
 		}
 
 		var (
-			apisixUpstreams []*apiv2.ApisixUpstream
-			adcUpstreams    []*adc.Upstream
+			upstreams []*adc.Upstream
 		)
-		data, _ := json.Marshal(rule.Upstreams)
-		log.Debugf(".http[].Upstreams: %s", data)
 		for _, upstreamRef := range rule.Upstreams {
 			upsNN := types.NamespacedName{
 				Namespace: ar.GetNamespace(),
 				Name:      upstreamRef.Name,
 			}
-			log.Debugf("try to get ApisixUpstream: %s", upsNN)
 			au, ok := tctx.Upstreams[upsNN]
 			if !ok {
 				log.Debugf("failed to retrieve ApisixUpstream from tctx, ApisixUpstream: %s", upsNN)
 				continue
 			}
-			log.Debugf("try to translate the ApisixUpstream: %v", au)
-			adcUpstream, err := t.translateApisixUpstream(tctx, au)
+			upstream, err := t.translateApisixUpstream(tctx, au)
 			if err != nil {
-				log.Debugf("failed to translate ApisixUpstream, ApisixUpstream: %v, err: %v", au, err)
 				t.Log.Error(err, "failed to translate ApisixUpstream", "ApisixUpstream", utils.NamespacedName(au))
 				continue
 			}
 
-			apisixUpstreams = append(apisixUpstreams, au)
-			adcUpstreams = append(adcUpstreams, adcUpstream)
+			upstreams = append(upstreams, upstream)
 		}
 
-		_ = apisixUpstreams // todo: remove this
-
-		data, _ = json.Marshal(adcUpstreams)
-		log.Debugf("len(rule.Backends): %v, adcUpstreams: %s", len(rule.Backends), string(data))
-
 		// If no .http[].backends is used and only .http[].upstreams is used, the first valid upstream is used as service.upstream;
 		// Other upstreams are configured in the traffic-split plugin
-		if len(rule.Backends) == 0 && len(adcUpstreams) > 0 {
-			log.Debugf("set first upstream as service.Upstream, first upstream: %v", adcUpstreams[0])
-			upstream = adcUpstreams[0]
-			adcUpstreams = adcUpstreams[1:]
+		if len(rule.Backends) == 0 && len(upstreams) > 0 {
+			upstream = upstreams[0]
+			upstreams = upstreams[1:]
 		}
 
-		var wups []adc.TrafficSplitConfigRuleWeightedUpstream
-		for _, adcUpstream := range adcUpstreams {
-			weight, err := strconv.Atoi(adcUpstream.Labels["meta_weight"])
+		var weightedUpstreams []adc.TrafficSplitConfigRuleWeightedUpstream
+		for _, item := range upstreams {
+			weight, err := strconv.Atoi(item.Labels["meta_weight"])
 			if err != nil {
-				t.Log.Error(err, "failed to parse meta_weight from upstream labels", "labels", adcUpstream.GetLabels())
 				weight = apiv2.DefaultWeight
 			}
-			wups = append(wups, adc.TrafficSplitConfigRuleWeightedUpstream{
-				Upstream: adcUpstream,
+			weightedUpstreams = append(weightedUpstreams, adc.TrafficSplitConfigRuleWeightedUpstream{
+				Upstream: item,
 				Weight:   weight,
 			})
 		}
-		if len(wups) > 0 {
+		if len(weightedUpstreams) > 0 {
 			route.Plugins["traffic-split"] = &adc.TrafficSplitConfig{
 				Rules: []adc.TrafficSplitConfigRule{
 					{
-						WeightedUpstreams: wups,
+						WeightedUpstreams: weightedUpstreams,
 					},
 				},
 			}

internal/provider/adc/translator/apisixupstream.go

@@ -99,7 +99,7 @@ func translateApisixUpstreamLoadBalancer(au *apiv2.ApisixUpstream, ups *adc.Upst
 }
 
 func translateApisixUpstreamHealthCheck(au *apiv2.ApisixUpstream, ups *adc.Upstream) error {
-	// todo: no field `.Checks` in adc.Upstream
+	// todo: handle `.Checks` in next PR
 	return nil
 }
 
@@ -141,7 +141,7 @@ func translateApisixUpstreamRetriesAndTimeout(au *apiv2.ApisixUpstream, ups *adc
 }
 
 func translateApisixUpstreamClientTLS(au *apiv2.ApisixUpstream, ups *adc.Upstream) error {
-	// todo: no field `.TLS` in adc.Upstream
+	// todo: handle `.TLS` in next PR
 	return nil
 }
 
@@ -159,7 +159,7 @@ func translateApisixUpstreamPassHost(au *apiv2.ApisixUpstream, ups *adc.Upstream
 }
 
 func translateApisixUpstreamDiscovery(upstream *apiv2.ApisixUpstream, upstream2 *adc.Upstream) error {
-	// todo: no filed `.Discovery*` in adc.Upstream
+	// todo: handle `.Discovery*` in next PR
 	return nil
 }
 

internal/utils/k8s.go

@@ -56,6 +56,7 @@ var hostDefRegex = regexp.MustCompile(hostDef)
 // ref to : https://github.com/apache/apisix/blob/c5fc10d9355a0c177a7532f01c77745ff0639a7f/apisix/schema_def.lua#L40
 // ref to : https://github.com/kubernetes/kubernetes/blob/976a940f4a4e84fe814583848f97b9aafcdb083f/staging/src/k8s.io/apimachinery/pkg/util/validation/validation.go#L205
 // They define regex differently, but k8s's dns is more accurate
+// todo: validate by CRD definition
 func MatchHostDef(host string) bool {
 	return hostDefRegex.MatchString(host)
 }