Merge branch 'main' into landau/shift-plugins-to-config

jetify-com · mikeland73 · Feb 29, 2024 · Feb 22, 2024 · Feb 22, 2024 · Feb 22, 2024
commit 908f9a8c92544d88c654cf7396e33df6a81eb0aa
diff --git a/internal/devconfig/file.go b/internal/devconfig/file.go
@@ -37,7 +37,6 @@ const (
 type ConfigFile struct {
 	Name        string `json:"name,omitempty"`
 	Description string `json:"description,omitempty"`
-	Version     string `json:"version"`
 
 	// PackagesMutator is the slice of Nix packages that devbox makes available in
 	// its environment. Deliberately do not omitempty.

diff --git a/internal/plugin/plugin.go b/internal/plugin/plugin.go
@@ -14,7 +14,6 @@ import (
 	"text/template"
 
 	"github.com/pkg/errors"
-	"github.com/samber/lo"
 	"go.jetpack.io/devbox/internal/devconfig"
 	"go.jetpack.io/devbox/internal/devpkg"
 
@@ -44,7 +43,8 @@ type config struct {
 	DeprecatedDescription string `json:"readme"`
 	// If true, we remove the package that triggered this plugin from the environment
 	// Useful when we want to replace with flake
-	RemoveTriggerPackage bool `json:"__remove_trigger_package,omitempty"`
+	RemoveTriggerPackage bool   `json:"__remove_trigger_package,omitempty"`
+	Version              string `json:"version"`
 }
 
 func (c *config) ProcessComposeYaml() (string, string) {
@@ -283,9 +283,5 @@ func (c *config) Description() string {
 	if c == nil {
 		return ""
 	}
-	return lo.Ternary(
-		c.ConfigFile.Description != "",
-		c.ConfigFile.Description,
-		c.DeprecatedDescription,
-	)
+	return cmp.Or(c.ConfigFile.Description, c.DeprecatedDescription)
 }