Merge branch v2.10 into v3.0

pkg/provider/nomad/nomad.go

@@ -89,7 +89,18 @@ type Configuration struct {
 
 // SetDefaults sets the default values for the Nomad Traefik Provider Configuration.
 func (c *Configuration) SetDefaults() {
-	c.Endpoint = &EndpointConfig{}
+	defConfig := api.DefaultConfig()
+	c.Endpoint = &EndpointConfig{
+		Address: defConfig.Address,
+		Region:  defConfig.Region,
+		Token:   defConfig.SecretID,
+		TLS: &types.ClientTLS{
+			CA:                 defConfig.TLSConfig.CACert,
+			Cert:               defConfig.TLSConfig.ClientCert,
+			Key:                defConfig.TLSConfig.ClientKey,
+			InsecureSkipVerify: defConfig.TLSConfig.Insecure,
+		},
+	}
 	c.Prefix = defaultPrefix
 	c.ExposedByDefault = true
 	c.RefreshInterval = ptypes.Duration(15 * time.Second)
@@ -107,9 +118,9 @@ type Provider struct {
 }
 
 type EndpointConfig struct {
-	// Address is the Nomad endpoint address, if empty it defaults to NOMAD_ADDR or "http://localhost:4646".
+	// Address is the Nomad endpoint address, if empty it defaults to NOMAD_ADDR or "http://127.0.0.1:4646".
 	Address string `description:"The address of the Nomad server, including scheme and port." json:"address,omitempty" toml:"address,omitempty" yaml:"address,omitempty"`
-	// Region is the Nomad region, if empty it defaults to NOMAD_REGION or "global".
+	// Region is the Nomad region, if empty it defaults to NOMAD_REGION.
 	Region string `description:"Nomad region to use. If not provided, the local agent region is used." json:"region,omitempty" toml:"region,omitempty" yaml:"region,omitempty"`
 	// Token is the ACL token to connect with Nomad, if empty it defaults to NOMAD_TOKEN.
 	Token            string           `description:"Token is used to provide a per-request ACL token." json:"token,omitempty" toml:"token,omitempty" yaml:"token,omitempty" loggable:"false"`
@@ -208,24 +219,19 @@ func (p *Provider) loadConfiguration(ctx context.Context, configurationC chan<-
 }
 
 func createClient(namespace string, endpoint *EndpointConfig) (*api.Client, error) {
-	config := api.Config{
+	return api.NewClient(&api.Config{
 		Address:   endpoint.Address,
 		Namespace: namespace,
 		Region:    endpoint.Region,
 		SecretID:  endpoint.Token,
 		WaitTime:  time.Duration(endpoint.EndpointWaitTime),
-	}
-
-	if endpoint.TLS != nil {
-		config.TLSConfig = &api.TLSConfig{
+		TLSConfig: &api.TLSConfig{
 			CACert:     endpoint.TLS.CA,
 			ClientCert: endpoint.TLS.Cert,
 			ClientKey:  endpoint.TLS.Key,
 			Insecure:   endpoint.TLS.InsecureSkipVerify,
-		}
-	}
-
-	return api.NewClient(&config)
+		},
+	})
 }
 
 // configuration contains information from the service's tags that are globals

pkg/provider/nomad/nomad_test.go

@@ -7,7 +7,9 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"github.com/traefik/traefik/v3/pkg/types"
 )
 
 func Test_globalConfig(t *testing.T) {
@@ -76,6 +78,61 @@ func Test_globalConfig(t *testing.T) {
 	}
 }
 
+func TestProvider_SetDefaults_Endpoint(t *testing.T) {
+	testCases := []struct {
+		desc     string
+		envs     map[string]string
+		expected *EndpointConfig
+	}{
+		{
+			desc: "without env vars",
+			envs: map[string]string{},
+			expected: &EndpointConfig{
+				Address: "http://127.0.0.1:4646",
+				TLS:     &types.ClientTLS{},
+			},
+		},
+		{
+			desc: "with env vars",
+			envs: map[string]string{
+				"NOMAD_ADDR":        "https://nomad.example.com",
+				"NOMAD_REGION":      "us-west",
+				"NOMAD_TOKEN":       "almighty_token",
+				"NOMAD_CACERT":      "/etc/ssl/private/nomad-agent-ca.pem",
+				"NOMAD_CLIENT_CERT": "/etc/ssl/private/global-client-nomad.pem",
+				"NOMAD_CLIENT_KEY":  "/etc/ssl/private/global-client-nomad-key.pem",
+				"NOMAD_SKIP_VERIFY": "true",
+			},
+			expected: &EndpointConfig{
+				Address: "https://nomad.example.com",
+				Region:  "us-west",
+				Token:   "almighty_token",
+				TLS: &types.ClientTLS{
+					CA:                 "/etc/ssl/private/nomad-agent-ca.pem",
+					Cert:               "/etc/ssl/private/global-client-nomad.pem",
+					Key:                "/etc/ssl/private/global-client-nomad-key.pem",
+					InsecureSkipVerify: true,
+				},
+				EndpointWaitTime: 0,
+			},
+		},
+	}
+
+	for _, test := range testCases {
+		test := test
+		t.Run(test.desc, func(t *testing.T) {
+			for k, v := range test.envs {
+				t.Setenv(k, v)
+			}
+
+			p := &Provider{}
+			p.SetDefaults()
+
+			assert.Equal(t, test.expected, p.Endpoint)
+		})
+	}
+}
+
 func Test_getNomadServiceData(t *testing.T) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		switch {