go

Author: millotp

clients/algoliasearch-client-go/algolia/transport/transport.go

@@ -44,7 +44,7 @@ func New(cfg Configuration) *Transport {
 	return transport
 }
 
-func (t *Transport) Request(ctx context.Context, req *http.Request, k call.Kind, c *RequestConfiguration) (*http.Response, []byte, error) {
+func (t *Transport) Request(ctx context.Context, req *http.Request, k call.Kind, c RequestConfiguration) (*http.Response, []byte, error) {
 	var intermediateNetworkErrors []error
 
 	// Add Content-Encoding header, if needed
@@ -65,15 +65,15 @@ func (t *Transport) Request(ctx context.Context, req *http.Request, k call.Kind,
 		)
 
 		switch {
-		case c != nil && k == call.Read && c.ReadTimeout != nil:
+		case k == call.Read && c.ReadTimeout != nil:
 			ctxTimeout = *c.ReadTimeout
-		case c != nil && k == call.Write && c.WriteTimeout != nil:
+		case k == call.Write && c.WriteTimeout != nil:
 			ctxTimeout = *c.WriteTimeout
 		default:
 			ctxTimeout = h.timeout
 		}
 
-		if c != nil && c.ConnectTimeout != nil {
+		if c.ConnectTimeout != nil {
 			connectTimeout = *c.ConnectTimeout
 		} else {
 			connectTimeout = t.connectTimeout

templates/go/api.mustache

@@ -30,6 +30,7 @@ type config struct {
 	context      context.Context
 	queryParams  url.Values
 	headerParams map[string]string
+  timeouts transport.RequestConfiguration
 
   {{#isSearchClient}}
   // -- ChunkedBatch options
@@ -80,6 +81,24 @@ func WithQueryParam(key string, value any) requestOption {
 	})
 }
 
+func WithReadTimeout(timeout time.Duration) requestOption {
+  return requestOption(func(c *config) {
+    c.timeouts.ReadTimeout = &timeout
+  })
+}
+
+func WithWriteTimeout(timeout time.Duration) requestOption {
+  return requestOption(func(c *config) {
+    c.timeouts.WriteTimeout = &timeout
+  })
+}
+
+func WithConnectTimeout(timeout time.Duration) requestOption {
+  return requestOption(func(c *config) {
+    c.timeouts.ConnectTimeout = &timeout
+  })
+}
+
 {{#isSearchClient}}
 
 // --------- ChunkedBatch options ---------
@@ -453,6 +472,13 @@ func (c *APIClient) {{nickname}}WithHTTPInfo({{#hasParams}}r {{#structPrefix}}{{
     context:      context.Background(),
     queryParams:  url.Values{},
     headerParams: map[string]string{},
+    {{#vendorExtensions.x-timeouts}}
+    timeouts: transport.RequestConfiguration{
+      ReadTimeout:  utils.ToPtr({{read}} * time.Millisecond),
+      WriteTimeout: utils.ToPtr({{write}} * time.Millisecond),
+      ConnectTimeout: utils.ToPtr({{connect}} * time.Millisecond),
+    },
+    {{/vendorExtensions.x-timeouts}}
   }
 
   {{#vendorExtensions.x-is-custom-request}}
@@ -507,11 +533,7 @@ func (c *APIClient) {{nickname}}WithHTTPInfo({{#hasParams}}r {{#structPrefix}}{{
 		return nil, nil, err
 	}
 
-	return c.callAPI(
-    req,
-    {{#vendorExtensions}}{{#x-use-read-transporter}}true{{/x-use-read-transporter}}{{^x-use-read-transporter}}false{{/x-use-read-transporter}},{{/vendorExtensions}}
-    {{#vendorExtensions.x-timeouts}}&transport.RequestConfiguration{ReadTimeout: utils.ToPtr({{read}} * time.Millisecond), WriteTimeout: utils.ToPtr({{write}} * time.Millisecond), ConnectTimeout: utils.ToPtr({{connect}} * time.Millisecond)}{{/vendorExtensions.x-timeouts}}{{^vendorExtensions.x-timeouts}}nil{{/vendorExtensions.x-timeouts}},
-  )
+	return c.callAPI(req, {{#vendorExtensions}}{{#x-use-read-transporter}}true{{/x-use-read-transporter}}{{^x-use-read-transporter}}false{{/x-use-read-transporter}},{{/vendorExtensions}}conf.timeouts)
 }
 
 /*

templates/go/client.mustache

@@ -129,7 +129,7 @@ func (c *APIClient) AddDefaultHeader(key string, value string) {
 }
 
 // callAPI do the request.
-func (c *APIClient) callAPI(request *http.Request, useReadTransporter bool, requestConfiguration *transport.RequestConfiguration) (*http.Response, []byte, error) {
+func (c *APIClient) callAPI(request *http.Request, useReadTransporter bool, requestConfiguration transport.RequestConfiguration) (*http.Response, []byte, error) {
 	callKind := call.Write
   if useReadTransporter || request.Method == http.MethodGet {
     callKind = call.Read

templates/go/tests/method.mustache

@@ -2,4 +2,13 @@ client.{{#lambda.titlecase}}{{method}}{{/lambda.titlecase}}({{#hasParams}}{{^isH
   {{#parametersWithDataType}}{{#required}}{{> tests/generateParams}},{{/required}}{{/parametersWithDataType}}
 {{^isHelper}}){{#parametersWithDataType}}{{^required}}.With{{#lambda.pascalcase}}{{{key}}}{{/lambda.pascalcase}}({{> tests/generateParams}}){{/required}}{{/parametersWithDataType}}{{/isHelper}}{{#isHelper}}{{#parametersWithDataType}}{{^required}}{{> tests/generateParams}},{{/required}}{{/parametersWithDataType}}{{/isHelper}}{{/hasParams}}{{#requestOptions}}{{#hasParams}},{{/hasParams}}
 {{#queryParameters.parametersWithDataType}}{{clientPrefix}}.WithQueryParam("{{{key}}}", {{> tests/generateInnerParams}}),{{/queryParameters.parametersWithDataType}}{{#headers.parametersWithDataType}}{{clientPrefix}}.WithHeaderParam("{{{key}}}", {{> tests/generateInnerParams}}),{{/headers.parametersWithDataType}}
+{{#timeouts.read}}
+{{clientPrefix}}.WithReadTimeout({{.}} * time.Millisecond),
+{{/timeouts.read}}
+{{#timeouts.write}}
+{{clientPrefix}}.WithWriteTimeout({{.}} * time.Millisecond),
+{{/timeouts.write}}
+{{#timeouts.connect}}
+{{clientPrefix}}.WithConnectTimeout({{.}} * time.Millisecond),
+{{/timeouts.connect}}
 {{/requestOptions}})