move RunService from CLI to the client, print output in the command

This commit is contained in:
Pavel Sviderski
2024-11-13 19:52:46 +10:00
parent 6736839ccb
commit 5e79697505
3 changed files with 48 additions and 27 deletions
@@ -1,4 +1,4 @@
package cli
package client
import (
"context"
@@ -16,26 +16,28 @@ type ServiceOptions struct {
Publish []string
}
func (cli *CLI) RunService(ctx context.Context, clusterName string, opts *ServiceOptions) error {
c, err := cli.ConnectCluster(ctx, clusterName)
if err != nil {
return fmt.Errorf("connect to cluster: %w", err)
}
defer func() {
_ = c.Close()
}()
type RunServiceResponse struct {
ID string
Name string
MachineName string
}
func (c *Client) RunService(ctx context.Context, opts *ServiceOptions) (RunServiceResponse, error) {
var resp RunServiceResponse
listResp, err := c.ListMachines(ctx, &emptypb.Empty{})
if err != nil {
return fmt.Errorf("list machines: %w", err)
return resp, fmt.Errorf("list machines: %w", err)
}
// TODO: update ListMachine endpoint to return machine status based on the Corrosion member list.
// TODO: find the first available machine (state UP).
machineIP, _ := listResp.Machines[0].Machine.Network.ManagementIp.ToAddr()
resp.MachineName = listResp.Machines[0].Machine.Name
if opts.Machine != "" {
for _, m := range listResp.Machines {
if m.Machine.Name == opts.Machine || m.Machine.Id == opts.Machine {
machineIP, _ = m.Machine.Network.ManagementIp.ToAddr()
resp.MachineName = m.Machine.Name
break
}
}
@@ -44,20 +46,23 @@ func (cli *CLI) RunService(ctx context.Context, clusterName string, opts *Servic
md := metadata.Pairs("machines", machineIP.String())
ctx = metadata.NewOutgoingContext(ctx, md)
// TODO: generate a random service ID.
resp.ID = "todo-service-id"
// TODO: generate a random service name if not specified.
resp.Name = opts.Name
// TODO: generate a container name from the service name.
// TODO: set service labels on the container.
config := &container.Config{
Image: opts.Image,
}
// TODO: generate a container name from the service name.
// TODO: set service labels on the container.
resp, err := c.CreateContainer(ctx, config, nil, nil, nil, opts.Name)
createResp, err := c.CreateContainer(ctx, config, nil, nil, nil, opts.Name)
if err != nil {
return fmt.Errorf("create container: %w", err)
return resp, fmt.Errorf("create container: %w", err)
}
if err = c.StartContainer(ctx, createResp.ID, container.StartOptions{}); err != nil {
return resp, fmt.Errorf("start container: %w", err)
}
if err = c.StartContainer(ctx, resp.ID, container.StartOptions{}); err != nil {
return fmt.Errorf("start container: %w", err)
}
fmt.Printf("Service %q started with container ID %q\n", opts.Name, resp.ID)
return nil
return resp, nil
}