chore(api-usage-monitoring filter): remove deprecated parameter (#949)

Signed-off-by: Maxim Tschumak <maxim.tschumak@gmail.com>
zalando · Apr 11, 2019 · f376407 · f376407
1 parent e354aee
commit f376407
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/cmd/skipper/main.go b/cmd/skipper/main.go
@@ -72,11 +72,10 @@ const (
 	defaultWebhookTimeout                 = 2 * time.Second
 
 	// API Monitoring
-	defaultApiUsageMonitoringEnable                       = false
-	defaultApiUsageMonitoringRealmKeys                    = ""
-	defaultApiUsageMonitoringClientKeys                   = "sub"
-	defaultApiUsageMonitoringDefaultClientTrackingPattern = ""
-	defaultApiUsageMonitoringRealmsTrackingPattern        = "services"
+	defaultApiUsageMonitoringEnable                = false
+	defaultApiUsageMonitoringRealmKeys             = ""
+	defaultApiUsageMonitoringClientKeys            = "sub"
+	defaultApiUsageMonitoringRealmsTrackingPattern = "services"
 
 	// generic:
 	addressUsage                         = "network address that skipper should listen on"
@@ -169,11 +168,10 @@ const (
 	oidcSecretsFileUsage                 = "file storing the encryption key of the OID Connect token"
 
 	// API Monitoring:
-	apiUsageMonitoringEnableUsage                       = "enables the apiUsageMonitoring filter"
-	apiUsageMonitoringRealmKeysUsage                    = "name of the property in the JWT payload that contains the authority realm"
-	apiUsageMonitoringClientKeysUsage                   = "comma separated list of names of the properties in the JWT body that contains the client ID"
-	apiUsageMonitoringDefaultClientTrackingPatternUsage = "*Deprecated*: set `client_tracking_pattern` directly on filter"
-	apiUsageMonitoringRealmsTrackingPatternUsage        = "regular expression used for matching monitored realms (defaults is 'services')"
+	apiUsageMonitoringEnableUsage                = "enables the apiUsageMonitoring filter"
+	apiUsageMonitoringRealmKeysUsage             = "name of the property in the JWT payload that contains the authority realm"
+	apiUsageMonitoringClientKeysUsage            = "comma separated list of names of the properties in the JWT body that contains the client ID"
+	apiUsageMonitoringRealmsTrackingPatternUsage = "regular expression used for matching monitored realms (defaults is 'services')"
 
 	// Default filters
 	defaultFiltersDirUsage = "path to directory which contains default filter configurations per service and namespace (disabled if not set)"
@@ -479,7 +477,6 @@ func init() {
 	flag.BoolVar(&apiUsageMonitoringEnable, "enable-api-usage-monitoring", defaultApiUsageMonitoringEnable, apiUsageMonitoringEnableUsage)
 	flag.StringVar(&apiUsageMonitoringRealmKeys, "api-usage-monitoring-realm-keys", defaultApiUsageMonitoringRealmKeys, apiUsageMonitoringRealmKeysUsage)
 	flag.StringVar(&apiUsageMonitoringClientKeys, "api-usage-monitoring-client-keys", defaultApiUsageMonitoringClientKeys, apiUsageMonitoringClientKeysUsage)
-	flag.StringVar(&apiUsageMonitoringDefaultClientTrackingPattern, "api-usage-monitoring-default-client-tracking-pattern", defaultApiUsageMonitoringDefaultClientTrackingPattern, apiUsageMonitoringDefaultClientTrackingPatternUsage)
 	flag.StringVar(&apiUsageMonitoringRealmsTrackingPattern, "api-usage-monitoring-realms-tracking-pattern", defaultApiUsageMonitoringRealmsTrackingPattern, apiUsageMonitoringRealmsTrackingPatternUsage)
 
 	// Default filters:
@@ -678,11 +675,10 @@ func main() {
 		KubernetesEastWestDomain:    kubernetesEastWestDomain,
 
 		// API Monitoring:
-		ApiUsageMonitoringEnable:                       apiUsageMonitoringEnable,
-		ApiUsageMonitoringRealmKeys:                    apiUsageMonitoringRealmKeys,
-		ApiUsageMonitoringClientKeys:                   apiUsageMonitoringClientKeys,
-		ApiUsageMonitoringDefaultClientTrackingPattern: apiUsageMonitoringDefaultClientTrackingPattern,
-		ApiUsageMonitoringRealmsTrackingPattern:        apiUsageMonitoringRealmsTrackingPattern,
+		ApiUsageMonitoringEnable:                apiUsageMonitoringEnable,
+		ApiUsageMonitoringRealmKeys:             apiUsageMonitoringRealmKeys,
+		ApiUsageMonitoringClientKeys:            apiUsageMonitoringClientKeys,
+		ApiUsageMonitoringRealmsTrackingPattern: apiUsageMonitoringRealmsTrackingPattern,
 
 		// Default filters:
 		DefaultFiltersDir: defaultFiltersDir,

diff --git a/skipper.go b/skipper.go
@@ -506,7 +506,6 @@ type Options struct {
 	ApiUsageMonitoringEnable                       bool
 	ApiUsageMonitoringRealmKeys                    string
 	ApiUsageMonitoringClientKeys                   string
-	ApiUsageMonitoringDefaultClientTrackingPattern string
 	ApiUsageMonitoringRealmsTrackingPattern        string
 
 	// Default filters directory enables default filters mechanism and sets the directory where the filters are located