Merge pull request #43 from KusionStack/more-flexible-placeholder-in-…

…custom-config

feat: support more flexible placeholder writing in archive download url

.golangci.yml

@@ -43,12 +43,12 @@ linters:
     - unconvert
     - unparam
     - whitespace
-    - wsl
+    # - wsl
 
 linters-settings:
   gofumpt:
     # Select the Go version to target. The default is `1.15`.
     lang-version: "1.17"
     # Choose whether or not to use the extra rules that are disabled
     # by default
-    extra-rules: false
+    extra-rules: false

pkg/sources/custom/types.go

@@ -1,7 +1,9 @@
 package custom
 
 import (
+	"bytes"
 	"fmt"
+	"html/template"
 	"runtime"
 )
 
@@ -14,11 +16,20 @@ func getArchiveDownloadURL(archiveDownloadURLMap map[string]string, ver string)
 	if archiveDownloadURLMap == nil {
 		return "", ErrEmptyDownloadURLMap
 	}
-
-	if urlPattern, ok := archiveDownloadURLMap[getOsArchKey(runtime.GOOS, runtime.GOARCH)]; ok {
-		return fmt.Sprintf(urlPattern, ver), nil
+	osArchKey := getOsArchKey(runtime.GOOS, runtime.GOARCH)
+	if urlPattern, ok := archiveDownloadURLMap[osArchKey]; ok {
+		tmpl, err := template.New("").Parse(urlPattern)
+		if err != nil {
+			return "", err
+		}
+		var buf bytes.Buffer
+		data := struct{ VERSION string }{ver}
+		if err := tmpl.Execute(&buf, data); err != nil {
+			return "", err
+		}
+		fmt.Println(buf.String())
+		return buf.String(), nil
 	}
-
 	return "", ErrUnsupportedOsArch
 }
 

pkg/version/types.go

@@ -21,12 +21,12 @@ var versionInfo *Info
 // Info contains versioning information.
 // following attributes:
 //
-//    ReleaseVersion - "vX.Y.Z-00000000" used to indicate the last release version,
-// 		  containing GitVersion and GitCommitShort.
-//    GitVersion - "vX.Y.Z" used to indicate the last git tag.
-//    GitCommit - The git commit id corresponding to this source code.
-//    GitTreeState - "clean" indicates no changes since the git commit id
-//        "dirty" indicates source code changes after the git commit id
+//	   ReleaseVersion - "vX.Y.Z-00000000" used to indicate the last release version,
+//			  containing GitVersion and GitCommitShort.
+//	   GitVersion - "vX.Y.Z" used to indicate the last git tag.
+//	   GitCommit - The git commit id corresponding to this source code.
+//	   GitTreeState - "clean" indicates no changes since the git commit id
+//	       "dirty" indicates source code changes after the git commit id
 type Info struct {
 	ReleaseVersion string      `json:"releaseVersion" yaml:"releaseVersion"`                 // Such as "v1.2.3-3836f877"
 	GitVersion     string      `json:"gitVersion" yaml:"gitVersion"`                         // Such as "v1.2.3"