From b04cdcd83274c79633e34e29fb2fb2f990d37da8 Mon Sep 17 00:00:00 2001 From: Stefan Majer Date: Thu, 5 Nov 2026 08:13:45 +0100 Subject: [PATCH 1/8] Add housekeeping command --- cmd/admin/v2/machine.go | 35 ++++++++++++++++++++++++++++++++++- cmd/completion/machine.go | 3 +++ go.mod | 12 ++++++------ go.sum | 24 ++++++++++++------------ 4 files changed, 55 insertions(+), 19 deletions(-) diff --git a/cmd/admin/v2/machine.go b/cmd/admin/v2/machine.go index 7f37594..0a60df1 100644 --- a/cmd/admin/v2/machine.go +++ b/cmd/admin/v2/machine.go @@ -10,6 +10,7 @@ import ( "path/filepath" "strings" + "github.com/metal-stack/api/go/enum" "github.com/metal-stack/api/go/errorutil" adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" @@ -228,7 +229,19 @@ If ~/.ssh/[id_ed25519.pub | id_rsa.pub | id_dsa.pub] is present it will be picke firewallSSHCmd.Flags().StringP("identity", "i", "~/.ssh/id_rsa", "specify identity file to SSH to the firewall like: -i path/to/id_rsa") firewallSSHCmd.Flags().String("reason", "", "the reason why to connect to the firewall through SSH") - return genericcli.NewCmds(cmdsConfig, bmcCmd, lockCmd, taintCmd, consoleCmd, consolePasswordCmd, firewallSSHCmd) + housekeepingCmd := &cobra.Command{ + Use: "housekeeping", + Short: "start a specific housekeeping action on machines", + RunE: func(cmd *cobra.Command, args []string) error { + return w.housekeeping(cmd.Context()) + }, + ValidArgsFunction: c.Completion.Machine, + } + housekeepingCmd.Flags().String("action", "", "the housekeeping action to perform on all machines") + genericcli.Must(housekeepingCmd.RegisterFlagCompletionFunc("action", c.Completion.MachineHousekeepingActions)) + genericcli.Must(housekeepingCmd.MarkFlagRequired("action")) + + return genericcli.NewCmds(cmdsConfig, bmcCmd, lockCmd, taintCmd, consoleCmd, consolePasswordCmd, firewallSSHCmd, housekeepingCmd) } func (c *machine) Create(rq *apiv2.MachineServiceCreateRequest) (*apiv2.Machine, error) { @@ -592,3 +605,23 @@ func (c *machine) firewallSSH(ctx context.Context, args []string) (err error) { } return s.Connect(nil) } + +func (c *machine) housekeeping(ctx context.Context) (err error) { + actionString := viper.GetString("action") + + action, err := enum.GetEnum[adminv2.MachineHousekeepingAction](actionString) + if err != nil { + return fmt.Errorf("unknown housekeeping action: %s", actionString) + } + + result, err := c.c.Client.Adminv2().Machine().Housekeeping(ctx, &adminv2.MachineServiceHousekeepingRequest{ + Action: adminv2.MachineHousekeepingAction(action), + }) + if err != nil { + return err + } + + fmt.Fprintf(c.c.Out, "housekeeping action:%s finished on these machines:%v", actionString, result.ModifiedMachineIds) + + return nil +} diff --git a/cmd/completion/machine.go b/cmd/completion/machine.go index 5f85edb..55bc1e1 100644 --- a/cmd/completion/machine.go +++ b/cmd/completion/machine.go @@ -79,3 +79,6 @@ func (c *Completion) MachineState(cmd *cobra.Command, args []string, toComplete func (c *Completion) MachineAllocationType(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { return c.genericEnums(apiv2.MachineAllocationType_name) } +func (c *Completion) MachineHousekeepingActions(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { + return c.genericEnums(adminv2.MachineHousekeepingAction_name) +} diff --git a/go.mod b/go.mod index 014566b..aff8af0 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/fatih/color v1.19.0 github.com/google/go-cmp v0.7.0 github.com/google/uuid v1.6.0 - github.com/metal-stack/api v0.9.0 + github.com/metal-stack/api v0.9.1-0.20261105065148-30bdfe14ab53 github.com/metal-stack/metal-console v0.8.2 github.com/metal-stack/metal-lib v0.26.4 github.com/metal-stack/v v1.0.3 @@ -17,7 +17,7 @@ require ( github.com/spf13/cobra v1.10.2 github.com/spf13/viper v1.21.0 github.com/stretchr/testify v1.12.1 - google.golang.org/grpc v1.84.0 + google.golang.org/grpc v1.85.0 google.golang.org/protobuf v1.36.12 sigs.k8s.io/yaml v1.6.0 ) @@ -26,7 +26,7 @@ require ( buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.12-20260825204119-511051f7f437.2 // indirect buf.build/go/protovalidate v1.4.0 // indirect buf.build/go/protoyaml v0.7.0 // indirect - cel.dev/cel-go v0.32.0 // indirect + cel.dev/cel-go v0.33.2 // indirect cel.dev/expr v0.25.3 // indirect connectrpc.com/connect/v2 v2.0.0 // indirect filippo.io/edwards25519 v1.2.0 // indirect @@ -90,7 +90,7 @@ require ( github.com/tailscale/wireguard-go v0.0.0-20260928213032-417aef361226 // indirect github.com/x448/float16 v0.8.4 // indirect go.yaml.in/yaml/v2 v2.4.4 // indirect - go.yaml.in/yaml/v3 v3.0.5 // indirect + go.yaml.in/yaml/v3 v3.0.6 // indirect go4.org/mem v0.0.0-20240501181205-ae6ca9944745 // indirect go4.org/netipx v0.0.0-20260823151212-3075585bcbeb // indirect golang.org/x/crypto v0.58.0 // indirect @@ -104,8 +104,8 @@ require ( golang.org/x/time v0.16.0 // indirect golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect golang.zx2c4.com/wireguard/windows v1.0.1 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20261019180522-ce908d29299b // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20261019180522-ce908d29299b // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20261026165753-2ffab32bce7e // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20261026165753-2ffab32bce7e // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gvisor.dev/gvisor v0.0.0-20260915211658-a6f909f08a72 // indirect diff --git a/go.sum b/go.sum index 85044b9..51a764e 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,8 @@ buf.build/go/protovalidate v1.4.0 h1:UjLrYbt5VX7+TMOs2+pG5FhZhIG1mSfK4EIopbb4LcM buf.build/go/protovalidate v1.4.0/go.mod h1:8vJfzNT6NIG2qm3uFsJDXMlRmG+bQJzbcIn1Aa0vPGs= buf.build/go/protoyaml v0.7.0 h1:z4oVoFicbpPefhT7WAykxUdfp0yEQlhMQ2mCZOY5V38= buf.build/go/protoyaml v0.7.0/go.mod h1:+a0cavd0uMvirb87xdu2ZMMmjlIQoiH/N2Ich5MGSQ0= -cel.dev/cel-go v0.32.0 h1:irvpFKr5EuGPyxeME03ERh0rii1TX+BDAnB9eL3IvNk= -cel.dev/cel-go v0.32.0/go.mod h1:DnVip7tpJSsgZymwfT+m1tnEVy3ivAjSMXPx12YrMkU= +cel.dev/cel-go v0.33.2 h1:eAcEdBguc6AFrGbPOyE0g168Uey4kKFW9J6qsBLSeMU= +cel.dev/cel-go v0.33.2/go.mod h1:DnVip7tpJSsgZymwfT+m1tnEVy3ivAjSMXPx12YrMkU= cel.dev/expr v0.25.3 h1:A2jO8jwOugrrovveCWfj0KEZOfqiLgAcwjpHPhzIGw0= cel.dev/expr v0.25.3/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4= connectrpc.com/connect v1.21.1 h1:h2kacdlzXpZU2OQFSv98xkjYXNUSr/ptxmGVbS/+CRM= @@ -197,8 +197,8 @@ github.com/mdlayher/sdnotify v1.0.0 h1:Ma9XeLVN/l0qpyx1tNeMSeTjCPH6NtuD6/N9XdTlQ github.com/mdlayher/sdnotify v1.0.0/go.mod h1:HQUmpM4XgYkhDLtd+Uad8ZFK1T9D5+pNxnXQjCeJlGE= github.com/mdlayher/socket v0.8.0 h1:1lIVvHAs3sT623kPkPDa+I0nLVusskwnpWzp6ZUcNyc= github.com/mdlayher/socket v0.8.0/go.mod h1:EhNb63aXqexVoTJDblxvDOSuIGIJinC4H5ZktnaJ6Rk= -github.com/metal-stack/api v0.9.0 h1:CvwxczHrA4fnNIvx/VzoWAFU4vLrZERG7dgVEcevnhk= -github.com/metal-stack/api v0.9.0/go.mod h1:U0CJxoo35jpS87HNDbVDrilxR106TnE5rJ/xSmgQkPg= +github.com/metal-stack/api v0.9.1-0.20261105065148-30bdfe14ab53 h1:C3tXQ9AnJ4paROSLCcTbS/P0GzPvvZxP/cXMeCEssVw= +github.com/metal-stack/api v0.9.1-0.20261105065148-30bdfe14ab53/go.mod h1:HFPC2zOhi2wB+q48Yq6P3G5o6K1Vl3sy04Dxpx89XtM= github.com/metal-stack/metal-console v0.8.2 h1:Y86penzEROJKcLica1PeE2ddtr9G0/u16HiCAYXaxxU= github.com/metal-stack/metal-console v0.8.2/go.mod h1:ZkselOaxF/iELFL9Tku3maXgpX4DM0CHjoG7CGuky6E= github.com/metal-stack/metal-lib v0.26.4 h1:Qg+JorX0AgQCkrCK07wvstGEoRcm/Y97E2UG5ZBAXjo= @@ -302,8 +302,8 @@ github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcY go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ= go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= -go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +go.yaml.in/yaml/v3 v3.0.6 h1:zcDfvjXEqTQmpjniUBLc91xYJMB2c4QOFxEF/LCEckM= +go.yaml.in/yaml/v3 v3.0.6/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= go4.org/mem v0.0.0-20240501181205-ae6ca9944745 h1:Tl++JLUCe4sxGu8cTpDzRLd3tN7US4hOxG5YpKCzkek= go4.org/mem v0.0.0-20240501181205-ae6ca9944745/go.mod h1:reUoABIJ9ikfM5sgtSF3Wushcza7+WeD01VB9Lirh3g= go4.org/netipx v0.0.0-20260823151212-3075585bcbeb h1:XBM4hvfwGAttkkiTIFfeigdfcL1xIfdKXqFdgiHGtDs= @@ -341,12 +341,12 @@ golang.zx2c4.com/wireguard v0.0.0-20260522210424-ecfc5a8d5446 h1:cqHQ3AycTHvM2R7 golang.zx2c4.com/wireguard v0.0.0-20260522210424-ecfc5a8d5446/go.mod h1:rpwXGsirqLqN2L0JDJQlwOboGHmptD5ZD6T2VmcqhTw= golang.zx2c4.com/wireguard/windows v1.0.1 h1:eOxiDVbywPC+ZQqvdCK7x+ZwWXKbYv50TtH8ysFIbw8= golang.zx2c4.com/wireguard/windows v1.0.1/go.mod h1:+fbT3FFdX4zzYDLwJh5+HPEcNN/3HyNdzhNSVsQM+zs= -google.golang.org/genproto/googleapis/api v0.0.0-20261019180522-ce908d29299b h1:nB3spRIaSPtxJpxb0k41yljROvm2Jrwfs2pSNdKS5y8= -google.golang.org/genproto/googleapis/api v0.0.0-20261019180522-ce908d29299b/go.mod h1:9N4vtjEwvgQKEdlFVQO0M44ErhecQ9DCSQfGoZ51M6w= -google.golang.org/genproto/googleapis/rpc v0.0.0-20261019180522-ce908d29299b h1:6WNWHZk91dp4gZ25642OALkuG1UVNZbwENJD19DnB8k= -google.golang.org/genproto/googleapis/rpc v0.0.0-20261019180522-ce908d29299b/go.mod h1:OaIUM3+LpYcK2GXM4FTmhWoIq371Owdr+Cc7/BsYHHc= -google.golang.org/grpc v1.84.0 h1:soMyaPJ8pAak5PIQ0DGBUir0XRo2fRoMqhNWMLlLxO0= -google.golang.org/grpc v1.84.0/go.mod h1:ljCht0DrxQrXBDRTZp52Qxh3Ffk8CdYm2sj4O2QN2C0= +google.golang.org/genproto/googleapis/api v0.0.0-20261026165753-2ffab32bce7e h1:e789sLZjeTdc02ZCQGTSzHOu0fR73+dwPQVKUp67Z88= +google.golang.org/genproto/googleapis/api v0.0.0-20261026165753-2ffab32bce7e/go.mod h1:vHV3wJM9WZyfV7GyB+OQGq5dWVrFwCDxapPK4WlRD88= +google.golang.org/genproto/googleapis/rpc v0.0.0-20261026165753-2ffab32bce7e h1:w3fy/G8OrJHYexn+u5y7hFyc8YRRIr7DCevtIOwAcGY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20261026165753-2ffab32bce7e/go.mod h1:OaIUM3+LpYcK2GXM4FTmhWoIq371Owdr+Cc7/BsYHHc= +google.golang.org/grpc v1.85.0 h1:BPBCfuVRQ1qvBhKDOq9uvQllMvO59rKsYhXpp7Dd8vw= +google.golang.org/grpc v1.85.0/go.mod h1:0rQrOD58yjal/0EaVbGBANindixsCZNQPDV3VKtaKuQ= google.golang.org/protobuf v1.36.12 h1:pJOKDDOyeXErUroCihFAd5LQuwXBSpVnKGrj5o/fwxc= google.golang.org/protobuf v1.36.12/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From a1911ade326195b20118afa26478fd50c575f9aa Mon Sep 17 00:00:00 2001 From: Stefan Majer Date: Thu, 5 Nov 2026 09:35:07 +0100 Subject: [PATCH 2/8] Fix --- cmd/admin/v2/machine.go | 7 +++---- go.mod | 6 +++--- go.sum | 12 ++++++------ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/cmd/admin/v2/machine.go b/cmd/admin/v2/machine.go index 0a60df1..cbf4bda 100644 --- a/cmd/admin/v2/machine.go +++ b/cmd/admin/v2/machine.go @@ -10,7 +10,6 @@ import ( "path/filepath" "strings" - "github.com/metal-stack/api/go/enum" "github.com/metal-stack/api/go/errorutil" adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" @@ -609,12 +608,12 @@ func (c *machine) firewallSSH(ctx context.Context, args []string) (err error) { func (c *machine) housekeeping(ctx context.Context) (err error) { actionString := viper.GetString("action") - action, err := enum.GetEnum[adminv2.MachineHousekeepingAction](actionString) - if err != nil { + action, ok := adminv2.MachineHousekeepingAction_value[actionString] + if !ok { return fmt.Errorf("unknown housekeeping action: %s", actionString) } - result, err := c.c.Client.Adminv2().Machine().Housekeeping(ctx, &adminv2.MachineServiceHousekeepingRequest{ + result, err := c.c.Client.Adminv2().Housekeeping().Machine(ctx, &adminv2.HousekeepingServiceMachineRequest{ Action: adminv2.MachineHousekeepingAction(action), }) if err != nil { diff --git a/go.mod b/go.mod index aff8af0..4046793 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/fatih/color v1.19.0 github.com/google/go-cmp v0.7.0 github.com/google/uuid v1.6.0 - github.com/metal-stack/api v0.9.1-0.20261105065148-30bdfe14ab53 + github.com/metal-stack/api v0.9.1-0.20261105083043-c057a14048cb github.com/metal-stack/metal-console v0.8.2 github.com/metal-stack/metal-lib v0.26.4 github.com/metal-stack/v v1.0.3 @@ -104,8 +104,8 @@ require ( golang.org/x/time v0.16.0 // indirect golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect golang.zx2c4.com/wireguard/windows v1.0.1 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20261026165753-2ffab32bce7e // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20261026165753-2ffab32bce7e // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20261104224025-d1e00e9f33ab // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20261104224025-d1e00e9f33ab // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gvisor.dev/gvisor v0.0.0-20260915211658-a6f909f08a72 // indirect diff --git a/go.sum b/go.sum index 51a764e..a18bfb7 100644 --- a/go.sum +++ b/go.sum @@ -197,8 +197,8 @@ github.com/mdlayher/sdnotify v1.0.0 h1:Ma9XeLVN/l0qpyx1tNeMSeTjCPH6NtuD6/N9XdTlQ github.com/mdlayher/sdnotify v1.0.0/go.mod h1:HQUmpM4XgYkhDLtd+Uad8ZFK1T9D5+pNxnXQjCeJlGE= github.com/mdlayher/socket v0.8.0 h1:1lIVvHAs3sT623kPkPDa+I0nLVusskwnpWzp6ZUcNyc= github.com/mdlayher/socket v0.8.0/go.mod h1:EhNb63aXqexVoTJDblxvDOSuIGIJinC4H5ZktnaJ6Rk= -github.com/metal-stack/api v0.9.1-0.20261105065148-30bdfe14ab53 h1:C3tXQ9AnJ4paROSLCcTbS/P0GzPvvZxP/cXMeCEssVw= -github.com/metal-stack/api v0.9.1-0.20261105065148-30bdfe14ab53/go.mod h1:HFPC2zOhi2wB+q48Yq6P3G5o6K1Vl3sy04Dxpx89XtM= +github.com/metal-stack/api v0.9.1-0.20261105083043-c057a14048cb h1:5zYKnoTDULNK+y98xAQfo8clP8lGdmZ+EVaH0fmaqWY= +github.com/metal-stack/api v0.9.1-0.20261105083043-c057a14048cb/go.mod h1:aL6rQWsPR1WphjO1YxF02H1eJbw3TmE7GIQi2m69b74= github.com/metal-stack/metal-console v0.8.2 h1:Y86penzEROJKcLica1PeE2ddtr9G0/u16HiCAYXaxxU= github.com/metal-stack/metal-console v0.8.2/go.mod h1:ZkselOaxF/iELFL9Tku3maXgpX4DM0CHjoG7CGuky6E= github.com/metal-stack/metal-lib v0.26.4 h1:Qg+JorX0AgQCkrCK07wvstGEoRcm/Y97E2UG5ZBAXjo= @@ -341,10 +341,10 @@ golang.zx2c4.com/wireguard v0.0.0-20260522210424-ecfc5a8d5446 h1:cqHQ3AycTHvM2R7 golang.zx2c4.com/wireguard v0.0.0-20260522210424-ecfc5a8d5446/go.mod h1:rpwXGsirqLqN2L0JDJQlwOboGHmptD5ZD6T2VmcqhTw= golang.zx2c4.com/wireguard/windows v1.0.1 h1:eOxiDVbywPC+ZQqvdCK7x+ZwWXKbYv50TtH8ysFIbw8= golang.zx2c4.com/wireguard/windows v1.0.1/go.mod h1:+fbT3FFdX4zzYDLwJh5+HPEcNN/3HyNdzhNSVsQM+zs= -google.golang.org/genproto/googleapis/api v0.0.0-20261026165753-2ffab32bce7e h1:e789sLZjeTdc02ZCQGTSzHOu0fR73+dwPQVKUp67Z88= -google.golang.org/genproto/googleapis/api v0.0.0-20261026165753-2ffab32bce7e/go.mod h1:vHV3wJM9WZyfV7GyB+OQGq5dWVrFwCDxapPK4WlRD88= -google.golang.org/genproto/googleapis/rpc v0.0.0-20261026165753-2ffab32bce7e h1:w3fy/G8OrJHYexn+u5y7hFyc8YRRIr7DCevtIOwAcGY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20261026165753-2ffab32bce7e/go.mod h1:OaIUM3+LpYcK2GXM4FTmhWoIq371Owdr+Cc7/BsYHHc= +google.golang.org/genproto/googleapis/api v0.0.0-20261104224025-d1e00e9f33ab h1:n6IDWZ1RzI/NberLoLLFNrjl1H45uhc4+WYsUf5lPPc= +google.golang.org/genproto/googleapis/api v0.0.0-20261104224025-d1e00e9f33ab/go.mod h1:vHV3wJM9WZyfV7GyB+OQGq5dWVrFwCDxapPK4WlRD88= +google.golang.org/genproto/googleapis/rpc v0.0.0-20261104224025-d1e00e9f33ab h1:8sYjjefPfQ+FZEh1ZwBAqK/NifJVhOxut8nRh3SJzZM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20261104224025-d1e00e9f33ab/go.mod h1:OaIUM3+LpYcK2GXM4FTmhWoIq371Owdr+Cc7/BsYHHc= google.golang.org/grpc v1.85.0 h1:BPBCfuVRQ1qvBhKDOq9uvQllMvO59rKsYhXpp7Dd8vw= google.golang.org/grpc v1.85.0/go.mod h1:0rQrOD58yjal/0EaVbGBANindixsCZNQPDV3VKtaKuQ= google.golang.org/protobuf v1.36.12 h1:pJOKDDOyeXErUroCihFAd5LQuwXBSpVnKGrj5o/fwxc= From 301d3122748e7e982c71fce0aeac73846e970a0f Mon Sep 17 00:00:00 2001 From: Stefan Majer Date: Thu, 5 Nov 2026 11:59:57 +0100 Subject: [PATCH 3/8] progress --- cmd/admin/v2/machine.go | 17 ++--------------- cmd/completion/machine.go | 3 --- cmd/tableprinters/common.go | 5 +++++ go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 10 insertions(+), 21 deletions(-) diff --git a/cmd/admin/v2/machine.go b/cmd/admin/v2/machine.go index cbf4bda..31634ce 100644 --- a/cmd/admin/v2/machine.go +++ b/cmd/admin/v2/machine.go @@ -237,8 +237,6 @@ If ~/.ssh/[id_ed25519.pub | id_rsa.pub | id_dsa.pub] is present it will be picke ValidArgsFunction: c.Completion.Machine, } housekeepingCmd.Flags().String("action", "", "the housekeeping action to perform on all machines") - genericcli.Must(housekeepingCmd.RegisterFlagCompletionFunc("action", c.Completion.MachineHousekeepingActions)) - genericcli.Must(housekeepingCmd.MarkFlagRequired("action")) return genericcli.NewCmds(cmdsConfig, bmcCmd, lockCmd, taintCmd, consoleCmd, consolePasswordCmd, firewallSSHCmd, housekeepingCmd) } @@ -606,21 +604,10 @@ func (c *machine) firewallSSH(ctx context.Context, args []string) (err error) { } func (c *machine) housekeeping(ctx context.Context) (err error) { - actionString := viper.GetString("action") - - action, ok := adminv2.MachineHousekeepingAction_value[actionString] - if !ok { - return fmt.Errorf("unknown housekeeping action: %s", actionString) - } - - result, err := c.c.Client.Adminv2().Housekeeping().Machine(ctx, &adminv2.HousekeepingServiceMachineRequest{ - Action: adminv2.MachineHousekeepingAction(action), - }) + result, err := c.c.Client.Adminv2().Housekeeping().MachineLiveliness(ctx, &adminv2.HousekeepingServiceMachineLivelinessRequest{}) if err != nil { return err } - fmt.Fprintf(c.c.Out, "housekeeping action:%s finished on these machines:%v", actionString, result.ModifiedMachineIds) - - return nil + return c.c.DescribePrinter.Print(result) } diff --git a/cmd/completion/machine.go b/cmd/completion/machine.go index 55bc1e1..5f85edb 100644 --- a/cmd/completion/machine.go +++ b/cmd/completion/machine.go @@ -79,6 +79,3 @@ func (c *Completion) MachineState(cmd *cobra.Command, args []string, toComplete func (c *Completion) MachineAllocationType(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { return c.genericEnums(apiv2.MachineAllocationType_name) } -func (c *Completion) MachineHousekeepingActions(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { - return c.genericEnums(adminv2.MachineHousekeepingAction_name) -} diff --git a/cmd/tableprinters/common.go b/cmd/tableprinters/common.go index c85b175..bb29874 100644 --- a/cmd/tableprinters/common.go +++ b/cmd/tableprinters/common.go @@ -77,6 +77,11 @@ func (t *TablePrinter) ToHeaderAndRows(data any, wide bool) ([]string, [][]strin case []*apiv2.MachineBMCDetails: return t.MachineBMCTable(d, wide) + case *adminv2.HousekeepingServiceMachineLivelinessResponse: + return t.HousekeepingMachineLivelinessTable(pointer.WrapInSlice(d), wide) + case []*adminv2.HousekeepingServiceMachineLivelinessResponse: + return t.HousekeepingMachineLivelinessTable(d, wide) + case *apiv2.IP: return t.IPTable(pointer.WrapInSlice(d), wide) case []*apiv2.IP: diff --git a/go.mod b/go.mod index 4046793..2210d1e 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/fatih/color v1.19.0 github.com/google/go-cmp v0.7.0 github.com/google/uuid v1.6.0 - github.com/metal-stack/api v0.9.1-0.20261105083043-c057a14048cb + github.com/metal-stack/api v0.9.1-0.20261105100723-d66288ec5c00 github.com/metal-stack/metal-console v0.8.2 github.com/metal-stack/metal-lib v0.26.4 github.com/metal-stack/v v1.0.3 diff --git a/go.sum b/go.sum index a18bfb7..a4ee8f6 100644 --- a/go.sum +++ b/go.sum @@ -197,8 +197,8 @@ github.com/mdlayher/sdnotify v1.0.0 h1:Ma9XeLVN/l0qpyx1tNeMSeTjCPH6NtuD6/N9XdTlQ github.com/mdlayher/sdnotify v1.0.0/go.mod h1:HQUmpM4XgYkhDLtd+Uad8ZFK1T9D5+pNxnXQjCeJlGE= github.com/mdlayher/socket v0.8.0 h1:1lIVvHAs3sT623kPkPDa+I0nLVusskwnpWzp6ZUcNyc= github.com/mdlayher/socket v0.8.0/go.mod h1:EhNb63aXqexVoTJDblxvDOSuIGIJinC4H5ZktnaJ6Rk= -github.com/metal-stack/api v0.9.1-0.20261105083043-c057a14048cb h1:5zYKnoTDULNK+y98xAQfo8clP8lGdmZ+EVaH0fmaqWY= -github.com/metal-stack/api v0.9.1-0.20261105083043-c057a14048cb/go.mod h1:aL6rQWsPR1WphjO1YxF02H1eJbw3TmE7GIQi2m69b74= +github.com/metal-stack/api v0.9.1-0.20261105100723-d66288ec5c00 h1:XPKQTWqcVWkEIXl++oISMUmQSESwSk9VIF14xpuWmg4= +github.com/metal-stack/api v0.9.1-0.20261105100723-d66288ec5c00/go.mod h1:aL6rQWsPR1WphjO1YxF02H1eJbw3TmE7GIQi2m69b74= github.com/metal-stack/metal-console v0.8.2 h1:Y86penzEROJKcLica1PeE2ddtr9G0/u16HiCAYXaxxU= github.com/metal-stack/metal-console v0.8.2/go.mod h1:ZkselOaxF/iELFL9Tku3maXgpX4DM0CHjoG7CGuky6E= github.com/metal-stack/metal-lib v0.26.4 h1:Qg+JorX0AgQCkrCK07wvstGEoRcm/Y97E2UG5ZBAXjo= From 168017a94cd543ff9a6fdf7bb8b90aa49d4932e5 Mon Sep 17 00:00:00 2001 From: Stefan Majer Date: Thu, 5 Nov 2026 14:49:28 +0100 Subject: [PATCH 4/8] housekeeping endpoint --- cmd/admin/v2/commands.go | 1 + cmd/admin/v2/housekeepeing.go | 105 ++++++++++++++++++++++++++++++ cmd/admin/v2/machine.go | 21 +----- cmd/tableprinters/common.go | 4 +- cmd/tableprinters/housekeeping.go | 28 ++++++++ 5 files changed, 137 insertions(+), 22 deletions(-) create mode 100644 cmd/admin/v2/housekeepeing.go create mode 100644 cmd/tableprinters/housekeeping.go diff --git a/cmd/admin/v2/commands.go b/cmd/admin/v2/commands.go index 5960e76..49e3df1 100644 --- a/cmd/admin/v2/commands.go +++ b/cmd/admin/v2/commands.go @@ -17,6 +17,7 @@ func AddCmds(cmd *cobra.Command, c *config.Config) { adminCmd.AddCommand(newAuditCmd(c)) adminCmd.AddCommand(newComponentCmd(c)) adminCmd.AddCommand(newFilesystemCmd(c)) + adminCmd.AddCommand(newHousekeepingCmd(c)) adminCmd.AddCommand(newImageCmd(c)) adminCmd.AddCommand(newIPCmd(c)) adminCmd.AddCommand(newMachineCmd(c)) diff --git a/cmd/admin/v2/housekeepeing.go b/cmd/admin/v2/housekeepeing.go new file mode 100644 index 0000000..8bc2367 --- /dev/null +++ b/cmd/admin/v2/housekeepeing.go @@ -0,0 +1,105 @@ +package v2 + +import ( + "context" + + adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" + "github.com/metal-stack/cli/cmd/config" + "github.com/spf13/cobra" +) + +type housekeeping struct { + c *config.Config +} + +func newHousekeepingCmd(c *config.Config) *cobra.Command { + w := &housekeeping{ + c: c, + } + + housekeepingCmd := &cobra.Command{ + Use: "housekeeping", + Short: "execute housekeeping commands", + } + + machineLivelinessCmd := &cobra.Command{ + Use: "machine-liveliness", + Short: "execute machine liveliness housekeeping", + RunE: func(cmd *cobra.Command, args []string) error { + return w.machineLiveliness(cmd.Context()) + }, + } + + machineVPNConnectedCmd := &cobra.Command{ + Use: "machine-vpn-connected", + Short: "execute machine vpn connected housekeeping", + RunE: func(cmd *cobra.Command, args []string) error { + return w.machineVPNConnected(cmd.Context()) + }, + } + + machineResurrectCmd := &cobra.Command{ + Use: "machine-resurrect", + Short: "execute machine resurrect housekeeping", + RunE: func(cmd *cobra.Command, args []string) error { + return w.machineResurrect(cmd.Context()) + }, + } + + housekeepingCmd.AddCommand(machineLivelinessCmd) + housekeepingCmd.AddCommand(machineVPNConnectedCmd) + housekeepingCmd.AddCommand(machineResurrectCmd) + + return housekeepingCmd +} + +func (h *housekeeping) machineLiveliness(ctx context.Context) (err error) { + result, err := h.c.Client.Adminv2().Housekeeping().MachineLiveliness(ctx, &adminv2.HousekeepingServiceMachineLivelinessRequest{}) + if err != nil { + return err + } + + return h.c.DescribePrinter.Print(result) +} + +func (h *housekeeping) machineVPNConnected(ctx context.Context) (err error) { + result, err := h.c.Client.Adminv2().Housekeeping().MachineVPNConnected(ctx, &adminv2.HousekeepingServiceMachineVPNConnectedRequest{}) + if err != nil { + return err + } + + return h.c.ListPrinter.Print(result.ModifiedMachines) +} + +func (h *housekeeping) machineResurrect(ctx context.Context) (err error) { + result, err := h.c.Client.Adminv2().Housekeeping().MachineResurrect(ctx, &adminv2.HousekeepingServiceMachineResurrectRequest{}) + if err != nil { + return err + } + + return h.c.ListPrinter.Print(result.ModifiedMachines) +} + +func (h *housekeeping) Get(id string) (any, error) { + panic("unimplemented") +} + +func (h *housekeeping) List() (any, error) { + panic("unimplemented") +} + +func (h *housekeeping) Create(rq any) (any, error) { + panic("unimplemented") +} + +func (h *housekeeping) Delete(id string) (any, error) { + panic("unimplemented") +} + +func (h *housekeeping) Convert(r any) (string, any, any, error) { + panic("unimplemented") +} + +func (h *housekeeping) Update(rq any) (any, error) { + panic("unimplemented") +} diff --git a/cmd/admin/v2/machine.go b/cmd/admin/v2/machine.go index 31634ce..7f37594 100644 --- a/cmd/admin/v2/machine.go +++ b/cmd/admin/v2/machine.go @@ -228,17 +228,7 @@ If ~/.ssh/[id_ed25519.pub | id_rsa.pub | id_dsa.pub] is present it will be picke firewallSSHCmd.Flags().StringP("identity", "i", "~/.ssh/id_rsa", "specify identity file to SSH to the firewall like: -i path/to/id_rsa") firewallSSHCmd.Flags().String("reason", "", "the reason why to connect to the firewall through SSH") - housekeepingCmd := &cobra.Command{ - Use: "housekeeping", - Short: "start a specific housekeeping action on machines", - RunE: func(cmd *cobra.Command, args []string) error { - return w.housekeeping(cmd.Context()) - }, - ValidArgsFunction: c.Completion.Machine, - } - housekeepingCmd.Flags().String("action", "", "the housekeeping action to perform on all machines") - - return genericcli.NewCmds(cmdsConfig, bmcCmd, lockCmd, taintCmd, consoleCmd, consolePasswordCmd, firewallSSHCmd, housekeepingCmd) + return genericcli.NewCmds(cmdsConfig, bmcCmd, lockCmd, taintCmd, consoleCmd, consolePasswordCmd, firewallSSHCmd) } func (c *machine) Create(rq *apiv2.MachineServiceCreateRequest) (*apiv2.Machine, error) { @@ -602,12 +592,3 @@ func (c *machine) firewallSSH(ctx context.Context, args []string) (err error) { } return s.Connect(nil) } - -func (c *machine) housekeeping(ctx context.Context) (err error) { - result, err := c.c.Client.Adminv2().Housekeeping().MachineLiveliness(ctx, &adminv2.HousekeepingServiceMachineLivelinessRequest{}) - if err != nil { - return err - } - - return c.c.DescribePrinter.Print(result) -} diff --git a/cmd/tableprinters/common.go b/cmd/tableprinters/common.go index bb29874..a9212ff 100644 --- a/cmd/tableprinters/common.go +++ b/cmd/tableprinters/common.go @@ -77,9 +77,9 @@ func (t *TablePrinter) ToHeaderAndRows(data any, wide bool) ([]string, [][]strin case []*apiv2.MachineBMCDetails: return t.MachineBMCTable(d, wide) - case *adminv2.HousekeepingServiceMachineLivelinessResponse: + case *adminv2.MachineWithLiveliness: return t.HousekeepingMachineLivelinessTable(pointer.WrapInSlice(d), wide) - case []*adminv2.HousekeepingServiceMachineLivelinessResponse: + case []*adminv2.MachineWithLiveliness: return t.HousekeepingMachineLivelinessTable(d, wide) case *apiv2.IP: diff --git a/cmd/tableprinters/housekeeping.go b/cmd/tableprinters/housekeeping.go new file mode 100644 index 0000000..de57106 --- /dev/null +++ b/cmd/tableprinters/housekeeping.go @@ -0,0 +1,28 @@ +package tableprinters + +import ( + "github.com/metal-stack/api/go/enum" + adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" +) + +func (t *TablePrinter) HousekeepingMachineLivelinessTable(data []*adminv2.MachineWithLiveliness, wide bool) ([]string, [][]string, error) { + var ( + rows [][]string + header = []string{"Machine", "Liveliness"} + ) + + for _, ms := range data { + var lvl = "unknown" + lvlString, err := enum.GetStringValue(ms.Liveliness) + if err != nil { + lvl = "unknown" + } + lvl = *lvlString + + rows = append(rows, []string{ms.Uuid, lvl}) + } + + t.t.DisableAutoWrap(false) + + return header, rows, nil +} From 3635f2c05a0036b933e546e771db050e5404b4ae Mon Sep 17 00:00:00 2001 From: Stefan Majer Date: Thu, 5 Nov 2026 15:13:06 +0100 Subject: [PATCH 5/8] Pin --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2210d1e..2c8955d 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/fatih/color v1.19.0 github.com/google/go-cmp v0.7.0 github.com/google/uuid v1.6.0 - github.com/metal-stack/api v0.9.1-0.20261105100723-d66288ec5c00 + github.com/metal-stack/api v0.10.0 github.com/metal-stack/metal-console v0.8.2 github.com/metal-stack/metal-lib v0.26.4 github.com/metal-stack/v v1.0.3 diff --git a/go.sum b/go.sum index a4ee8f6..76e9a27 100644 --- a/go.sum +++ b/go.sum @@ -197,8 +197,8 @@ github.com/mdlayher/sdnotify v1.0.0 h1:Ma9XeLVN/l0qpyx1tNeMSeTjCPH6NtuD6/N9XdTlQ github.com/mdlayher/sdnotify v1.0.0/go.mod h1:HQUmpM4XgYkhDLtd+Uad8ZFK1T9D5+pNxnXQjCeJlGE= github.com/mdlayher/socket v0.8.0 h1:1lIVvHAs3sT623kPkPDa+I0nLVusskwnpWzp6ZUcNyc= github.com/mdlayher/socket v0.8.0/go.mod h1:EhNb63aXqexVoTJDblxvDOSuIGIJinC4H5ZktnaJ6Rk= -github.com/metal-stack/api v0.9.1-0.20261105100723-d66288ec5c00 h1:XPKQTWqcVWkEIXl++oISMUmQSESwSk9VIF14xpuWmg4= -github.com/metal-stack/api v0.9.1-0.20261105100723-d66288ec5c00/go.mod h1:aL6rQWsPR1WphjO1YxF02H1eJbw3TmE7GIQi2m69b74= +github.com/metal-stack/api v0.10.0 h1:FAwBb/pKNx+SOXfxZRnMbj7BIhE4J9d5dZ2p3XDIV9I= +github.com/metal-stack/api v0.10.0/go.mod h1:aL6rQWsPR1WphjO1YxF02H1eJbw3TmE7GIQi2m69b74= github.com/metal-stack/metal-console v0.8.2 h1:Y86penzEROJKcLica1PeE2ddtr9G0/u16HiCAYXaxxU= github.com/metal-stack/metal-console v0.8.2/go.mod h1:ZkselOaxF/iELFL9Tku3maXgpX4DM0CHjoG7CGuky6E= github.com/metal-stack/metal-lib v0.26.4 h1:Qg+JorX0AgQCkrCK07wvstGEoRcm/Y97E2UG5ZBAXjo= From 85c8b0189e295dcd9d9bdf93b7dd848dda0de90b Mon Sep 17 00:00:00 2001 From: Stefan Majer Date: Fri, 6 Nov 2026 07:46:21 +0100 Subject: [PATCH 6/8] Tests and descriptions --- cmd/admin/v2/housekeepeing.go | 4 + tests/e2e/admin/housekeeping_test.go | 155 ++++++++++++++++++++++++ tests/e2e/testresources/housekeeping.go | 17 +++ 3 files changed, 176 insertions(+) create mode 100644 tests/e2e/admin/housekeeping_test.go create mode 100644 tests/e2e/testresources/housekeeping.go diff --git a/cmd/admin/v2/housekeepeing.go b/cmd/admin/v2/housekeepeing.go index 8bc2367..10f3a51 100644 --- a/cmd/admin/v2/housekeepeing.go +++ b/cmd/admin/v2/housekeepeing.go @@ -20,11 +20,13 @@ func newHousekeepingCmd(c *config.Config) *cobra.Command { housekeepingCmd := &cobra.Command{ Use: "housekeeping", Short: "execute housekeeping commands", + Long: "housekeeping commands are usually as cronjobs in the control-plane", } machineLivelinessCmd := &cobra.Command{ Use: "machine-liveliness", Short: "execute machine liveliness housekeeping", + Long: "updates the liveleness of all machines, only the modified machines are returned", RunE: func(cmd *cobra.Command, args []string) error { return w.machineLiveliness(cmd.Context()) }, @@ -33,6 +35,7 @@ func newHousekeepingCmd(c *config.Config) *cobra.Command { machineVPNConnectedCmd := &cobra.Command{ Use: "machine-vpn-connected", Short: "execute machine vpn connected housekeeping", + Long: "updates the vpn connection details of machines which have vpn configured, only the modified machines are returned", RunE: func(cmd *cobra.Command, args []string) error { return w.machineVPNConnected(cmd.Context()) }, @@ -41,6 +44,7 @@ func newHousekeepingCmd(c *config.Config) *cobra.Command { machineResurrectCmd := &cobra.Command{ Use: "machine-resurrect", Short: "execute machine resurrect housekeeping", + Long: "tries to resurrect machines which are not allocated but not in waiting state by forcing a restart, only machines where a restart was triggered are returned", RunE: func(cmd *cobra.Command, args []string) error { return w.machineResurrect(cmd.Context()) }, diff --git a/tests/e2e/admin/housekeeping_test.go b/tests/e2e/admin/housekeeping_test.go new file mode 100644 index 0000000..7daf641 --- /dev/null +++ b/tests/e2e/admin/housekeeping_test.go @@ -0,0 +1,155 @@ +package admin_e2e + +import ( + "testing" + + "connectrpc.com/connect" + "github.com/metal-stack/api/go/client" + adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" + apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" + e2erootcmd "github.com/metal-stack/cli/testing/e2e" + "github.com/metal-stack/cli/tests/e2e/testresources" + "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" +) + +func Test_AdminHousekeepingCmd_MachineLiveliness(t *testing.T) { + tests := []*e2e.Test[adminv2.HousekeepingServiceMachineLivelinessResponse, *adminv2.HousekeepingServiceMachineLivelinessResponse]{ + { + Name: "machine-liveliness", + CmdArgs: []string{"admin", "housekeeping", "machine-liveliness"}, + NewRootCmd: e2erootcmd.NewRootCmd(t, &e2erootcmd.TestConfig{ + ClientCalls: []client.ClientCall{ + { + WantRequest: &adminv2.HousekeepingServiceMachineLivelinessRequest{}, + WantResponse: func() connect.AnyResponse { + return connect.NewResponse(&adminv2.HousekeepingServiceMachineLivelinessResponse{ + ModifiedMachines: []*adminv2.MachineWithLiveliness{ + testresources.MachineWithLiveliness1, + testresources.MachineWithLiveliness2, + }, + }) + }, + }, + }, + }), + WantProtoObject: &adminv2.HousekeepingServiceMachineLivelinessResponse{ + ModifiedMachines: []*adminv2.MachineWithLiveliness{ + testresources.MachineWithLiveliness1, + testresources.MachineWithLiveliness2, + }, + }, + Template: new(`{{ range .modified_machines }}{{ .uuid }} {{ .liveliness }}{{ "\n" }}{{ end }}`), + WantTemplate: new(` +5fa2bbe1-407c-4142-92d5-e4419daf9646 1 +673fc473-63ca-4ea4-b9dd-b45cb2127a6f 2 + `), + WantDefault: new(` +modifiedMachines: + - uuid: 5fa2bbe1-407c-4142-92d5-e4419daf9646 + liveliness: MACHINE_LIVELINESS_ALIVE + - uuid: 673fc473-63ca-4ea4-b9dd-b45cb2127a6f + liveliness: MACHINE_LIVELINESS_DEAD + `), + }, + } + for _, tt := range tests { + tt.TestCmd(t) + } +} + +func Test_AdminHousekeepingCmd_MachineVPNConnected(t *testing.T) { + tests := []*e2e.Test[adminv2.HousekeepingServiceMachineVPNConnectedResponse, apiv2.VPNNode]{ + { + Name: "machine-vpn-connected", + CmdArgs: []string{"admin", "housekeeping", "machine-vpn-connected"}, + NewRootCmd: e2erootcmd.NewRootCmd(t, &e2erootcmd.TestConfig{ + ClientCalls: []client.ClientCall{ + { + WantRequest: &adminv2.HousekeepingServiceMachineVPNConnectedRequest{}, + WantResponse: func() connect.AnyResponse { + return connect.NewResponse(&adminv2.HousekeepingServiceMachineVPNConnectedResponse{ + ModifiedMachines: []*apiv2.VPNNode{ + testresources.VpnNode2(), + testresources.VpnNode1(), + }, + }) + }, + }, + }, + }), + Template: new("{{ .id }} {{ .project }}"), + WantTemplate: new(` +2 f3b4e6a1-2c8d-4e5f-a7b9-1d3e5f7a9b0c +1 0d81bca7-73f6-4da3-8397-4a8c52a0c583 + `), + WantTable: new(` + ID NAME PROJECT IPS LAST SEEN + 2 node-2 f3b4e6a1-2c8d-4e5f-a7b9-1d3e5f7a9b0c 2.3.4.5 2000-01-01 00:01:00 + 1 node-1 0d81bca7-73f6-4da3-8397-4a8c52a0c583 1.2.3.4,1.2.3.5 2000-01-01 00:00:00 + `), + WantWideTable: new(` + ID NAME PROJECT IPS LAST SEEN + 2 node-2 f3b4e6a1-2c8d-4e5f-a7b9-1d3e5f7a9b0c 2.3.4.5 2000-01-01 00:01:00 + 1 node-1 0d81bca7-73f6-4da3-8397-4a8c52a0c583 1.2.3.4,1.2.3.5 2000-01-01 00:00:00 + `), + WantMarkdown: new(` + | ID | NAME | PROJECT | IPS | LAST SEEN | + |----|--------|--------------------------------------|-----------------|---------------------| + | 2 | node-2 | f3b4e6a1-2c8d-4e5f-a7b9-1d3e5f7a9b0c | 2.3.4.5 | 2000-01-01 00:01:00 | + | 1 | node-1 | 0d81bca7-73f6-4da3-8397-4a8c52a0c583 | 1.2.3.4,1.2.3.5 | 2000-01-01 00:00:00 | + `), + }, + } + for _, tt := range tests { + tt.TestCmd(t) + } +} + +func Test_AdminHousekeepingCmd_MachineResurrect(t *testing.T) { + tests := []*e2e.Test[adminv2.HousekeepingServiceMachineResurrectResponse, apiv2.Machine]{ + { + Name: "machine-resurrect", + CmdArgs: []string{"admin", "housekeeping", "machine-resurrect"}, + NewRootCmd: e2erootcmd.NewRootCmd(t, &e2erootcmd.TestConfig{ + ClientCalls: []client.ClientCall{ + { + WantRequest: &adminv2.HousekeepingServiceMachineResurrectRequest{}, + WantResponse: func() connect.AnyResponse { + return connect.NewResponse(&adminv2.HousekeepingServiceMachineResurrectResponse{ + ModifiedMachines: []*apiv2.Machine{ + testresources.Machine2(), + testresources.Machine1(), + }, + }) + }, + }, + }, + }), + Template: new("{{ .allocation.uuid }} {{ .allocation.project }}"), + WantTemplate: new(` +4f94e87b-b08f-4f82-b053-9b8305de60ad f3b4e6a1-2c8d-4e5f-a7b9-1d3e5f7a9b0c + + `), + WantTable: new(` + ID LAST EVENT WHEN AGE HOSTNAME PROJECT SIZE IMAGE PARTITION RACK + 673fc473-63ca-4ea4-b9dd-b45cb2127a6f 🛡 Phoned Home 1m 1m machine-2 f3b4e6a1-2c8d-4e5f-a7b9-1d3e5f7a9b0c v1-medium-x86 Ubuntu 24.04 partition-2 rack-1 + 5fa2bbe1-407c-4142-92d5-e4419daf9646 Alive 1m v1-medium-x86 partition-1 rack-1 + `), + WantWideTable: new(` + ID LAST EVENT WHEN AGE DESCRIPTION NAME HOSTNAME PROJECT IPS SIZE IMAGE PARTITION RACK STARTED TAGS STATE + 673fc473-63ca-4ea4-b9dd-b45cb2127a6f Phoned Home 1m 1m machine 2 machine-2 machine-2 f3b4e6a1-2c8d-4e5f-a7b9-1d3e5f7a9b0c 4.5.6.7 v1-medium-x86 Ubuntu 24.04 partition-2 rack-1 1999-12-31T23:59:00Z c=d available + 192.1.1.1 + 5fa2bbe1-407c-4142-92d5-e4419daf9646 Alive 1m v1-medium-x86 partition-1 rack-1 a=b available + `), + WantMarkdown: new(` + | ID | | LAST EVENT | WHEN | AGE | HOSTNAME | PROJECT | SIZE | IMAGE | PARTITION | RACK | + |--------------------------------------|---|-------------|------|-----|-----------|--------------------------------------|---------------|--------------|-------------|--------| + | 673fc473-63ca-4ea4-b9dd-b45cb2127a6f | 🛡 | Phoned Home | 1m | 1m | machine-2 | f3b4e6a1-2c8d-4e5f-a7b9-1d3e5f7a9b0c | v1-medium-x86 | Ubuntu 24.04 | partition-2 | rack-1 | + | 5fa2bbe1-407c-4142-92d5-e4419daf9646 | | Alive | 1m | | | | v1-medium-x86 | | partition-1 | rack-1 | + `), + }, + } + for _, tt := range tests { + tt.TestCmd(t) + } +} diff --git a/tests/e2e/testresources/housekeeping.go b/tests/e2e/testresources/housekeeping.go new file mode 100644 index 0000000..5e826af --- /dev/null +++ b/tests/e2e/testresources/housekeeping.go @@ -0,0 +1,17 @@ +package testresources + +import ( + adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" + apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" +) + +var ( + MachineWithLiveliness1 = &adminv2.MachineWithLiveliness{ + Uuid: Machine1().Uuid, + Liveliness: apiv2.MachineLiveliness_MACHINE_LIVELINESS_ALIVE, + } + MachineWithLiveliness2 = &adminv2.MachineWithLiveliness{ + Uuid: Machine2().Uuid, + Liveliness: apiv2.MachineLiveliness_MACHINE_LIVELINESS_DEAD, + } +) From 3a2323f5aa48213e463f637f7508c9b8405fa97c Mon Sep 17 00:00:00 2001 From: Stefan Majer Date: Fri, 6 Nov 2026 07:56:30 +0100 Subject: [PATCH 7/8] satisfy linter --- cmd/tableprinters/housekeeping.go | 5 ++-- docs/admin/metalctlv2_admin.md | 1 + go.mod | 18 +++++++------- go.sum | 40 +++++++++++++++---------------- 4 files changed, 33 insertions(+), 31 deletions(-) diff --git a/cmd/tableprinters/housekeeping.go b/cmd/tableprinters/housekeeping.go index de57106..f995ca2 100644 --- a/cmd/tableprinters/housekeeping.go +++ b/cmd/tableprinters/housekeeping.go @@ -12,12 +12,13 @@ func (t *TablePrinter) HousekeepingMachineLivelinessTable(data []*adminv2.Machin ) for _, ms := range data { - var lvl = "unknown" + var lvl string lvlString, err := enum.GetStringValue(ms.Liveliness) if err != nil { lvl = "unknown" + } else { + lvl = *lvlString } - lvl = *lvlString rows = append(rows, []string{ms.Uuid, lvl}) } diff --git a/docs/admin/metalctlv2_admin.md b/docs/admin/metalctlv2_admin.md index e620c5f..8b060f1 100644 --- a/docs/admin/metalctlv2_admin.md +++ b/docs/admin/metalctlv2_admin.md @@ -31,6 +31,7 @@ these commands utilize the admin api, which can only be accessed by metal-stack * [metalctlv2 admin audit](metalctlv2_admin_audit.md) - manage audit entities * [metalctlv2 admin component](metalctlv2_admin_component.md) - manage component entities * [metalctlv2 admin filesystemlayout](metalctlv2_admin_filesystemlayout.md) - manage filesystemlayout entities +* [metalctlv2 admin housekeeping](metalctlv2_admin_housekeeping.md) - execute housekeeping commands * [metalctlv2 admin image](metalctlv2_admin_image.md) - manage image entities * [metalctlv2 admin ip](metalctlv2_admin_ip.md) - manage ip entities * [metalctlv2 admin machine](metalctlv2_admin_machine.md) - manage machine entities diff --git a/go.mod b/go.mod index 2c8955d..0dd4531 100644 --- a/go.mod +++ b/go.mod @@ -25,10 +25,10 @@ require ( require ( buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.12-20260825204119-511051f7f437.2 // indirect buf.build/go/protovalidate v1.4.0 // indirect - buf.build/go/protoyaml v0.7.0 // indirect + buf.build/go/protoyaml v0.8.0 // indirect cel.dev/cel-go v0.33.2 // indirect cel.dev/expr v0.25.3 // indirect - connectrpc.com/connect/v2 v2.0.0 // indirect + connectrpc.com/connect/v2 v2.0.2 // indirect filippo.io/edwards25519 v1.2.0 // indirect github.com/akutz/memconn v0.1.0 // indirect github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e // indirect @@ -42,21 +42,21 @@ require ( github.com/creachadair/msync v0.10.1 // indirect github.com/dblohm7/wingoes v0.0.0-20260526185140-fb298caac7ca // indirect github.com/fsnotify/fsnotify v1.10.1 // indirect - github.com/fxamacker/cbor/v2 v2.9.6 // indirect + github.com/fxamacker/cbor/v2 v2.10.0 // indirect github.com/gaissmai/bart v0.30.0 // indirect github.com/go-json-experiment/json v0.0.0-20260820222146-c27c302e5fc3 // indirect github.com/go-openapi/errors v0.22.9 // indirect github.com/go-openapi/strfmt v0.27.4 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/go-viper/mapstructure/v2 v2.5.0 // indirect - github.com/goccy/go-json v0.11.2 // indirect + github.com/goccy/go-json v0.12.0 // indirect github.com/goccy/go-yaml v1.19.2 // indirect github.com/godbus/dbus/v5 v5.2.4 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect github.com/google/btree v1.1.3 // indirect github.com/hdevalence/ed25519consensus v0.2.0 // indirect - github.com/huin/goupnp v1.3.0 // indirect + github.com/huin/goupnp v1.3.1 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jsimonetti/rtnetlink v1.4.2 // indirect github.com/klauspost/compress v1.20.3 // indirect @@ -89,13 +89,13 @@ require ( github.com/tailscale/web-client-prebuilt v0.0.0-20260917222731-e0ed2d0d0fea // indirect github.com/tailscale/wireguard-go v0.0.0-20260928213032-417aef361226 // indirect github.com/x448/float16 v0.8.4 // indirect - go.yaml.in/yaml/v2 v2.4.4 // indirect + go.yaml.in/yaml/v2 v2.4.5 // indirect go.yaml.in/yaml/v3 v3.0.6 // indirect go4.org/mem v0.0.0-20240501181205-ae6ca9944745 // indirect go4.org/netipx v0.0.0-20260823151212-3075585bcbeb // indirect golang.org/x/crypto v0.58.0 // indirect golang.org/x/exp v0.0.0-20261014143641-f0251eb4aa3e // indirect - golang.org/x/net v0.61.0 // indirect + golang.org/x/net v0.62.0 // indirect golang.org/x/oauth2 v0.37.0 // indirect golang.org/x/sync v0.24.0 // indirect golang.org/x/sys v0.49.0 // indirect @@ -103,7 +103,7 @@ require ( golang.org/x/text v0.43.0 // indirect golang.org/x/time v0.16.0 // indirect golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect - golang.zx2c4.com/wireguard/windows v1.0.1 // indirect + golang.zx2c4.com/wireguard/windows v1.1.1 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20261104224025-d1e00e9f33ab // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20261104224025-d1e00e9f33ab // indirect gopkg.in/inf.v0 v0.9.1 // indirect @@ -111,5 +111,5 @@ require ( gvisor.dev/gvisor v0.0.0-20260915211658-a6f909f08a72 // indirect k8s.io/apimachinery v0.37.1 // indirect sigs.k8s.io/json v0.0.0-20260909141634-11ed52e25bc5 // indirect - tailscale.com v1.104.2 // indirect + tailscale.com v1.104.5 // indirect ) diff --git a/go.sum b/go.sum index 76e9a27..9c59357 100644 --- a/go.sum +++ b/go.sum @@ -4,16 +4,16 @@ buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.12-202608252041 buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.12-20260825204119-511051f7f437.2/go.mod h1:TCt1lluMFnctISJXvkIQ4x3ABrPuUKCWKyjKdkJNBpw= buf.build/go/protovalidate v1.4.0 h1:UjLrYbt5VX7+TMOs2+pG5FhZhIG1mSfK4EIopbb4LcM= buf.build/go/protovalidate v1.4.0/go.mod h1:8vJfzNT6NIG2qm3uFsJDXMlRmG+bQJzbcIn1Aa0vPGs= -buf.build/go/protoyaml v0.7.0 h1:z4oVoFicbpPefhT7WAykxUdfp0yEQlhMQ2mCZOY5V38= -buf.build/go/protoyaml v0.7.0/go.mod h1:+a0cavd0uMvirb87xdu2ZMMmjlIQoiH/N2Ich5MGSQ0= +buf.build/go/protoyaml v0.8.0 h1:n6q7ygZTZo4kLzKXsymkiLharUgHfd507Ymi4t5xhY8= +buf.build/go/protoyaml v0.8.0/go.mod h1:3XRN/7BQCQNlhIgwzE46QTHLuUScH2d76lAFLCQEFWo= cel.dev/cel-go v0.33.2 h1:eAcEdBguc6AFrGbPOyE0g168Uey4kKFW9J6qsBLSeMU= cel.dev/cel-go v0.33.2/go.mod h1:DnVip7tpJSsgZymwfT+m1tnEVy3ivAjSMXPx12YrMkU= cel.dev/expr v0.25.3 h1:A2jO8jwOugrrovveCWfj0KEZOfqiLgAcwjpHPhzIGw0= cel.dev/expr v0.25.3/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4= connectrpc.com/connect v1.21.1 h1:h2kacdlzXpZU2OQFSv98xkjYXNUSr/ptxmGVbS/+CRM= connectrpc.com/connect v1.21.1/go.mod h1:fhMcVJ5w6r/yTYhnkEbW6+sIF7OZ5Ay7KYgmfebh2ek= -connectrpc.com/connect/v2 v2.0.0 h1:PVVpWl2Xv9dIWN2gijs4HK40NSnPFzLqCEEmZ8fCUQ8= -connectrpc.com/connect/v2 v2.0.0/go.mod h1:N32OLrstcPUzkykFynnefFro3+xzSdOrZlK2jHmS/xo= +connectrpc.com/connect/v2 v2.0.2 h1:PoPDmOlhc46elsuCdKCKTxjNBb3HJlKF+s/sP2oucPw= +connectrpc.com/connect/v2 v2.0.2/go.mod h1:N32OLrstcPUzkykFynnefFro3+xzSdOrZlK2jHmS/xo= connectrpc.com/validate v0.9.0 h1:NLl+dbx87CZh1LId4FF87t92L5tsdmS0qDXxjZRe054= connectrpc.com/validate v0.9.0/go.mod h1:dBEUzscHj4InQpm6J5xF8zX51MIUAPWZ7Jq8aNXRY9Y= filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= @@ -109,8 +109,8 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho= github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo= -github.com/fxamacker/cbor/v2 v2.9.6 h1:NHZPxuUjJXQjX9itA785y/5NKSlI4HQ+S7noZsmI7hs= -github.com/fxamacker/cbor/v2 v2.9.6/go.mod h1:4EaZp6ClVunETjQ4GHmGNzysDK91Lr+r6Yz6tJqzVCw= +github.com/fxamacker/cbor/v2 v2.10.0 h1:HVF3T5vYwLqO81ebPirWEPNv2SMrUMD3HLnKgEr6uWE= +github.com/fxamacker/cbor/v2 v2.10.0/go.mod h1:uSwlToFuT9BZAKRxxVm3qQC8DR4tlWl7D6pf20iRYH4= github.com/gaissmai/bart v0.30.0 h1:K1oTSQ6Nf76bhrgxeTqzZa4hE0M9x4xDfL6n6UG67Sc= github.com/gaissmai/bart v0.30.0/go.mod h1:GREWQfTLRWz/c5FTOsIw+KkscuFkIV5t8Rp7Nd1Td5c= github.com/github/fakeca v0.1.0 h1:Km/MVOFvclqxPM9dZBC4+QE564nU4gz4iZ0D9pMw28I= @@ -133,8 +133,8 @@ github.com/go4org/hashtriemap v0.0.0-20260925222741-44e5305f85d9 h1:J8S+Ms89nvHX github.com/go4org/hashtriemap v0.0.0-20260925222741-44e5305f85d9/go.mod h1:OGmRfY/9QEK2P5zCRtmqfbCF283xPkU2dvVA4MvbvpI= github.com/go4org/plan9netshell v0.0.0-20250324183649-788daa080737 h1:cf60tHxREO3g1nroKr2osU3JWZsJzkfi7rEg+oAB0Lo= github.com/go4org/plan9netshell v0.0.0-20250324183649-788daa080737/go.mod h1:MIS0jDzbU/vuM9MC4YnBITCv+RYuTRq8dJzmCrFsK9g= -github.com/goccy/go-json v0.11.2 h1:jdZv93Tt4ioR8yW1CoNsvSxrcZlCXAUU1aZXN7gpXUA= -github.com/goccy/go-json v0.11.2/go.mod h1:3NdmfEkZlB7YI5UFw/qdFKq8XN1aiWR0YyRPWZNQltY= +github.com/goccy/go-json v0.12.0 h1:pD+oWouAiz4yruwXIt/iT+lOMeyhr1aTtxzaMP/RgVI= +github.com/goccy/go-json v0.12.0/go.mod h1:3NdmfEkZlB7YI5UFw/qdFKq8XN1aiWR0YyRPWZNQltY= github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM= github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= github.com/godbus/dbus/v5 v5.2.4 h1:F2gUCy++NMIxGmo9J+z5le/+ZC8W1OgeR51P4i9ZB/U= @@ -157,8 +157,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hdevalence/ed25519consensus v0.2.0 h1:37ICyZqdyj0lAZ8P4D1d1id3HqbbG1N3iBb1Tb4rdcU= github.com/hdevalence/ed25519consensus v0.2.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= -github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= -github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= +github.com/huin/goupnp v1.3.1 h1:n8259zVoE4BU7dBCQEUlwZK1h0Z3pxZ58ov0xbJuIQU= +github.com/huin/goupnp v1.3.1/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= github.com/illarion/gonotify/v3 v3.0.2 h1:O7S6vcopHexutmpObkeWsnzMJt/r1hONIEogeVNmJMk= github.com/illarion/gonotify/v3 v3.0.2/go.mod h1:HWGPdPe817GfvY3w7cx6zkbzNZfi3QjcBm/wgVvEL1U= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= @@ -269,8 +269,8 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/tailscale/certstore v0.1.1-0.20260409135935-3638fb84b77d h1:JcGKBZAL7ePLwOhUdN8qGQZlP5GueEiIZwY7R62pejE= github.com/tailscale/certstore v0.1.1-0.20260409135935-3638fb84b77d/go.mod h1:XrBNfAFN+pwoWuksbFS9Ccxnopa15zJGgXRFN90l3K4= -github.com/tailscale/gliderssh v0.3.4-0.20260716005906-1a0f895faf28 h1:Azz5ILxxVsHN/KjIu3wkJPAmmtiijucZw4Ax5Ye8n+s= -github.com/tailscale/gliderssh v0.3.4-0.20260716005906-1a0f895faf28/go.mod h1:wn16Km1EZOX4UEAyaZa3dBwfFGOJ7neck40NcwosJUw= +github.com/tailscale/gliderssh v0.3.4-0.20261026144310-31f7cf365d3a h1:LQfS++EBVN2Bk9/FbFjJmdP/CsebU0OupOX58tO4p04= +github.com/tailscale/gliderssh v0.3.4-0.20261026144310-31f7cf365d3a/go.mod h1:wn16Km1EZOX4UEAyaZa3dBwfFGOJ7neck40NcwosJUw= github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55 h1:Gzfnfk2TWrk8Jj4P4c1a3CtQyMaTVCznlkLZI++hok4= github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55/go.mod h1:4k4QO+dQ3R5FofL+SanAUZe+/QfeK0+OIuwDIRu2vSg= github.com/tailscale/golang-x-crypto v0.0.0-20260720160339-c86ca1284b96 h1:m9EAsCu/afUkg9YkknXaRqMPl/omkUNRol5yB7hbG0Y= @@ -299,8 +299,8 @@ github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zd github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= -go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ= -go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ= +go.yaml.in/yaml/v2 v2.4.5 h1:a5nxWvYi94DRl6QSLlTbLpVmutgx2qg8EVjnJtuFpwI= +go.yaml.in/yaml/v2 v2.4.5/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= go.yaml.in/yaml/v3 v3.0.6 h1:zcDfvjXEqTQmpjniUBLc91xYJMB2c4QOFxEF/LCEckM= go.yaml.in/yaml/v3 v3.0.6/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= @@ -318,8 +318,8 @@ golang.org/x/image v0.46.0 h1:b1+oYj0Jbp6K5MDT4i4/eZpYlk3V8SJhhDKh6LBHAyQ= golang.org/x/image v0.46.0/go.mod h1:3B3W05VGVQyuXucLINLjXKrqISASfi4Xj+iCVkLMwew= golang.org/x/mod v0.42.0 h1:ICeL3t2L30ljSPHHxDnR4fqVcBt/zR2zJAb9juavmQg= golang.org/x/mod v0.42.0/go.mod h1:u5fzIrRInkL8MaO1cbRkUHT64v303YIT5KEqpNr7jRs= -golang.org/x/net v0.61.0 h1:RR+6j/BTBCrggOLugxa+66R8FvoN6MHlzDlZIbN9YFw= -golang.org/x/net v0.61.0/go.mod h1:WgDCOTH8iwtB66T4/GfI94AHo/hhdb7Hah9NDseQfiI= +golang.org/x/net v0.62.0 h1:18ELalfM5+XNRwzM2nYqXsZQ9ByS1uhj2O/U7+5jqRY= +golang.org/x/net v0.62.0/go.mod h1:WgDCOTH8iwtB66T4/GfI94AHo/hhdb7Hah9NDseQfiI= golang.org/x/oauth2 v0.37.0 h1:JUlcxA8oAtauLfiH8FX2/FkAWHAdi0QtGCGc+hofE98= golang.org/x/oauth2 v0.37.0/go.mod h1:IxwZNxUULJmpBFf9K/9NTMSIfZZuvuTy1gGxhigP/58= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -339,8 +339,8 @@ golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeu golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI= golang.zx2c4.com/wireguard v0.0.0-20260522210424-ecfc5a8d5446 h1:cqHQ3AycTHvM2R7ikgyX57D+XvtcSnGylsLkOVhta/w= golang.zx2c4.com/wireguard v0.0.0-20260522210424-ecfc5a8d5446/go.mod h1:rpwXGsirqLqN2L0JDJQlwOboGHmptD5ZD6T2VmcqhTw= -golang.zx2c4.com/wireguard/windows v1.0.1 h1:eOxiDVbywPC+ZQqvdCK7x+ZwWXKbYv50TtH8ysFIbw8= -golang.zx2c4.com/wireguard/windows v1.0.1/go.mod h1:+fbT3FFdX4zzYDLwJh5+HPEcNN/3HyNdzhNSVsQM+zs= +golang.zx2c4.com/wireguard/windows v1.1.1 h1:8/H97U1v1PNDNcBsMZgU3KFuND9MQdTsU2NOwmCXArE= +golang.zx2c4.com/wireguard/windows v1.1.1/go.mod h1:+fbT3FFdX4zzYDLwJh5+HPEcNN/3HyNdzhNSVsQM+zs= google.golang.org/genproto/googleapis/api v0.0.0-20261104224025-d1e00e9f33ab h1:n6IDWZ1RzI/NberLoLLFNrjl1H45uhc4+WYsUf5lPPc= google.golang.org/genproto/googleapis/api v0.0.0-20261104224025-d1e00e9f33ab/go.mod h1:vHV3wJM9WZyfV7GyB+OQGq5dWVrFwCDxapPK4WlRD88= google.golang.org/genproto/googleapis/rpc v0.0.0-20261104224025-d1e00e9f33ab h1:8sYjjefPfQ+FZEh1ZwBAqK/NifJVhOxut8nRh3SJzZM= @@ -370,5 +370,5 @@ sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs= sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4= software.sslmate.com/src/go-pkcs12 v0.7.3 h1:JBQD3FDqYjTeyDAeZQklj2ar88ykBLtALloPJHyAauU= software.sslmate.com/src/go-pkcs12 v0.7.3/go.mod h1:Qiz0EyvDRJjjxGyUQa2cCNZn/wMyzrRJ/qcDXOQazLI= -tailscale.com v1.104.2 h1:zBbSW0tI4Xi2PhrZEl9yt6oWay3l8A+M8scsTnZpyAk= -tailscale.com v1.104.2/go.mod h1:D+gqEyJjFnwIaojBLaKxUbOfEO3cRXOaFaOZ5BIvYqs= +tailscale.com v1.104.5 h1:TLemRww20+bcQ0FEVTTZ7yMtVDZ4pOpSCL86Oo9g3mA= +tailscale.com v1.104.5/go.mod h1:Hq4zB8UpaxMW1fvqO30CLVQo3A7Ith0t9MnvEyiuoSA= From b8cf938f5387323eedfa6cb6e2c8f6b0b66b0c7e Mon Sep 17 00:00:00 2001 From: Stefan Majer Date: Fri, 6 Nov 2026 09:52:10 +0100 Subject: [PATCH 8/8] Review Comments --- cmd/admin/v2/housekeepeing.go | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/cmd/admin/v2/housekeepeing.go b/cmd/admin/v2/housekeepeing.go index 10f3a51..8a72aa1 100644 --- a/cmd/admin/v2/housekeepeing.go +++ b/cmd/admin/v2/housekeepeing.go @@ -83,27 +83,3 @@ func (h *housekeeping) machineResurrect(ctx context.Context) (err error) { return h.c.ListPrinter.Print(result.ModifiedMachines) } - -func (h *housekeeping) Get(id string) (any, error) { - panic("unimplemented") -} - -func (h *housekeeping) List() (any, error) { - panic("unimplemented") -} - -func (h *housekeeping) Create(rq any) (any, error) { - panic("unimplemented") -} - -func (h *housekeeping) Delete(id string) (any, error) { - panic("unimplemented") -} - -func (h *housekeeping) Convert(r any) (string, any, any, error) { - panic("unimplemented") -} - -func (h *housekeeping) Update(rq any) (any, error) { - panic("unimplemented") -}