update preview service for import service

Signed-off-by: Patrick Zhao <zhaoyu@koderover.com>

Author: PetrusZ

pkg/microservice/aslan/core/common/service/kube/render.go

@@ -432,7 +432,7 @@ func FetchImportedAllManifests(envInfo *models.Product, serviceTmp *models.Servi
 	}
 	fullRenderedYaml = ParseSysKeys(envInfo.Namespace, envInfo.EnvName, envInfo.ProductName, serviceTmp.ServiceName, fullRenderedYaml)
 
-	manifests := releaseutil.SplitManifests(fullRenderedYaml)
+	manifests := util.SplitManifestsOrdered(fullRenderedYaml)
 
 	kubeClient, err := clientmanager.NewKubeClientManager().GetControllerRuntimeClient(envInfo.ClusterID)
 	if err != nil {

pkg/microservice/aslan/core/environment/service/service.go

@@ -19,6 +19,7 @@ package service
 import (
 	"context"
 	"fmt"
+	"slices"
 
 	"github.com/koderover/zadig/v2/pkg/tool/clientmanager"
 	"github.com/pkg/errors"
@@ -334,15 +335,38 @@ func PreviewService(args *PreviewServiceArgs, _ *zap.SugaredLogger) (*SvcDiffRes
 
 	curYaml := ""
 	isImportToDeploy := false
-	if envInfo.ServiceDeployStrategy[args.ServiceName] == setting.ServiceDeployStrategyImport && (args.UpdateServiceRevision || len(args.VariableKVs) > 0) {
-		isImportToDeploy = true
+	if envInfo.ServiceDeployStrategy[args.ServiceName] == setting.ServiceDeployStrategyImport {
+		// is imported service
+		if len(args.DeployContents) > 0 {
+			// is workflow
+			if len(args.DeployContents) == 1 && slices.Contains(args.DeployContents, config.DeployImage) {
+				// only update images
+				envSvc := envInfo.GetServiceMap()[args.ServiceName]
+				if envSvc == nil {
+					return nil, e.ErrPreviewYaml.AddErr(fmt.Errorf("service %s not found in environment", args.ServiceName))
+				}
+				for _, container := range envSvc.Containers {
+					ret.Current.Yaml += container.Image + "\n"
+				}
+				for _, container := range args.ServiceModules {
+					ret.Latest.Yaml += container.Image + "\n"
+				}
+				return ret, nil
+			} else if slices.Contains(args.DeployContents, config.DeployVars) || slices.Contains(args.DeployContents, config.DeployConfig) {
+				// set update variables or configuration
+				isImportToDeploy = true
+			}
+		} else {
+			// is environment
+			isImportToDeploy = true
+		}
 	}
 
 	curYaml, _, err = kube.FetchCurrentAppliedYaml(&kube.GeneSvcYamlOption{
 		ProductName:           args.ProductName,
 		EnvName:               args.EnvName,
 		ServiceName:           args.ServiceName,
-		UpdateServiceRevision: args.UpdateServiceRevision,
+		UpdateServiceRevision: false,
 		IsImportToDeploy:      isImportToDeploy,
 	})
 	if err != nil {
@@ -352,17 +376,6 @@ func PreviewService(args *PreviewServiceArgs, _ *zap.SugaredLogger) (*SvcDiffRes
 		log.Errorf(ret.Error)
 	}
 
-	// for situations only update images, replace images directly
-	if !args.UpdateServiceRevision && len(args.VariableKVs) == 0 {
-		latestYaml, _, err := kube.ReplaceWorkloadImages(curYaml, args.ServiceModules)
-		if err != nil {
-			return nil, e.ErrPreviewYaml.AddErr(err)
-		}
-		ret.Current.Yaml = curYaml
-		ret.Latest.Yaml = latestYaml
-		return ret, nil
-	}
-
 	candidateOverrides, err := buildPreviewCandidateOverrides(envInfo, args.ServiceName, args.UpdateServiceRevision, args.VariableKVs)
 	if err != nil {
 		return nil, e.ErrPreviewYaml.AddErr(err)

pkg/microservice/aslan/core/environment/service/types.go

@@ -83,6 +83,7 @@ type PreviewServiceArgs struct {
 	UpdateServiceRevision bool                            `json:"update_service_revision"`
 	ServiceModules        []*commonmodels.Container       `json:"service_modules"`
 	VariableKVs           []*commontypes.RenderVariableKV `json:"variable_kvs"`
+	DeployContents        []config.DeployContent          `json:"deploy_contents"`
 }
 
 type RestartScaleArgs struct {

pkg/util/helm.go

@@ -20,10 +20,12 @@ import (
 	"fmt"
 	"io/fs"
 	"path/filepath"
+	"sort"
 	"strings"
 
 	"go.uber.org/zap"
 	"gopkg.in/yaml.v3"
+	"helm.sh/helm/v3/pkg/releaseutil"
 	"k8s.io/helm/pkg/strvals"
 
 	"github.com/koderover/zadig/v2/pkg/setting"
@@ -100,3 +102,17 @@ func ReadValuesYAMLFromLocal(base string, logger *zap.SugaredLogger) ([]byte, er
 	}
 	return content, nil
 }
+
+func SplitManifestsOrdered(content string) []string {
+	res := make([]string, 0)
+	manifests := releaseutil.SplitManifests(content)
+	manifestKeys := make([]string, 0, len(manifests))
+	for key := range manifests {
+		manifestKeys = append(manifestKeys, key)
+	}
+	sort.Sort(releaseutil.BySplitManifestsOrder(manifestKeys))
+	for _, key := range manifestKeys {
+		res = append(res, manifests[key])
+	}
+	return res
+}