feat: support x-machines placement constraints in compose files (#90)

OrlovEvgeny · web-flow · commit 31cd4c77e966 · 2025-07-10T16:46:29.000+10:00
diff --git a/cmd/ucind/cluster/create.go b/cmd/ucind/cluster/create.go
@@ -2,8 +2,8 @@ package cluster
 
 import (
 	"fmt"
-	"github.com/spf13/cobra"
 	"github.com/psviderski/uncloud/internal/ucind"
+	"github.com/spf13/cobra"
 )
 
 func NewCreateCommand() *cobra.Command {
diff --git a/cmd/ucind/cluster/remove.go b/cmd/ucind/cluster/remove.go
@@ -2,8 +2,8 @@ package cluster
 
 import (
 	"fmt"
-	"github.com/spf13/cobra"
 	"github.com/psviderski/uncloud/internal/ucind"
+	"github.com/spf13/cobra"
 )
 
 func NewRemoveCommand() *cobra.Command {
diff --git a/cmd/uncloud/machine/token.go b/cmd/uncloud/machine/token.go
@@ -2,9 +2,9 @@ package machine
 
 import (
 	"fmt"
-	"github.com/spf13/cobra"
 	"github.com/psviderski/uncloud/internal/daemon"
 	"github.com/psviderski/uncloud/internal/machine"
+	"github.com/spf13/cobra"
 )
 
 type tokenOptions struct {
diff --git a/experiment/talos_discovery.go b/experiment/talos_discovery.go
@@ -6,12 +6,12 @@ import (
 	"crypto/cipher"
 	"encoding/hex"
 	"fmt"
+	"github.com/psviderski/uncloud/internal/machine/network"
 	"github.com/siderolabs/discovery-api/api/v1alpha1/client/pb"
 	discovery "github.com/siderolabs/discovery-client/pkg/client"
 	"go.uber.org/zap"
 	"net/netip"
 	"time"
-	"github.com/psviderski/uncloud/internal/machine/network"
 )
 
 const (
diff --git a/internal/daemon/daemon.go b/internal/daemon/daemon.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 	systemd "github.com/coreos/go-systemd/daemon"
-	"log/slog"
 	"github.com/psviderski/uncloud/internal/machine"
+	"log/slog"
 )
 
 type Daemon struct {
diff --git a/internal/machine/api/proxy/backend.go b/internal/machine/api/proxy/backend.go
@@ -2,10 +2,10 @@ package proxy
 
 import (
 	"fmt"
+	"github.com/psviderski/uncloud/internal/machine/api/pb"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/encoding/protowire"
 	"google.golang.org/protobuf/proto"
-	"github.com/psviderski/uncloud/internal/machine/api/pb"
 )
 
 // One2ManyResponder converts upstream responses into messages from upstreams, so that multiple
diff --git a/internal/machine/cluster/cluster.go b/internal/machine/cluster/cluster.go
@@ -5,17 +5,17 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/psviderski/uncloud/internal/corrosion"
+	"github.com/psviderski/uncloud/internal/machine/api/pb"
+	"github.com/psviderski/uncloud/internal/machine/network"
+	"github.com/psviderski/uncloud/internal/machine/store"
+	"github.com/psviderski/uncloud/internal/secret"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/emptypb"
 	"log/slog"
 	"net/netip"
 	"time"
-	"github.com/psviderski/uncloud/internal/corrosion"
-	"github.com/psviderski/uncloud/internal/machine/api/pb"
-	"github.com/psviderski/uncloud/internal/machine/network"
-	"github.com/psviderski/uncloud/internal/machine/store"
-	"github.com/psviderski/uncloud/internal/secret"
 )
 
 type Cluster struct {
diff --git a/internal/machine/corroservice/config.go b/internal/machine/corroservice/config.go
@@ -4,10 +4,10 @@ import (
 	"bytes"
 	"fmt"
 	"github.com/BurntSushi/toml"
+	"github.com/psviderski/uncloud/internal/fs"
 	"net/netip"
 	"os"
 	"path/filepath"
-	"github.com/psviderski/uncloud/internal/fs"
 )
 
 const (
diff --git a/internal/machine/network/tunnel/tunnel.go b/internal/machine/network/tunnel/tunnel.go
@@ -3,13 +3,13 @@ package tunnel
 import (
 	"context"
 	"fmt"
+	"github.com/psviderski/uncloud/internal/secret"
 	"golang.zx2c4.com/wireguard/conn"
 	"golang.zx2c4.com/wireguard/device"
 	"golang.zx2c4.com/wireguard/tun/netstack"
 	"net"
 	"net/netip"
 	"time"
-	"github.com/psviderski/uncloud/internal/secret"
 )
 
 const (
diff --git a/internal/machine/network/wireguard.go b/internal/machine/network/wireguard.go
@@ -2,10 +2,10 @@ package network
 
 import (
 	"fmt"
+	"github.com/psviderski/uncloud/internal/secret"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 	"net/netip"
 	"time"
-	"github.com/psviderski/uncloud/internal/secret"
 )
 
 const (
diff --git a/internal/machine/network/wireguard_linux.go b/internal/machine/network/wireguard_linux.go
@@ -6,6 +6,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/psviderski/uncloud/internal/secret"
 	"github.com/vishvananda/netlink"
 	"go4.org/netipx"
 	"golang.org/x/sys/unix"
@@ -17,7 +18,6 @@ import (
 	"slices"
 	"sync"
 	"time"
-	"github.com/psviderski/uncloud/internal/secret"
 )
 
 type WireGuardNetwork struct {
diff --git a/internal/machine/state.go b/internal/machine/state.go
@@ -3,10 +3,10 @@ package machine
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/psviderski/uncloud/internal/machine/network"
 	"os"
 	"path/filepath"
 	"sync"
-	"github.com/psviderski/uncloud/internal/machine/network"
 )
 
 const (
diff --git a/internal/machine/store/store.go b/internal/machine/store/store.go
@@ -5,10 +5,10 @@ import (
 	_ "embed"
 	"errors"
 	"fmt"
-	"google.golang.org/protobuf/encoding/protojson"
-	"log/slog"
 	"github.com/psviderski/uncloud/internal/corrosion"
 	"github.com/psviderski/uncloud/internal/machine/api/pb"
+	"google.golang.org/protobuf/encoding/protojson"
+	"log/slog"
 )
 
 var (
diff --git a/internal/machine/token.go b/internal/machine/token.go
@@ -4,9 +4,9 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"github.com/psviderski/uncloud/internal/secret"
 	"net/netip"
 	"strings"
-	"github.com/psviderski/uncloud/internal/secret"
 )
 
 const (
diff --git a/pkg/client/compose/machines.go b/pkg/client/compose/machines.go
@@ -0,0 +1,83 @@
+package compose
+
+import (
+	"fmt"
+	"strings"
+)
+
+const MachinesExtensionKey = "x-machines"
+
+// MachinesSource represents the parsed x-machines extension data as slice of strings
+type MachinesSource []string
+
+// DecodeMapstructure implements custom decoding for multiple input types
+func (m *MachinesSource) DecodeMapstructure(value interface{}) error {
+	switch v := value.(type) {
+	case *MachinesSource:
+		// Handle case where compose-go passes a pointer to an already created instance
+		*m = *v
+		return nil
+	case MachinesSource:
+		// Handle case where compose-go passes a direct instance
+		*m = v
+		return nil
+	case string:
+		// Support single string value or comma-separated values
+		// x-machines: my-machine or x-machines: "machine-1,machine-2"
+		machines, err := parseMachineNames(v)
+		if err != nil {
+			return err
+		}
+		*m = MachinesSource(machines)
+		return nil
+	case []string:
+		// Support string array: x-machines: ["machine-1", "machine-2"]
+		machines, err := validateMachineNames(v)
+		if err != nil {
+			return err
+		}
+		*m = MachinesSource(machines)
+		return nil
+	case []interface{}:
+		// Support interface array that may come from YAML parsing
+		machineNames := make([]string, 0, len(v))
+		for i, machine := range v {
+			str, ok := machine.(string)
+			if !ok {
+				return fmt.Errorf("x-machines[%d] is not a string, got %T", i, machine)
+			}
+			machineNames = append(machineNames, str)
+		}
+		machines, err := validateMachineNames(machineNames)
+		if err != nil {
+			return err
+		}
+		*m = MachinesSource(machines)
+		return nil
+	default:
+		return fmt.Errorf("x-machines must be a string or list of strings, got %T", value)
+	}
+}
+
+// parseMachineNames parses a single string that may contain comma-separated machine names
+func parseMachineNames(machinesStr string) ([]string, error) {
+	// Split by comma and process each machine name, works for both single and multiple values
+	parts := strings.Split(machinesStr, ",")
+	machines := make([]string, 0, len(parts))
+	for _, part := range parts {
+		machines = append(machines, strings.TrimSpace(part))
+	}
+	return validateMachineNames(machines)
+}
+
+// validateMachineNames validates machine names to ensure they are not empty and contain valid characters.
+func validateMachineNames(machines []string) ([]string, error) {
+	for i, machine := range machines {
+		machine = strings.TrimSpace(machine)
+		if machine == "" {
+			return nil, fmt.Errorf("x-machines[%d] cannot be empty", i)
+		}
+		machines[i] = machine
+	}
+	return machines, nil
+}
diff --git a/pkg/client/compose/project.go b/pkg/client/compose/project.go
@@ -5,7 +5,7 @@ package compose
 import (
 	"context"
 	"fmt"
-
+	
 	composecli "github.com/compose-spec/compose-go/v2/cli"
 	"github.com/compose-spec/compose-go/v2/types"
 )
@@ -25,24 +25,25 @@ func LoadProject(ctx context.Context, paths []string, opts ...composecli.Project
 		// If none was selected, get default Compose file names from current or parent folders.
 		composecli.WithDefaultConfigPath,
 		composecli.WithExtension(PortsExtensionKey, PortsSource{}),
+		composecli.WithExtension(MachinesExtensionKey, MachinesSource{}),
 	}
-
+	
 	options, err := composecli.NewProjectOptions(
 		paths,
 		append(defaultOpts, opts...)...,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("create compose parser options: %w", err)
 	}
-
+	
 	project, err := options.LoadProject(ctx)
 	if err != nil {
 		return nil, err
 	}
-
+	
 	if project, err = transformServicesPortsExtension(project); err != nil {
 		return nil, err
 	}
-
+	
 	return project, nil
 }
diff --git a/pkg/client/compose/service.go b/pkg/client/compose/service.go
@@ -55,13 +55,16 @@ func ServiceSpecFromCompose(project *types.Project, serviceName string) (api.Ser
 		},
 		Name: serviceName,
 		Mode: api.ServiceModeReplicated,
-		// TODO: implement and map x-machines to Placement.
 	}
 
 	if ports, ok := service.Extensions[PortsExtensionKey].([]api.PortSpec); ok {
 		spec.Ports = ports
 	}
 
+	if machines, ok := service.Extensions[MachinesExtensionKey].(MachinesSource); ok {
+		spec.Placement.Machines = []string(machines)
+	}
+
 	// Map LogDriver if specified
 	if service.Logging != nil && service.Logging.Driver != "" {
 		spec.Container.LogDriver = &api.LogDriver{
@@ -85,6 +88,7 @@ func ServiceSpecFromCompose(project *types.Project, serviceName string) (api.Ser
 		default:
 			return spec, fmt.Errorf("unsupported deploy mode: '%s'", service.Deploy.Mode)
 		}
+
 	}
 
 	// TODO: can service.tmpfs be handled as tmpfs volume mounts as well?
diff --git a/pkg/client/compose/service_test.go b/pkg/client/compose/service_test.go
diff --git a/test/e2e/compose_deploy_test.go b/test/e2e/compose_deploy_test.go
diff --git a/test/e2e/fixtures/compose-placement-comma.yaml b/test/e2e/fixtures/compose-placement-comma.yaml
diff --git a/test/e2e/fixtures/compose-placement-nonexistent.yaml b/test/e2e/fixtures/compose-placement-nonexistent.yaml
diff --git a/test/e2e/fixtures/compose-placement.yaml b/test/e2e/fixtures/compose-placement.yaml

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ package cluster`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`		`- "github.com/spf13/cobra"`
`6`	`5`	`"github.com/psviderski/uncloud/internal/ucind"`
	`6`	`+ "github.com/spf13/cobra"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func NewCreateCommand() *cobra.Command {`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@ package machine`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`		`- "github.com/spf13/cobra"`
`6`	`5`	`"github.com/psviderski/uncloud/internal/daemon"`
`7`	`6`	`"github.com/psviderski/uncloud/internal/machine"`
	`7`	`+ "github.com/spf13/cobra"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`type tokenOptions struct {`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"fmt"`
`6`	`6`	`systemd "github.com/coreos/go-systemd/daemon"`
`7`		`- "log/slog"`
`8`	`7`	`"github.com/psviderski/uncloud/internal/machine"`
	`8`	`+ "log/slog"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type Daemon struct {`