From e1530bb6f38ea84b7303c6ade59ac70487525c9d Mon Sep 17 00:00:00 2001 From: Pavel Sviderski Date: Fri, 14 Mar 2025 21:41:06 +1000 Subject: [PATCH] feat(deploy): load compose project --- cmd/uncloud/deploy.go | 68 ++++++++++++++++++++++++++++++---- go.mod | 5 ++- go.sum | 7 ++++ internal/cli/client/compose.go | 14 +++++++ 4 files changed, 85 insertions(+), 9 deletions(-) create mode 100644 internal/cli/client/compose.go diff --git a/cmd/uncloud/deploy.go b/cmd/uncloud/deploy.go index 1857df29..26790361 100644 --- a/cmd/uncloud/deploy.go +++ b/cmd/uncloud/deploy.go @@ -3,17 +3,16 @@ package main import ( "context" "fmt" + composecli "github.com/compose-spec/compose-go/v2/cli" + "github.com/compose-spec/compose-go/v2/graph" + "github.com/compose-spec/compose-go/v2/types" "github.com/spf13/cobra" "uncloud/internal/cli" ) type deployOptions struct { - //configPath string + files []string services []string - //machines []string - //env []string - //envFile string - //projectDir string cluster string } @@ -36,12 +35,65 @@ func NewDeployCommand() *cobra.Command { }, } - cmd.Flags().StringVarP(&opts.cluster, "cluster", "c", "", "Name of the cluster to deploy to (default is the current cluster)") + cmd.Flags().StringSliceVarP(&opts.files, "file", "f", nil, + "One or more Compose files to deploy services from. (default compose.yaml)") + cmd.Flags().StringVarP(&opts.cluster, "cluster", "c", "", + "Name of the cluster to deploy to (default is the current cluster)") return cmd } -// deploy parses the compose file and deploys the services to the Uncloud cluster. +// deploy parses the Compose file(s) and deploys the services. func deploy(ctx context.Context, uncli *cli.CLI, opts deployOptions) error { - return fmt.Errorf("not implemented") + project, err := loadComposeProject(ctx, opts) + if err != nil { + return err + } + + projectYAML, err := project.MarshalYAML() + if err != nil { + return err + } + + fmt.Println(string(projectYAML)) + + // TODO: move to ComposeDeployment. + err = graph.InDependencyOrder(ctx, project, + // TODO: properly handle dependency conditions. + func(ctx context.Context, name string, service types.ServiceConfig) error { + service, err := project.GetService(name) + if err != nil { + return err + } + + fmt.Println(service.Name) + + return nil + }) + + return nil +} + +func loadComposeProject(ctx context.Context, opts deployOptions) (*types.Project, error) { + options, err := composecli.NewProjectOptions( + opts.files, + // First apply os.Environment, always wins. + composecli.WithOsEnv, + // Read dot env file to populate project environment. + composecli.WithDotEnv, + // Get compose file path set by COMPOSE_FILE. + composecli.WithConfigFileEnv, + // If none was selected, get default compose.yaml file from current dir or parent folders. + composecli.WithDefaultConfigPath, + ) + if err != nil { + return nil, fmt.Errorf("create compose parser options: %w", err) + } + + project, err := options.LoadProject(ctx) + if err != nil { + return nil, fmt.Errorf("load compose file(s): %w", err) + } + + return project, nil } diff --git a/go.mod b/go.mod index 9937b767..63351828 100644 --- a/go.mod +++ b/go.mod @@ -11,6 +11,7 @@ require ( github.com/caddyserver/caddy/v2 v2.8.4 github.com/cenkalti/backoff/v4 v4.3.0 github.com/charmbracelet/huh v0.6.0 + github.com/compose-spec/compose-go/v2 v2.4.5 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf github.com/dgraph-io/badger/v3 v3.2103.5 github.com/distribution/reference v0.6.0 @@ -83,7 +84,6 @@ require ( github.com/charmbracelet/x/term v0.2.0 // indirect github.com/chzyer/readline v1.5.1 // indirect github.com/cloudflare/cfssl v1.6.4 // indirect - github.com/compose-spec/compose-go/v2 v2.4.5 // indirect github.com/containerd/console v1.0.4 // indirect github.com/containerd/containerd v1.7.24 // indirect github.com/containerd/containerd/api v1.7.19 // indirect @@ -269,6 +269,9 @@ require ( github.com/urfave/cli v1.22.16 // indirect github.com/vbatts/tar-split v0.11.6 // indirect github.com/vishvananda/netns v0.0.4 // indirect + github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect + github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect + github.com/xeipuuv/gojsonschema v1.2.0 // indirect github.com/zeebo/blake3 v0.2.4 // indirect go.etcd.io/bbolt v1.3.11 // indirect go.opencensus.io v0.24.0 // indirect diff --git a/go.sum b/go.sum index 722dc586..fdd33a3b 100644 --- a/go.sum +++ b/go.sum @@ -1069,6 +1069,13 @@ github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0 h1:GDDkbFiaK8jsSD github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw= github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b h1:FsyNrX12e5BkplJq7wKOLk0+C6LZ+KGXvuEcKUYm5ss= github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= +github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/internal/cli/client/compose.go b/internal/cli/client/compose.go new file mode 100644 index 00000000..35d2815a --- /dev/null +++ b/internal/cli/client/compose.go @@ -0,0 +1,14 @@ +package client + +import "github.com/compose-spec/compose-go/v2/types" + +type ComposeDeployment struct { + project *types.Project +} + +func NewComposeDeployment(project *types.Project) *ComposeDeployment { + return &ComposeDeployment{project: project} +} + +// TODO: implement Plan method to generate a deployment plan that consists of a sequence of operations with +// service Deployments.