Merge pull request #158 from DataDog/shang/multi-urls-fix

[proc] made endpoints and api keys match length instead of returning an error

Author: shang-wang

config/config.go

@@ -254,10 +254,15 @@ func NewAgentConfig(agentIni *File, agentYaml *YamlAgentConfig) (*AgentConfig, e
 		cfg.StatsdPort = agentIni.GetIntDefault("Main", "dogstatsd_port", cfg.StatsdPort)
 
 		// All process-agent specific config lives under [process.config] section.
+		// NOTE: we truncate either endpoints or APIEndpoints if the lengths don't match
 		ns = "process.config"
 		endpoints := agentIni.GetStrArrayDefault(ns, "endpoint", ",", []string{defaultEndpoint})
-		if len(endpoints) != len(cfg.APIEndpoints) {
-			return nil, fmt.Errorf("found %d api keys and %d endpoints", len(cfg.APIEndpoints), len(endpoints))
+		if len(endpoints) < len(cfg.APIEndpoints) {
+			log.Warnf("found %d api keys and %d endpoints", len(cfg.APIEndpoints), len(endpoints))
+			cfg.APIEndpoints = cfg.APIEndpoints[:len(endpoints)]
+		} else if len(endpoints) > len(cfg.APIEndpoints) {
+			log.Warnf("found %d api keys and %d endpoints", len(cfg.APIEndpoints), len(endpoints))
+			endpoints = endpoints[:len(cfg.APIEndpoints)]
 		}
 		for i, e := range endpoints {
 			u, err := url.Parse(e)

config/config_test.go

@@ -163,24 +163,45 @@ func TestGetHostname(t *testing.T) {
 }
 
 func TestDDAgentMultiAPIKeys(t *testing.T) {
+	// if no endpoint is given but api_keys are there, match the first api_key
+	// with the default endpoint
 	assert := assert.New(t)
 	ddAgentConf, _ := ini.Load([]byte("[Main]\n\napi_key=foo,bar "))
 	configFile := &File{instance: ddAgentConf, Path: "whatever"}
 	agentConfig, err := NewAgentConfig(configFile, nil)
-	assert.Error(err)
+	assert.NoError(err)
+	assert.Equal(1, len(agentConfig.APIEndpoints))
+	assert.Equal("foo", agentConfig.APIEndpoints[0].APIKey)
+	assert.Equal("process.datadoghq.com", agentConfig.APIEndpoints[0].Endpoint.Hostname())
 
 	ddAgentConf, _ = ini.Load([]byte(strings.Join([]string{
 		"[Main]",
-		"api_key = foo,bar",
+		"api_key=foo,bar",
 		"[process.config]",
 		"endpoint=https://process.datadoghq.com,https://process.datadoghq.eu",
 	}, "\n")))
 	configFile = &File{instance: ddAgentConf, Path: "whatever"}
 	agentConfig, err = NewAgentConfig(configFile, nil)
+	assert.NoError(err)
+	assert.Equal(2, len(agentConfig.APIEndpoints))
 	assert.Equal("foo", agentConfig.APIEndpoints[0].APIKey)
 	assert.Equal("process.datadoghq.com", agentConfig.APIEndpoints[0].Endpoint.Hostname())
 	assert.Equal("bar", agentConfig.APIEndpoints[1].APIKey)
 	assert.Equal("process.datadoghq.eu", agentConfig.APIEndpoints[1].Endpoint.Hostname())
+
+	// if endpoint count is greater than api_key count, drop additional endpoints
+	ddAgentConf, _ = ini.Load([]byte(strings.Join([]string{
+		"[Main]",
+		"api_key=foo",
+		"[process.config]",
+		"endpoint=https://process.datadoghq.com,https://process.datadoghq.eu",
+	}, "\n")))
+	configFile = &File{instance: ddAgentConf, Path: "whatever"}
+	agentConfig, err = NewAgentConfig(configFile, nil)
+	assert.NoError(err)
+	assert.Equal(1, len(agentConfig.APIEndpoints))
+	assert.Equal("foo", agentConfig.APIEndpoints[0].APIKey)
+	assert.Equal("process.datadoghq.com", agentConfig.APIEndpoints[0].Endpoint.Hostname())
 }
 
 func TestDefaultConfig(t *testing.T) {