Skip to content

Commit 74a0f79

Browse files
fix: issue release id missing in json output (#540)
1 parent 5ac6e6d commit 74a0f79

4 files changed

Lines changed: 15 additions & 10 deletions

File tree

pkg/cmd/release/create/create.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ func createRun(cmd *cobra.Command, f factory.Factory, flags *CreateFlags) error
294294
cmd.Printf("%s\n", releaseVersion)
295295
case constants.OutputFormatJson:
296296
v := &list.ReleaseViewModel{
297+
ID: options.Response.ReleaseID,
297298
Version: releaseVersion,
298299
Assembled: assembled,
299300
ReleaseNotes: releaseNotes,

pkg/cmd/release/create/create_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1394,7 +1394,7 @@ func TestReleaseCreate_AutomationMode(t *testing.T) {
13941394
_, err := testutil.ReceivePair(cmdReceiver)
13951395
assert.Nil(t, err)
13961396

1397-
assert.Equal(t, "{\"ReleaseNotes\":\"\",\"Assembled\":\"0001-01-01T00:00:00Z\",\"Channel\":\"Alpha channel\",\"Version\":\"1.2.3\"}\n", stdOut.String())
1397+
assert.Equal(t, "{\"ID\":\"Releases-999\",\"ReleaseNotes\":\"\",\"Assembled\":\"0001-01-01T00:00:00Z\",\"Channel\":\"Alpha channel\",\"Version\":\"1.2.3\"}\n", stdOut.String())
13981398
assert.Equal(t, "", stdErr.String())
13991399
}},
14001400

pkg/cmd/release/list/list.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ func NewListFlags() *ListFlags {
3232
}
3333

3434
type ReleaseViewModel struct {
35+
ID string
3536
ReleaseNotes string
3637
Assembled time.Time
3738
Channel string
@@ -118,6 +119,7 @@ func listRun(cmd *cobra.Command, f factory.Factory, flags *ListFlags) error {
118119
func(item *releases.Release, lookup []string) ReleaseViewModel { // result producer
119120
item.Links = nil
120121
return ReleaseViewModel{
122+
ID: item.ID,
121123
Assembled: item.Assembled,
122124
Channel: lookup[0],
123125
Version: item.Version,

pkg/cmd/release/list/list_test.go

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ func TestReleaseList(t *testing.T) {
7272
api.ExpectRequest(t, "GET", "/api/Spaces-1/projects/Projects-22/releases").
7373
RespondWith(resources.Resources[*releases.Release]{
7474
Items: []*releases.Release{
75-
releases.NewRelease(defaultChannel.ID, fireProjectID, "2.1"),
76-
releases.NewRelease(defaultChannel.ID, fireProjectID, "2.0"),
75+
fixtures.NewRelease(spaceID, "Releases-1", "2.1", fireProjectID, defaultChannel.ID),
76+
fixtures.NewRelease(spaceID, "Releases-2", "2.0", fireProjectID, defaultChannel.ID),
7777
releases.NewRelease(betaChannel.ID, fireProjectID, "2.0-beta2"),
7878
releases.NewRelease(betaChannel.ID, fireProjectID, "2.0-beta1"),
7979
},
@@ -116,8 +116,8 @@ func TestReleaseList(t *testing.T) {
116116
api.ExpectRequest(t, "GET", "/api/Spaces-1/projects/Projects-22/releases").
117117
RespondWith(resources.Resources[*releases.Release]{
118118
Items: []*releases.Release{
119-
releases.NewRelease(defaultChannel.ID, fireProjectID, "2.1"),
120-
releases.NewRelease(defaultChannel.ID, fireProjectID, "2.0"),
119+
fixtures.NewRelease(spaceID, "Releases-1", "2.1", fireProjectID, defaultChannel.ID),
120+
fixtures.NewRelease(spaceID, "Releases-2", "2.0", fireProjectID, defaultChannel.ID),
121121
releases.NewRelease(betaChannel.ID, fireProjectID, "2.0-beta2"),
122122
releases.NewRelease(betaChannel.ID, fireProjectID, "2.0-beta1"),
123123
},
@@ -158,7 +158,7 @@ func TestReleaseList(t *testing.T) {
158158

159159
api.ExpectRequest(t, "GET", "/api/Spaces-1/projects/Projects-22/releases").
160160
RespondWith(resources.Resources[*releases.Release]{
161-
Items: []*releases.Release{releases.NewRelease(defaultChannel.ID, fireProjectID, "2.1")},
161+
Items: []*releases.Release{fixtures.NewRelease(spaceID, "Releases-1", "2.1", fireProjectID, defaultChannel.ID)},
162162
})
163163

164164
api.ExpectRequest(t, "GET", "/api/Spaces-1/channels?ids=Channels-1&take=1").
@@ -191,7 +191,7 @@ func TestReleaseList(t *testing.T) {
191191

192192
api.ExpectRequest(t, "GET", "/api/Spaces-1/projects/Projects-22/releases").
193193
RespondWith(resources.Resources[*releases.Release]{
194-
Items: []*releases.Release{releases.NewRelease(defaultChannel.ID, fireProjectID, "2.1")},
194+
Items: []*releases.Release{fixtures.NewRelease(spaceID, "Releases-1", "2.1", fireProjectID, defaultChannel.ID)},
195195
})
196196

197197
api.ExpectRequest(t, "GET", "/api/Spaces-1/channels?ids=Channels-1&take=1").
@@ -223,7 +223,7 @@ func TestReleaseList(t *testing.T) {
223223

224224
api.ExpectRequest(t, "GET", "/api/Spaces-1/projects/Projects-22/releases").
225225
RespondWith(resources.Resources[*releases.Release]{
226-
Items: []*releases.Release{releases.NewRelease(defaultChannel.ID, fireProjectID, "2.1")},
226+
Items: []*releases.Release{fixtures.NewRelease(spaceID, "Releases-1", "2.1", fireProjectID, defaultChannel.ID)},
227227
})
228228

229229
api.ExpectRequest(t, "GET", "/api/Spaces-1/channels?ids=Channels-1&take=1").
@@ -233,6 +233,7 @@ func TestReleaseList(t *testing.T) {
233233
assert.Nil(t, err)
234234

235235
type x struct {
236+
ID string
236237
Assembled time.Time
237238
Channel string
238239
Version string
@@ -243,6 +244,7 @@ func TestReleaseList(t *testing.T) {
243244

244245
expectedTime, _ := time.Parse(time.RFC1123Z, "Mon, 01 Jan 0001 00:00:00")
245246
assert.Equal(t, []x{{
247+
ID: "Releases-1",
246248
Channel: defaultChannel.Name,
247249
Version: "2.1",
248250
ReleaseNotes: "",
@@ -268,7 +270,7 @@ func TestReleaseList(t *testing.T) {
268270

269271
api.ExpectRequest(t, "GET", "/api/Spaces-1/projects/Projects-22/releases").
270272
RespondWith(resources.Resources[*releases.Release]{
271-
Items: []*releases.Release{releases.NewRelease(defaultChannel.ID, fireProjectID, "2.1")},
273+
Items: []*releases.Release{fixtures.NewRelease(spaceID, "Releases-1", "2.1", fireProjectID, defaultChannel.ID)},
272274
})
273275

274276
api.ExpectRequest(t, "GET", "/api/Spaces-1/channels?ids=Channels-1&take=1").
@@ -300,7 +302,7 @@ func TestReleaseList(t *testing.T) {
300302

301303
api.ExpectRequest(t, "GET", "/api/Spaces-1/projects/Projects-22/releases").
302304
RespondWith(resources.Resources[*releases.Release]{
303-
Items: []*releases.Release{releases.NewRelease(defaultChannel.ID, fireProjectID, "2.1")},
305+
Items: []*releases.Release{fixtures.NewRelease(spaceID, "Releases-1", "2.1", fireProjectID, defaultChannel.ID)},
304306
})
305307

306308
api.ExpectRequest(t, "GET", "/api/Spaces-1/channels?ids=Channels-1&take=1").

0 commit comments

Comments
 (0)