Merge pull request #161 from conductor-sdk/feature/with-context-execu…

…tor-fns Add `WithContext` functions to executor
conductor-sdk · Nov 7, 2024 · 3891d83 · 3891d83
2 parents 283f031 + 6f17031
commit 3891d83
Show file tree

Hide file tree

Showing 8 changed files with 514 additions and 299 deletions.
diff --git a/sdk/authentication/token_helper.go b/sdk/authentication/token_helper.go
@@ -234,9 +234,7 @@ func contains(haystack []string, needle string) bool {
 }
 
 func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) {
-	if bodyBuf == nil {
-		bodyBuf = &bytes.Buffer{}
-	}
+	bodyBuf = &bytes.Buffer{}
 	if reader, ok := body.(io.Reader); ok {
 		_, err = bodyBuf.ReadFrom(reader)
 	} else if b, ok := body.([]byte); ok {
@@ -248,7 +246,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e
 	} else if jsonCheck.MatchString(contentType) {
 		err = json.NewEncoder(bodyBuf).Encode(body)
 	} else if xmlCheck.MatchString(contentType) {
-		xml.NewEncoder(bodyBuf).Encode(body)
+		err = xml.NewEncoder(bodyBuf).Encode(body)
 	}
 
 	if err != nil {

diff --git a/sdk/client/api_client.go b/sdk/client/api_client.go
@@ -247,9 +247,8 @@ func parameterToString(obj interface{}, collectionFormat string) string {
 }
 
 func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) {
-	if bodyBuf == nil {
-		bodyBuf = &bytes.Buffer{}
-	}
+	bodyBuf = &bytes.Buffer{}
+
 	if reader, ok := body.(io.Reader); ok {
 		_, err = bodyBuf.ReadFrom(reader)
 	} else if b, ok := body.([]byte); ok {
@@ -261,7 +260,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e
 	} else if jsonCheck.MatchString(contentType) {
 		err = json.NewEncoder(bodyBuf).Encode(body)
 	} else if xmlCheck.MatchString(contentType) {
-		xml.NewEncoder(bodyBuf).Encode(body)
+		err = xml.NewEncoder(bodyBuf).Encode(body)
 	}
 
 	if err != nil {

diff --git a/sdk/client/http_requester.go b/sdk/client/http_requester.go
@@ -139,12 +139,12 @@ func (h *HttpRequester) prepareRequest(
 	// Encode the parameters.
 	url.RawQuery = query.Encode()
 
-	// Generate a new request
 	if body != nil {
-		localVarRequest, err = http.NewRequest(method, url.String(), body)
+		localVarRequest, err = http.NewRequestWithContext(ctx, method, url.String(), body)
 	} else {
-		localVarRequest, err = http.NewRequest(method, url.String(), nil)
+		localVarRequest, err = http.NewRequestWithContext(ctx, method, url.String(), nil)
 	}
+
 	if err != nil {
 		return nil, err
 	}

diff --git a/sdk/model/rbac/create_or_update_application_request.go b/sdk/model/rbac/create_or_update_application_request.go
@@ -11,6 +11,5 @@ package rbac
 
 type CreateOrUpdateApplicationRequest struct {
 	// Application's name e.g.: Payment Processors
-	Name        string `json:"name"`
-	Description string `json"description"`
+	Name string `json:"name"`
 }