From b05615d0e16d225e82146a194805170b12d8b3a9 Mon Sep 17 00:00:00 2001 From: Vittorio Curcio Date: Tue, 11 Dec 2018 23:06:25 +0100 Subject: [PATCH 1/6] Fix GetContent signature --- default_api.go | 2 +- default_api_test.go | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/default_api.go b/default_api.go index cd6f810..97b78ff 100644 --- a/default_api.go +++ b/default_api.go @@ -3848,7 +3848,7 @@ func (a *DefaultApiService) GetCommits_8(pullRequestID int64, localVarOptionals @param "blame" (string) if present the blame will be returned for the file as well. @param "noContent" (string) if present and used with blame only the blame is retrieved instead of the contents. @return */ -func (a *DefaultApiService) GetContent(localVarOptionals map[string]interface{}) (*APIResponse, error) { +func (a *DefaultApiService) GetContent(projectKey string, repositorySlug string, localVarOptionals map[string]interface{}) (*APIResponse, error) { var ( localVarHTTPMethod = strings.ToUpper("Get") localVarPostBody interface{} diff --git a/default_api_test.go b/default_api_test.go index 1da056d..3d3a199 100644 --- a/default_api_test.go +++ b/default_api_test.go @@ -2099,6 +2099,8 @@ func TestDefaultApiService_GetContent(t *testing.T) { client *APIClient } type args struct { + projectKey string + repositorySlug string localVarOptionals map[string]interface{} } tests := []struct { @@ -2115,7 +2117,7 @@ func TestDefaultApiService_GetContent(t *testing.T) { a := &DefaultApiService{ client: tt.fields.client, } - got, err := a.GetContent(tt.args.localVarOptionals) + got, err := a.GetContent(tt.args.projectKey, tt.args.repositorySlug, tt.args.localVarOptionals) if (err != nil) != tt.wantErr { t.Errorf("DefaultApiService.GetContent() error = %v, wantErr %v", err, tt.wantErr) return From df97495651687791b1bed0fe00a616248f7ca828 Mon Sep 17 00:00:00 2001 From: Vittorio Curcio Date: Tue, 11 Dec 2018 23:26:51 +0100 Subject: [PATCH 2/6] Replace placeholder in path --- default_api.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/default_api.go b/default_api.go index 97b78ff..e546012 100644 --- a/default_api.go +++ b/default_api.go @@ -3858,6 +3858,8 @@ func (a *DefaultApiService) GetContent(projectKey string, repositorySlug string, // create path and map variables localVarPath := a.client.cfg.BasePath + "/api/1.0/projects/{projectKey}/repos/{repositorySlug}/browse" + localVarPath = strings.Replace(localVarPath, "{"+"projectKey"+"}", fmt.Sprintf("%v", projectKey), -1) + localVarPath = strings.Replace(localVarPath, "{"+"repositorySlug"+"}", fmt.Sprintf("%v", repositorySlug), -1) localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} From a8242c8540998ea94769489c6bdd1436b478608f Mon Sep 17 00:00:00 2001 From: Vittorio Curcio Date: Wed, 12 Dec 2018 22:45:13 +0100 Subject: [PATCH 3/6] Add GetContent_0 to interact with the browse endpoint --- default_api.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/default_api.go b/default_api.go index e546012..25e03d1 100644 --- a/default_api.go +++ b/default_api.go @@ -3849,6 +3849,14 @@ func (a *DefaultApiService) GetCommits_8(pullRequestID int64, localVarOptionals @param "noContent" (string) if present and used with blame only the blame is retrieved instead of the contents. @return */ func (a *DefaultApiService) GetContent(projectKey string, repositorySlug string, localVarOptionals map[string]interface{}) (*APIResponse, error) { + return a.getContentWithPath(projectKey, repositorySlug, "", localVarOptionals) +} + +func (a *DefaultApiService) GetContent_0(projectKey string, repositorySlug string, path string, localVarOptionals map[string]interface{}) (*APIResponse, error) { + return a.getContentWithPath(projectKey, repositorySlug, path, localVarOptionals) +} + +func (a *DefaultApiService) getContentWithPath(projectKey string, repositorySlug string, path string, localVarOptionals map[string]interface{}) (*APIResponse, error) { var ( localVarHTTPMethod = strings.ToUpper("Get") localVarPostBody interface{} @@ -3857,9 +3865,10 @@ func (a *DefaultApiService) GetContent(projectKey string, repositorySlug string, ) // create path and map variables - localVarPath := a.client.cfg.BasePath + "/api/1.0/projects/{projectKey}/repos/{repositorySlug}/browse" + localVarPath := a.client.cfg.BasePath + "/api/1.0/projects/{projectKey}/repos/{repositorySlug}/browse/{path}" localVarPath = strings.Replace(localVarPath, "{"+"projectKey"+"}", fmt.Sprintf("%v", projectKey), -1) localVarPath = strings.Replace(localVarPath, "{"+"repositorySlug"+"}", fmt.Sprintf("%v", repositorySlug), -1) + localVarPath = strings.Replace(localVarPath, "{"+"path"+"}", fmt.Sprintf("%v", path), -1) localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} From 07c06c3d3fc3c233035230017b7b255e9acc38be Mon Sep 17 00:00:00 2001 From: Vittorio Curcio Date: Wed, 12 Dec 2018 22:54:29 +0100 Subject: [PATCH 4/6] Remove trailing / --- default_api.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/default_api.go b/default_api.go index 25e03d1..ffe00cb 100644 --- a/default_api.go +++ b/default_api.go @@ -3865,10 +3865,10 @@ func (a *DefaultApiService) getContentWithPath(projectKey string, repositorySlug ) // create path and map variables - localVarPath := a.client.cfg.BasePath + "/api/1.0/projects/{projectKey}/repos/{repositorySlug}/browse/{path}" + localVarPath := a.client.cfg.BasePath + "/api/1.0/projects/{projectKey}/repos/{repositorySlug}/browse{path}" localVarPath = strings.Replace(localVarPath, "{"+"projectKey"+"}", fmt.Sprintf("%v", projectKey), -1) localVarPath = strings.Replace(localVarPath, "{"+"repositorySlug"+"}", fmt.Sprintf("%v", repositorySlug), -1) - localVarPath = strings.Replace(localVarPath, "{"+"path"+"}", fmt.Sprintf("%v", path), -1) + localVarPath = strings.Replace(localVarPath, "{"+"path"+"}", fmt.Sprintf("/%v", path), -1) localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} From 23c70d2142c9958d5c9ed7b8cf11e66fc95eebb1 Mon Sep 17 00:00:00 2001 From: Vittorio Curcio Date: Wed, 12 Dec 2018 23:03:28 +0100 Subject: [PATCH 5/6] Really do not add trailing / --- default_api.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/default_api.go b/default_api.go index ffe00cb..03dc84a 100644 --- a/default_api.go +++ b/default_api.go @@ -3868,7 +3868,9 @@ func (a *DefaultApiService) getContentWithPath(projectKey string, repositorySlug localVarPath := a.client.cfg.BasePath + "/api/1.0/projects/{projectKey}/repos/{repositorySlug}/browse{path}" localVarPath = strings.Replace(localVarPath, "{"+"projectKey"+"}", fmt.Sprintf("%v", projectKey), -1) localVarPath = strings.Replace(localVarPath, "{"+"repositorySlug"+"}", fmt.Sprintf("%v", repositorySlug), -1) - localVarPath = strings.Replace(localVarPath, "{"+"path"+"}", fmt.Sprintf("/%v", path), -1) + if path != "" { + localVarPath = localVarPath + "/" + path + } localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} From dc293425f5e13f5351944e3364a57a8fb2845b42 Mon Sep 17 00:00:00 2001 From: Vittorio Curcio Date: Wed, 12 Dec 2018 23:06:45 +0100 Subject: [PATCH 6/6] Fix endpoint path --- default_api.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default_api.go b/default_api.go index 03dc84a..6ce63ff 100644 --- a/default_api.go +++ b/default_api.go @@ -3865,7 +3865,7 @@ func (a *DefaultApiService) getContentWithPath(projectKey string, repositorySlug ) // create path and map variables - localVarPath := a.client.cfg.BasePath + "/api/1.0/projects/{projectKey}/repos/{repositorySlug}/browse{path}" + localVarPath := a.client.cfg.BasePath + "/api/1.0/projects/{projectKey}/repos/{repositorySlug}/browse" localVarPath = strings.Replace(localVarPath, "{"+"projectKey"+"}", fmt.Sprintf("%v", projectKey), -1) localVarPath = strings.Replace(localVarPath, "{"+"repositorySlug"+"}", fmt.Sprintf("%v", repositorySlug), -1) if path != "" {