From d90ab4c319945930274cc9a4bc1e2cad3111a050 Mon Sep 17 00:00:00 2001 From: Jay07GIT Date: Mon, 12 Aug 2024 18:06:53 +0530 Subject: [PATCH] commented the request-timeout config --- build/docker/api/application.conf | 5 ++++- modules/api/src/it/resources/application.conf | 4 +++- modules/api/src/main/resources/application.conf | 7 +++++-- modules/api/src/universal/conf/application.conf | 5 ++++- modules/docs/src/main/mdoc/operator/config-api.md | 6 ++++-- modules/portal/app/models/Meta.scala | 2 +- .../portal/app/views/dnsChanges/dnsChangeNew.scala.html | 2 +- modules/portal/test/models/MetaSpec.scala | 2 +- test/api/functional/application.conf | 5 ++++- test/api/integration/application.conf | 6 +++++- 10 files changed, 32 insertions(+), 12 deletions(-) diff --git a/build/docker/api/application.conf b/build/docker/api/application.conf index ae2ec8671..6a5dd8732 100644 --- a/build/docker/api/application.conf +++ b/build/docker/api/application.conf @@ -350,7 +350,10 @@ akka.http { # The time period within which the TCP binding process must be completed. # Set to `infinite` to disable. bind-timeout = 5s - request-timeout = 60s + + # A default request timeout is applied globally to all routes and can be configured using the + # akka.http.server.request-timeout setting (which defaults to 20 seconds). + # request-timeout = 60s # Show verbose error messages back to the client verbose-error-messages = on diff --git a/modules/api/src/it/resources/application.conf b/modules/api/src/it/resources/application.conf index 9a15efdea..aa1cf2367 100644 --- a/modules/api/src/it/resources/application.conf +++ b/modules/api/src/it/resources/application.conf @@ -347,7 +347,9 @@ akka.http { # The time period within which the TCP binding process must be completed. # Set to `infinite` to disable. bind-timeout = 5s - request-timeout = 60s + # A default request timeout is applied globally to all routes and can be configured using the + # akka.http.server.request-timeout setting (which defaults to 20 seconds). + # request-timeout = 60s # Show verbose error messages back to the client verbose-error-messages = on diff --git a/modules/api/src/main/resources/application.conf b/modules/api/src/main/resources/application.conf index 08b230b7d..68b519c26 100644 --- a/modules/api/src/main/resources/application.conf +++ b/modules/api/src/main/resources/application.conf @@ -19,7 +19,7 @@ vinyldns { shared-approved-types = ["A", "AAAA", "CNAME", "PTR", "TXT"] # Batch change settings - batch-change-limit = 100 + batch-change-limit = 1000 batch-change-limit = ${?BATCH_CHANGE_LIMIT} manual-batch-review-enabled = true manual-batch-review-enabled = ${?MANUAL_BATCH_REVIEW_ENABLED} @@ -366,7 +366,10 @@ akka.http { # The time period within which the TCP binding process must be completed. # Set to `infinite` to disable. bind-timeout = 5s - request-timeout = 60s + + # A default request timeout is applied globally to all routes and can be configured using the + # akka.http.server.request-timeout setting (which defaults to 20 seconds). + # request-timeout = 60s # Show verbose error messages back to the client verbose-error-messages = on diff --git a/modules/api/src/universal/conf/application.conf b/modules/api/src/universal/conf/application.conf index fefbd421a..56008f0a7 100644 --- a/modules/api/src/universal/conf/application.conf +++ b/modules/api/src/universal/conf/application.conf @@ -351,7 +351,10 @@ akka.http { # The time period within which the TCP binding process must be completed. # Set to `infinite` to disable. bind-timeout = 5s - request-timeout = 60s + + # A default request timeout is applied globally to all routes and can be configured using the + # akka.http.server.request-timeout setting (which defaults to 20 seconds). + # request-timeout = 60s # Show verbose error messages back to the client verbose-error-messages = on diff --git a/modules/docs/src/main/mdoc/operator/config-api.md b/modules/docs/src/main/mdoc/operator/config-api.md index 31a77c291..c25243e51 100644 --- a/modules/docs/src/main/mdoc/operator/config-api.md +++ b/modules/docs/src/main/mdoc/operator/config-api.md @@ -990,8 +990,10 @@ dotted-hosts = { # The time period within which the TCP binding process must be completed. # Set to `infinite` to disable. bind-timeout = 5s - request-timeout = 60s - + # A default request timeout is applied globally to all routes and can be configured using the + # akka.http.server.request-timeout setting (which defaults to 20 seconds). + # request-timeout = 60s + # Show verbose error messages back to the client verbose-error-messages = on } diff --git a/modules/portal/app/models/Meta.scala b/modules/portal/app/models/Meta.scala index 6bbf18eed..a5db1af77 100644 --- a/modules/portal/app/models/Meta.scala +++ b/modules/portal/app/models/Meta.scala @@ -32,7 +32,7 @@ object Meta { Meta( config.getOptional[String]("vinyldns.version").getOrElse("unknown"), config.getOptional[Boolean]("shared-display-enabled").getOrElse(false), - config.getOptional[Int]("api.limits.batchchange-routing-max-items-limit").getOrElse(100), + config.getOptional[Int]("api.limits.batchchange-routing-max-items-limit").getOrElse(1000), config.getOptional[Long]("default-ttl").getOrElse(7200L), config.getOptional[Boolean]("manual-batch-review-enabled").getOrElse(false), config.getOptional[Boolean]("scheduled-changes-enabled").getOrElse(false), diff --git a/modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html b/modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html index 651f707c2..4ca86c4c9 100644 --- a/modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html +++ b/modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html @@ -329,7 +329,7 @@

See documentation for sample CSV

-

Limit reached. Cannot add more than {{batchChangeLimit}} records per DNS change.

+

Limit reached. Cannot add more than {{batchChangeLimit}} records per DNS change.

diff --git a/modules/portal/test/models/MetaSpec.scala b/modules/portal/test/models/MetaSpec.scala index 90177278e..cee972091 100644 --- a/modules/portal/test/models/MetaSpec.scala +++ b/modules/portal/test/models/MetaSpec.scala @@ -39,7 +39,7 @@ class MetaSpec extends Specification with Mockito { } "default to 1000 if batch-change-limit is not found" in { val config = Map("vinyldns.version" -> "foo-bar") - Meta(Configuration.from(config)).batchChangeLimit must beEqualTo(100) + Meta(Configuration.from(config)).batchChangeLimit must beEqualTo(1000) } "get the default-ttl value in config" in { val config = Map("default-ttl" -> 7210) diff --git a/test/api/functional/application.conf b/test/api/functional/application.conf index cfb05f9bd..5c7f48aa3 100644 --- a/test/api/functional/application.conf +++ b/test/api/functional/application.conf @@ -301,7 +301,10 @@ akka.http { # The time period within which the TCP binding process must be completed. # Set to `infinite` to disable. bind-timeout = 5s - request-timeout = 60s + + # A default request timeout is applied globally to all routes and can be configured using the + # akka.http.server.request-timeout setting (which defaults to 20 seconds). + # request-timeout = 60s # Show verbose error messages back to the client verbose-error-messages = on diff --git a/test/api/integration/application.conf b/test/api/integration/application.conf index 0434f5692..e7c8c20e1 100644 --- a/test/api/integration/application.conf +++ b/test/api/integration/application.conf @@ -359,7 +359,11 @@ akka.http { # The time period within which the TCP binding process must be completed. # Set to `infinite` to disable. bind-timeout = 5s - request-timeout = 60s + + # A default request timeout is applied globally to all routes and can be configured using the + # akka.http.server.request-timeout setting (which defaults to 20 seconds). + # request-timeout = 60s + # Show verbose error messages back to the client verbose-error-messages = on }