remove pointers from config struct

almeidapaulopt · Dec 11, 2024 · a641d6c · a641d6c
1 parent d4511cc
commit a641d6c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/internal/proxyconfig/proxyconfig.go b/internal/proxyconfig/proxyconfig.go
@@ -12,8 +12,8 @@ import (
 type (
 	// Config struct stores all the configuration for the proxy
 	Config struct {
-		Tailscale *Tailscale `validate:"dive"`
-		Dashboard *Dashboard `validate:"dive"`
+		Tailscale Tailscale `validate:"dive"`
+		Dashboard Dashboard `validate:"dive"`
 		// Global
 		TargetProvider string
 		TargetID       string

diff --git a/internal/proxyproviders/tailscale/provider.go b/internal/proxyproviders/tailscale/provider.go
@@ -42,8 +42,6 @@ func New(log zerolog.Logger, name string, provider *config.TailscaleServerConfig
 func (c *Client) NewProxy(config *proxyconfig.Config) (proxyproviders.Proxy, error) {
 	c.log.Debug().
 		Str("hostname", config.Hostname).
-		Bool("ephemeral", config.Tailscale.Ephemeral).
-		Bool("runWebClient", config.Tailscale.RunWebClient).
 		Msg("Setting up tailscale server")
 
 	// If the auth key is not set, use the provider auth key

diff --git a/internal/targetproviders/docker/container.go b/internal/targetproviders/docker/container.go
@@ -116,7 +116,7 @@ func (c *container) newProxyConfig() (*proxyconfig.Config, error) {
 	pcfg.ProxyURL = proxyURL
 	pcfg.Hostname = proxyURL.Hostname()
 	pcfg.TargetProvider = c.targetProviderName
-	pcfg.Tailscale = tailscale
+	pcfg.Tailscale = *tailscale
 	pcfg.ProxyProvider = c.getLabelString(LabelProxyProvider, proxyconfig.DefaultProxyProvider)
 	pcfg.ProxyAccessLog = c.getLabelBool(LabelContainerAccessLog, proxyconfig.DefaultProxyAccessLog)
 	pcfg.TLSValidate = c.getLabelBool(LabelTLSValidate, proxyconfig.DefaultTLSValidate)

diff --git a/internal/targetproviders/files/files.go b/internal/targetproviders/files/files.go
@@ -39,8 +39,8 @@ type (
 	configProxiesList map[string]proxyConfig
 
 	proxyConfig struct {
-		Dashboard     *proxyconfig.Dashboard
-		Tailscale     *proxyconfig.Tailscale
+		Dashboard     proxyconfig.Dashboard
+		Tailscale     proxyconfig.Tailscale
 		URL           string `validate:"required,uri"`
 		ProxyProvider string
 		TLSValidate   bool `default:"true" validate:"boolean"`