From e1afed75ffd5769dc8499c266256a04a1dc8c77e Mon Sep 17 00:00:00 2001 From: Jim Date: Fri, 10 Jul 2020 20:44:00 -0400 Subject: [PATCH] fix dbMask and role tests... (#188) * fix up tests. * case sensitive dbMask --- internal/iam/repository_role.go | 2 +- .../controller/handlers/roles/role_service_test.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/iam/repository_role.go b/internal/iam/repository_role.go index 9b29b2de99..a9df763547 100644 --- a/internal/iam/repository_role.go +++ b/internal/iam/repository_role.go @@ -69,7 +69,7 @@ func (r *Repository) UpdateRole(ctx context.Context, role *Role, fieldMaskPaths map[string]interface{}{ "name": role.Name, "description": role.Description, - "grantscopeid": role.GrantScopeId, + "GrantScopeId": role.GrantScopeId, }, fieldMaskPaths, ) diff --git a/internal/servers/controller/handlers/roles/role_service_test.go b/internal/servers/controller/handlers/roles/role_service_test.go index d5a3ccffa7..e8dcb7f611 100644 --- a/internal/servers/controller/handlers/roles/role_service_test.go +++ b/internal/servers/controller/handlers/roles/role_service_test.go @@ -581,7 +581,7 @@ func TestUpdate(t *testing.T) { Name: &wrapperspb.StringValue{Value: "new"}, Description: &wrapperspb.StringValue{Value: "desc"}, CreatedTime: or.GetCreateTime().GetTimestamp(), - GrantScopeId: &wrapperspb.StringValue{Value: pr.GetScopeId()}, + GrantScopeId: &wrapperspb.StringValue{Value: or.GetScopeId()}, }, }, errCode: codes.OK, @@ -681,7 +681,7 @@ func TestUpdate(t *testing.T) { Id: or.GetPublicId(), Description: &wrapperspb.StringValue{Value: "default"}, CreatedTime: or.GetCreateTime().GetTimestamp(), - GrantScopeId: &wrapperspb.StringValue{Value: pr.GetScopeId()}, + GrantScopeId: &wrapperspb.StringValue{Value: or.GetScopeId()}, }, }, errCode: codes.OK, @@ -703,7 +703,7 @@ func TestUpdate(t *testing.T) { Name: &wrapperspb.StringValue{Value: "updated"}, Description: &wrapperspb.StringValue{Value: "default"}, CreatedTime: or.GetCreateTime().GetTimestamp(), - GrantScopeId: &wrapperspb.StringValue{Value: pr.GetScopeId()}, + GrantScopeId: &wrapperspb.StringValue{Value: or.GetScopeId()}, }, }, errCode: codes.OK, @@ -725,7 +725,7 @@ func TestUpdate(t *testing.T) { Name: &wrapperspb.StringValue{Value: "default"}, Description: &wrapperspb.StringValue{Value: "notignored"}, CreatedTime: or.GetCreateTime().GetTimestamp(), - GrantScopeId: &wrapperspb.StringValue{Value: pr.GetScopeId()}, + GrantScopeId: &wrapperspb.StringValue{Value: or.GetScopeId()}, }, }, errCode: codes.OK,