chore(refactor): the translation of upstream

pkg/providers/apisix/apisix_upstream.go

@@ -278,15 +278,14 @@ func (c *apisixUpstreamController) sync(ctx context.Context, ev *types.Event) er
 						c.recordStatus(au, utils.ResourceSyncAborted, err, metav1.ConditionFalse, au.GetGeneration())
 						return err
 					}
-					var newUps *apisixv1.Upstream
+					newUps := apisixv1.NewDefaultUpstream()
 					if au.Spec != nil && ev.Type != types.EventDelete {
 						cfg, ok := portLevelSettings[port.Port]
 						if !ok {
 							cfg = au.Spec.ApisixUpstreamConfig
 						}
 						// FIXME Same ApisixUpstreamConfig might be translated multiple times.
-						newUps, err = c.translator.TranslateUpstreamConfigV2(&cfg)
-						if err != nil {
+						if err = c.translator.TranslateUpstreamConfigV2(&cfg, newUps); err != nil {
 							log.Errorw("ApisixUpstream conversion cannot be completed, or the format is incorrect",
 								zap.Any("object", au),
 								zap.Error(err),
@@ -295,8 +294,6 @@ func (c *apisixUpstreamController) sync(ctx context.Context, ev *types.Event) er
 							c.recordStatus(au, utils.ResourceSyncAborted, err, metav1.ConditionFalse, au.GetGeneration())
 							return err
 						}
-					} else {
-						newUps = apisixv1.NewDefaultUpstream()
 					}
 
 					newUps.Metadata = ups.Metadata

pkg/providers/apisix/translation/apisix_plugin.go

@@ -46,11 +46,7 @@ func (t *translator) translateTrafficSplitPlugin(ctx *translation.TranslateConte
 	)
 
 	for _, backend := range backends {
-		svcClusterIP, svcPort, err := t.GetServiceClusterIPAndPort(&backend, ns)
-		if err != nil {
-			return nil, err
-		}
-		ups, err := t.translateService(ns, backend.ServiceName, backend.Subset, backend.ResolveGranularity, svcClusterIP, svcPort)
+		ups, err := t.TranslateUpstream(ns, backend.ServiceName, backend.Subset, backend.ResolveGranularity, backend.ServicePort)
 		if err != nil {
 			return nil, err
 		}

pkg/providers/apisix/translation/apisix_plugin_test.go

@@ -546,7 +546,7 @@ func TestTranslateTrafficSplitPluginBadCases(t *testing.T) {
 	cfg, err = tr.translateTrafficSplitPlugin(ctx, ar1.Namespace, 30, backends)
 	assert.Nil(t, cfg)
 	assert.NotNil(t, err)
-	assert.Equal(t, "service.spec.ports: port not defined", err.Error())
+	assert.Contains(t, err.Error(), "service.Spec.Ports: port port-not-found not found")
 
 	backends[1].ServicePort.StrVal = "port2"
 	backends[1].ResolveGranularity = "service"