Skip to content

Commit

Permalink
Remove users endpoint (HTTP & GRPC)
Browse files Browse the repository at this point in the history
  • Loading branch information
harture committed Mar 27, 2019
1 parent 5fa8aff commit 7effb10
Show file tree
Hide file tree
Showing 32 changed files with 0 additions and 2,110 deletions.
7 changes: 0 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,6 @@ If no configuration file is passed, the service will try to load the default con

The keycloak event-emitter module sends all events to the bridge's event endpoint. The event emitter use HTTP with flatbuffers.

### gRPC and HTTP clients

All applications can interact with the bridge using either HTTP or gRPC.
The applications need to implement its own client. The Flatbuffer schema is available in `api/user/user.fbs`, see the directory `/examples`.

### Health

The service exposes HTTP routes to monitor the application health.
Expand Down Expand Up @@ -106,8 +101,6 @@ Gomock is used to automatically genarate mocks. See the Cloudtrust [Gitbook](htt

The unit tests don't cover:

- http client example (```./examples/http/http.go```)
- grpc client example (```./examples/grpc/grpc.go```)
- keycloak_bridge (```./cmd/keycloak_bridge.go```)

The first two are provided as example.
Expand Down
57 changes: 0 additions & 57 deletions api/user/fb/GetUsersReply.go

This file was deleted.

60 changes: 0 additions & 60 deletions api/user/fb/GetUsersRequest.go

This file was deleted.

74 changes: 0 additions & 74 deletions api/user/fb/UserService_grpc.go

This file was deleted.

14 changes: 0 additions & 14 deletions api/user/user.fbs

This file was deleted.

73 changes: 0 additions & 73 deletions cmd/keycloakb/keycloak_bridge.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"fmt"
"io"
"math/rand"
"net"
"net/http"
"net/http/pprof"
"os"
Expand All @@ -22,7 +21,6 @@ import (
job_lock "github.com/cloudtrust/go-jobs/lock"
job_status "github.com/cloudtrust/go-jobs/status"
fb_flaki "github.com/cloudtrust/keycloak-bridge/api/flaki/fb"
"github.com/cloudtrust/keycloak-bridge/api/user/fb"
"github.com/cloudtrust/keycloak-bridge/internal/idgenerator"
"github.com/cloudtrust/keycloak-bridge/internal/keycloakb"
"github.com/cloudtrust/keycloak-bridge/pkg/event"
Expand All @@ -31,15 +29,13 @@ import (
health_job "github.com/cloudtrust/keycloak-bridge/pkg/job"
"github.com/cloudtrust/keycloak-bridge/pkg/management"
"github.com/cloudtrust/keycloak-bridge/pkg/middleware"
"github.com/cloudtrust/keycloak-bridge/pkg/user"
keycloak "github.com/cloudtrust/keycloak-client"
sentry "github.com/getsentry/raven-go"
"github.com/go-kit/kit/endpoint"
"github.com/go-kit/kit/log"
"github.com/go-kit/kit/metrics"
gokit_influx "github.com/go-kit/kit/metrics/influx"
"github.com/go-kit/kit/ratelimit"
grpc_transport "github.com/go-kit/kit/transport/grpc"
_ "github.com/go-sql-driver/mysql"
flatbuffers "github.com/google/flatbuffers/go"
"github.com/gorilla/mux"
Expand Down Expand Up @@ -82,7 +78,6 @@ func main() {
var c = config(log.With(logger, "unit", "config"))
var (
// Component
grpcAddr = c.GetString("component-grpc-host-port")
httpAddr = c.GetString("component-http-host-port")

// Flaki
Expand Down Expand Up @@ -375,43 +370,6 @@ func main() {
}
}

// User service.
var userEndpoints = user.Endpoints{}
{
var userLogger = log.With(logger, "svc", "user")

var userModule user.Module
{
userModule = user.NewModule(keycloakClient)
userModule = user.MakeModuleInstrumentingMW(influxMetrics.NewHistogram("user_module"))(userModule)
userModule = user.MakeModuleLoggingMW(log.With(userLogger, "mw", "module"))(userModule)
userModule = user.MakeModuleTracingMW(tracer)(userModule)
}

var userComponent user.Component
{
userComponent = user.NewComponent(userModule)
userComponent = user.MakeComponentInstrumentingMW(influxMetrics.NewHistogram("user_component"))(userComponent)
userComponent = user.MakeComponentLoggingMW(log.With(userLogger, "mw", "component"))(userComponent)
userComponent = user.MakeComponentTracingMW(tracer)(userComponent)
userComponent = user.MakeComponentTrackingMW(sentryClient, log.With(userLogger, "mw", "component"))(userComponent)
}

var userEndpoint endpoint.Endpoint
{
userEndpoint = user.MakeGetUsersEndpoint(userComponent)
userEndpoint = middleware.MakeEndpointInstrumentingMW(influxMetrics.NewHistogram("user_endpoint"))(userEndpoint)
userEndpoint = middleware.MakeEndpointLoggingMW(log.With(userLogger, "mw", "endpoint", "unit", "getusers"))(userEndpoint)
userEndpoint = middleware.MakeEndpointTracingMW(tracer, "user_endpoint")(userEndpoint)
}
// Rate limiting
userEndpoint = ratelimit.NewErroringLimiter(rate.NewLimiter(rate.Every(time.Second), rateLimit["user"]))(userEndpoint)

userEndpoints = user.Endpoints{
Endpoint: userEndpoint,
}
}

// Event service.
var eventEndpoints = event.Endpoints{}
{
Expand Down Expand Up @@ -799,37 +757,6 @@ func main() {
}
}

// GRPC server.
go func() {
var logger = log.With(logger, "transport", "grpc")
logger.Log("addr", grpcAddr)

var lis net.Listener
{
var err error
lis, err = net.Listen("tcp", grpcAddr)
if err != nil {
logger.Log("msg", "could not initialise listener", "error", err)
errc <- err
return
}
}

// User Handler.
var getUsersHandler grpc_transport.Handler
{
getUsersHandler = user.MakeGRPCGetUsersHandler(userEndpoints.Endpoint)
getUsersHandler = middleware.MakeGRPCCorrelationIDMW(flakiClient, tracer, logger, ComponentName, ComponentID)(getUsersHandler)
getUsersHandler = middleware.MakeGRPCTracingMW(tracer, ComponentName, "grpc_server_getusers")(getUsersHandler)
}

var grpcServer = user.NewGRPCServer(getUsersHandler)
var userServer = grpc.NewServer(grpc.CustomCodec(flatbuffers.FlatbuffersCodec{}))
fb.RegisterUserServiceServer(userServer, grpcServer)

errc <- userServer.Serve(lis)
}()

// HTTP Server.
go func() {
var logger = log.With(logger, "transport", "http")
Expand Down
Loading

0 comments on commit 7effb10

Please sign in to comment.