Also include the edition into the alternatives paths, although it is …

…currently hardcoded to generic.
engity-com · Oct 18, 2024 · 415225d · 415225d
1 parent 975e972
commit 415225d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/docs/reference/alternatives.md b/docs/reference/alternatives.md
@@ -12,7 +12,7 @@ Especially if a containerized environment (like [Docker environment](environment
 
 ## Properties
 
-<<property("downloadUrl", "URL", "data-type.md#url", template_context="context/alternative-binary.md", default="https://github.com/engity-com/bifroest/releases/download/v{{.version}}/bifroest-{{.os}}-{{.arch}}-generic{{.packageExt}}")>>
+<<property("downloadUrl", "URL", "data-type.md#url", template_context="context/alternative-binary.md", default="https://github.com/engity-com/bifroest/releases/download/v{{.version}}/bifroest-{{.os}}-{{.arch}}-{{.edition}}{{.packageExt}}")>>
 URL where to download the alternative version of Bifröst. Usually we simply will get this from [the GitHub Releases of Bifröst](https://github.com/engity-com/bifroest/releases).
 
 <<property("location", "File Path", "data-type.md#file-path", template_context="context/alternative-binary.md", default="<os specific>")>>
@@ -22,5 +22,5 @@ A file that already exists, will not be downloaded again.
 
 The default value is different, depending on the platform Bifröst runs on:
 
-* Linux: `/var/lib/engity/bifroest/binaries/{{.version}}/{{.os}}-{{.arch}}{{.ext}}`
-* Window: `C:\ProgramData\Engity\Bifroest\binaries\{{.version}}\{{.os}}-{{.arch}}{{.ext}}`
+* Linux: `/var/lib/engity/bifroest/binaries/{{.version}}/{{.os}}-{{.arch}}-{{.edition}}{{.ext}}`
+* Window: `C:\ProgramData\Engity\Bifroest\binaries\{{.version}}\{{.os}}-{{.arch}}-{{.edition}}{{.ext}}`
diff --git a/pkg/alternatives/binaries.go b/pkg/alternatives/binaries.go
@@ -204,6 +204,8 @@ func (this alternativeResolutionContext) GetField(name string) (any, bool, error
 		return this.Architecture, true, nil
 	case "version":
 		return this.Version, true, nil
+	case "edition":
+		return "generic", true, nil
 	case "ext":
 		return this.Ext(), true, nil
 	case "packageExt":

diff --git a/pkg/configuration/alternatives.go b/pkg/configuration/alternatives.go
@@ -7,7 +7,7 @@ import (
 )
 
 var (
-	DefaultAlternativesDownloadUrl = template.MustNewUrl("https://github.com/engity-com/bifroest/releases/download/v{{.version}}/bifroest-{{.os}}-{{.arch}}-generic{{.packageExt}}")
+	DefaultAlternativesDownloadUrl = template.MustNewUrl("https://github.com/engity-com/bifroest/releases/download/v{{.version}}/bifroest-{{.os}}-{{.arch}}-{{.edition}}{{.packageExt}}")
 	DefaultAlternativesLocation    = template.MustNewString(defaultAlternativesLocation)
 )
 

diff --git a/pkg/configuration/alternatives_unix.go b/pkg/configuration/alternatives_unix.go
@@ -3,5 +3,5 @@
 package configuration
 
 var (
-	defaultAlternativesLocation = `/var/lib/engity/bifroest/binaries/{{.version}}/{{.os}}-{{.arch}}{{.ext}}`
+	defaultAlternativesLocation = `/var/lib/engity/bifroest/binaries/{{.version}}/{{.os}}-{{.arch}}-{{.edition}}{{.ext}}`
 )
diff --git a/pkg/configuration/alternatives_windows.go b/pkg/configuration/alternatives_windows.go
@@ -3,5 +3,5 @@
 package configuration
 
 var (
-	defaultAlternativesLocation = `C:\ProgramData\Engity\Bifroest\binaries\{{.version}}\{{.os}}-{{.arch}}{{.ext}}`
+	defaultAlternativesLocation = `C:\ProgramData\Engity\Bifroest\binaries\{{.version}}\{{.os}}-{{.arch}}-{{.edition}}{{.ext}}`
 )