remove mapstructure from identity,networking,objectstorage,orchestration,pagination
diff --git a/openstack/orchestration/v1/buildinfo/results.go b/openstack/orchestration/v1/buildinfo/results.go
index fe655a3..c3d2cdb 100644
--- a/openstack/orchestration/v1/buildinfo/results.go
+++ b/openstack/orchestration/v1/buildinfo/results.go
@@ -1,19 +1,18 @@
package buildinfo
import (
- "github.com/mitchellh/mapstructure"
"github.com/gophercloud/gophercloud"
)
// Revision represents the API/Engine revision of a Heat deployment.
type Revision struct {
- Revision string `mapstructure:"revision"`
+ Revision string `json:"revision"`
}
// BuildInfo represents the build information for a Heat deployment.
type BuildInfo struct {
- API Revision `mapstructure:"api"`
- Engine Revision `mapstructure:"engine"`
+ API Revision `json:"api"`
+ Engine Revision `json:"engine"`
}
// GetResult represents the result of a Get operation.
@@ -24,14 +23,7 @@
// Extract returns a pointer to a BuildInfo object and is called after a
// Get operation.
func (r GetResult) Extract() (*BuildInfo, error) {
- if r.Err != nil {
- return nil, r.Err
- }
-
- var res BuildInfo
- if err := mapstructure.Decode(r.Body, &res); err != nil {
- return nil, err
- }
-
- return &res, nil
+ var s *BuildInfo
+ err := r.ExtractInto(&s)
+ return s, err
}