Merge pull request #1351 from merico-dev/refactor-trello-options

refactor: trello plugin with new options config

Author: daniel-hutao

internal/pkg/plugin/argocdapp/validate.go

@@ -36,5 +36,7 @@ func setDefault(options configmanager.RawOptions) (configmanager.RawOptions, err
 			opts.ImageRepo.URL = fmt.Sprintf("%s/", opts.ImageRepo.URL)
 		}
 	}
+
+	// set ci file config
 	return mapz.DecodeStructToMap(opts)
 }

internal/pkg/plugin/installer/ci/cifile/server/githubci.go

@@ -10,7 +10,7 @@ import (
 
 const (
 	CIGithubType               CIServerType = "github"
-	ciGitHubWorkConfigLocation string       = ".github/workflows"
+	CiGitHubWorkConfigLocation string       = ".github/workflows"
 	ciGithubTempName           string       = "app.yaml"
 )
 
@@ -19,7 +19,7 @@ type GitHubWorkflow struct {
 
 // CIFilePath return .github/workflows/app.yml
 func (g *GitHubWorkflow) CIFilePath() string {
-	return filepath.Join(ciGitHubWorkConfigLocation, ciGithubTempName)
+	return filepath.Join(CiGitHubWorkConfigLocation, ciGithubTempName)
 }
 
 func (g *GitHubWorkflow) FilterCIFilesFunc() file.DirFileFilterFunc {
@@ -35,6 +35,6 @@ func (g *GitHubWorkflow) FilterCIFilesFunc() file.DirFileFilterFunc {
 func (g *GitHubWorkflow) GetGitNameFunc() file.DirFileNameFunc {
 	return func(filePath, _ string) string {
 		basePath := filepath.Base(filePath)
-		return path.Join(ciGitHubWorkConfigLocation, basePath)
+		return path.Join(CiGitHubWorkConfigLocation, basePath)
 	}
 }

internal/pkg/plugin/installer/ci/cifile/state.go

@@ -5,7 +5,6 @@ import (
 	"github.com/devstream-io/devstream/internal/pkg/statemanager"
 	"github.com/devstream-io/devstream/pkg/util/log"
 	"github.com/devstream-io/devstream/pkg/util/scm"
-	"github.com/devstream-io/devstream/pkg/util/scm/git"
 )
 
 func GetCIFileStatus(options configmanager.RawOptions) (statemanager.ResourceStatus, error) {
@@ -26,29 +25,10 @@ func GetCIFileStatus(options configmanager.RawOptions) (statemanager.ResourceSta
 		return nil, err
 	}
 
-	statusMap := make(statemanager.ResourceStatus)
-	for scmPath, content := range gitMap {
-		localFileSHA := git.CalculateLocalFileSHA(content)
-		// get remote file status
-		statusMap[scmPath] = map[string]interface{}{
-			"localSHA": localFileSHA,
-			"scm":      getSCMFileStatus(client, scmPath),
-		}
-	}
-	return statusMap, nil
-}
-
-func getSCMFileStatus(client scm.ClientOperation, scmPath string) (scmFileStatus []map[string]string) {
-	gitFileInfos, err := client.GetPathInfo(scmPath)
+	gitFileStatus, err := scm.GetGitFileStats(client, gitMap)
 	if err != nil {
-		log.Debugf("ci status get location info failed: %+v", err)
-		return scmFileStatus
-	}
-	for _, fileStatus := range gitFileInfos {
-		scmFileStatus = append(scmFileStatus, map[string]string{
-			"scmSHA":    fileStatus.SHA,
-			"scmBranch": fileStatus.Branch,
-		})
+		return nil, err
 	}
-	return scmFileStatus
+	statusMap := statemanager.ResourceStatus(gitFileStatus)
+	return statusMap, nil
 }