From 7754bc6fdcc50b0f13b2e470f804fab82e2e9a67 Mon Sep 17 00:00:00 2001
From: Erik F <16261515+erikfuller@users.noreply.github.com>
Date: Tue, 3 Oct 2023 13:59:16 -0700
Subject: [PATCH] removed additional references to 'mesh'

---
 pkg/deploy/lattice/service_network_manager.go |  8 ++++----
 pkg/deploy/lattice/target_group_manager.go    | 11 ++++++-----
 pkg/gateway/model_build_listener_test.go      | 14 +++++++-------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/pkg/deploy/lattice/service_network_manager.go b/pkg/deploy/lattice/service_network_manager.go
index b3b5c7a7..0490ca01 100644
--- a/pkg/deploy/lattice/service_network_manager.go
+++ b/pkg/deploy/lattice/service_network_manager.go
@@ -58,7 +58,7 @@ type defaultServiceNetworkManager struct {
 //
 // return errors.New(LATTICE_RETRY) when:
 //
-//	CreateServiceNetworkVpcAssociationInput returns ServiceNetworkVpcAssociationStatusFailed/ServiceNetworkVpcAssociationStatusCreateInProgress/MeshVpcAssociationStatusDeleteInProgress
+//	CreateServiceNetworkVpcAssociationInput returns ServiceNetworkVpcAssociationStatusFailed/ServiceNetworkVpcAssociationStatusCreateInProgress/ServiceNetworkVpcAssociationStatusDeleteInProgress
 
 func (m *defaultServiceNetworkManager) CreateOrUpdate(ctx context.Context, serviceNetwork *model.ServiceNetwork) (model.ServiceNetworkStatus, error) {
 	// check if exists
@@ -266,13 +266,13 @@ func (m *defaultServiceNetworkManager) isServiceNetworkAlreadyAssociatedWithVPC(
 			if err == nil {
 				switch associationStatus {
 				case vpclattice.ServiceNetworkVpcAssociationStatusActive:
-					m.log.Debugf("Mesh and Vpc association is active.")
+					m.log.Debugf("ServiceNetwork and Vpc association is active.")
 					return true, r, resp, nil
 				case vpclattice.ServiceNetworkVpcAssociationStatusCreateFailed:
-					m.log.Debugf("Mesh and Vpc association does not exists, start creating service_network and vpc association")
+					m.log.Debugf("ServiceNetwork and Vpc association does not exists, start creating service_network and vpc association")
 					return false, r, resp, nil
 				case vpclattice.ServiceNetworkVpcAssociationStatusDeleteFailed:
-					m.log.Debugf("Mesh and Vpc association failed to delete")
+					m.log.Debugf("ServiceNetwork and Vpc association failed to delete")
 					return true, r, resp, nil
 				case vpclattice.ServiceNetworkVpcAssociationStatusDeleteInProgress:
 					m.log.Debugf("ServiceNetwork and Vpc association is being deleted, retry later")
diff --git a/pkg/deploy/lattice/target_group_manager.go b/pkg/deploy/lattice/target_group_manager.go
index 67291a8b..233e5fc4 100644
--- a/pkg/deploy/lattice/target_group_manager.go
+++ b/pkg/deploy/lattice/target_group_manager.go
@@ -59,11 +59,12 @@ func getLatticeTGName(targetGroup *model.TargetGroup) string {
 //
 // return errors.New(LATTICE_RETRY) when:
 //
-//	CreateTargetGroupWithContext returns
-//		TG is TargetGroupStatusUpdateInProgress
-//		TG is MeshVpcAssociationStatusFailed
-//		TG is TargetGroupStatusCreateInProgress
-//		TG is TargetGroupStatusFailed
+//		CreateTargetGroupWithContext returns
+//			TG is TargetGroupStatusUpdateInProgress
+//			TG is TargetGroupStatusCreateFailed
+//			TG is TargetGroupStatusCreateInProgress
+//			TG is TargetGroupStatusDeleteFailed
+//	        TG is TargetGroupStatusDeleteInProgress
 //
 // return nil when:
 //
diff --git a/pkg/gateway/model_build_listener_test.go b/pkg/gateway/model_build_listener_test.go
index b2793230..2929a5e7 100644
--- a/pkg/gateway/model_build_listener_test.go
+++ b/pkg/gateway/model_build_listener_test.go
@@ -76,7 +76,7 @@ func Test_ListenerModelBuild(t *testing.T) {
 					CommonRouteSpec: gwv1beta1.CommonRouteSpec{
 						ParentRefs: []gwv1beta1.ParentReference{
 							{
-								Name:        "mesh1",
+								Name:        "gw1",
 								SectionName: &httpSectionName,
 							},
 						},
@@ -110,7 +110,7 @@ func Test_ListenerModelBuild(t *testing.T) {
 					CommonRouteSpec: gwv1beta1.CommonRouteSpec{
 						ParentRefs: []gwv1beta1.ParentReference{
 							{
-								Name:        "mesh1",
+								Name:        "gw1",
 								SectionName: &httpSectionName,
 							},
 						},
@@ -144,7 +144,7 @@ func Test_ListenerModelBuild(t *testing.T) {
 					CommonRouteSpec: gwv1beta1.CommonRouteSpec{
 						ParentRefs: []gwv1beta1.ParentReference{
 							{
-								Name:        "mesh1",
+								Name:        "gw1",
 								SectionName: &httpSectionName,
 							},
 						},
@@ -178,7 +178,7 @@ func Test_ListenerModelBuild(t *testing.T) {
 					CommonRouteSpec: gwv1beta1.CommonRouteSpec{
 						ParentRefs: []gwv1beta1.ParentReference{
 							{
-								Name:        "mesh1",
+								Name:        "gw1",
 								SectionName: &httpSectionName,
 							},
 						},
@@ -210,7 +210,7 @@ func Test_ListenerModelBuild(t *testing.T) {
 					CommonRouteSpec: gwv1beta1.CommonRouteSpec{
 						ParentRefs: []gwv1beta1.ParentReference{
 							{
-								Name:        "mesh1",
+								Name:        "gw1",
 								SectionName: &httpSectionName,
 							},
 						},
@@ -268,7 +268,7 @@ func Test_ListenerModelBuild(t *testing.T) {
 					CommonRouteSpec: gwv1beta1.CommonRouteSpec{
 						ParentRefs: []gwv1beta1.ParentReference{
 							{
-								Name:        "mesh1",
+								Name:        "gw1",
 								SectionName: &httpSectionName,
 							},
 						},
@@ -300,7 +300,7 @@ func Test_ListenerModelBuild(t *testing.T) {
 					CommonRouteSpec: gwv1beta1.CommonRouteSpec{
 						ParentRefs: []gwv1beta1.ParentReference{
 							{
-								Name:        "mesh1",
+								Name:        "gw1",
 								SectionName: &missingSectionName,
 							},
 						},