Enable tag override (#215)

In some cases we want to add tags to services already registered in consul. This option allow external tools to add tags to existing services and order Consul to keep tags and propagate to cluster.

Author: misiek08

consul/consul.go

@@ -126,6 +126,7 @@ func consulServiceToService(consulService *consulapi.CatalogService) *service.Se
 		Name: consulService.ServiceName,
 		Tags: consulService.ServiceTags,
 		RegisteringAgentAddress: consulService.Address,
+		EnableTagOverride: consulService.ServiceEnableTagOverride,
 	}
 }
 
@@ -186,6 +187,7 @@ func (c *Consul) register(service *consulapi.AgentServiceRegistration) error {
 		"Tags":    service.Tags,
 		"Address": service.Address,
 		"Port":    service.Port,
+		"EnableTagOverride": service.EnableTagOverride,
 	}
 	log.WithFields(fields).Info("Registering")
 
@@ -291,6 +293,7 @@ func (c *Consul) marathonTaskToConsulServices(task *apps.Task, app *apps.App) ([
 			Address: serviceAddress,
 			Tags:    tags,
 			Checks:  checks,
+			EnableTagOverride: true,
 		})
 	}
 	return registrations, nil

consul/consul_test.go

@@ -133,6 +133,32 @@ func TestGetService_FailingAgent_GivingUp(t *testing.T) {
 	assert.Nil(t, services)
 }
 
+func TestServiceHasEnabledTagOverriding(t *testing.T) {
+	t.Parallel()
+
+	server := CreateTestServer(t)
+	defer server.Stop()
+
+	consul := ClientAtServer(server)
+
+	app := utils.ConsulApp("serviceA", 1)
+	app.Tasks[0].Host = server.Config.Bind
+	app.Labels["test"] = "tag"
+
+	err := consul.Register(&app.Tasks[0], app)
+
+	assert.NoError(t, err)
+
+	consul_services, err := consul.GetServices("serviceA")
+	services := make(map[string]*service.Service)
+	for _, s := range consul_services {
+		services[s.Name] = s
+	}
+
+	assert.NoError(t, err)
+	assert.True(t, services["serviceA"].EnableTagOverride)
+}
+
 func TestGetServices_RemovingFailingAgentsAndRetrying(t *testing.T) {
 	t.Parallel()
 	// create server

service/service.go

@@ -19,6 +19,7 @@ type Service struct {
 	Name                    string
 	Tags                    []string
 	RegisteringAgentAddress string
+	EnableTagOverride       bool
 }
 
 func (s *Service) TaskId() (apps.TaskID, error) {