rename per second to per window

MAIF · Jan 9, 2025 · 42fb24a · 42fb24a
1 parent 7e75a54
commit 42fb24a
Show file tree

Hide file tree

Showing 13 changed files with 60 additions and 60 deletions.
diff --git a/kubernetes/helm/otoroshi/crds-with-schema.yaml b/kubernetes/helm/otoroshi/crds-with-schema.yaml
@@ -2316,7 +2316,7 @@ spec:
               throttlingQuota:
                 type: "integer"
                 format: "int64"
-                description: "Authorized number of calls per second globally, measured\
+                description: "Authorized number of calls per window globally, measured\
                   \ on 10 seconds"
               anonymousReporting:
                 type: "boolean"
@@ -3325,7 +3325,7 @@ spec:
               perIpThrottlingQuota:
                 type: "integer"
                 format: "int64"
-                description: "Authorized number of calls per second globally per IP\
+                description: "Authorized number of calls per window globally per IP\
                   \ address, measured on 10 seconds"
               useCircuitBreakers:
                 type: "boolean"
@@ -3501,7 +3501,7 @@ spec:
               throttlingQuota:
                 type: "integer"
                 format: "int64"
-                description: "Authorized number of calls per second, measured on 10\
+                description: "Authorized number of calls per window, measured on 10\
                   \ seconds"
               constrainedServicesOnly:
                 type: "boolean"

diff --git a/otoroshi/app/controllers/SwaggerController.scala b/otoroshi/app/controllers/SwaggerController.scala
@@ -896,7 +896,7 @@ class SwaggerController(cc: ControllerComponents, assetsBuilder: AssetsBuilder)(
         "clientName"         -> SimpleStringType ~~> "The name of the api key, for humans ;-)",
         "authorizedEntities" -> SimpleArrayType ~~> "The group/service ids (prefixed by group_ or service_ on which the key is authorized",
         "enabled"            -> SimpleBooleanType ~~> "Whether or not the key is enabled. If disabled, resources won't be available to calls using this key",
-        "throttlingQuota"    -> SimpleLongType ~~> "Authorized number of calls per second, measured on 10 seconds",
+        "throttlingQuota"    -> SimpleLongType ~~> "Authorized number of calls per window, measured on 10 seconds",
         "dailyQuota"         -> SimpleLongType ~~> "Authorized number of calls per day",
         "monthlyQuota"       -> SimpleLongType ~~> "Authorized number of calls per month",
         "metadata"           -> SimpleObjectType ~~> "Bunch of metadata for the key"
@@ -990,8 +990,8 @@ class SwaggerController(cc: ControllerComponents, assetsBuilder: AssetsBuilder)(
         "apiReadOnly"             -> SimpleBooleanType ~~> "If enabled, Admin API won't be able to write/update/delete entities",
         "u2fLoginOnly"            -> SimpleBooleanType ~~> "If enabled, login to backoffice through Auth0 will be disabled",
         "ipFiltering"             -> Ref("IpFiltering"),
-        "throttlingQuota"         -> SimpleLongType ~~> "Authorized number of calls per second globally, measured on 10 seconds",
-        "perIpThrottlingQuota"    -> SimpleLongType ~~> "Authorized number of calls per second globally per IP address, measured on 10 seconds",
+        "throttlingQuota"         -> SimpleLongType ~~> "Authorized number of calls per window globally",
+        "perIpThrottlingQuota"    -> SimpleLongType ~~> "Authorized number of calls per window globally per IP address",
         "elasticWritesConfigs"    -> ArrayOf(Ref("ElasticConfig")) ~~> "Configs. for Elastic writes",
         "elasticReadsConfig"      -> Ref("ElasticConfig") ~~> "Config. for elastic reads",
         "analyticsWebhooks"       -> ArrayOf(Ref("Webhook")) ~~> "Webhook that will receive all internal Otoroshi events",
@@ -1187,9 +1187,9 @@ class SwaggerController(cc: ControllerComponents, assetsBuilder: AssetsBuilder)(
         "remainingCallsPerMonth"
       ),
       "properties"  -> Json.obj(
-        "authorizedCallsPerWindow"   -> SimpleLongType ~~> "The number of authorized calls per second",
-        "throttlingCallsPerWindow"      -> SimpleLongType ~~> "The current number of calls per second",
-        "remainingCallsPerWindow"    -> SimpleLongType ~~> "The remaining number of calls per second",
+        "authorizedCallsPerWindow"   -> SimpleLongType ~~> "The number of authorized calls per window",
+        "throttlingCallsPerWindow"      -> SimpleLongType ~~> "The current number of calls per window",
+        "remainingCallsPerWindow"    -> SimpleLongType ~~> "The remaining number of calls per window",
         "authorizedCallsPerDay"   -> SimpleLongType ~~> "The number of authorized calls per day",
         "currentCallsPerDay"      -> SimpleLongType ~~> "The current number of calls per day",
         "remainingCallsPerDay"    -> SimpleLongType ~~> "The remaining number of calls per day",

diff --git a/otoroshi/app/openapi/openapi-cfg.json b/otoroshi/app/openapi/openapi-cfg.json
@@ -1594,7 +1594,7 @@
     "otoroshi.models.ApiKey.restrictions": "Apikey restrictions settings",
     "otoroshi.models.ApiKey.rotation": "Apikey rotation settings",
     "otoroshi.models.ApiKey.tags": "Apikey tags",
-    "otoroshi.models.ApiKey.throttlingQuota": "Authorized number of calls per second, measured on 10 seconds",
+    "otoroshi.models.ApiKey.throttlingQuota": "Authorized number of calls per window",
     "otoroshi.models.ApiKey.validUntil": "Date until when the apikey is valid",
     "otoroshi.models.ApiKeyConstraints.basicAuth": "Settings to extract basic auth style apikey",
     "otoroshi.models.ApiKeyConstraints.clientIdAuth": "Settings to extract client_id only apikey",
@@ -1798,7 +1798,7 @@
     "otoroshi.models.GlobalConfig.metadata": "Entity metadata",
     "otoroshi.models.GlobalConfig.middleFingers": "Use middle finger emoji as a response character for endless HTTP responses",
     "otoroshi.models.GlobalConfig.otoroshiId": "Unique id for this otoroshi instance",
-    "otoroshi.models.GlobalConfig.perIpThrottlingQuota": "Authorized number of calls per second globally per IP address, measured on 10 seconds",
+    "otoroshi.models.GlobalConfig.perIpThrottlingQuota": "Authorized number of calls per window globally per IP address",
     "otoroshi.models.GlobalConfig.plugins": "global plugins settings",
     "otoroshi.models.GlobalConfig.proxies": "Web proxies settings",
     "otoroshi.models.GlobalConfig.quotasSettings": "Settings to generate alert when an apikey almost exceeded or exceeded its quotas",
@@ -1808,7 +1808,7 @@
     "otoroshi.models.GlobalConfig.streamEntityOnly": "HTTP will be streamed only. Doesn't work with old browsers",
     "otoroshi.models.GlobalConfig.tags": "Entity tags",
     "otoroshi.models.GlobalConfig.templates": "The otoroshi default templates for entities",
-    "otoroshi.models.GlobalConfig.throttlingQuota": "Authorized number of calls per second globally, measured on 10 seconds",
+    "otoroshi.models.GlobalConfig.throttlingQuota": "Authorized number of calls per window globally",
     "otoroshi.models.GlobalConfig.tlsSettings": "TLS settings",
     "otoroshi.models.GlobalConfig.trustXForwarded": "Use X-Forwarded-* headers for routing",
     "otoroshi.models.GlobalConfig.u2fLoginOnly": "If enabled, login to backoffice through Auth0 will be disabled",
@@ -1957,13 +1957,13 @@
     "otoroshi.models.RegionMatch.region": "Region name",
     "otoroshi.models.RemainingQuotas.authorizedCallsPerDay": "Number of authorized call per day",
     "otoroshi.models.RemainingQuotas.authorizedCallsPerMonth": "Number of authorized call per month",
-    "otoroshi.models.RemainingQuotas.authorizedCallsPerWindow": "Number of authorized call per second",
+    "otoroshi.models.RemainingQuotas.authorizedCallsPerWindow": "Number of authorized call per window",
     "otoroshi.models.RemainingQuotas.currentCallsPerDay": "Current number of call per day",
     "otoroshi.models.RemainingQuotas.currentCallsPerMonth": "Current number of call per month",
-    "otoroshi.models.RemainingQuotas.throttlingCallsPerWindow": "Current number of call per second",
+    "otoroshi.models.RemainingQuotas.throttlingCallsPerWindow": "Current number of call per window",
     "otoroshi.models.RemainingQuotas.remainingCallsPerDay": "Remaining number of call per day",
     "otoroshi.models.RemainingQuotas.remainingCallsPerMonth": "Remaining number of call per month",
-    "otoroshi.models.RemainingQuotas.remainingCallsPerWindow": "Remaining number of call per second",
+    "otoroshi.models.RemainingQuotas.remainingCallsPerWindow": "Remaining number of call per window",
     "otoroshi.models.RestrictionPath.method": "Method of the http request",
     "otoroshi.models.RestrictionPath.path": "Path of the http request",
     "otoroshi.models.Restrictions.allowLast": "Evalute allowed paths after everything else",

diff --git a/otoroshi/build.sbt b/otoroshi/build.sbt
@@ -393,7 +393,7 @@ reStart / javaOptions ++= Seq(
   "-Dotoroshi.next.state-sync-interval=1000",
   // "-Dotoroshi.next.experimental.netty-server.native.driver=IOUring",
   // "-Dotoroshi.storage=ext:foo",
-//  "-Dotoroshi.storage=file"
+  "-Dotoroshi.storage=file"
   //"-Dotoroshi.storage=postgresql",
   // "-Dotoroshi.storage=redis",
 //   "-Dotoroshi.redis.lettuce.uri=redis://localhost:6379/",

diff --git a/otoroshi/conf/schemas/openapi-cfg.json b/otoroshi/conf/schemas/openapi-cfg.json
@@ -1628,7 +1628,7 @@
     "otoroshi.models.ApiKey.restrictions": "Apikey restrictions settings",
     "otoroshi.models.ApiKey.rotation": "Apikey rotation settings",
     "otoroshi.models.ApiKey.tags": "Apikey tags",
-    "otoroshi.models.ApiKey.throttlingQuota": "Authorized number of calls per second, measured on 10 seconds",
+    "otoroshi.models.ApiKey.throttlingQuota": "Authorized number of calls per window",
     "otoroshi.models.ApiKey.validUntil": "Date until when the apikey is valid",
     "otoroshi.models.ApiKeyConstraints.basicAuth": "???",
     "otoroshi.models.ApiKeyConstraints.clientIdAuth": "???",
@@ -1832,7 +1832,7 @@
     "otoroshi.models.GlobalConfig.metadata": "Entity metadata",
     "otoroshi.models.GlobalConfig.middleFingers": "Use middle finger emoji as a response character for endless HTTP responses",
     "otoroshi.models.GlobalConfig.otoroshiId": "Unique id for this otoroshi instance",
-    "otoroshi.models.GlobalConfig.perIpThrottlingQuota": "Authorized number of calls per second globally per IP address, measured on 10 seconds",
+    "otoroshi.models.GlobalConfig.perIpThrottlingQuota": "Authorized number of calls per window globally per IP address",
     "otoroshi.models.GlobalConfig.plugins": "global plugins settings",
     "otoroshi.models.GlobalConfig.proxies": "Web proxies settings",
     "otoroshi.models.GlobalConfig.quotasSettings": "Settings to generate alert when an apikey almost exceeded or exceeded its quotas",
@@ -1842,7 +1842,7 @@
     "otoroshi.models.GlobalConfig.streamEntityOnly": "HTTP will be streamed only. Doesn't work with old browsers",
     "otoroshi.models.GlobalConfig.tags": "Entity tags",
     "otoroshi.models.GlobalConfig.templates": "The otoroshi default templates for entities",
-    "otoroshi.models.GlobalConfig.throttlingQuota": "Authorized number of calls per second globally, measured on 10 seconds",
+    "otoroshi.models.GlobalConfig.throttlingQuota": "Authorized number of calls per window globally",
     "otoroshi.models.GlobalConfig.tlsSettings": "TLS settings",
     "otoroshi.models.GlobalConfig.trustXForwarded": "Use X-Forwarded-* headers for routing",
     "otoroshi.models.GlobalConfig.u2fLoginOnly": "If enabled, login to backoffice through Auth0 will be disabled",
@@ -1990,13 +1990,13 @@
     "otoroshi.models.RegionMatch.region": "???",
     "otoroshi.models.RemainingQuotas.authorizedCallsPerDay": "Number of authorized call per day",
     "otoroshi.models.RemainingQuotas.authorizedCallsPerMonth": "Number of authorized call per month",
-    "otoroshi.models.RemainingQuotas.authorizedCallsPerWindow": "Number of authorized call per second",
+    "otoroshi.models.RemainingQuotas.authorizedCallsPerWindow": "Number of authorized call per window",
     "otoroshi.models.RemainingQuotas.currentCallsPerDay": "Current number of call per day",
     "otoroshi.models.RemainingQuotas.currentCallsPerMonth": "Current number of call per month",
-    "otoroshi.models.RemainingQuotas.throttlingCallsPerWindow": "Current number of call per second",
+    "otoroshi.models.RemainingQuotas.throttlingCallsPerWindow": "Current number of call per window",
     "otoroshi.models.RemainingQuotas.remainingCallsPerDay": "Remaining number of call per day",
     "otoroshi.models.RemainingQuotas.remainingCallsPerMonth": "Remaining number of call per month",
-    "otoroshi.models.RemainingQuotas.remainingCallsPerWindow": "Remaining number of call per second",
+    "otoroshi.models.RemainingQuotas.remainingCallsPerWindow": "Remaining number of call per window",
     "otoroshi.models.RestrictionPath.method": "???",
     "otoroshi.models.RestrictionPath.path": "???",
     "otoroshi.models.Restrictions.allowLast": "???",

diff --git a/otoroshi/conf/schemas/openapi-flat.json b/otoroshi/conf/schemas/openapi-flat.json
@@ -3945,7 +3945,7 @@
           "throttlingQuota" : {
             "type" : "integer",
             "format" : "int64",
-            "description" : "Authorized number of calls per second, measured on 10 seconds"
+            "description" : "Authorized number of calls per window"
           },
           "constrainedServicesOnly" : {
             "type" : "boolean",
@@ -13040,7 +13040,7 @@
       "throttlingQuota" : {
         "type" : "integer",
         "format" : "int64",
-        "description" : "Authorized number of calls per second, measured on 10 seconds"
+        "description" : "Authorized number of calls per window"
       },
       "constrainedServicesOnly" : {
         "type" : "boolean",
@@ -20638,7 +20638,7 @@
             "throttlingQuota" : {
               "type" : "integer",
               "format" : "int64",
-              "description" : "Authorized number of calls per second, measured on 10 seconds"
+              "description" : "Authorized number of calls per window"
             },
             "constrainedServicesOnly" : {
               "type" : "boolean",
@@ -25144,7 +25144,7 @@
             "throttlingQuota" : {
               "type" : "integer",
               "format" : "int64",
-              "description" : "Authorized number of calls per second globally, measured on 10 seconds"
+              "description" : "Authorized number of calls per window globally"
             },
             "anonymousReporting" : {
               "type" : "boolean",
@@ -26460,7 +26460,7 @@
             "perIpThrottlingQuota" : {
               "type" : "integer",
               "format" : "int64",
-              "description" : "Authorized number of calls per second globally per IP address, measured on 10 seconds"
+              "description" : "Authorized number of calls per window globally per IP address"
             },
             "useCircuitBreakers" : {
               "type" : "boolean",
@@ -29802,7 +29802,7 @@
       "throttlingQuota" : {
         "type" : "integer",
         "format" : "int64",
-        "description" : "Authorized number of calls per second globally, measured on 10 seconds"
+        "description" : "Authorized number of calls per window globally"
       },
       "anonymousReporting" : {
         "type" : "boolean",
@@ -31131,7 +31131,7 @@
       "perIpThrottlingQuota" : {
         "type" : "integer",
         "format" : "int64",
-        "description" : "Authorized number of calls per second globally per IP address, measured on 10 seconds"
+        "description" : "Authorized number of calls per window globally per IP address"
       },
       "useCircuitBreakers" : {
         "type" : "boolean",
@@ -36551,12 +36551,12 @@
       "throttlingCallsPerWindow" : {
         "type" : "integer",
         "format" : "int64",
-        "description" : "Current number of call per second"
+        "description" : "Current number of call per window"
       },
       "remainingCallsPerWindow" : {
         "type" : "integer",
         "format" : "int64",
-        "description" : "Remaining number of call per second"
+        "description" : "Remaining number of call per window"
       },
       "currentCallsPerDay" : {
         "type" : "integer",
@@ -36581,7 +36581,7 @@
       "authorizedCallsPerWindow" : {
         "type" : "integer",
         "format" : "int64",
-        "description" : "Number of authorized call per second"
+        "description" : "Number of authorized call per window"
       },
       "authorizedCallsPerMonth" : {
         "type" : "integer",
@@ -42974,7 +42974,7 @@
           "throttlingQuota" : {
             "type" : "integer",
             "format" : "int64",
-            "description" : "Authorized number of calls per second, measured on 10 seconds"
+            "description" : "Authorized number of calls per window"
           },
           "constrainedServicesOnly" : {
             "type" : "boolean",
@@ -51175,7 +51175,7 @@
               "throttlingQuota" : {
                 "type" : "integer",
                 "format" : "int64",
-                "description" : "Authorized number of calls per second, measured on 10 seconds"
+                "description" : "Authorized number of calls per window"
               },
               "constrainedServicesOnly" : {
                 "type" : "boolean",
@@ -56177,7 +56177,7 @@
           "throttlingQuota" : {
             "type" : "integer",
             "format" : "int64",
-            "description" : "Authorized number of calls per second globally, measured on 10 seconds"
+            "description" : "Authorized number of calls per window globally"
           },
           "anonymousReporting" : {
             "type" : "boolean",
@@ -57506,7 +57506,7 @@
           "perIpThrottlingQuota" : {
             "type" : "integer",
             "format" : "int64",
-            "description" : "Authorized number of calls per second globally per IP address, measured on 10 seconds"
+            "description" : "Authorized number of calls per window globally per IP address"
           },
           "useCircuitBreakers" : {
             "type" : "boolean",
@@ -61682,7 +61682,7 @@
           "throttlingQuota" : {
             "type" : "integer",
             "format" : "int64",
-            "description" : "Authorized number of calls per second, measured on 10 seconds"
+            "description" : "Authorized number of calls per window"
           },
           "constrainedServicesOnly" : {
             "type" : "boolean",

diff --git a/otoroshi/conf/schemas/openapi.json b/otoroshi/conf/schemas/openapi.json
@@ -19135,7 +19135,7 @@
           "throttlingQuota" : {
             "type" : "integer",
             "format" : "int64",
-            "description" : "Authorized number of calls per second, measured on 10 seconds"
+            "description" : "Authorized number of calls per window"
           },
           "constrainedServicesOnly" : {
             "type" : "boolean",
@@ -20477,7 +20477,7 @@
           "throttlingQuota" : {
             "type" : "integer",
             "format" : "int64",
-            "description" : "Authorized number of calls per second globally, measured on 10 seconds"
+            "description" : "Authorized number of calls per window globally"
           },
           "anonymousReporting" : {
             "type" : "boolean",
@@ -20680,7 +20680,7 @@
           "perIpThrottlingQuota" : {
             "type" : "integer",
             "format" : "int64",
-            "description" : "Authorized number of calls per second globally per IP address, measured on 10 seconds"
+            "description" : "Authorized number of calls per window globally per IP address"
           },
           "useCircuitBreakers" : {
             "type" : "boolean",
@@ -21176,12 +21176,12 @@
           "throttlingCallsPerWindow" : {
             "type" : "integer",
             "format" : "int64",
-            "description" : "Current number of call per second"
+            "description" : "Current number of call per window"
           },
           "remainingCallsPerWindow" : {
             "type" : "integer",
             "format" : "int64",
-            "description" : "Remaining number of call per second"
+            "description" : "Remaining number of call per window"
           },
           "currentCallsPerDay" : {
             "type" : "integer",
@@ -21206,7 +21206,7 @@
           "authorizedCallsPerWindow" : {
             "type" : "integer",
             "format" : "int64",
-            "description" : "Number of authorized call per second"
+            "description" : "Number of authorized call per window"
           },
           "authorizedCallsPerMonth" : {
             "type" : "integer",

diff --git a/otoroshi/javascript/src/forms/ng_plugins/NgCustomThrottling.js b/otoroshi/javascript/src/forms/ng_plugins/NgCustomThrottling.js
@@ -2,7 +2,7 @@ export default {
   id: 'cp:otoroshi.next.plugins.NgCustomThrottling',
   config_schema: {
     throttling_quota: {
-      label: 'Allowed calls per seconds',
+      label: 'Allowed calls per window',
       type: 'number',
     },
     per_route: {