[PL-26239]: fix for list response (#218)

* [PL-26239]: fix for list response
drone · Aug 26, 2022 · f4a3110 · f4a3110
1 parent b83308f
commit f4a3110
Show file tree

Hide file tree

Showing 3 changed files with 124 additions and 4 deletions.
diff --git a/scm/driver/github/repo.go b/scm/driver/github/repo.go
@@ -53,6 +53,11 @@ type hook struct {
 	} `json:"config"`
 }
 
+type repositoryList struct {
+	TotalCount   int           `json:"total_count"`
+	Repositories []*repository `json:"repositories"`
+}
+
 // RepositoryService implements the repository service for
 // the GitHub driver.
 type RepositoryService struct {
@@ -108,9 +113,9 @@ func (s *RepositoryService) List(ctx context.Context, opts scm.ListOptions) ([]*
 // List returns the github app installation repository list.
 func (s *RepositoryService) ListByInstallation(ctx context.Context, opts scm.ListOptions) ([]*scm.Repository, *scm.Response, error) {
 	path := fmt.Sprintf("installation/repositories?%s", encodeListOptions(opts))
-	out := []*repository{}
-	res, err := s.client.do(ctx, "GET", path, nil, &out)
-	return convertRepositoryList(out), res, err
+	out := new(repositoryList)
+	res, err := s.client.do(ctx, "GET", path, nil, out)
+	return convertRepositoryList(out.Repositories), res, err
 }
 
 // ListHooks returns a list or repository hooks.

diff --git a/scm/driver/github/repo_test.go b/scm/driver/github/repo_test.go
@@ -142,7 +142,7 @@ func TestGithubAppInstallationList(t *testing.T) {
 		Type("application/json").
 		SetHeaders(mockHeaders).
 		SetHeaders(mockPageHeaders).
-		File("testdata/repos.json")
+		File("testdata/github_app_repos.json")
 
 	client := NewDefault()
 	got, res, err := client.Repositories.(*RepositoryService).ListByInstallation(context.Background(), scm.ListOptions{Page: 1, Size: 30})

diff --git a/scm/driver/github/testdata/github_app_repos.json b/scm/driver/github/testdata/github_app_repos.json
@@ -0,0 +1,115 @@
+{
+    "total_count": 1,
+    "repositories": [
+        {
+            "id": 1296269,
+            "owner": {
+                "login": "octocat",
+                "id": 1,
+                "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+                "gravatar_id": "",
+                "url": "https://api.github.com/users/octocat",
+                "html_url": "https://github.com/octocat",
+                "followers_url": "https://api.github.com/users/octocat/followers",
+                "following_url": "https://api.github.com/users/octocat/following{/other_user}",
+                "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}",
+                "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}",
+                "subscriptions_url": "https://api.github.com/users/octocat/subscriptions",
+                "organizations_url": "https://api.github.com/users/octocat/orgs",
+                "repos_url": "https://api.github.com/users/octocat/repos",
+                "events_url": "https://api.github.com/users/octocat/events{/privacy}",
+                "received_events_url": "https://api.github.com/users/octocat/received_events",
+                "type": "User",
+                "site_admin": false
+            },
+            "name": "Hello-World",
+            "full_name": "octocat/Hello-World",
+            "description": "This your first repo!",
+            "private": true,
+            "fork": true,
+            "visibility": "public",
+            "url": "https://api.github.com/repos/octocat/Hello-World",
+            "html_url": "https://github.com/octocat/Hello-World",
+            "archive_url": "http://api.github.com/repos/octocat/Hello-World/{archive_format}{/ref}",
+            "assignees_url": "http://api.github.com/repos/octocat/Hello-World/assignees{/user}",
+            "blobs_url": "http://api.github.com/repos/octocat/Hello-World/git/blobs{/sha}",
+            "branches_url": "http://api.github.com/repos/octocat/Hello-World/branches{/branch}",
+            "clone_url": "https://github.com/octocat/Hello-World.git",
+            "collaborators_url": "http://api.github.com/repos/octocat/Hello-World/collaborators{/collaborator}",
+            "comments_url": "http://api.github.com/repos/octocat/Hello-World/comments{/number}",
+            "commits_url": "http://api.github.com/repos/octocat/Hello-World/commits{/sha}",
+            "compare_url": "http://api.github.com/repos/octocat/Hello-World/compare/{base}...{head}",
+            "contents_url": "http://api.github.com/repos/octocat/Hello-World/contents/{+path}",
+            "contributors_url": "http://api.github.com/repos/octocat/Hello-World/contributors",
+            "deployments_url": "http://api.github.com/repos/octocat/Hello-World/deployments",
+            "downloads_url": "http://api.github.com/repos/octocat/Hello-World/downloads",
+            "events_url": "http://api.github.com/repos/octocat/Hello-World/events",
+            "forks_url": "http://api.github.com/repos/octocat/Hello-World/forks",
+            "git_commits_url": "http://api.github.com/repos/octocat/Hello-World/git/commits{/sha}",
+            "git_refs_url": "http://api.github.com/repos/octocat/Hello-World/git/refs{/sha}",
+            "git_tags_url": "http://api.github.com/repos/octocat/Hello-World/git/tags{/sha}",
+            "git_url": "git:github.com/octocat/Hello-World.git",
+            "hooks_url": "http://api.github.com/repos/octocat/Hello-World/hooks",
+            "issue_comment_url": "http://api.github.com/repos/octocat/Hello-World/issues/comments{/number}",
+            "issue_events_url": "http://api.github.com/repos/octocat/Hello-World/issues/events{/number}",
+            "issues_url": "http://api.github.com/repos/octocat/Hello-World/issues{/number}",
+            "keys_url": "http://api.github.com/repos/octocat/Hello-World/keys{/key_id}",
+            "labels_url": "http://api.github.com/repos/octocat/Hello-World/labels{/name}",
+            "languages_url": "http://api.github.com/repos/octocat/Hello-World/languages",
+            "merges_url": "http://api.github.com/repos/octocat/Hello-World/merges",
+            "milestones_url": "http://api.github.com/repos/octocat/Hello-World/milestones{/number}",
+            "mirror_url": "git:git.example.com/octocat/Hello-World",
+            "notifications_url": "http://api.github.com/repos/octocat/Hello-World/notifications{?since, all, participating}",
+            "pulls_url": "http://api.github.com/repos/octocat/Hello-World/pulls{/number}",
+            "releases_url": "http://api.github.com/repos/octocat/Hello-World/releases{/id}",
+            "ssh_url": "git@github.com:octocat/Hello-World.git",
+            "stargazers_url": "http://api.github.com/repos/octocat/Hello-World/stargazers",
+            "statuses_url": "http://api.github.com/repos/octocat/Hello-World/statuses/{sha}",
+            "subscribers_url": "http://api.github.com/repos/octocat/Hello-World/subscribers",
+            "subscription_url": "http://api.github.com/repos/octocat/Hello-World/subscription",
+            "svn_url": "https://svn.github.com/octocat/Hello-World",
+            "tags_url": "http://api.github.com/repos/octocat/Hello-World/tags",
+            "teams_url": "http://api.github.com/repos/octocat/Hello-World/teams",
+            "trees_url": "http://api.github.com/repos/octocat/Hello-World/git/trees{/sha}",
+            "homepage": "https://github.com",
+            "language": null,
+            "forks_count": 9,
+            "stargazers_count": 80,
+            "watchers_count": 80,
+            "size": 108,
+            "default_branch": "master",
+            "open_issues_count": 0,
+            "topics": [
+                "octocat",
+                "atom",
+                "electron",
+                "API"
+            ],
+            "has_issues": true,
+            "has_wiki": true,
+            "has_pages": false,
+            "has_downloads": true,
+            "archived": false,
+            "pushed_at": "2011-01-26T19:06:43Z",
+            "created_at": "2011-01-26T19:01:12Z",
+            "updated_at": "2011-01-26T19:14:43Z",
+            "permissions": {
+                "admin": true,
+                "push": true,
+                "pull": true
+            },
+            "allow_rebase_merge": true,
+            "allow_squash_merge": true,
+            "allow_merge_commit": true,
+            "subscribers_count": 42,
+            "network_count": 0,
+            "license": {
+                "key": "mit",
+                "name": "MIT License",
+                "spdx_id": "MIT",
+                "url": "https://api.github.com/licenses/mit",
+                "html_url": "http://choosealicense.com/licenses/mit/"
+            }
+        }
+    ]
+}