From 9ad868fa7515f13d15787c80af9592054f726d9c Mon Sep 17 00:00:00 2001 From: Lynwee Hou Date: Thu, 7 Mar 2024 17:52:44 +0800 Subject: [PATCH] fix(plugins): fix wrong resp when testing connections, fix a typo in bitbucket --- backend/plugins/opsgenie/api/connection.go | 6 +++--- backend/plugins/pagerduty/api/connection.go | 4 ++-- backend/plugins/sonarqube/api/connection_api.go | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/plugins/opsgenie/api/connection.go b/backend/plugins/opsgenie/api/connection.go index d53b8b00a46..8cc7340b3a4 100644 --- a/backend/plugins/opsgenie/api/connection.go +++ b/backend/plugins/opsgenie/api/connection.go @@ -51,7 +51,7 @@ func testOpsgenieConn(ctx context.Context, connection models.OpsgenieConn) (*plu return nil, errors.HttpStatus(http.StatusForbidden).New("API Key need 'Read' and 'Configuration access' Access rights") } - if response.StatusCode == http.StatusOK { + if response.StatusCode == http.StatusOK || response.StatusCode == http.StatusAccepted { return &plugin.ApiResourceOutput{Body: nil, Status: http.StatusOK}, nil } @@ -79,7 +79,7 @@ func TestExistingConnection(input *plugin.ApiResourceInput) (*plugin.ApiResource if testConnectionErr != nil { return nil, plugin.WrapTestConnectionErrResp(basicRes, testConnectionErr) } - return &plugin.ApiResourceOutput{Body: testConnectionResult, Status: http.StatusOK}, nil + return testConnectionResult, nil } // TestConnection test opsgenie connection @@ -101,7 +101,7 @@ func TestConnection(input *plugin.ApiResourceInput) (*plugin.ApiResourceOutput, if testConnectionErr != nil { return nil, plugin.WrapTestConnectionErrResp(basicRes, testConnectionErr) } - return &plugin.ApiResourceOutput{Body: testConnectionResult, Status: http.StatusOK}, nil + return testConnectionResult, nil } // @Summary create opsgenie connection diff --git a/backend/plugins/pagerduty/api/connection.go b/backend/plugins/pagerduty/api/connection.go index 0c29062ece0..13be31f96c1 100644 --- a/backend/plugins/pagerduty/api/connection.go +++ b/backend/plugins/pagerduty/api/connection.go @@ -69,7 +69,7 @@ func TestConnection(input *plugin.ApiResourceInput) (*plugin.ApiResourceOutput, if testConnectionErr != nil { return nil, plugin.WrapTestConnectionErrResp(basicRes, testConnectionErr) } - return &plugin.ApiResourceOutput{Body: testConnectionResult, Status: http.StatusOK}, nil + return testConnectionResult, nil } // TestExistingConnection test pagerduty connection @@ -93,7 +93,7 @@ func TestExistingConnection(input *plugin.ApiResourceInput) (*plugin.ApiResource if testConnectionErr != nil { return nil, plugin.WrapTestConnectionErrResp(basicRes, testConnectionErr) } - return &plugin.ApiResourceOutput{Body: testConnectionResult, Status: http.StatusOK}, nil + return testConnectionResult, nil } // @Summary create pagerduty connection diff --git a/backend/plugins/sonarqube/api/connection_api.go b/backend/plugins/sonarqube/api/connection_api.go index 9058ce3f7e8..44d2c3b71d5 100644 --- a/backend/plugins/sonarqube/api/connection_api.go +++ b/backend/plugins/sonarqube/api/connection_api.go @@ -100,7 +100,7 @@ func TestConnection(input *plugin.ApiResourceInput) (*plugin.ApiResourceOutput, errMsg := fmt.Sprintf("Test connection fail, unexpected status code: %d", testConnectionResult.Status) return nil, plugin.WrapTestConnectionErrResp(basicRes, errors.Default.New(errMsg)) } - return &plugin.ApiResourceOutput{Body: testConnectionResult, Status: http.StatusOK}, nil + return testConnectionResult, nil } // TestExistingConnection test sonarqube connection options @@ -125,7 +125,7 @@ func TestExistingConnection(input *plugin.ApiResourceInput) (*plugin.ApiResource errMsg := fmt.Sprintf("Test connection fail, unexpected status code: %d", testConnectionResult.Status) return nil, plugin.WrapTestConnectionErrResp(basicRes, errors.Default.New(errMsg)) } - return &plugin.ApiResourceOutput{Body: testConnectionResult, Status: http.StatusOK}, nil + return testConnectionResult, nil } // PostConnections create sonarqube connection