feat: move module binary to KUSION_HOME by new path format

KusionStack · Apr 22, 2024 · 5cf1d5f · 5cf1d5f
1 parent e77a5fd
commit 5cf1d5f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/cmd/mod/mod_push.go b/pkg/cmd/mod/mod_push.go
@@ -337,7 +337,7 @@ func (o *PushModOptions) buildModule() (string, error) {
 
 	output := filepath.Join(targetDir, "_dist", pOS, pArch, "kusion-module-"+name+"_"+o.Version)
 	if strings.Contains(o.OSArch, "windows") {
-		output = filepath.Join(targetDir, "_dist", pOS, pArch, "kusion-module-"+name+"_"+o.Version+".exe")
+		output = output + ".exe"
 	}
 
 	path, err := buildBinary(goBin, pOS, pArch, moduleSrc, output, o.IOStreams)

diff --git a/pkg/engine/api/generate/generator/generator.go b/pkg/engine/api/generate/generator/generator.go
@@ -103,8 +103,8 @@ func copyDependentModules(workDir string) error {
 		if dep.Source.Oci != nil {
 			info := dep.Source.Oci
 			pkgDir := filepath.Join(absPkgPath, dep.FullName)
-			platform := fmt.Sprintf("%s-%s", runtime.GOOS, runtime.GOARCH)
-			source := filepath.Join(pkgDir, "_dist", platform, "generator")
+			source := filepath.Join(pkgDir, "_dist", runtime.GOOS, runtime.GOARCH, "kusion-module-"+dep.FullName)
+
 			moduleDir := filepath.Join(kusionHomePath, "modules", info.Repo, info.Tag, runtime.GOOS, runtime.GOARCH)
 			dest := filepath.Join(moduleDir, fmt.Sprintf("kusion-module-%s", dep.FullName))
 			if runtime.GOOS == "windows" {