Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4d900eafd1 | |||
| 38f9070c24 | |||
| 67d0ab1d9d | |||
| 7383b370f0 | |||
| 4c847e6de9 |
12
cmd/mcp/edit.go
Normal file
12
cmd/mcp/edit.go
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "github.com/spf13/cobra"
|
||||||
|
|
||||||
|
func editCmd() *cobra.Command {
|
||||||
|
return &cobra.Command{
|
||||||
|
Use: "edit <service>",
|
||||||
|
Short: "Open service definition in $EDITOR",
|
||||||
|
Args: cobra.ExactArgs(1),
|
||||||
|
RunE: runServiceEdit,
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -51,6 +51,7 @@ func main() {
|
|||||||
root.AddCommand(nodeCmd())
|
root.AddCommand(nodeCmd())
|
||||||
root.AddCommand(purgeCmd())
|
root.AddCommand(purgeCmd())
|
||||||
root.AddCommand(logsCmd())
|
root.AddCommand(logsCmd())
|
||||||
|
root.AddCommand(editCmd())
|
||||||
|
|
||||||
if err := root.Execute(); err != nil {
|
if err := root.Execute(); err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
version = "0.6.0";
|
version = pkgs.lib.removePrefix "v" (self.gitDescribe or self.shortRev or self.dirtyShortRev or "unknown");
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
packages.${system} = {
|
packages.${system} = {
|
||||||
|
|||||||
@@ -34,6 +34,9 @@ func (a *Agent) Deploy(ctx context.Context, req *mcpv1.DeployRequest) (*mcpv1.De
|
|||||||
filtered = append(filtered, cs)
|
filtered = append(filtered, cs)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if len(filtered) == 0 {
|
||||||
|
return nil, fmt.Errorf("component %q not found in service %q", target, serviceName)
|
||||||
|
}
|
||||||
components = filtered
|
components = filtered
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -63,8 +63,12 @@ func (a *Agent) Logs(req *mcpv1.LogsRequest, stream mcpv1.McpAgentService_LogsSe
|
|||||||
|
|
||||||
scanner := bufio.NewScanner(pr)
|
scanner := bufio.NewScanner(pr)
|
||||||
for scanner.Scan() {
|
for scanner.Scan() {
|
||||||
|
line := scanner.Bytes()
|
||||||
|
if len(line) == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
if err := stream.Send(&mcpv1.LogsResponse{
|
if err := stream.Send(&mcpv1.LogsResponse{
|
||||||
Data: append(scanner.Bytes(), '\n'),
|
Data: append(line, '\n'),
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
_ = cmd.Process.Kill()
|
_ = cmd.Process.Kill()
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -99,6 +99,12 @@ func (a *Agent) liveCheckServices(ctx context.Context) ([]*mcpv1.ServiceInfo, er
|
|||||||
|
|
||||||
if rc, ok := runtimeByName[containerName]; ok {
|
if rc, ok := runtimeByName[containerName]; ok {
|
||||||
ci.ObservedState = rc.State
|
ci.ObservedState = rc.State
|
||||||
|
if rc.Version != "" {
|
||||||
|
ci.Version = rc.Version
|
||||||
|
}
|
||||||
|
if rc.Image != "" {
|
||||||
|
ci.Image = rc.Image
|
||||||
|
}
|
||||||
if !rc.Started.IsZero() {
|
if !rc.Started.IsZero() {
|
||||||
ci.Started = timestamppb.New(rc.Started)
|
ci.Started = timestamppb.New(rc.Started)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user