Reverted to separate variable for version resolving

Roemer · Roemer · commit 72d82b3901a8 · 2025-08-14T14:07:56.000Z
diff --git a/features/src/docker-out/README.md b/features/src/docker-out/README.md
@@ -8,8 +8,11 @@ A feature which installs the Docker client and re-uses the host socket.
 "features": {
     "ghcr.io/postfinance/devcontainer-features/docker-out:0.1.0": {
         "version": "latest",
+        "versionResolve": false,
         "composeVersion": "latest",
-        "buildxVersion": "latest"
+        "composeVersionResolve": false,
+        "buildxVersion": "latest",
+        "buildxVersionResolve": false
     }
 }
 ```
@@ -18,9 +21,12 @@ A feature which installs the Docker client and re-uses the host socket.
 
 | Option | Description | Type | Default Value | Proposals |
 |-----|-----|-----|-----|-----|
-| version | The version of the Docker CLI to install. | string | latest | latest, 28.3.3!, 20.10 |
-| composeVersion | The version of the Compose plugin to install. | string | latest | latest, 2.39.1!, 2.29 |
-| buildxVersion | The version of the buildx plugin to install. | string | latest | latest, 0.26.1!, 0.10 |
+| version | The version of the Docker CLI to install. | string | latest | latest, 28.3.3, 20.10 |
+| versionResolve | Whether to resolve the version automatically. | boolean | false | true, false |
+| composeVersion | The version of the Compose plugin to install. | string | latest | latest, 2.39.1, 2.29 |
+| composeVersionResolve | Whether to resolve the version automatically. | boolean | false | true, false |
+| buildxVersion | The version of the buildx plugin to install. | string | latest | latest, 0.26.1, 0.10 |
+| buildxVersionResolve | Whether to resolve the version automatically. | boolean | false | true, false |
 
 ## Customizations
 
diff --git a/features/src/docker-out/devcontainer-feature.json b/features/src/docker-out/devcontainer-feature.json
@@ -8,31 +8,46 @@
             "type": "string",
             "proposals": [
                 "latest",
-                "28.3.3!",
+                "28.3.3",
                 "20.10"
             ],
             "default": "latest",
             "description": "The version of the Docker CLI to install."
         },
+        "versionResolve": {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether to resolve the version automatically."
+        },
         "composeVersion": {
             "type": "string",
             "proposals": [
                 "latest",
-                "2.39.1!",
+                "2.39.1",
                 "2.29"
             ],
             "default": "latest",
             "description": "The version of the Compose plugin to install."
         },
+        "composeVersionResolve": {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether to resolve the version automatically."
+        },
         "buildxVersion": {
             "type": "string",
             "proposals": [
                 "latest",
-                "0.26.1!",
+                "0.26.1",
                 "0.10"
             ],
             "default": "latest",
             "description": "The version of the buildx plugin to install."
+        },
+        "buildxVersionResolve": {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether to resolve the version automatically."
         }
     },
     "customizations": {
diff --git a/features/src/docker-out/install.sh b/features/src/docker-out/install.sh
@@ -6,5 +6,8 @@ esac
 
 "./installer_$ARCH" \
     -version="${VERSION:-"latest"}" \
+    -versionResolve="${VERSIONRESOLVE:-"false"}" \
     -composeVersion="${COMPOSEVERSION:-"latest"}" \
-    -buildxVersion="${BUILDXVERSION:-"latest"}"
+    -composeVersionResolve="${COMPOSEVERSIONRESOLVE:-"false"}" \
+    -buildxVersion="${BUILDXVERSION:-"latest"}" \
+    -buildxVersionResolve="${BUILDXVERSIONRESOLVE:-"false"}"
diff --git a/features/src/docker-out/installer.go b/features/src/docker-out/installer.go
@@ -33,21 +33,24 @@ func main() {
 func runMain() error {
 	// Handle the flags
 	version := flag.String("version", "latest", "The version of the Docker CLI to install.")
+	versionResolve := flag.Bool("versionResolve", false, "Whether to resolve the version to the latest available version.")
 	composeVersion := flag.String("composeVersion", "latest", "The version of the Compose plugin to install.")
+	composeVersionResolve := flag.Bool("composeVersionResolve", false, "Whether to resolve the version to the latest available version.")
 	buildxVersion := flag.String("buildxVersion", "latest", "The version of the buildx plugin to install.")
+	buildxVersionResolve := flag.Bool("buildxVersionResolve", false, "Whether to resolve the version to the latest available version.")
 
 	flag.Parse()
 
 	// Create and process the feature
 	feature := installer.NewFeature("Docker-Out", false,
 		&dockerCliComponent{
-			ComponentBase: installer.NewComponentBase("Docker CLI", *version),
+			ComponentBase: installer.NewComponentBase("Docker CLI", *version, *versionResolve),
 		},
 		&dockerComposeComponent{
-			ComponentBase: installer.NewComponentBase("Docker Compose", *composeVersion),
+			ComponentBase: installer.NewComponentBase("Docker Compose", *composeVersion, *composeVersionResolve),
 		},
 		&dockerBuildxComponent{
-			ComponentBase: installer.NewComponentBase("Docker buildx", *buildxVersion),
+			ComponentBase: installer.NewComponentBase("Docker buildx", *buildxVersion, *buildxVersionResolve),
 		},
 	)
 	return feature.Process()
diff --git a/features/src/go/README.md b/features/src/go/README.md
@@ -8,6 +8,7 @@ A feature which installs Go.
 "features": {
     "ghcr.io/postfinance/devcontainer-features/go:0.1.0": {
         "version": "latest",
+        "versionResolve": false,
         "downloadRegistryBase": "",
         "downloadRegistryPath": ""
     }
@@ -18,7 +19,8 @@ A feature which installs Go.
 
 | Option | Description | Type | Default Value | Proposals |
 |-----|-----|-----|-----|-----|
-| version | The version of Go to install. | string | latest | latest, 1.24, 1.21.8! |
+| version | The version of Go to install. | string | latest | latest, 1.24, 1.21.8 |
+| versionResolve | Whether to resolve the version automatically. | boolean | false | true, false |
 | downloadRegistryBase | The download registry to use for Go binaries. | string | &lt;empty&gt; | https://mycompany.com/artifactory/dl-google-generic-remote |
 | downloadRegistryPath | The download registry path to use for Go binaries. | string | &lt;empty&gt; |  |
 
diff --git a/features/src/go/devcontainer-feature.json b/features/src/go/devcontainer-feature.json
@@ -9,11 +9,16 @@
             "proposals": [
                 "latest",
                 "1.24",
-                "1.21.8!"
+                "1.21.8"
             ],
             "default": "latest",
             "description": "The version of Go to install."
         },
+        "versionResolve":{
+            "type":"boolean",
+            "default": false,
+            "description": "Whether to resolve the version automatically."
+        },
         "downloadRegistryBase": {
             "type": "string",
             "default": "",
diff --git a/features/src/go/install.sh b/features/src/go/install.sh
@@ -6,5 +6,6 @@ esac
 
 "./installer_$ARCH" \
     -version="${VERSION:-"latest"}" \
-    -downloadRegistryBase="${DOWNLOAD_REGISTRY_BASE:-""}" \
-    -downloadRegistryPath="${DOWNLOAD_REGISTRY_PATH:-""}"
+    -versionResolve="${VERSIONRESOLVE:-false}" \
+    -downloadRegistryBase="${DOWNLOADREGISTRYBASE:-""}" \
+    -downloadRegistryPath="${DOWNLOADREGISTRYPATH:-""}"
diff --git a/features/src/go/installer.go b/features/src/go/installer.go
@@ -36,6 +36,7 @@ func main() {
 func runMain() error {
 	// Handle the flags
 	version := flag.String("version", "latest", "The version of Go to install.")
+	versionResolve := flag.Bool("versionResolve", false, "Whether to resolve the version to the latest available version.")
 	downloadRegistryBase := flag.String("downloadRegistryBase", "", "The download registry to use for Go binaries.")
 	downloadRegistryPath := flag.String("downloadRegistryPath", "", "The download registry path to use for Go binaries.")
 	flag.Parse()
@@ -51,7 +52,7 @@ func runMain() error {
 	// Create and process the feature
 	feature := installer.NewFeature("Go", true,
 		&goComponent{
-			ComponentBase:        installer.NewComponentBase("Go", *version),
+			ComponentBase:        installer.NewComponentBase("Go", *version, *versionResolve),
 			DownloadRegistryBase: *downloadRegistryBase,
 			DownloadRegistryPath: *downloadRegistryPath,
 		})
diff --git a/features/src/zig/README.md b/features/src/zig/README.md
@@ -8,6 +8,7 @@ A feature which installs Zig.
 "features": {
     "ghcr.io/postfinance/devcontainer-features/zig:0.1.0": {
         "version": "latest",
+        "versionResolve": false,
         "downloadRegistryBase": "",
         "downloadRegistryPath": ""
     }
@@ -18,7 +19,8 @@ A feature which installs Zig.
 
 | Option | Description | Type | Default Value | Proposals |
 |-----|-----|-----|-----|-----|
-| version | The version of Zig to install. | string | latest | latest, 0.13.0!, 0.12 |
+| version | The version of Zig to install. | string | latest | latest, 0.13.0, 0.12 |
+| versionResolve | Whether to resolve the version automatically. | boolean | false | true, false |
 | downloadRegistryBase | The download registry to use for Zig binaries. | string | &lt;empty&gt; | https://mycompany.com/artifactory/ziglang-generic-remote |
 | downloadRegistryPath | The download registry path to use for Zig binaries. | string | &lt;empty&gt; |  |
 
diff --git a/features/src/zig/devcontainer-feature.json b/features/src/zig/devcontainer-feature.json
@@ -8,12 +8,17 @@
             "type": "string",
             "proposals": [
                 "latest",
-                "0.13.0!",
+                "0.13.0",
                 "0.12"
             ],
             "default": "latest",
             "description": "The version of Zig to install."
         },
+        "versionResolve":{
+            "type":"boolean",
+            "default": false,
+            "description": "Whether to resolve the version automatically."
+        },
         "downloadRegistryBase": {
             "type": "string",
             "default": "",
diff --git a/features/src/zig/install.sh b/features/src/zig/install.sh
@@ -6,5 +6,6 @@ esac
 
 "./installer_$ARCH" \
     -version="${VERSION:-"latest"}" \
-    -downloadRegistryBase="${DOWNLOAD_REGISTRY_BASE:-""}" \
-    -downloadRegistryPath="${DOWNLOAD_REGISTRY_PATH:-""}"
+    -versionResolve="${VERSIONRESOLVE:-"false"}" \
+    -downloadRegistryBase="${DOWNLOADREGISTRYBASE:-""}" \
+    -downloadRegistryPath="${DOWNLOADREGISTRYPATH:-""}"
diff --git a/features/src/zig/installer.go b/features/src/zig/installer.go
@@ -34,6 +34,7 @@ func main() {
 func runMain() error {
 	// Handle the flags
 	version := flag.String("version", "latest", "The version of Zig to install.")
+	versionResolve := flag.Bool("versionResolve", false, "Whether to resolve the version to the latest available version.")
 	downloadRegistryBase := flag.String("downloadRegistryBase", "", "The download registry to use for Zig binaries.")
 	downloadRegistryPath := flag.String("downloadRegistryPath", "", "The download registry path to use for Zig binaries.")
 	flag.Parse()
@@ -49,7 +50,7 @@ func runMain() error {
 	// Create and process the feature
 	feature := installer.NewFeature("Zig", true,
 		&zigComponent{
-			ComponentBase:        installer.NewComponentBase("Zig", *version),
+			ComponentBase:        installer.NewComponentBase("Zig", *version, *versionResolve),
 			DownloadRegistryBase: *downloadRegistryBase,
 			DownloadRegistryPath: *downloadRegistryPath,
 		})
diff --git a/features/test/docker-out/scenarios.json b/features/test/docker-out/scenarios.json
@@ -8,7 +8,7 @@
         },
         "features": {
             "./docker-out": {
-                "version": "27.2.1!"
+                "version": "27.2.1"
             }
         }
     }
diff --git a/features/test/go/install-with-resolve.sh b/features/test/go/install-with-resolve.sh
diff --git a/features/test/go/scenarios.json b/features/test/go/scenarios.json
@@ -8,11 +8,11 @@
         },
         "features": {
             "./go": {
-                "version": "1.23.1!"
+                "version": "1.23.1"
             }
         }
     },
-    "install-non-exact": {
+    "install-with-resolve": {
         "build": {
             "dockerfile": "Dockerfile",
             "options": [
@@ -21,7 +21,8 @@
         },
         "features": {
             "./go": {
-                "version": "1.23"
+                "version": "1.23",
+                "versionResolve": true
             }
         }
     }
diff --git a/installer/feature.go b/installer/feature.go
@@ -36,8 +36,7 @@ func (f *Feature) Process() error {
 	for _, component := range f.components {
 		fmt.Printf("Processing component '%s'\n", component.GetName())
 		requestedVersionString := component.GetRequestedVersion()
-		isExactVersion := strings.HasSuffix(requestedVersionString, "!")
-		requestedVersionString = strings.TrimSuffix(requestedVersionString, "!")
+		resolveVersion := component.GetResolveVersion()
 
 		// Skip if "none" version was requested
 		if requestedVersionString == VERSION_NONE {
@@ -83,11 +82,12 @@ func (f *Feature) Process() error {
 		} else {
 			// Parse the reference version
 			referenceVersion := gover.ParseSimple(strings.Split(strings.ReplaceAll(requestedVersionString, "-", "."), "."))
-			if isExactVersion {
+			if !resolveVersion {
 				// The exact version was passed, so directly use it
 				versionToInstall = referenceVersion
 				versionToInstall.Raw = requestedVersionString
 			} else {
+				fmt.Println("Resolving version...")
 				// Get all versions
 				allVersions, err := component.GetAllVersions()
 				if err != nil {
@@ -126,6 +126,8 @@ type IComponent interface {
 	GetName() string
 	// Gets the requestedVersion of the component.
 	GetRequestedVersion() string
+	// Gets the resolveVersion of the component.
+	GetResolveVersion() bool
 	// Returns a list of all available versions.
 	GetAllVersions() ([]*gover.Version, error)
 	// Returns the latest version. Defaults to nil which then uses the max of GetAllVersions.
@@ -135,17 +137,19 @@ type IComponent interface {
 }
 
 // Constructor for a base component.
-func NewComponentBase(name string, requestedVersion string) *ComponentBase {
+func NewComponentBase(name string, requestedVersion string, resolveVersion bool) *ComponentBase {
 	return &ComponentBase{
 		name:             name,
 		requestedVersion: requestedVersion,
+		resolveVersion:   resolveVersion,
 	}
 }
 
 // Base struct for a component with common things.
 type ComponentBase struct {
 	name             string
 	requestedVersion string
+	resolveVersion   bool
 }
 
 // Gets the name of the component.
@@ -158,6 +162,11 @@ func (c *ComponentBase) GetRequestedVersion() string {
 	return c.requestedVersion
 }
 
+// Gets the resolveVersion of the component.
+func (c *ComponentBase) GetResolveVersion() bool {
+	return c.resolveVersion
+}
+
 // Gets all possible version. Returns nil if no implementation is provided.
 func (c *ComponentBase) GetAllVersions() ([]*gover.Version, error) {
 	return nil, nil
