Fix lint

Signed-off-by: rick.stokkingreef <rick.stokkingreef@airalo.com>

Author: stokkie90

pkg/plugin/grpcroute.go

@@ -397,6 +397,16 @@ func removeManagedGRPCRouteEntry(managedRouteMap ManagedRouteMap, routeRuleList
 		managedRouteMapKey := managedRouteName + "." + grpcRouteName
 		return nil, fmt.Errorf(ManagedRouteMapEntryDeleteError, managedRouteMapKey, managedRouteMapKey)
 	}
+	if managedRouteIndex < 0 || managedRouteIndex >= len(routeRuleList) {
+		// stale or corrupted managed route index; clean references for this route and continue gracefully
+		for name, managedMap := range managedRouteMap {
+			delete(managedMap, grpcRouteName)
+			if len(managedMap) == 0 {
+				delete(managedRouteMap, name)
+			}
+		}
+		return routeRuleList, nil
+	}
 	delete(routeManagedRouteMap, grpcRouteName)
 	if len(managedRouteMap[managedRouteName]) == 0 {
 		delete(managedRouteMap, managedRouteName)

pkg/plugin/httproute.go

@@ -396,6 +396,16 @@ func removeManagedHTTPRouteEntry(managedRouteMap ManagedRouteMap, routeRuleList
 		managedRouteMapKey := managedRouteName + "." + httpRouteName
 		return nil, fmt.Errorf(ManagedRouteMapEntryDeleteError, managedRouteMapKey, managedRouteMapKey)
 	}
+	if managedRouteIndex < 0 || managedRouteIndex >= len(routeRuleList) {
+		// stale or corrupted managed route index; clean references for this route and continue gracefully
+		for name, managedMap := range managedRouteMap {
+			delete(managedMap, httpRouteName)
+			if len(managedMap) == 0 {
+				delete(managedRouteMap, name)
+			}
+		}
+		return routeRuleList, nil
+	}
 	delete(routeManagedRouteMap, httpRouteName)
 	if len(managedRouteMap[managedRouteName]) == 0 {
 		delete(managedRouteMap, managedRouteName)

test/e2e/constants.go

@@ -35,6 +35,10 @@ const (
 	GRPC_ROUTE_FILTERS_PATH         = "./testdata/grpcroute-filters.yml"
 	GRPC_ROUTE_FILTERS_ROLLOUT_PATH = "./testdata/single-grpcroute-filters-rollout.yml"
 
+	// HTTP Route label test paths
+	HTTP_ROUTE_LABEL_PATH         = "./testdata/httproute-basic.yml"
+	HTTP_ROUTE_LABEL_ROLLOUT_PATH = "./testdata/single-httproute-label-rollout.yml"
+
 	ROLLOUT_TEMPLATE_CONTAINERS_FIELD      = "spec.template.spec.containers"
 	ROLLOUT_TEMPLATE_FIRST_CONTAINER_FIELD = "spec.template.spec.containers.0"
 	NEW_IMAGE_FIELD_VALUE                  = "argoproj/rollouts-demo:green"

test/e2e/httproute_label_test.go

@@ -52,36 +52,36 @@ func setupHTTPRouteLabelEnv(ctx context.Context, t *testing.T, config *envconf.C
 	clusterResources := config.Client().Resources()
 	resourcesMap := map[string]*unstructured.Unstructured{}
 	ctx = context.WithValue(ctx, RESOURCES_MAP_KEY, resourcesMap)
-	firstHTTPRouteFile, err := os.Open(HTTP_ROUTE_BASIC_PATH)
+	firstHTTPRouteFile, err := os.Open(HTTP_ROUTE_LABEL_PATH)
 	if err != nil {
-		logrus.Errorf("file %q opening was failed: %s", HTTP_ROUTE_BASIC_PATH, err)
+		logrus.Errorf("file %q opening was failed: %s", HTTP_ROUTE_LABEL_PATH, err)
 		t.Error()
 		return ctx
 	}
 	defer firstHTTPRouteFile.Close()
-	logrus.Infof("file %q was opened", HTTP_ROUTE_BASIC_PATH)
-	rolloutFile, err := os.Open(HTTP_ROUTE_BASIC_ROLLOUT_PATH)
+	logrus.Infof("file %q was opened", HTTP_ROUTE_LABEL_PATH)
+	rolloutFile, err := os.Open(HTTP_ROUTE_LABEL_ROLLOUT_PATH)
 	if err != nil {
-		logrus.Errorf("file %q opening was failed: %s", HTTP_ROUTE_BASIC_ROLLOUT_PATH, err)
+		logrus.Errorf("file %q opening was failed: %s", HTTP_ROUTE_LABEL_ROLLOUT_PATH, err)
 		t.Error()
 		return ctx
 	}
 	defer rolloutFile.Close()
-	logrus.Infof("file %q was opened", HTTP_ROUTE_BASIC_ROLLOUT_PATH)
+	logrus.Infof("file %q was opened", HTTP_ROUTE_LABEL_ROLLOUT_PATH)
 	err = decoder.Decode(firstHTTPRouteFile, &httpRoute)
 	if err != nil {
-		logrus.Errorf("file %q decoding was failed: %s", HTTP_ROUTE_BASIC_PATH, err)
+		logrus.Errorf("file %q decoding was failed: %s", HTTP_ROUTE_LABEL_PATH, err)
 		t.Error()
 		return ctx
 	}
-	logrus.Infof("file %q was decoded", HTTP_ROUTE_BASIC_PATH)
+	logrus.Infof("file %q was decoded", HTTP_ROUTE_LABEL_PATH)
 	err = decoder.Decode(rolloutFile, &rollout)
 	if err != nil {
-		logrus.Errorf("file %q decoding was failed: %s", HTTP_ROUTE_BASIC_ROLLOUT_PATH, err)
+		logrus.Errorf("file %q decoding was failed: %s", HTTP_ROUTE_LABEL_ROLLOUT_PATH, err)
 		t.Error()
 		return ctx
 	}
-	logrus.Infof("file %q was decoded", HTTP_ROUTE_BASIC_ROLLOUT_PATH)
+	logrus.Infof("file %q was decoded", HTTP_ROUTE_LABEL_ROLLOUT_PATH)
 	httpRouteObject, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&httpRoute)
 	if err != nil {
 		logrus.Errorf("httpRoute %q converting to unstructured was failed: %s", httpRoute.GetName(), err)
@@ -327,4 +327,3 @@ func getMatchHTTPRouteLabelFetcher(t *testing.T, expectLabel bool) func(k8s.Obje
 		return !ok
 	}
 }
-

test/e2e/testdata/grpcroute-filters.yml

@@ -25,7 +25,8 @@ spec:
                 value: grpc-added-value
             remove:
               - X-Remove-GRPC-Header
-        # ResponseHeaderModifier - adds, sets, and removes response headers  
+        # Unsupported filters
+        # ResponseHeaderModifier - adds, sets, and removes response headers
         - type: ResponseHeaderModifier
           responseHeaderModifier:
             set:

test/e2e/testdata/single-httproute-label-rollout.yml

@@ -0,0 +1,40 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Rollout
+metadata:
+  name: httproute-label
+  namespace: default
+spec:
+  replicas: 2
+  strategy:
+    canary:
+      canaryService: argo-rollouts-canary-service
+      stableService: argo-rollouts-stable-service
+      trafficRouting:
+        plugins:
+          argoproj-labs/gatewayAPI:
+            httpRoute: httproute-basic
+            namespace: default
+      steps:
+        - setWeight: 30
+        - pause:
+            duration: 10s
+  revisionHistoryLimit: 1
+  selector:
+    matchLabels:
+      app: rollouts-demo
+  template:
+    metadata:
+      labels:
+        app: rollouts-demo
+    spec:
+      containers:
+        - name: rollouts-demo
+          image: argoproj/rollouts-demo:red
+          ports:
+            - name: http
+              containerPort: 8080
+              protocol: TCP
+          resources:
+            requests:
+              memory: 32Mi
+              cpu: 5m

test/e2e/testdata/single-httproute-rollout.yml

@@ -16,7 +16,7 @@ spec:
             namespace: default
       steps:
         - setWeight: 30
-        - pause: {  }
+        - pause: {}
   revisionHistoryLimit: 1
   selector:
     matchLabels:
@@ -36,4 +36,4 @@ spec:
           resources:
             requests:
               memory: 32Mi
-              cpu: 5m
+              cpu: 5m