feat: interpret current arg to get current platform

Signed-off-by: Justin Chadwell <[email protected]>

cmd/dagger/flags.go

@@ -17,6 +17,7 @@ import (
  "strconv"
  "strings"
 
+ "github.com/containerd/containerd/platforms"
  "github.com/moby/buildkit/util/gitutil"
  "github.com/spf13/pflag"
 
@@ -44,6 +45,8 @@ func GetCustomFlagValue(name string) DaggerValue {
  return &moduleSourceValue{}
  case Module:
  return &moduleValue{}
+ case Platform:
+ return &platformValue{}
  }
  return nil
 }
@@ -69,6 +72,8 @@ func GetCustomFlagValueSlice(name string) DaggerValue {
  return &sliceValue[*moduleSourceValue]{}
  case Module:
  return &sliceValue[*moduleValue]{}
+ case Platform:
+ return &sliceValue[*platformValue]{}
  }
  return nil
 }
@@ -592,6 +597,36 @@ func (v *moduleSourceValue) Get(ctx context.Context, dag *dagger.Client, _ *dagg
  return modConf.Source, nil
 }
 
+type platformValue struct {
+ platform string
+}
+
+func (v *platformValue) Type() string {
+ return Platform
+}
+
+func (v *platformValue) Set(s string) error {
+ if s == "" {
+ return fmt.Errorf("platform cannot be empty")
+ }
+ if s == "current" {
+ s = platforms.DefaultString()
+ }
+ v.platform = s
+ return nil
+}
+
+func (v *platformValue) String() string {
+ return v.platform
+}
+
+func (v *platformValue) Get(ctx context.Context, dag *dagger.Client, _ *dagger.ModuleSource) (any, error) {
+ if v.platform == "" {
+ return nil, fmt.Errorf("platform cannot be empty")
+ }
+ return v.platform, nil
+}
+
 // AddFlag adds a flag appropriate for the argument type. Should return a
 // pointer to the value.
 func (r *modFunctionArg) AddFlag(flags *pflag.FlagSet, dag *dagger.Client) (any, error) {

cmd/dagger/functions.go

@@ -30,6 +30,7 @@ const (
  CacheVolume string = "CacheVolume"
  ModuleSource string = "ModuleSource"
  Module string = "Module"
+ Platform string = "Platform"
 )
 
 var funcGroup = &cobra.Group{

core/integration/module_call_test.go

@@ -5,6 +5,7 @@ import (
  "strings"
  "testing"
 
+ "github.com/containerd/containerd/platforms"
  "github.com/moby/buildkit/identity"
  "github.com/stretchr/testify/require"
 
@@ -526,6 +527,9 @@ func (m *Test) ToPlatform(platform string) Platform {
  out, err := modGen.With(daggerCall("from-platform", "--platform", "linux/amd64")).Stdout(ctx)
  require.NoError(t, err)
  require.Equal(t, "linux/amd64", out)
+ out, err = modGen.With(daggerCall("from-platform", "--platform", "current")).Stdout(ctx)
+ require.NoError(t, err)
+ require.Equal(t, platforms.DefaultString(), out)
  _, err = modGen.With(daggerCall("from-platform", "--platform", "invalid")).Stdout(ctx)
  require.ErrorContains(t, err, "unknown operating system or architecture")