fix: implement a file based test for session persistence

Signed-off-by: Kensei Nakada <handbomusic@gmail.com>
envoyproxy · Jul 18, 2024 · 0f45c69 · 0f45c69
1 parent 6ed0db1
commit 0f45c69
Show file tree

Hide file tree

Showing 10 changed files with 195 additions and 282 deletions.
diff --git a/internal/gatewayapi/route.go b/internal/gatewayapi/route.go
@@ -329,7 +329,7 @@ func (t *Translator) processHTTPRouteRule(httpRoute *HTTPRouteContext, ruleIdx i
 				if err != nil {
 					return nil, err
 				}
-				sessionPersistence.Cookie.TTL = &ttl
+				sessionPersistence.Cookie.TTL = &metav1.Duration{Duration: ttl}
 			}
 		}
 	}

diff --git a/internal/ir/xds.go b/internal/ir/xds.go
@@ -11,7 +11,6 @@ import (
 	"net/http"
 	"net/netip"
 	"reflect"
-	"time"
 
 	"golang.org/x/exp/slices"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -588,7 +587,7 @@ type SessionPersistence struct {
 // CookieBasedSessionPersistence defines the configuration for cookie-based session persistence.
 // +k8s:deepcopy-gen=true
 type CookieBasedSessionPersistence struct {
-	TTL *time.Duration `json:"ttl,omitempty" yaml:"ttl,omitempty"`
+	TTL *metav1.Duration `json:"ttl,omitempty" yaml:"ttl,omitempty"`
 }
 
 // HeaderBasedSessionPersistence defines the configuration for header-based session persistence.

diff --git a/internal/ir/zz_generated.deepcopy.go b/internal/ir/zz_generated.deepcopy.go
diff --git a/internal/xds/translator/session_persistence.go b/internal/xds/translator/session_persistence.go
@@ -66,7 +66,7 @@ func (s *sessionPersistence) patchHCM(mgr *hcmv3.HttpConnectionManager, irListen
 				Cookie: &httpv3.Cookie{
 					Name: sp.SessionName,
 					Path: routePathToCookiePath(route.PathMatch),
-					Ttl:  durationpb.New(*sp.Cookie.TTL),
+					Ttl:  durationpb.New(sp.Cookie.TTL.Duration),
 				},
 			}
 		case sp.Header != nil:

diff --git a/internal/xds/translator/session_persistence_test.go b/internal/xds/translator/session_persistence_test.go
diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml
@@ -0,0 +1,65 @@
+http:
+- name: "first-listener"
+  address: "0.0.0.0"
+  port: 10080
+  hostnames:
+  - "*"
+  path:
+    mergeSlashes: true
+    escapedSlashesAction: UnescapeAndRedirect
+  routes:
+  - name: "header-based-session-persistence-route"
+    hostname: "*"
+    pathMatch:
+      safeRegex: "/v1/.*"
+    sessionPersistence:
+      sessionName: "session1"
+      header: {}
+    destination:
+      name: "regex-route-dest"
+      settings:
+      - endpoints:
+        - host: "1.2.3.4"
+          port: 50000
+  - name: "cookie-based-session-persistence-route-regex"
+    hostname: "*"
+    pathMatch:
+      safeRegex: "/v1/.*/hoge"
+    sessionPersistence:
+      sessionName: "session1"
+      cookie:
+        ttl: "1h"
+    destination:
+      name: "regex-route-dest"
+      settings:
+      - endpoints:
+        - host: "1.2.3.4"
+          port: 50000
+  - name: "cookie-based-session-persistence-route-prefix"
+    hostname: "*"
+    pathMatch:
+      prefix: "/v2/"
+    sessionPersistence:
+      sessionName: "session1"
+      cookie:
+        ttl: "1h"
+    destination:
+      name: "regex-route-dest"
+      settings:
+      - endpoints:
+        - host: "1.2.3.4"
+          port: 50000
+  - name: "cookie-based-session-persistence-route-exact"
+    hostname: "*"
+    pathMatch:
+      exact: "/v3/user"
+    sessionPersistence:
+      sessionName: "session1"
+      cookie:
+        ttl: "1h"
+    destination:
+      name: "regex-route-dest"
+      settings:
+      - endpoints:
+        - host: "1.2.3.4"
+          port: 50000