Skip to content

Commit 213e767

Browse files
update list and get repo cmds to match updated API response (#672)
1 parent 5a0f3c0 commit 213e767

4 files changed

Lines changed: 9 additions & 13 deletions

File tree

cmd/kosli/getRepo.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,17 +107,15 @@ func (o *getRepoOptions) run(out io.Writer, args []string) error {
107107

108108
func printRepoAsTable(raw string, out io.Writer, page int) error {
109109
var response struct {
110-
Embedded struct {
111-
Repos []map[string]any `json:"repos"`
112-
} `json:"_embedded"`
110+
Repos []map[string]any `json:"repos"`
113111
}
114112

115113
err := json.Unmarshal([]byte(raw), &response)
116114
if err != nil {
117115
return err
118116
}
119117

120-
repos := response.Embedded.Repos
118+
repos := response.Repos
121119
if len(repos) == 0 {
122120
logger.Info("Repo was not found.")
123121
return nil

cmd/kosli/getRepo_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func (suite *GetRepoCommandTestSuite) TestGetRepoCmd() {
6060
{
6161
name: "03-getting an existing repo with --output json works",
6262
cmd: fmt.Sprintf(`get repo kosli-dev/cli --output json %s`, suite.acmeOrgKosliArguments),
63-
goldenJson: []jsonCheck{{"_embedded.repos", "non-empty"}},
63+
goldenJson: []jsonCheck{{"repos", "non-empty"}},
6464
},
6565
{
6666
name: "04-getting an existing repo with matching --provider works",
@@ -69,7 +69,7 @@ func (suite *GetRepoCommandTestSuite) TestGetRepoCmd() {
6969
{
7070
name: "05-getting an existing repo with matching --provider and --output json works",
7171
cmd: fmt.Sprintf(`get repo kosli-dev/cli --provider github --output json %s`, suite.acmeOrgKosliArguments),
72-
goldenJson: []jsonCheck{{"_embedded.repos", "non-empty"}},
72+
goldenJson: []jsonCheck{{"repos", "non-empty"}},
7373
},
7474
{
7575
name: "06-getting a repo with a non-matching --provider returns not-found message",

cmd/kosli/listRepos.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,14 @@ func (o *listReposOptions) run(out io.Writer) error {
8484
func printReposListAsTable(raw string, out io.Writer, page int) error {
8585
var repos []map[string]any
8686
var response struct {
87-
Embedded struct {
88-
Repos []map[string]any `json:"repos"`
89-
} `json:"_embedded"`
87+
Repos []map[string]any `json:"repos"`
9088
}
9189

9290
err := json.Unmarshal([]byte(raw), &response)
9391
if err != nil {
9492
return err
9593
}
96-
repos = response.Embedded.Repos
94+
repos = response.Repos
9795

9896
if len(repos) == 0 {
9997
logger.Info("No repos were found.")

cmd/kosli/listRepos_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ func (suite *ListReposCommandTestSuite) TestListReposCmd() {
6262
{
6363
name: "03-listing repos with --output json works when there are repos",
6464
cmd: fmt.Sprintf(`list repos --output json %s`, suite.acmeOrgKosliArguments),
65-
goldenJson: []jsonCheck{{"_embedded.repos", "non-empty"}},
65+
goldenJson: []jsonCheck{{"repos", "non-empty"}},
6666
},
6767
// THIS TEST IS FLAKY IN CI SINCE CI VARIABLES ARE SET THERE AND REPOS MAY EXIST FROM OTHER TESTS
6868
// {
6969
// name: "04-listing repos with --output json works when there are no repos",
7070
// cmd: fmt.Sprintf(`list repos --output json %s`, suite.defaultKosliArguments),
71-
// goldenJson: []jsonCheck{{"_embedded.repos", "[]"}},
71+
// goldenJson: []jsonCheck{{"repos", "[]"}},
7272
// },
7373
{
7474
wantError: true,
@@ -101,7 +101,7 @@ func (suite *ListReposCommandTestSuite) TestListReposCmd() {
101101
{
102102
name: "10-listing repos with --name filter and --output json works",
103103
cmd: fmt.Sprintf(`list repos --name kosli-dev/cli --output json %s`, suite.acmeOrgKosliArguments),
104-
goldenJson: []jsonCheck{{"_embedded.repos", "non-empty"}},
104+
goldenJson: []jsonCheck{{"repos", "non-empty"}},
105105
},
106106
{
107107
name: "11-listing repos with --provider filter works",

0 commit comments

Comments
 (0)