Adds support for service tagged addresses

hashicorp · Jul 25, 2020 · de992d8 · de992d8
1 parent d1f1b0d
commit de992d8
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 23 deletions.
diff --git a/dependency/catalog_node_test.go b/dependency/catalog_node_test.go
@@ -125,6 +125,12 @@ func TestCatalogNodeQuery_Fetch(t *testing.T) {
 							"meta1": "value1",
 						},
 					},
+					&CatalogNodeService{
+						ID:      "service-taggedAddresses",
+						Service: "service-taggedAddresses",
+						Tags:    ServiceTags([]string{}),
+						Meta:    map[string]string{},
+					},
 				},
 			},
 		},

diff --git a/dependency/catalog_services_test.go b/dependency/catalog_services_test.go
@@ -78,6 +78,10 @@ func TestCatalogServicesQuery_Fetch(t *testing.T) {
 					Name: "service-meta",
 					Tags: ServiceTags([]string{"tag1"}),
 				},
+				&CatalogSnippet{
+					Name: "service-taggedAddresses",
+					Tags: ServiceTags([]string{}),
+				},
 			},
 		},
 	}

diff --git a/dependency/dependency_test.go b/dependency/dependency_test.go
@@ -55,6 +55,24 @@ func TestMain(m *testing.M) {
 	if err := consul_agent.ServiceRegister(serviceMetaService); err != nil {
 		Fatalf("%v", err)
 	}
+	// service with serviceTaggedAddresses
+	serviceTaggedAddressesService := &api.AgentServiceRegistration{
+		ID:   "service-taggedAddresses",
+		Name: "service-taggedAddresses",
+		TaggedAddresses: map[string]api.ServiceAddress{
+			"lan": {
+				Address: "192.0.2.1",
+				Port:    80,
+			},
+			"wan": {
+				Address: "192.0.2.2",
+				Port:    443,
+			},
+		},
+	}
+	if err := consul_agent.ServiceRegister(serviceTaggedAddressesService); err != nil {
+		Fatalf("%v", err)
+	}
 	// connect enabled service
 	testService := &api.AgentServiceRegistration{
 		Name:    "foo",

diff --git a/dependency/health_service.go b/dependency/health_service.go
@@ -38,20 +38,21 @@ func init() {
 
 // HealthService is a service entry in Consul.
 type HealthService struct {
-	Node                string
-	NodeID              string
-	NodeAddress         string
-	NodeTaggedAddresses map[string]string
-	NodeMeta            map[string]string
-	ServiceMeta         map[string]string
-	Address             string
-	ID                  string
-	Name                string
-	Tags                ServiceTags
-	Checks              api.HealthChecks
-	Status              string
-	Port                int
-	Weights             api.AgentWeights
+	Node                   string
+	NodeID                 string
+	NodeAddress            string
+	NodeTaggedAddresses    map[string]string
+	NodeMeta               map[string]string
+	ServiceMeta            map[string]string
+	Address                string
+	ServiceTaggedAddresses map[string]api.ServiceAddress
+	ID                     string
+	Name                   string
+	Tags                   ServiceTags
+	Checks                 api.HealthChecks
+	Status                 string
+	Port                   int
+	Weights                api.AgentWeights
 }
 
 // HealthServiceQuery is the representation of all a service query in Consul.
@@ -177,15 +178,16 @@ func (d *HealthServiceQuery) Fetch(clients *ClientSet, opts *QueryOptions) (inte
 		}
 
 		list = append(list, &HealthService{
-			Node:                entry.Node.Node,
-			NodeID:              entry.Node.ID,
-			NodeAddress:         entry.Node.Address,
-			NodeTaggedAddresses: entry.Node.TaggedAddresses,
-			NodeMeta:            entry.Node.Meta,
-			ServiceMeta:         entry.Service.Meta,
-			Address:             address,
-			ID:                  entry.Service.ID,
-			Name:                entry.Service.Service,
+			Node:                   entry.Node.Node,
+			NodeID:                 entry.Node.ID,
+			NodeAddress:            entry.Node.Address,
+			NodeTaggedAddresses:    entry.Node.TaggedAddresses,
+			NodeMeta:               entry.Node.Meta,
+			ServiceMeta:            entry.Service.Meta,
+			Address:                address,
+			ServiceTaggedAddresses: entry.Service.TaggedAddresses,
+			ID:                     entry.Service.ID,
+			Name:                   entry.Service.Service,
 			Tags: ServiceTags(
 				deepCopyAndSortTags(entry.Service.Tags)),
 			Status:  status,

diff --git a/dependency/health_service_test.go b/dependency/health_service_test.go
@@ -316,6 +316,43 @@ func TestHealthServiceQuery_Fetch(t *testing.T) {
 				},
 			},
 		},
+		{
+			"service-taggedAddresses",
+			"service-taggedAddresses",
+			[]*HealthService{
+				&HealthService{
+					Node:        testConsul.Config.NodeName,
+					NodeAddress: testConsul.Config.Bind,
+					NodeTaggedAddresses: map[string]string{
+						"lan": "127.0.0.1",
+						"wan": "127.0.0.1",
+					},
+					NodeMeta: map[string]string{
+						"consul-network-segment": "",
+					},
+					ServiceMeta: map[string]string{},
+					Address:     testConsul.Config.Bind,
+					ServiceTaggedAddresses: map[string]api.ServiceAddress{
+						"lan": {
+							Address: "192.0.2.1",
+							Port:    80,
+						},
+						"wan": {
+							Address: "192.0.2.2",
+							Port:    443,
+						},
+					},
+					ID:     "service-taggedAddresses",
+					Name:   "service-taggedAddresses",
+					Tags:   []string{},
+					Status: "passing",
+					Weights: api.AgentWeights{
+						Passing: 1,
+						Warning: 1,
+					},
+				},
+			},
+		},
 	}
 
 	for i, tc := range cases {