support get values yaml from other type repo in openapi (#4531)

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

Author: PetrusZ

pkg/microservice/aslan/core/environment/handler/openapi.go

@@ -23,19 +23,23 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"os"
+	"path"
 	"strconv"
 	"strings"
 
 	"github.com/gin-gonic/gin"
 	"k8s.io/apimachinery/pkg/util/sets"
 
+	"github.com/koderover/zadig/v2/pkg/microservice/aslan/config"
 	commonrepo "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/mongodb"
 	commonservice "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/service"
+	"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/service/command"
 	fsservice "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/service/fs"
 	commonutil "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/util"
 	"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/environment/service"
-	codehostdb "github.com/koderover/zadig/v2/pkg/microservice/systemconfig/core/codehost/repository/mongodb"
 	"github.com/koderover/zadig/v2/pkg/setting"
+	"github.com/koderover/zadig/v2/pkg/shared/client/systemconfig"
 	internalhandler "github.com/koderover/zadig/v2/pkg/shared/handler"
 	e "github.com/koderover/zadig/v2/pkg/tool/errors"
 	"github.com/koderover/zadig/v2/pkg/types"
@@ -2231,20 +2235,43 @@ func OpenAPIAddHelmServicesToEnv(c *gin.Context) {
 
 		valuesData := &commonservice.ValuesDataArgs{}
 		if service.ImportValuesFromGit != nil {
-			codehostID, err := codehostdb.NewCodehostColl().GetCodeHostByAlias(service.ImportValuesFromGit.CodehostName)
+			codeHost, err := systemconfig.New().GetCodeHostByAlias(service.ImportValuesFromGit.CodehostName)
 			if err != nil {
-				ctx.RespErr = e.ErrInvalidParam.AddDesc(fmt.Sprintf("codehost %s not found", service.ImportValuesFromGit.CodehostName))
+				ctx.RespErr = e.ErrInvalidParam.AddDesc(fmt.Sprintf("failed to get codehost %s, err: %s", service.ImportValuesFromGit.CodehostName, err))
 				return
 			}
 
-			autoSyncYamlBytes, err := fsservice.DownloadFileFromSource(&fsservice.DownloadFromSourceArgs{
-				CodehostID: codehostID.ID,
-				Namespace:  service.ImportValuesFromGit.Namespace,
-				Owner:      service.ImportValuesFromGit.Namespace,
-				Repo:       service.ImportValuesFromGit.Repo,
-				Branch:     service.ImportValuesFromGit.Branch,
-				Path:       service.ImportValuesFromGit.ValuePath,
-			})
+			var autoSyncYamlBytes []byte
+			if codeHost.Type == setting.SourceFromOther {
+				service.ImportValuesFromGit.AutoSync = false
+				err = command.RunGitCmds(
+					codeHost,
+					service.ImportValuesFromGit.Namespace,
+					service.ImportValuesFromGit.Namespace,
+					service.ImportValuesFromGit.Repo,
+					service.ImportValuesFromGit.Branch,
+					"origin",
+				)
+				if err != nil {
+					ctx.RespErr = e.ErrInvalidParam.AddDesc(fmt.Sprintf("failed to sync git repo for values yaml, err: %s", err))
+					return
+				}
+				repoPath := path.Join(config.S3StoragePath(), service.ImportValuesFromGit.Repo, service.ImportValuesFromGit.ValuePath)
+				autoSyncYamlBytes, err = os.ReadFile(repoPath)
+				if err != nil {
+					ctx.RespErr = e.ErrInvalidParam.AddDesc(fmt.Sprintf("failed to read values yaml from synced repo, path: %s, err: %s", repoPath, err))
+					return
+				}
+			} else {
+				autoSyncYamlBytes, err = fsservice.DownloadFileFromSource(&fsservice.DownloadFromSourceArgs{
+					CodehostID: codeHost.ID,
+					Namespace:  service.ImportValuesFromGit.Namespace,
+					Owner:      service.ImportValuesFromGit.Namespace,
+					Repo:       service.ImportValuesFromGit.Repo,
+					Branch:     service.ImportValuesFromGit.Branch,
+					Path:       service.ImportValuesFromGit.ValuePath,
+				})
+			}
 			if err != nil {
 				ctx.RespErr = e.ErrInvalidParam.AddDesc(fmt.Sprintf("failed to download auto sync yaml, err: %s", err))
 				return
@@ -2254,7 +2281,7 @@ func OpenAPIAddHelmServicesToEnv(c *gin.Context) {
 
 			valuesData = &commonservice.ValuesDataArgs{
 				GitRepoConfig: &commonservice.RepoConfig{
-					CodehostID:  codehostID.ID,
+					CodehostID:  codeHost.ID,
 					Owner:       service.ImportValuesFromGit.Namespace,
 					Namespace:   service.ImportValuesFromGit.Namespace,
 					Repo:        service.ImportValuesFromGit.Repo,

pkg/microservice/systemconfig/core/codehost/service/codehost.go

@@ -171,6 +171,10 @@ func GetCodeHost(id int, ignoreDelete bool, _ *zap.SugaredLogger) (*models.CodeH
 	return mongodb.NewCodehostColl().GetCodeHostByID(id, ignoreDelete)
 }
 
+func GetCodeHostByAlias(alias string) (*models.CodeHost, error) {
+	return mongodb.NewCodehostColl().GetCodeHostByAlias(alias)
+}
+
 type state struct {
 	CodeHostID  int    `json:"code_host_id"`
 	RedirectURL string `json:"redirect_url"`

pkg/shared/client/systemconfig/codehost.go

@@ -70,6 +70,37 @@ func GetCodeHostInfo(opt *Option) (*CodeHost, error) {
 	return New().GetCodeHostByAddressAndOwner(opt.Address, opt.Namespace, opt.CodeHostType)
 }
 
+func (c *Client) GetCodeHostByAlias(alias string) (*CodeHost, error) {
+	resp, err := codehostservice.GetCodeHostByAlias(alias)
+	if err != nil {
+		return nil, err
+	}
+	res := &CodeHost{
+		ID:                 resp.ID,
+		Address:            resp.Address,
+		Type:               resp.Type,
+		AccessToken:        resp.AccessToken,
+		RefreshToken:       resp.RefreshToken,
+		Namespace:          resp.Namespace,
+		Region:             resp.Region,
+		AccessKey:          resp.ApplicationId,
+		SecretKey:          resp.ClientSecret,
+		Username:           resp.Username,
+		Password:           resp.Password,
+		DisableSSL:         resp.DisableSSL,
+		EnableProxy:        resp.EnableProxy,
+		UpdatedAt:          resp.UpdatedAt,
+		Alias:              resp.Alias,
+		AuthType:           resp.AuthType,
+		SSHKey:             resp.SSHKey,
+		PrivateAccessToken: resp.PrivateAccessToken,
+		P4Host:             resp.P4Host,
+		P4Port:             resp.P4Port,
+	}
+
+	return res, nil
+}
+
 func (c *Client) GetCodeHost(id int) (*CodeHost, error) {
 	resp, err := codehostservice.GetCodeHost(id, false, log.SugaredLogger())
 	if err != nil {