Skip to content

Commit

Permalink
Unify naming and location of auth RPC services (#46559) (#46596)
Browse files Browse the repository at this point in the history 
This moves packages around and renames things such that all existing
and non-legacy auth RPC services follow the same semantics.

- RPC services are all now under `lib/auth/<rpc_package>/<rpc_package><rpc_version>`
  i.e. lib/auth/accessmonitoringrules/accessmonitoringrulesv1
- Generated proto code imported in lib/auth/grpcserver.go are now
  aliased to <rpc_package><rpc_version>pb
  i.e. accessmonitoringrulesv1pb
  • Loading branch information
@rosstimothy
rosstimothy committed Sep 13, 2024
1 parent a0a903f commit 7435ec0
Show file tree
Hide file tree
Showing 8 changed files with 106 additions and 89 deletions.
0 ...grules/accessmonitoringrulesv1/service.go → ...grules/accessmonitoringrulesv1/service.go
View file
File renamed without changes.
0 ...s/accessmonitoringrulesv1/service_test.go → ...s/accessmonitoringrulesv1/service_test.go
View file
File renamed without changes.
113 changes: 56 additions & 57 deletions lib/auth/grpcserver.go
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/auth/kubewaitingcontainer/service.go → ...ntainer/kubewaitingcontainerv1/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

package kubewaitingcontainer
package kubewaitingcontainerv1

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion ...auth/kubewaitingcontainer/service_test.go → ...er/kubewaitingcontainerv1/service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

package kubewaitingcontainer
package kubewaitingcontainerv1

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion lib/auth/loginrule/service.go → lib/auth/loginrule/loginrulev1/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package loginrule
package loginrulev1

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion lib/auth/userloginstate/service.go → ...serloginstate/userloginstatev1/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package userloginstate
package userloginstatev1

import (
"context"
Expand Down
74 changes: 46 additions & 28 deletions lib/auth/userloginstate/service_test.go → ...ginstate/userloginstatev1/service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package userloginstate
package userloginstatev1

import (
"context"
Expand All @@ -28,7 +28,7 @@ import (
"github.com/jonboulle/clockwork"
"github.com/stretchr/testify/require"

userloginstatev1 "github.com/gravitational/teleport/api/gen/proto/go/teleport/userloginstate/v1"
userloginstatepb "github.com/gravitational/teleport/api/gen/proto/go/teleport/userloginstate/v1"
"github.com/gravitational/teleport/api/types"
"github.com/gravitational/teleport/api/types/header"
"github.com/gravitational/teleport/api/types/trait"
Expand Down Expand Up @@ -68,24 +68,24 @@ func TestGetUserLoginStates(t *testing.T) {

ctx, noAccessCtx, svc := initSvc(t)

getResp, err := svc.GetUserLoginStates(ctx, &userloginstatev1.GetUserLoginStatesRequest{})
getResp, err := svc.GetUserLoginStates(ctx, &userloginstatepb.GetUserLoginStatesRequest{})
require.NoError(t, err)
require.Empty(t, getResp.UserLoginStates)

uls1 := newUserLoginState(t, "1", nil, stRoles, stTraits, stRoles, stTraits)
uls2 := newUserLoginState(t, "2", nil, stRoles, stTraits, stRoles, stTraits)

_, err = svc.UpsertUserLoginState(ctx, &userloginstatev1.UpsertUserLoginStateRequest{UserLoginState: conv.ToProto(uls1)})
_, err = svc.UpsertUserLoginState(ctx, &userloginstatepb.UpsertUserLoginStateRequest{UserLoginState: conv.ToProto(uls1)})
require.NoError(t, err)

_, err = svc.UpsertUserLoginState(ctx, &userloginstatev1.UpsertUserLoginStateRequest{UserLoginState: conv.ToProto(uls2)})
_, err = svc.UpsertUserLoginState(ctx, &userloginstatepb.UpsertUserLoginStateRequest{UserLoginState: conv.ToProto(uls2)})
require.NoError(t, err)

getResp, err = svc.GetUserLoginStates(ctx, &userloginstatev1.GetUserLoginStatesRequest{})
getResp, err = svc.GetUserLoginStates(ctx, &userloginstatepb.GetUserLoginStatesRequest{})
require.NoError(t, err)
require.Empty(t, cmp.Diff([]*userloginstate.UserLoginState{uls1, uls2}, mustFromProtoAll(t, getResp.UserLoginStates...), cmpOpts...))

_, err = svc.GetUserLoginStates(noAccessCtx, &userloginstatev1.GetUserLoginStatesRequest{})
_, err = svc.GetUserLoginStates(noAccessCtx, &userloginstatepb.GetUserLoginStatesRequest{})
require.True(t, trace.IsAccessDenied(err))
}

Expand All @@ -94,20 +94,20 @@ func TestUpsertUserLoginStates(t *testing.T) {

ctx, noAccessCtx, svc := initSvc(t)

getResp, err := svc.GetUserLoginStates(ctx, &userloginstatev1.GetUserLoginStatesRequest{})
getResp, err := svc.GetUserLoginStates(ctx, &userloginstatepb.GetUserLoginStatesRequest{})
require.NoError(t, err)
require.Empty(t, getResp.UserLoginStates)

uls1 := newUserLoginState(t, "1", nil, stRoles, stTraits, stRoles, stTraits)
uls2 := newUserLoginState(t, "2", nil, stRoles, stTraits, stRoles, stTraits)

_, err = svc.UpsertUserLoginState(ctx, &userloginstatev1.UpsertUserLoginStateRequest{UserLoginState: conv.ToProto(uls1)})
_, err = svc.UpsertUserLoginState(ctx, &userloginstatepb.UpsertUserLoginStateRequest{UserLoginState: conv.ToProto(uls1)})
require.NoError(t, err)

_, err = svc.UpsertUserLoginState(noAccessCtx, &userloginstatev1.UpsertUserLoginStateRequest{UserLoginState: conv.ToProto(uls2)})
_, err = svc.UpsertUserLoginState(noAccessCtx, &userloginstatepb.UpsertUserLoginStateRequest{UserLoginState: conv.ToProto(uls2)})
require.True(t, trace.IsAccessDenied(err))

getResp, err = svc.GetUserLoginStates(ctx, &userloginstatev1.GetUserLoginStatesRequest{})
getResp, err = svc.GetUserLoginStates(ctx, &userloginstatepb.GetUserLoginStatesRequest{})
require.NoError(t, err)
require.Empty(t, cmp.Diff([]*userloginstate.UserLoginState{uls1}, mustFromProtoAll(t, getResp.UserLoginStates...), cmpOpts...))
}
Expand All @@ -117,22 +117,22 @@ func TestGetUserLoginState(t *testing.T) {

ctx, noAccessCtx, svc := initSvc(t)

getResp, err := svc.GetUserLoginStates(ctx, &userloginstatev1.GetUserLoginStatesRequest{})
getResp, err := svc.GetUserLoginStates(ctx, &userloginstatepb.GetUserLoginStatesRequest{})
require.NoError(t, err)
require.Empty(t, getResp.UserLoginStates)

uls1 := newUserLoginState(t, "1", nil, stRoles, stTraits, stRoles, stTraits)

_, err = svc.UpsertUserLoginState(ctx, &userloginstatev1.UpsertUserLoginStateRequest{UserLoginState: conv.ToProto(uls1)})
_, err = svc.UpsertUserLoginState(ctx, &userloginstatepb.UpsertUserLoginStateRequest{UserLoginState: conv.ToProto(uls1)})
require.NoError(t, err)

get, err := svc.GetUserLoginState(ctx, &userloginstatev1.GetUserLoginStateRequest{
get, err := svc.GetUserLoginState(ctx, &userloginstatepb.GetUserLoginStateRequest{
Name: uls1.GetName(),
})
require.NoError(t, err)
require.Empty(t, cmp.Diff(uls1, mustFromProto(t, get), cmpOpts...))

_, err = svc.GetUserLoginState(noAccessCtx, &userloginstatev1.GetUserLoginStateRequest{
_, err = svc.GetUserLoginState(noAccessCtx, &userloginstatepb.GetUserLoginStateRequest{
Name: uls1.GetName(),
})
require.True(t, trace.IsAccessDenied(err))
Expand All @@ -143,25 +143,25 @@ func TestDeleteUserLoginState(t *testing.T) {

ctx, _, svc := initSvc(t)

getResp, err := svc.GetUserLoginStates(ctx, &userloginstatev1.GetUserLoginStatesRequest{})
getResp, err := svc.GetUserLoginStates(ctx, &userloginstatepb.GetUserLoginStatesRequest{})
require.NoError(t, err)
require.Empty(t, getResp.UserLoginStates)

uls1 := newUserLoginState(t, "1", nil, stRoles, stTraits, stRoles, stTraits)

_, err = svc.UpsertUserLoginState(ctx, &userloginstatev1.UpsertUserLoginStateRequest{UserLoginState: conv.ToProto(uls1)})
_, err = svc.UpsertUserLoginState(ctx, &userloginstatepb.UpsertUserLoginStateRequest{UserLoginState: conv.ToProto(uls1)})
require.NoError(t, err)

get, err := svc.GetUserLoginState(ctx, &userloginstatev1.GetUserLoginStateRequest{
get, err := svc.GetUserLoginState(ctx, &userloginstatepb.GetUserLoginStateRequest{
Name: uls1.GetName(),
})
require.NoError(t, err)
require.Empty(t, cmp.Diff(uls1, mustFromProto(t, get), cmpOpts...))

_, err = svc.DeleteUserLoginState(ctx, &userloginstatev1.DeleteUserLoginStateRequest{Name: uls1.GetName()})
_, err = svc.DeleteUserLoginState(ctx, &userloginstatepb.DeleteUserLoginStateRequest{Name: uls1.GetName()})
require.NoError(t, err)

_, err = svc.GetUserLoginState(ctx, &userloginstatev1.GetUserLoginStateRequest{Name: uls1.GetName()})
_, err = svc.GetUserLoginState(ctx, &userloginstatepb.GetUserLoginStateRequest{Name: uls1.GetName()})
require.True(t, trace.IsNotFound(err))
}

Expand All @@ -170,27 +170,27 @@ func TestDeleteAllAccessLists(t *testing.T) {

ctx, _, svc := initSvc(t)

getResp, err := svc.GetUserLoginStates(ctx, &userloginstatev1.GetUserLoginStatesRequest{})
getResp, err := svc.GetUserLoginStates(ctx, &userloginstatepb.GetUserLoginStatesRequest{})
require.NoError(t, err)
require.Empty(t, getResp.UserLoginStates)

uls1 := newUserLoginState(t, "1", nil, stRoles, stTraits, stRoles, stTraits)
uls2 := newUserLoginState(t, "2", nil, stRoles, stTraits, stRoles, stTraits)

_, err = svc.UpsertUserLoginState(ctx, &userloginstatev1.UpsertUserLoginStateRequest{UserLoginState: conv.ToProto(uls1)})
_, err = svc.UpsertUserLoginState(ctx, &userloginstatepb.UpsertUserLoginStateRequest{UserLoginState: conv.ToProto(uls1)})
require.NoError(t, err)

_, err = svc.UpsertUserLoginState(ctx, &userloginstatev1.UpsertUserLoginStateRequest{UserLoginState: conv.ToProto(uls2)})
_, err = svc.UpsertUserLoginState(ctx, &userloginstatepb.UpsertUserLoginStateRequest{UserLoginState: conv.ToProto(uls2)})
require.NoError(t, err)

getResp, err = svc.GetUserLoginStates(ctx, &userloginstatev1.GetUserLoginStatesRequest{})
getResp, err = svc.GetUserLoginStates(ctx, &userloginstatepb.GetUserLoginStatesRequest{})
require.NoError(t, err)
require.Empty(t, cmp.Diff([]*userloginstate.UserLoginState{uls1, uls2}, mustFromProtoAll(t, getResp.UserLoginStates...), cmpOpts...))

_, err = svc.DeleteAllUserLoginStates(ctx, &userloginstatev1.DeleteAllUserLoginStatesRequest{})
_, err = svc.DeleteAllUserLoginStates(ctx, &userloginstatepb.DeleteAllUserLoginStatesRequest{})
require.NoError(t, err)

getResp, err = svc.GetUserLoginStates(ctx, &userloginstatev1.GetUserLoginStatesRequest{})
getResp, err = svc.GetUserLoginStates(ctx, &userloginstatepb.GetUserLoginStatesRequest{})
require.NoError(t, err)
require.Empty(t, getResp.UserLoginStates)
}
Expand Down Expand Up @@ -298,7 +298,7 @@ func genUserContext(ctx context.Context, username string, groups []string) conte
})
}

func mustFromProto(t *testing.T, uls *userloginstatev1.UserLoginState) *userloginstate.UserLoginState {
func mustFromProto(t *testing.T, uls *userloginstatepb.UserLoginState) *userloginstate.UserLoginState {
t.Helper()

out, err := conv.FromProto(uls)
Expand All @@ -307,7 +307,7 @@ func mustFromProto(t *testing.T, uls *userloginstatev1.UserLoginState) *userlogi
return out
}

func mustFromProtoAll(t *testing.T, ulsList ...*userloginstatev1.UserLoginState) []*userloginstate.UserLoginState {
func mustFromProtoAll(t *testing.T, ulsList ...*userloginstatepb.UserLoginState) []*userloginstate.UserLoginState {
t.Helper()

var convertedUlsList []*userloginstate.UserLoginState
Expand All @@ -319,3 +319,21 @@ func mustFromProtoAll(t *testing.T, ulsList ...*userloginstatev1.UserLoginState)

return convertedUlsList
}

func newUserLoginState(t *testing.T, name string, labels map[string]string, originalRoles []string, originalTraits map[string][]string,
roles []string, traits map[string][]string) *userloginstate.UserLoginState {
t.Helper()

uls, err := userloginstate.New(header.Metadata{
Name: name,
Labels: labels,
}, userloginstate.Spec{
OriginalRoles: originalRoles,
OriginalTraits: originalTraits,
Roles: roles,
Traits: traits,
})
require.NoError(t, err)

return uls
}

0 comments on commit 7435ec0

Please sign in to comment.