No need to expose http and grpc ports for a single check

.changelog/10173.txt

@@ -2,7 +2,7 @@
 agent: Save exposed Envoy ports to the agent's state when `Expose.Checks` is true in proxy's configuration.
 ```
 ```release-note:improvement
-api: Add `ExposedHTTPPort` and `ExposedGRPCPort` to the health check API resource.
+api: Add `ExposedPort` to the health check API resource.
 ```
 ```release-note:improvement
 command: Exclude exposed Envoy ports from traffic redirection when providing `-proxy-id` and `Expose.Checks` is set.

agent/agent.go

@@ -2555,7 +2555,7 @@ func (a *Agent) addCheck(check *structs.HealthCheck, chkType *structs.CheckType,
 					return err
 				}
 				http.ProxyHTTP = httpInjectAddr(http.HTTP, proxy.Address, port)
-				check.ExposedHTTPPort = port
+				check.ExposedPort = port
 			}
 
 			http.Start()
@@ -2625,7 +2625,7 @@ func (a *Agent) addCheck(check *structs.HealthCheck, chkType *structs.CheckType,
 					return err
 				}
 				grpc.ProxyGRPC = grpcInjectAddr(grpc.GRPC, proxy.Address, port)
-				check.ExposedGRPCPort = port
+				check.ExposedPort = port
 			}
 
 			grpc.Start()
@@ -3812,7 +3812,7 @@ func (a *Agent) rerouteExposedChecks(serviceID structs.ServiceID, proxyAddr stri
 		}
 		c.ProxyHTTP = httpInjectAddr(c.HTTP, proxyAddr, port)
 		hc := a.State.Check(cid)
-		hc.ExposedHTTPPort = port
+		hc.ExposedPort = port
 	}
 	for cid, c := range a.checkGRPCs {
 		if c.ServiceID != serviceID {
@@ -3824,7 +3824,7 @@ func (a *Agent) rerouteExposedChecks(serviceID structs.ServiceID, proxyAddr stri
 		}
 		c.ProxyGRPC = grpcInjectAddr(c.GRPC, proxyAddr, port)
 		hc := a.State.Check(cid)
-		hc.ExposedGRPCPort = port
+		hc.ExposedPort = port
 	}
 	return nil
 }
@@ -3838,15 +3838,15 @@ func (a *Agent) resetExposedChecks(serviceID structs.ServiceID) {
 		if c.ServiceID == serviceID {
 			c.ProxyHTTP = ""
 			hc := a.State.Check(cid)
-			hc.ExposedHTTPPort = 0
+			hc.ExposedPort = 0
 			ids = append(ids, cid)
 		}
 	}
 	for cid, c := range a.checkGRPCs {
 		if c.ServiceID == serviceID {
 			c.ProxyGRPC = ""
 			hc := a.State.Check(cid)
-			hc.ExposedGRPCPort = 0
+			hc.ExposedPort = 0
 			ids = append(ids, cid)
 		}
 	}

agent/agent_test.go

@@ -4330,7 +4330,7 @@ func TestAgent_RerouteExistingHTTPChecks(t *testing.T) {
 
 	retry.Run(t, func(r *retry.R) {
 		hc := a.State.Check(structs.NewCheckID("http", nil))
-		require.Equal(r, hc.ExposedHTTPPort, 21500)
+		require.Equal(r, hc.ExposedPort, 21500)
 	})
 
 	retry.Run(t, func(r *retry.R) {
@@ -4343,7 +4343,7 @@ func TestAgent_RerouteExistingHTTPChecks(t *testing.T) {
 
 	retry.Run(t, func(r *retry.R) {
 		hc := a.State.Check(structs.NewCheckID("grpc", nil))
-		require.Equal(r, hc.ExposedGRPCPort, 21501)
+		require.Equal(r, hc.ExposedPort, 21501)
 	})
 
 	// Re-register a proxy and disable exposing HTTP checks.
@@ -4377,7 +4377,7 @@ func TestAgent_RerouteExistingHTTPChecks(t *testing.T) {
 
 	retry.Run(t, func(r *retry.R) {
 		hc := a.State.Check(structs.NewCheckID("http", nil))
-		require.Equal(r, hc.ExposedHTTPPort, 0)
+		require.Equal(r, hc.ExposedPort, 0)
 	})
 
 	retry.Run(t, func(r *retry.R) {
@@ -4389,7 +4389,7 @@ func TestAgent_RerouteExistingHTTPChecks(t *testing.T) {
 
 	retry.Run(t, func(r *retry.R) {
 		hc := a.State.Check(structs.NewCheckID("grpc", nil))
-		require.Equal(r, hc.ExposedGRPCPort, 0)
+		require.Equal(r, hc.ExposedPort, 0)
 	})
 }
 
@@ -4483,7 +4483,7 @@ func TestAgent_RerouteNewHTTPChecks(t *testing.T) {
 
 	retry.Run(t, func(r *retry.R) {
 		hc := a.State.Check(structs.NewCheckID("http", nil))
-		require.Equal(r, hc.ExposedHTTPPort, 21500)
+		require.Equal(r, hc.ExposedPort, 21500)
 	})
 
 	retry.Run(t, func(r *retry.R) {
@@ -4495,7 +4495,7 @@ func TestAgent_RerouteNewHTTPChecks(t *testing.T) {
 
 	retry.Run(t, func(r *retry.R) {
 		hc := a.State.Check(structs.NewCheckID("grpc", nil))
-		require.Equal(r, hc.ExposedGRPCPort, 21501)
+		require.Equal(r, hc.ExposedPort, 21501)
 	})
 }
 

agent/structs/structs.go

@@ -1413,13 +1413,9 @@ type HealthCheck struct {
 	ServiceTags []string      // optional service tags
 	Type        string        // Check type: http/ttl/tcp/etc
 
-	// ExposedHTTPPort is the port of the exposed Envoy listener representing the
-	// HTTP health check of the service.
-	ExposedHTTPPort int
-
-	// ExposedGRPCPort is the port of the exposed Envoy listener representing the
-	// GRPC health check of the service.
-	ExposedGRPCPort int
+	// ExposedPort is the port of the exposed Envoy listener representing the
+	// HTTP or GRPC health check of the service.
+	ExposedPort int
 
 	Definition HealthCheckDefinition `bexpr:"-"`
 

agent/structs/structs_filtering_test.go

@@ -545,15 +545,10 @@ var expectedFieldConfigHealthCheck bexpr.FieldConfigurations = bexpr.FieldConfig
 		SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual, bexpr.MatchIn, bexpr.MatchNotIn, bexpr.MatchMatches, bexpr.MatchNotMatches},
 		StructFieldName:     "Type",
 	},
-	"ExposedHTTPPort": &bexpr.FieldConfiguration{
+	"ExposedPort": &bexpr.FieldConfiguration{
 		CoerceFn:            bexpr.CoerceInt,
 		SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual},
-		StructFieldName:     "ExposedHTTPPort",
-	},
-	"ExposedGRPCPort": &bexpr.FieldConfiguration{
-		CoerceFn:            bexpr.CoerceInt,
-		SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual},
-		StructFieldName:     "ExposedGRPCPort",
+		StructFieldName:     "ExposedPort",
 	},
 }
 

api/agent.go

@@ -54,19 +54,18 @@ const (
 
 // AgentCheck represents a check known to the agent
 type AgentCheck struct {
-	Node            string
-	CheckID         string
-	Name            string
-	Status          string
-	Notes           string
-	Output          string
-	ServiceID       string
-	ServiceName     string
-	Type            string
-	ExposedHTTPPort int
-	ExposedGRPCPort int
-	Definition      HealthCheckDefinition
-	Namespace       string `json:",omitempty"`
+	Node        string
+	CheckID     string
+	Name        string
+	Status      string
+	Notes       string
+	Output      string
+	ServiceID   string
+	ServiceName string
+	Type        string
+	ExposedPort int
+	Definition  HealthCheckDefinition
+	Namespace   string `json:",omitempty"`
 }
 
 // AgentWeights represent optional weights for a service

command/connect/redirecttraffic/redirect_traffic.go

@@ -207,11 +207,8 @@ func (c *cmd) generateConfigFromFlags() (iptables.Config, error) {
 			}
 
 			for _, check := range checks {
-				if check.ExposedHTTPPort != 0 {
-					cfg.ExcludeInboundPorts = append(cfg.ExcludeInboundPorts, strconv.Itoa(check.ExposedHTTPPort))
-				}
-				if check.ExposedGRPCPort != 0 {
-					cfg.ExcludeInboundPorts = append(cfg.ExcludeInboundPorts, strconv.Itoa(check.ExposedGRPCPort))
+				if check.ExposedPort != 0 {
+					cfg.ExcludeInboundPorts = append(cfg.ExcludeInboundPorts, strconv.Itoa(check.ExposedPort))
 				}
 			}
 		}

command/connect/redirecttraffic/redirect_traffic_test.go

@@ -596,7 +596,7 @@ func TestGenerateConfigFromFlags(t *testing.T) {
 
 			if c.expError == "" {
 				require.NoError(t, err)
-				require.Equal(t, c.expCfg, cfg)
+				require.EqualValues(t, c.expCfg, cfg)
 			} else {
 				require.Error(t, err)
 				require.Contains(t, err.Error(), c.expError)