From 1d5981015a176ce6d37e7dae33ce0b00af3d43a2 Mon Sep 17 00:00:00 2001
From: AndrewChubatiuk <andrew.chubatiuk@gmail.com>
Date: Mon, 8 Feb 2021 18:16:49 +0200
Subject: [PATCH] fixed tests

---
 command/agent/consul/connect.go      |  4 ++--
 command/agent/consul/connect_test.go | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/command/agent/consul/connect.go b/command/agent/consul/connect.go
index 54ce30b11..7ec387c80 100644
--- a/command/agent/consul/connect.go
+++ b/command/agent/consul/connect.go
@@ -100,7 +100,7 @@ func connectSidecarRegistration(serviceId string, serviceName string, css *struc
 	if err != nil {
 		return nil, err
 	}
-
+	
 	return &api.AgentServiceRegistration{
 		Tags:    helper.CopySliceString(css.Tags),
 		Port:    cPort.Value,
@@ -108,7 +108,7 @@ func connectSidecarRegistration(serviceId string, serviceName string, css *struc
 		Proxy:   proxy,
 		Checks: api.AgentServiceChecks{
 			{
-				Name:     "Connect Sidecar Listening",
+				Name: 	  "Connect Sidecar Listening",
 				TCP:      ipaddr.FormatAddressPort(cNet.IP, cPort.Value),
 				Interval: "10s",
 			},
diff --git a/command/agent/consul/connect_test.go b/command/agent/consul/connect_test.go
index d42f63995..1e5df9424 100644
--- a/command/agent/consul/connect_test.go
+++ b/command/agent/consul/connect_test.go
@@ -27,13 +27,13 @@ func TestConnect_newConnect(t *testing.T) {
 	t.Parallel()
 
 	t.Run("nil", func(t *testing.T) {
-		asr, err := newConnect("", nil, nil)
+		asr, err := newConnect("","", nil, nil)
 		require.NoError(t, err)
 		require.Nil(t, asr)
 	})
 
 	t.Run("native", func(t *testing.T) {
-		asr, err := newConnect("", &structs.ConsulConnect{
+		asr, err := newConnect("", "", &structs.ConsulConnect{
 			Native: true,
 		}, nil)
 		require.NoError(t, err)
@@ -42,7 +42,7 @@ func TestConnect_newConnect(t *testing.T) {
 	})
 
 	t.Run("with sidecar", func(t *testing.T) {
-		asr, err := newConnect("redis", &structs.ConsulConnect{
+		asr, err := newConnect("redis-service-id", "redis", &structs.ConsulConnect{
 			Native: false,
 			SidecarService: &structs.ConsulSidecarService{
 				Tags: []string{"foo", "bar"},
@@ -68,20 +68,20 @@ func TestConnect_connectSidecarRegistration(t *testing.T) {
 	t.Parallel()
 
 	t.Run("nil", func(t *testing.T) {
-		sidecarReg, err := connectSidecarRegistration("", nil, testConnectNetwork)
+		sidecarReg, err := connectSidecarRegistration("", "", nil, testConnectNetwork)
 		require.NoError(t, err)
 		require.Nil(t, sidecarReg)
 	})
 
 	t.Run("no service port", func(t *testing.T) {
-		_, err := connectSidecarRegistration("unknown", &structs.ConsulSidecarService{
+		_, err := connectSidecarRegistration("unknown-id", "unknown", &structs.ConsulSidecarService{
 			// irrelevant
 		}, testConnectNetwork)
 		require.EqualError(t, err, `No Connect port defined for service "unknown"`)
 	})
 
 	t.Run("bad proxy", func(t *testing.T) {
-		_, err := connectSidecarRegistration("redis", &structs.ConsulSidecarService{
+		_, err := connectSidecarRegistration("redis-service-id", "redis", &structs.ConsulSidecarService{
 			Proxy: &structs.ConsulProxy{
 				Expose: &structs.ConsulExposeConfig{
 					Paths: []structs.ConsulExposePath{{
@@ -94,7 +94,7 @@ func TestConnect_connectSidecarRegistration(t *testing.T) {
 	})
 
 	t.Run("normal", func(t *testing.T) {
-		proxy, err := connectSidecarRegistration("redis", &structs.ConsulSidecarService{
+		proxy, err := connectSidecarRegistration("redis-service-id", "redis", &structs.ConsulSidecarService{
 			Tags: []string{"foo", "bar"},
 			Port: "sidecarPort",
 		}, testConnectNetwork)