You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2016/11/28 21:23:05 UTC
[07/11] incubator-trafficcontrol git commit: update user client for
psql
update user client for psql
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/dae0f12b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/dae0f12b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/dae0f12b
Branch: refs/heads/psql-rebase
Commit: dae0f12be5fef4bee250ab125230e4f0995215d5
Parents: cbd5e09
Author: David Neuman <da...@gmail.com>
Authored: Tue Nov 22 15:48:37 2016 -0700
Committer: David Neuman <da...@gmail.com>
Committed: Tue Nov 22 15:48:37 2016 -0700
----------------------------------------------------------------------
traffic_ops/client/fixtures/user.go | 2 +-
traffic_ops/client/tests/user_test.go | 2 +-
traffic_ops/client/user.go | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dae0f12b/traffic_ops/client/fixtures/user.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/fixtures/user.go b/traffic_ops/client/fixtures/user.go
index 39bf775..b70a3e8 100644
--- a/traffic_ops/client/fixtures/user.go
+++ b/traffic_ops/client/fixtures/user.go
@@ -24,7 +24,7 @@ func Users() *client.UserResponse {
client.User{
Username: "bsmith",
PublicSSHKey: "some-ssh-key",
- Role: "3",
+ Role: 3,
RoleName: "operations",
Email: "bobsmith@email.com",
FullName: "Bob Smith",
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dae0f12b/traffic_ops/client/tests/user_test.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/tests/user_test.go b/traffic_ops/client/tests/user_test.go
index d684770..bcddcce 100644
--- a/traffic_ops/client/tests/user_test.go
+++ b/traffic_ops/client/tests/user_test.go
@@ -57,7 +57,7 @@ func TestUsers(t *testing.T) {
testHelper.Success(t, "Should get back \"some-ssh-key\" for \"PublicSSHKey\"")
}
- if u.Role != "3" {
+ if u.Role != 3 {
testHelper.Error(t, "Should get back \"3\" for \"Role\", got %s", u.Role)
} else {
testHelper.Success(t, "Should get back \"3\" for \"Role\"")
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dae0f12b/traffic_ops/client/user.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/user.go b/traffic_ops/client/user.go
index 3e2a1d7..1b2cf2f 100644
--- a/traffic_ops/client/user.go
+++ b/traffic_ops/client/user.go
@@ -26,10 +26,10 @@ type UserResponse struct {
type User struct {
Username string `json:"username,omitempty"`
PublicSSHKey string `json:"publicSshKey,omitempty"`
- Role string `json:"role,omitempty"`
+ Role int `json:"role,omitempty"`
RoleName string `json:"rolename,omitempty"`
- UID string `json:"uid,omitempty"`
- GID string `json:"gid,omitempty"`
+ UID int `json:"uid,omitempty"`
+ GID int `json:"gid,omitempty"`
Company string `json:"company,omitempty"`
Email string `json:"email,omitempty"`
FullName string `json:"fullName,omitempty"`