Skip to content

Fix manual json return #378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Manar-Elhabbal7 wants to merge 2 commits into
base: master
Choose a base branch
from
+37 −17
Open

Fix manual json return #378

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d4a285
refactor: replace manual JSON string construction with struct marshal…
Manar-Elhabbal7 May 12, 2026
bd0f6dd
Merge branch 'master' into fix_manual_json_return
Manar-Elhabbal7 May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 37 additions & 17 deletions pkg/connectors/microcks_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,33 +318,52 @@ func (c *microcksClient) SetOAuthToken(oauthToken string) {
c.AuthToken = oauthToken
}

// testRequest represents a request for creating a new TestResult
type testRequest struct {
ServiceID string `json:"serviceId"`
TestEndpoint string `json:"testEndpoint"`
RunnerType string `json:"runnerType"`
Timeout int64 `json:"timeout"`
SecretName string `json:"secretName,omitempty"`
FilteredOperations json.RawMessage `json:"filteredOperations,omitempty"`
OperationsHeaders json.RawMessage `json:"operationsHeaders,omitempty"`
OAuth2Context *OAuth2ClientContext `json:"oAuth2Context,omitempty"`
}

func (c *microcksClient) CreateTestResult(serviceID string, testEndpoint string, runnerType string, secretName string, timeout int64, filteredOperations string, operationsHeaders string, oAuth2Context string) (string, error) {
// Ensure we have a correct URL.
rel := &url.URL{Path: "tests"}
u := c.APIURL.ResolveReference(rel)

// Prepare an input string as body.
var input = "{"
input += ("\"serviceId\": \"" + serviceID + "\", ")
input += ("\"testEndpoint\": \"" + testEndpoint + "\", ")
input += ("\"runnerType\": \"" + runnerType + "\", ")
input += ("\"timeout\": " + strconv.FormatInt(timeout, 10))
// Prepare an input struct as body.
request := testRequest{
ServiceID: serviceID,
TestEndpoint: testEndpoint,
RunnerType: runnerType,
Timeout: timeout,
}
if len(secretName) > 0 {
input += (", \"secretName\": \"" + secretName + "\"")
request.SecretName = secretName
}
if len(filteredOperations) > 0 && ensureValidOperationsList(filteredOperations) {
input += (", \"filteredOperations\": " + filteredOperations)
request.FilteredOperations = json.RawMessage(filteredOperations)
}
if len(operationsHeaders) > 0 && ensureValidOperationsHeaders(operationsHeaders) {
input += (", \"operationsHeaders\": " + operationsHeaders)
request.OperationsHeaders = json.RawMessage(operationsHeaders)
}
if len(oAuth2Context) > 0 && ensureValidOAuth2Context(oAuth2Context) {
input += (", \"oAuth2Context\": " + oAuth2Context)
if len(oAuth2Context) > 0 {
oContext, valid := ensureValidOAuth2Context(oAuth2Context)
if valid {
request.OAuth2Context = oContext
}
}

input += "}"
input, err := json.Marshal(request)
if err != nil {
return "", err
}

req, err := http.NewRequest("POST", u.String(), strings.NewReader(input))
req, err := http.NewRequest("POST", u.String(), bytes.NewReader(input))
if err != nil {
return "", err
}
Expand Down Expand Up @@ -557,16 +576,17 @@ func ensureValidOperationsHeaders(operationsHeaders string) bool {
return true
}

func ensureValidOAuth2Context(oAuth2Context string) bool {
func ensureValidOAuth2Context(oAuth2Context string) (*OAuth2ClientContext, bool) {
var oContext = OAuth2ClientContext{}
err := json.Unmarshal([]byte(oAuth2Context), &oContext)
if err != nil {
fmt.Println("Error parsing JSON in oAuth2Context: ", err)
return false
return nil, false
}
if !grantTypeChoices[oContext.GrantType] {
fmt.Println("grantType in oAuth2Context is not supported. OAuth2 is turned off.")
return false
return nil, false
}
return true
return &oContext, true
}