fix: filters should not hold reference to spec (#1625)

Signed-off-by: Sandor Szücs <[email protected]>
zalando · Dec 2, 2020 · e9382c0 · e9382c0
1 parent 315cdb5
commit e9382c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/filters/apiusagemonitoring/filter.go b/filters/apiusagemonitoring/filter.go
@@ -36,7 +36,8 @@ const (
 // apiUsageMonitoringFilter implements filters.Filter interface and is the structure
 // created for every route invocation of the `apiUsageMonitoring` filter.
 type apiUsageMonitoringFilter struct {
-	Spec        *apiUsageMonitoringSpec
+	clientKeys  []string
+	realmKeys   []string
 	Paths       []*pathInfo
 	UnknownPath *pathInfo
 }
@@ -131,7 +132,7 @@ func (f *apiUsageMonitoringFilter) getRealmClientKey(r *http.Request, path *path
 	}
 
 	// no realm in JWT ==> {unknown}.{unknown}
-	realm, ok := jwt.getOneOfString(f.Spec.realmKeys)
+	realm, ok := jwt.getOneOfString(f.realmKeys)
 	if !ok {
 		return unknownUnknown
 	}
@@ -142,7 +143,7 @@ func (f *apiUsageMonitoringFilter) getRealmClientKey(r *http.Request, path *path
 	}
 
 	// no client in JWT ==> realm.{unknown}
-	client, ok := jwt.getOneOfString(f.Spec.clientKeys)
+	client, ok := jwt.getOneOfString(f.clientKeys)
 	if !ok {
 		return realm + "." + unknownPlaceholder
 	}

diff --git a/filters/apiusagemonitoring/spec.go b/filters/apiusagemonitoring/spec.go
@@ -135,7 +135,8 @@ func (s *apiUsageMonitoringSpec) CreateFilter(args []interface{}) (filter filter
 	}
 
 	filter = &apiUsageMonitoringFilter{
-		Spec:        s,
+		realmKeys:   s.realmKeys,
+		clientKeys:  s.clientKeys,
 		Paths:       paths,
 		UnknownPath: s.buildUnknownPathInfo(paths),
 	}