From c9df73133f87e47d830c1619a578a9bcb3d5fceb Mon Sep 17 00:00:00 2001
From: treywelsh <treywelsh2+github@gmail.com>
Date: Mon, 14 Jan 2019 11:19:31 +0100
Subject: [PATCH] B #2658: GOCA - fix missing error check in Info methods

---
 src/oca/go/src/goca/image.go          | 5 ++++-
 src/oca/go/src/goca/marketplace.go    | 5 ++++-
 src/oca/go/src/goca/marketplaceapp.go | 5 ++++-
 src/oca/go/src/goca/securitygroup.go  | 5 ++++-
 src/oca/go/src/goca/template.go       | 5 ++++-
 src/oca/go/src/goca/virtualrouter.go  | 5 ++++-
 src/oca/go/src/goca/vm.go             | 5 ++++-
 7 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/oca/go/src/goca/image.go b/src/oca/go/src/goca/image.go
index 914beb3cef..f1af00f876 100644
--- a/src/oca/go/src/goca/image.go
+++ b/src/oca/go/src/goca/image.go
@@ -138,8 +138,11 @@ func NewImageFromName(name string) (*Image, error) {
 // Info connects to OpenNebula and fetches the information of the Image
 func (image *Image) Info() error {
 	response, err := client.Call("one.image.info", image.ID)
+	if err != nil {
+		return err
+	}
 	image.body = response.Body()
-	return err
+	return nil
 }
 
 // State looks up the state of the image and returns the ImageState
diff --git a/src/oca/go/src/goca/marketplace.go b/src/oca/go/src/goca/marketplace.go
index 2a667449ed..17548f42f1 100644
--- a/src/oca/go/src/goca/marketplace.go
+++ b/src/oca/go/src/goca/marketplace.go
@@ -126,6 +126,9 @@ func (market *MarketPlace) Rename(newName string) error {
 // Info retrieves information for the marketplace.
 func (market *MarketPlace) Info() error {
 	response, err := client.Call("one.market.info", market.ID)
+	if err != nil {
+		return err
+	}
 	market.body = response.Body()
-	return err
+	return nil
 }
diff --git a/src/oca/go/src/goca/marketplaceapp.go b/src/oca/go/src/goca/marketplaceapp.go
index 3baac110f7..b003227dec 100644
--- a/src/oca/go/src/goca/marketplaceapp.go
+++ b/src/oca/go/src/goca/marketplaceapp.go
@@ -134,8 +134,11 @@ func (marketApp *MarketPlaceApp) Rename(newName string) error {
 // Info retrieves information for the marketplace app.
 func (marketApp *MarketPlaceApp) Info() error {
 	response, err := client.Call("one.marketapp.info", marketApp.ID)
+	if err != nil {
+		return err
+	}
 	marketApp.body = response.Body()
-	return err
+	return nil
 }
 
 // Lock locks the marketplace app depending on blocking level.
diff --git a/src/oca/go/src/goca/securitygroup.go b/src/oca/go/src/goca/securitygroup.go
index f1ac0556bb..fedb6ebf68 100644
--- a/src/oca/go/src/goca/securitygroup.go
+++ b/src/oca/go/src/goca/securitygroup.go
@@ -143,6 +143,9 @@ func (sg *SecurityGroup) Rename(newName string) error {
 // Info retrieves information for the security group.
 func (sg *SecurityGroup) Info() error {
 	response, err := client.Call("one.secgroup.info", sg.ID)
+	if err != nil {
+		return err
+	}
 	sg.body = response.Body()
-	return err
+	return nil
 }
diff --git a/src/oca/go/src/goca/template.go b/src/oca/go/src/goca/template.go
index 33a11654aa..1972ff049f 100644
--- a/src/oca/go/src/goca/template.go
+++ b/src/oca/go/src/goca/template.go
@@ -80,8 +80,11 @@ func CreateTemplate(template string) (uint, error) {
 // Info connects to OpenNebula and fetches the information of the Template
 func (template *Template) Info() error {
 	response, err := client.Call("one.template.info", template.ID)
+	if err != nil {
+		return err
+	}
 	template.body = response.Body()
-	return err
+	return nil
 }
 
 // Update will modify the template. If appendTemplate is 0, it will
diff --git a/src/oca/go/src/goca/virtualrouter.go b/src/oca/go/src/goca/virtualrouter.go
index 75cfa8e4b4..c21ac33752 100644
--- a/src/oca/go/src/goca/virtualrouter.go
+++ b/src/oca/go/src/goca/virtualrouter.go
@@ -81,8 +81,11 @@ func CreateVirtualRouter(tpl string) (uint, error) {
 // Info connects to OpenNebula and fetches the information of the VirtualRouter
 func (vr *VirtualRouter) Info() error {
 	response, err := client.Call("one.vrouter.info", vr.ID)
+	if err != nil {
+		return err
+	}
 	vr.body = response.Body()
-	return err
+	return nil
 }
 
 // Update will modify the virtual router. If appendVirtualRouter is 0, it will
diff --git a/src/oca/go/src/goca/vm.go b/src/oca/go/src/goca/vm.go
index 55efce13fb..94c20034ce 100644
--- a/src/oca/go/src/goca/vm.go
+++ b/src/oca/go/src/goca/vm.go
@@ -585,8 +585,11 @@ func (vm *VM) Action(action string) error {
 // Info connects to OpenNebula and fetches the information of the VM
 func (vm *VM) Info() error {
 	response, err := client.Call("one.vm.info", vm.ID)
+	if err != nil {
+		return err
+	}
 	vm.body = response.Body()
-	return err
+	return nil
 }
 
 // Update will modify the VM's template. If appendTemplate is 0, it will