diff --git a/apptrust/http/http_client.go b/apptrust/http/http_client.go index ae24573..2dcd25e 100644 --- a/apptrust/http/http_client.go +++ b/apptrust/http/http_client.go @@ -26,7 +26,7 @@ type ApptrustHttpClient interface { Post(path string, requestBody interface{}, params map[string]string) (resp *http.Response, body []byte, err error) Get(path string) (resp *http.Response, body []byte, err error) Patch(path string, requestBody interface{}) (resp *http.Response, body []byte, err error) - Delete(path string) (resp *http.Response, body []byte, err error) + Delete(path string, params map[string]string) (resp *http.Response, body []byte, err error) } type apptrustHttpClient struct { @@ -139,8 +139,8 @@ func (c *apptrustHttpClient) toJsonBytes(payload interface{}) ([]byte, error) { return jsonBytes, nil } -func (c *apptrustHttpClient) Delete(path string) (resp *http.Response, body []byte, err error) { - url, err := utils.BuildUrl(c.serverDetails.Url, apptrustApiPath+path, nil) +func (c *apptrustHttpClient) Delete(path string, params map[string]string) (resp *http.Response, body []byte, err error) { + url, err := utils.BuildUrl(c.serverDetails.Url, apptrustApiPath+path, params) if err != nil { return nil, nil, err } diff --git a/apptrust/service/applications/application_service.go b/apptrust/service/applications/application_service.go index 0464aaa..f931c6b 100644 --- a/apptrust/service/applications/application_service.go +++ b/apptrust/service/applications/application_service.go @@ -60,7 +60,7 @@ func (as *applicationService) UpdateApplication(ctx service.Context, requestBody func (as *applicationService) DeleteApplication(ctx service.Context, applicationKey string) error { endpoint := fmt.Sprintf("/v1/applications/%s", applicationKey) - response, responseBody, err := ctx.GetHttpClient().Delete(endpoint) + response, responseBody, err := ctx.GetHttpClient().Delete(endpoint, nil) if err != nil { return err } diff --git a/apptrust/service/packages/package_service.go b/apptrust/service/packages/package_service.go index d23abe9..a8546e4 100644 --- a/apptrust/service/packages/package_service.go +++ b/apptrust/service/packages/package_service.go @@ -42,7 +42,7 @@ func (ps *packageService) BindPackage(ctx service.Context, applicationKey string func (ps *packageService) UnbindPackage(ctx service.Context, applicationKey, pkgType, pkgName, pkgVersion string) error { endpoint := fmt.Sprintf("/v1/applications/%s/packages/%s/%s/%s", applicationKey, pkgType, url.PathEscape(pkgName), pkgVersion) - response, responseBody, err := ctx.GetHttpClient().Delete(endpoint) + response, responseBody, err := ctx.GetHttpClient().Delete(endpoint, nil) if err != nil { return err } diff --git a/apptrust/service/packages/package_service_test.go b/apptrust/service/packages/package_service_test.go index 82e67f0..afa2bba 100644 --- a/apptrust/service/packages/package_service_test.go +++ b/apptrust/service/packages/package_service_test.go @@ -141,7 +141,7 @@ func TestUnbindPackage(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { mockHttpClient := mockhttp.NewMockApptrustHttpClient(ctrl) - mockHttpClient.EXPECT().Delete(fmt.Sprintf("/v1/applications/%s/packages/%s/%s/%s", applicationKey, tt.pkgType, url.PathEscape(tt.pkgName), tt.pkgVersion)). + mockHttpClient.EXPECT().Delete(fmt.Sprintf("/v1/applications/%s/packages/%s/%s/%s", applicationKey, tt.pkgType, url.PathEscape(tt.pkgName), tt.pkgVersion), nil). Return(tt.mockResponse, []byte(""), tt.mockError).Times(1) mockCtx := mockservice.NewMockContext(ctrl) diff --git a/apptrust/service/versions/version_service.go b/apptrust/service/versions/version_service.go index 16af4e4..77bafb3 100644 --- a/apptrust/service/versions/version_service.go +++ b/apptrust/service/versions/version_service.go @@ -101,7 +101,7 @@ func (vs *versionService) RollbackAppVersion(ctx service.Context, applicationKey func (vs *versionService) DeleteAppVersion(ctx service.Context, applicationKey, version string) error { url := fmt.Sprintf("/v1/applications/%s/versions/%s", applicationKey, version) - response, responseBody, err := ctx.GetHttpClient().Delete(url) + response, responseBody, err := ctx.GetHttpClient().Delete(url, map[string]string{"async": "false"}) if err != nil { return err }