diff --git a/internal/model/config.go b/internal/model/config.go index 778d5c11..b5a9842d 100644 --- a/internal/model/config.go +++ b/internal/model/config.go @@ -88,7 +88,6 @@ type Config struct { LabelProvider string `description:"Label provider to use for ACLs (auto, docker, kubernetes or none to disable). auto detects the environment." yaml:"labelProvider"` Log LogConfig `description:"Logging configuration." yaml:"log"` Tailscale TailscaleConfig `description:"Tailscale configuration." yaml:"tailscale"` - LabelProvider string `description:"Label provider to use (docker, kubernetes, auto)." yaml:"labelProvider"` } type DatabaseConfig struct { @@ -244,14 +243,6 @@ type OIDCClientConfig struct { Name string `description:"Client name in UI." yaml:"name"` } -type TailscaleWhoisResponse struct { - UserID string - LoginName string - DisplayName string - NodeName string - Tags []string -} - type ACLsConfig struct { Policy string `description:"ACL policy for allow-by-default or deny-by-default, available options are allow and deny, default is allow." yaml:"policy"` } diff --git a/internal/service/tailscale_service.go b/internal/service/tailscale_service.go index 9d341063..f750b9f7 100644 --- a/internal/service/tailscale_service.go +++ b/internal/service/tailscale_service.go @@ -15,6 +15,14 @@ import ( "tailscale.com/tsnet" ) +type TailscaleWhoisResponse struct { + UserID string + LoginName string + DisplayName string + NodeName string + Tags []string +} + type TailscaleService struct { log *logger.Logger wg *sync.WaitGroup @@ -89,7 +97,7 @@ func (ts *TailscaleService) watchAndClose() { } } -func (ts *TailscaleService) Whois(ctx context.Context, addr string) (*model.TailscaleWhoisResponse, error) { +func (ts *TailscaleService) Whois(ctx context.Context, addr string) (*TailscaleWhoisResponse, error) { who, err := ts.lc.WhoIs(ctx, addr) if err != nil { @@ -99,7 +107,7 @@ func (ts *TailscaleService) Whois(ctx context.Context, addr string) (*model.Tail return nil, fmt.Errorf("failed to get client whois: %w", err) } - res := model.TailscaleWhoisResponse{ + res := TailscaleWhoisResponse{ UserID: who.UserProfile.ID.String(), LoginName: who.UserProfile.LoginName, DisplayName: who.UserProfile.DisplayName,