Skip to content
This repository was archived by the owner on Aug 1, 2023. It is now read-only.

Commit 24ef2d6

Browse files
author
Samuel Ortiz
committed
imageservice: Do not use gophercloud.ErrResult for returning a body
gophercloud.Result should be used instead. Signed-off-by: Samuel Ortiz <[email protected]>
1 parent 916da9a commit 24ef2d6

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

openstack/imageservice/v2/images/results.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ type Image struct {
4242

4343
// CreateResult model
4444
type CreateResult struct {
45-
gophercloud.ErrResult
45+
gophercloud.Result
4646
}
4747

4848
func asBool(any interface{}) (bool, error) {
@@ -216,7 +216,7 @@ func extractMapStringStringAtKeyOptional(m map[string]interface{}, k string, ifM
216216
return ifMissing, nil
217217
}
218218

219-
func extractImage(res gophercloud.ErrResult) (*Image, error) {
219+
func extractImage(res gophercloud.Result) (*Image, error) {
220220
if res.Err != nil {
221221
return nil, res.Err
222222
}
@@ -296,42 +296,42 @@ func extractImage(res gophercloud.ErrResult) (*Image, error) {
296296

297297
// Extract build CreateResults from imput Image
298298
func (c CreateResult) Extract() (*Image, error) {
299-
return extractImage(c.ErrResult)
299+
return extractImage(c.Result)
300300
}
301301

302302
//DeleteResult model
303303
type DeleteResult struct {
304-
gophercloud.ErrResult
304+
gophercloud.Result
305305
}
306306

307307
// GetResult model
308308
type GetResult struct {
309-
gophercloud.ErrResult
309+
gophercloud.Result
310310
}
311311

312312
// Extract builds GetResult
313313
func (c GetResult) Extract() (*Image, error) {
314-
return extractImage(c.ErrResult)
314+
return extractImage(c.Result)
315315
}
316316

317317
// UpdateResult model
318318
type UpdateResult struct {
319-
gophercloud.ErrResult
319+
gophercloud.Result
320320
}
321321

322322
// Extract builds UpdateResult
323323
func (u UpdateResult) Extract() (*Image, error) {
324-
return extractImage(u.ErrResult)
324+
return extractImage(u.Result)
325325
}
326326

327327
// PutImageDataResult is model put image respose
328328
type PutImageDataResult struct {
329-
gophercloud.ErrResult
329+
gophercloud.Result
330330
}
331331

332332
// GetImageDataResult model for image response
333333
type GetImageDataResult struct {
334-
gophercloud.ErrResult
334+
gophercloud.Result
335335
}
336336

337337
// Extract builds images model from io.Reader

openstack/imageservice/v2/members/results.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type ImageMember struct {
1818

1919
// CreateMemberResult result model
2020
type CreateMemberResult struct {
21-
gophercloud.ErrResult
21+
gophercloud.Result
2222
}
2323

2424
// Extract ImageMember model from request if possible
@@ -35,7 +35,7 @@ func (cm CreateMemberResult) Extract() (*ImageMember, error) {
3535

3636
// ListMembersResult model
3737
type ListMembersResult struct {
38-
gophercloud.ErrResult
38+
gophercloud.Result
3939
}
4040

4141
// Extract returns list of image members
@@ -55,7 +55,7 @@ func (lm ListMembersResult) Extract() (*[]ImageMember, error) {
5555

5656
// MemberDetailsResult model
5757
type MemberDetailsResult struct {
58-
gophercloud.ErrResult
58+
gophercloud.Result
5959
}
6060

6161
// Extract returns image member details
@@ -74,7 +74,7 @@ func (md MemberDetailsResult) Extract() (*ImageMember, error) {
7474

7575
// MemberDeleteResult model
7676
type MemberDeleteResult struct {
77-
gophercloud.ErrResult
77+
gophercloud.Result
7878
}
7979

8080
// MemberUpdateResult model

0 commit comments

Comments
 (0)