Merge pull request #3370 from gophercloud/user-bool

stephenfin · web-flow · commit dda154aac9eb · 2025-05-23T15:46:36.000+01:00
identity: add support for string boolean in users' enabled member
diff --git a/openstack/identity/v3/users/results.go b/openstack/identity/v3/users/results.go
@@ -2,6 +2,8 @@ package users
 
 import (
 	"encoding/json"
+	"fmt"
+	"strconv"
 	"time"
 
 	"github.com/gophercloud/gophercloud/v2"
@@ -20,7 +22,7 @@ type User struct {
 	DomainID string `json:"domain_id"`
 
 	// Enabled is whether or not the user is enabled.
-	Enabled bool `json:"enabled"`
+	Enabled bool `json:"-"`
 
 	// Extra is a collection of miscellaneous key/values.
 	Extra map[string]any `json:"-"`
@@ -45,6 +47,7 @@ func (r *User) UnmarshalJSON(b []byte) error {
 	type tmp User
 	var s struct {
 		tmp
+		Enabled           any                             `json:"enabled"`
 		Extra             map[string]any                  `json:"extra"`
 		PasswordExpiresAt gophercloud.JSONRFC3339MilliNoZ `json:"password_expires_at"`
 	}
@@ -56,6 +59,20 @@ func (r *User) UnmarshalJSON(b []byte) error {
 
 	r.PasswordExpiresAt = time.Time(s.PasswordExpiresAt)
 
+	switch t := s.Enabled.(type) {
+	case nil:
+		r.Enabled = false
+	case bool:
+		r.Enabled = t
+	case string:
+		r.Enabled, err = strconv.ParseBool(t)
+		if err != nil {
+			return fmt.Errorf("Failed to parse Enabled %q: %v", t, err)
+		}
+	default:
+		return fmt.Errorf("Unknown type for Enabled: %T (value: %v)", t, t)
+	}
+
 	// Collect other fields and bundle them into Extra
 	// but only if a field titled "extra" wasn't sent.
 	if s.Extra != nil {
diff --git a/openstack/identity/v3/users/testing/fixtures_test.go b/openstack/identity/v3/users/testing/fixtures_test.go
@@ -25,7 +25,7 @@ const ListOutput = `
     "users": [
         {
             "domain_id": "default",
-            "enabled": true,
+            "enabled": "True",
             "id": "2844b2a08be147a08ef58317d6471f1f",
             "links": {
                 "self": "http://example.com/identity/v3/users/2844b2a08be147a08ef58317d6471f1f"

Original file line number	Diff line number	Diff line change
@@ -25,7 +25,7 @@ const ListOutput = `
`25`	`25`	`"users": [`
`26`	`26`	`{`
`27`	`27`	`"domain_id": "default",`
`28`		`- "enabled": true,`
	`28`	`+ "enabled": "True",`
`29`	`29`	`"id": "2844b2a08be147a08ef58317d6471f1f",`
`30`	`30`	`"links": {`
`31`	`31`	`"self": "http://example.com/identity/v3/users/2844b2a08be147a08ef58317d6471f1f"`