Rename to support library differences

internal/application/doc.go

@@ -6,8 +6,8 @@
 /*
 Package application includes support for applying updates to the Border servers.
 
-"Border Servers" are the servers that are exposed to the outside world and direct traffic into the cluster.
-At this time the only supported Border Servers are NGINX Plus servers. The BorderClient module defines
+"Border TcpServers" are the servers that are exposed to the outside world and direct traffic into the cluster.
+At this time the only supported Border TcpServers are NGINX Plus servers. The BorderClient module defines
 an interface that can be implemented to support other Border Server types.
 
 - HttpBorderClient: updates NGINX Plus servers using HTTP Upstream methods on the NGINX Plus API.

internal/application/http_border_client.go

@@ -36,7 +36,7 @@ func (hbc *HttpBorderClient) Update(event core.ServerUpdateEvent) error {
 }
 
 func (hbc *HttpBorderClient) Delete(event core.ServerUpdateEvent) error {
-err := hbc.nginxClient.DeleteHTTPServer(event.NginxHost, event.Servers[0].Server)
+err := hbc.nginxClient.DeleteHTTPServer(event.NginxHost, event.TcpServers[0].Server) // TODO: SW: This needs to be HttpServers not TcpServers
 if err != nil {
 return fmt.Errorf(`error occurred deleting the nginx+ upstream server: %w`, err)
 }

internal/core/events.go

@@ -30,7 +30,7 @@ type ServerUpdateEvent struct {
 NginxHost string
 Type EventType
 UpstreamName string
-Servers  []nginxClient.StreamUpstreamServer
+TcpServers []nginxClient.StreamUpstreamServer
 HttpServers []nginxClient.UpstreamServer
 }
 
@@ -49,7 +49,7 @@ func NewServerUpdateEvent(eventType EventType, upstreamName string, servers []ng
 return &ServerUpdateEvent{
 Type: eventType,
 UpstreamName: upstreamName,
-Servers:  servers,
+TcpServers: servers,
 }
 }
 
@@ -59,7 +59,7 @@ func ServerUpdateEventWithIdAndHost(event *ServerUpdateEvent, id string, nginxHo
 NginxHost: nginxHost,
 Type: event.Type,
 UpstreamName: event.UpstreamName,
-Servers:  event.Servers,
+TcpServers: event.TcpServers,
 }
 }
 

internal/synchronization/synchronizer.go

@@ -150,7 +150,7 @@ func (s *Synchronizer) handleCreatedUpdatedEvent(serverUpdateEvent *core.ServerU
 return fmt.Errorf(`error occurred building the nginx+ client: %w`, err)
 }
 
-_, _, _, err = client.UpdateStreamServers(serverUpdateEvent.UpstreamName, serverUpdateEvent.Servers)
+_, _, _, err = client.UpdateStreamServers(serverUpdateEvent.UpstreamName, serverUpdateEvent.TcpServers)
 if err != nil {
 return fmt.Errorf(`error occurred updating the nginx+ upstream servers: %w`, err)
 }
@@ -168,7 +168,7 @@ func (s *Synchronizer) handleDeletedEvent(serverUpdateEvent *core.ServerUpdateEv
 return fmt.Errorf(`error occurred building the nginx+ client: %w`, err)
 }
 
-err = client.DeleteStreamServer(serverUpdateEvent.UpstreamName, serverUpdateEvent.Servers[0].Server)
+err = client.DeleteStreamServer(serverUpdateEvent.UpstreamName, serverUpdateEvent.TcpServers[0].Server)
 if err != nil {
 return fmt.Errorf(`error occurred deleting the nginx+ upstream server: %w`, err)
 }

internal/synchronization/synchronizer_test.go

@@ -36,7 +36,7 @@ func TestSynchronizer_AddEventNoHosts(t *testing.T) {
 NginxHost: "",
 Type: 0,
 UpstreamName: "",
-Servers:  nil,
+TcpServers: nil,
 }
 settings, err := configuration.NewSettings(context.Background(), nil)
 rateLimiter := &mocks.MockRateLimiter{}
@@ -192,7 +192,7 @@ func buildEvents(count int) core.ServerUpdateEvents {
 NginxHost: "https://localhost:8080",
 Type: 0,
 UpstreamName: "",
-Servers:  nil,
+TcpServers: nil,
 }
 }
 return events

internal/translation/translator_test.go

@@ -594,7 +594,7 @@ func TestDeletedTranslateManyMixedPortsAndManyNodes(t *testing.T) {
 
 func assertExpectedServerCount(t *testing.T, expectedCount int, events core.ServerUpdateEvents) {
 for _, translatedEvent := range events {
-serverCount := len(translatedEvent.Servers)
+serverCount := len(translatedEvent.TcpServers)
 if serverCount != expectedCount {
 t.Fatalf("expected %d servers, got %d", expectedCount, serverCount)
 }