From 31c9633d0779847ad08a2a242631c7eae0b7412c Mon Sep 17 00:00:00 2001 From: Inf1mum Date: Thu, 19 Nov 2026 16:14:03 +0300 Subject: [PATCH] Fix #25722: forward keyword arguments from config.use to the Faraday middleware Signed-off-by: Inf1mum --- .../src/main/resources/ruby-nextgen/configuration.mustache | 6 +++--- .../codegen/rubynextgen/RubyNextgenClientCodegenTest.java | 3 ++- .../others/ruby-nextgen-qdrant/lib/qdrant/configuration.rb | 6 +++--- .../petstore/ruby-nextgen/lib/petstore/configuration.rb | 6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/ruby-nextgen/configuration.mustache b/modules/openapi-generator/src/main/resources/ruby-nextgen/configuration.mustache index 2a1694b2b6b1..ca55f08788a3 100644 --- a/modules/openapi-generator/src/main/resources/ruby-nextgen/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/ruby-nextgen/configuration.mustache @@ -34,7 +34,7 @@ module {{moduleName}} conn.response :json, content_type: /\bjson$/ conn.options.timeout = timeout conn.response :logger, logger if logger && debugging - @middlewares.each { |mw, mw_args, mw_block| conn.use(mw, *mw_args, &mw_block) } + @middlewares.each { |mw, mw_args, mw_kwargs, mw_block| conn.use(mw, *mw_args, **mw_kwargs, &mw_block) } conn.adapter Faraday.default_adapter end @@ -79,8 +79,8 @@ module {{moduleName}} # Register a Faraday middleware to run on every request, after the built-in # request middleware (so it sees the serialized body and final URL) and just # before the adapter. Use for request signing (OVH, AWS SigV4, ...). - def use(middleware, *args, &block) - @middlewares << [middleware, args, block] + def use(middleware, *args, **kwargs, &block) + @middlewares << [middleware, args, kwargs, block] self end diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/rubynextgen/RubyNextgenClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/rubynextgen/RubyNextgenClientCodegenTest.java index 9132e70bb442..0b4d922105ff 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/rubynextgen/RubyNextgenClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/rubynextgen/RubyNextgenClientCodegenTest.java @@ -437,7 +437,8 @@ public void testConfigurationExposesMiddlewareSeam() throws Exception { new org.openapitools.codegen.DefaultGenerator(false).opts(input).generate(); org.openapitools.codegen.TestUtils.assertFileContains( target.resolve("lib/petstore/configuration.rb"), - "def use(", "@middlewares.each"); + "def use(", "@middlewares.each", + "*args, **kwargs, &block", "*mw_args, **mw_kwargs, &mw_block"); } @Test diff --git a/samples/client/others/ruby-nextgen-qdrant/lib/qdrant/configuration.rb b/samples/client/others/ruby-nextgen-qdrant/lib/qdrant/configuration.rb index 2649242b82b2..57abd7c96600 100644 --- a/samples/client/others/ruby-nextgen-qdrant/lib/qdrant/configuration.rb +++ b/samples/client/others/ruby-nextgen-qdrant/lib/qdrant/configuration.rb @@ -34,7 +34,7 @@ def configure_faraday(conn) conn.response :json, content_type: /\bjson$/ conn.options.timeout = timeout conn.response :logger, logger if logger && debugging - @middlewares.each { |mw, mw_args, mw_block| conn.use(mw, *mw_args, &mw_block) } + @middlewares.each { |mw, mw_args, mw_kwargs, mw_block| conn.use(mw, *mw_args, **mw_kwargs, &mw_block) } conn.adapter Faraday.default_adapter end @@ -58,8 +58,8 @@ def apply_auth(headers, query, auth_names) # Register a Faraday middleware to run on every request, after the built-in # request middleware (so it sees the serialized body and final URL) and just # before the adapter. Use for request signing (OVH, AWS SigV4, ...). - def use(middleware, *args, &block) - @middlewares << [middleware, args, block] + def use(middleware, *args, **kwargs, &block) + @middlewares << [middleware, args, kwargs, block] self end diff --git a/samples/client/petstore/ruby-nextgen/lib/petstore/configuration.rb b/samples/client/petstore/ruby-nextgen/lib/petstore/configuration.rb index d741267c89af..d3b82cba3fbd 100644 --- a/samples/client/petstore/ruby-nextgen/lib/petstore/configuration.rb +++ b/samples/client/petstore/ruby-nextgen/lib/petstore/configuration.rb @@ -34,7 +34,7 @@ def configure_faraday(conn) conn.response :json, content_type: /\bjson$/ conn.options.timeout = timeout conn.response :logger, logger if logger && debugging - @middlewares.each { |mw, mw_args, mw_block| conn.use(mw, *mw_args, &mw_block) } + @middlewares.each { |mw, mw_args, mw_kwargs, mw_block| conn.use(mw, *mw_args, **mw_kwargs, &mw_block) } conn.adapter Faraday.default_adapter end @@ -57,8 +57,8 @@ def apply_auth(headers, query, auth_names) # Register a Faraday middleware to run on every request, after the built-in # request middleware (so it sees the serialized body and final URL) and just # before the adapter. Use for request signing (OVH, AWS SigV4, ...). - def use(middleware, *args, &block) - @middlewares << [middleware, args, block] + def use(middleware, *args, **kwargs, &block) + @middlewares << [middleware, args, kwargs, block] self end