Don't decode user_data

kayrus · kayrus · commit 0e8ffcb118ff · 2020-03-03T19:57:14.000+01:00
diff --git a/openstack/compute/v2/extensions/extendedserverattributes/results.go b/openstack/compute/v2/extensions/extendedserverattributes/results.go
@@ -1,10 +1,5 @@
 package extendedserverattributes
 
-import (
-	"encoding/base64"
-	"encoding/json"
-)
-
 // ServerAttributesExt represents basic OS-EXT-SRV-ATTR server response fields.
 // You should use extract methods from microversions.go to retrieve additional
 // fields.
@@ -45,31 +40,5 @@ type ServerAttributesExt struct {
 
 	// Userdata is the userdata of the instance.
 	// This requires microversion 2.3 or later.
-	Userdata *string `json:"-"`
-}
-
-func (r *ServerAttributesExt) UnmarshalJSON(b []byte) error {
-	type tmp ServerAttributesExt
-	var s struct {
-		tmp
-		Userdata *string `json:"OS-EXT-SRV-ATTR:user_data"`
-	}
-	err := json.Unmarshal(b, &s)
-	if err != nil {
-		return err
-	}
-
-	*r = ServerAttributesExt(s.tmp)
-
-	if s.Userdata != nil {
-		r.Userdata = new(string)
-		if v, err := base64.StdEncoding.DecodeString(*s.Userdata); err != nil {
-			r.Userdata = s.Userdata
-		} else {
-			v := string(v)
-			r.Userdata = &v
-		}
-	}
-
-	return err
+	Userdata *string `json:"OS-EXT-SRV-ATTR:user_data"`
 }
diff --git a/openstack/compute/v2/extensions/extendedserverattributes/testing/requests_test.go b/openstack/compute/v2/extensions/extendedserverattributes/testing/requests_test.go
@@ -36,7 +36,7 @@ func TestServerWithUsageExt(t *testing.T) {
 	th.AssertEquals(t, serverWithAttributesExt.Host, "compute01")
 	th.AssertEquals(t, serverWithAttributesExt.InstanceName, "instance-00000001")
 	th.AssertEquals(t, serverWithAttributesExt.HypervisorHostname, "compute01")
-	th.AssertEquals(t, *serverWithAttributesExt.Userdata, "foo")
+	th.AssertEquals(t, *serverWithAttributesExt.Userdata, "Zm9v")
 	th.AssertEquals(t, *serverWithAttributesExt.ReservationID, "r-ky9gim1l")
 	th.AssertEquals(t, *serverWithAttributesExt.LaunchIndex, 0)
 	th.AssertEquals(t, *serverWithAttributesExt.Hostname, "test00")
