maintenance: deregister any client

Author: tschaefer

cmd/service/deregister.go

@@ -12,11 +12,12 @@ import (
 	"github.com/tschaefer/finchctl/cmd/errors"
 	"github.com/tschaefer/finchctl/cmd/format"
 	"github.com/tschaefer/finchctl/internal/service"
+	"github.com/tschaefer/finchctl/internal/version"
 )
 
 var deregisterCmd = &cobra.Command{
 	Use:               "deregister [user@]host[:port]",
-	Short:             "Deregister the client from a service on a remote host",
+	Short:             "Deregister a client from a service on a remote host",
 	Args:              cobra.ExactArgs(1),
 	Run:               runDeregisterCmd,
 	ValidArgsFunction: completion.CompleteHostName,
@@ -25,6 +26,7 @@ var deregisterCmd = &cobra.Command{
 func init() {
 	deregisterCmd.Flags().String("run.format", "progress", "output format")
 	deregisterCmd.Flags().Bool("run.dry-run", false, "do not deregister, just print the commands that would be run")
+	deregisterCmd.Flags().String("client.rid", version.ResourceID(), "client resource ID (default: local client rid)")
 
 	_ = deregisterCmd.RegisterFlagCompletionFunc("run.format", completion.CompleteRunFormat)
 }
@@ -46,6 +48,8 @@ func runDeregisterCmd(cmd *cobra.Command, args []string) {
 	})
 	errors.CheckErr(err, formatType)
 
-	err = s.Deregister()
+	clientID, _ := cmd.Flags().GetString("client.rid")
+	keepCfg := cmd.Flags().Lookup("client.rid").Changed
+	err = s.Deregister(clientID, keepCfg)
 	errors.CheckErr(err, formatType)
 }

cmd/service/info.go

@@ -26,7 +26,7 @@ var infoCmd = &cobra.Command{
 }
 
 func init() {
-	infoCmd.Flags().Bool("output.json", false, "output in JSON format (not implemented yet)")
+	infoCmd.Flags().Bool("output.json", false, "output in JSON format")
 }
 
 func runInfoCmd(cmd *cobra.Command, args []string) {

internal/service/deregister.go

@@ -8,10 +8,9 @@ import (
 	"path"
 
 	"github.com/tschaefer/finchctl/internal/config"
-	"github.com/tschaefer/finchctl/internal/version"
 )
 
-func (s *Service) deregisterService() error {
+func (s *Service) deregisterService(clientID string, keepCfg bool) error {
 	if err := s.__updateSetTargetConfiguration(); err != nil {
 		return convertError(err, &DeregisterServiceError{})
 	}
@@ -20,7 +19,7 @@ func (s *Service) deregisterService() error {
 		return &DeregisterServiceError{Message: err.Error(), Reason: ""}
 	}
 
-	caCertPath := path.Join(s.libDir(), "traefik/etc/certs.d", version.ResourceID()+".pem")
+	caCertPath := path.Join(s.libDir(), "traefik/etc/certs.d", clientID+".pem")
 	out, err := s.target.Run(s.ctx, "rm -f "+caCertPath)
 	if err != nil {
 		return &DeregisterServiceError{Message: err.Error(), Reason: string(out)}
@@ -30,5 +29,9 @@ func (s *Service) deregisterService() error {
 		return nil
 	}
 
+	if !keepCfg {
+		return nil
+	}
+
 	return config.RemoveStack(s.config.Hostname)
 }

internal/service/service.go

@@ -181,7 +181,7 @@ func (s *Service) Register() error {
 	return nil
 }
 
-func (s *Service) Deregister() error {
+func (s *Service) Deregister(clientID string, keepCfg bool) error {
 	defer func() {
 		if s.format == target.FormatProgress {
 			println()
@@ -192,7 +192,7 @@ func (s *Service) Deregister() error {
 		return convertError(err, &DeregisterServiceError{})
 	}
 
-	if err := s.deregisterService(); err != nil {
+	if err := s.deregisterService(clientID, keepCfg); err != nil {
 		return err
 	}
 

internal/service/service_test.go

@@ -338,7 +338,7 @@ func Test_Deregister(t *testing.T) {
 	assert.NoError(t, err, "create service")
 
 	record := capture(func() {
-		err = s.Deregister()
+		err = s.Deregister("rid:finchctl:1234567890abcdef", false)
 	})
 	assert.NoError(t, err, "deregister service")
 
@@ -360,7 +360,7 @@ func Test_Deregister(t *testing.T) {
 	assert.NoError(t, err, "create service")
 
 	record = capture(func() {
-		err = s.Deregister()
+		err = s.Deregister("rid:finchctl:1234567890abcdef", false)
 	})
 	assert.NoError(t, err, "deregister service")