feature(worker/controller): register UpstreamMessageServiceServer

This commit is contained in:
Jim authored and Timothy Messier committed 2023-05-31 12:18:10 +00:00
1 parent 20cf521cc0
commit 410bec1e00
12 files changed
+225 -23

No files matched your search

@@ -21,6 +21,7 @@ func init() {
registerControllerServerCoordinationService,
registerControllerSessionService,
registerControllerMultihopService,
registerControllerUpstreamMessageService,
)
}
@@ -88,3 +89,31 @@ func registerControllerMultihopService(ctx context.Context, c *Controller, serve
multihop.RegisterMultihopServiceServer(server, multihopService)
return nil
}
func registerControllerUpstreamMessageService(ctx context.Context, c *Controller, server *grpc.Server) error {
const op = "controller.registerControllerUpstreamMessageService"
switch {
case nodeenrollment.IsNil(ctx):
return fmt.Errorf("%s: context is nil", op)
case c == nil:
return fmt.Errorf("%s: controller is nil", op)
case server == nil:
return fmt.Errorf("%s: server is nil", op)
}
workerAuthStorage, err := c.WorkerAuthRepoStorageFn()
switch {
case err != nil:
return fmt.Errorf("%s: error fetching worker auth storage: %w", op, err)
case workerAuthStorage == nil:
return fmt.Errorf("%s: worker auth repository storage func is unset", op)
}
upstreamMsgService, err := handlers.NewControllerUpstreamMessageServiceServer(ctx, workerAuthStorage)
if err != nil {
return fmt.Errorf("%s: error creating upstream message service handler: %w", op, err)
}
pbs.RegisterUpstreamMessageServiceServer(server, upstreamMsgService)
return nil
}
@@ -0,0 +1,56 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0
package controller_test
import (
"context"
"crypto/rand"
"testing"
"github.com/google/go-cmp/cmp"
"github.com/hashicorp/boundary/internal/cmd/config"
"github.com/hashicorp/boundary/internal/daemon/cluster/handlers"
"github.com/hashicorp/boundary/internal/daemon/controller"
"github.com/hashicorp/boundary/internal/daemon/worker"
"github.com/hashicorp/boundary/internal/db"
pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services"
"github.com/hashicorp/boundary/internal/kms"
"github.com/hashicorp/boundary/internal/types/scope"
"github.com/hashicorp/go-hclog"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/testing/protocmp"
)
func Test_Controller_RegisterUpstreamMessageServices(t *testing.T) {
assert, require := assert.New(t), require.New(t)
testCtx := context.Background()
conn, _ := db.TestSetup(t, "postgres")
wrapper := db.TestWrapper(t)
kmsCache := kms.TestKms(t, conn, wrapper)
require.NoError(kmsCache.CreateKeys(context.Background(), scope.Global.String(), kms.WithRandomReader(rand.Reader)))
logger := hclog.New(&hclog.LoggerOptions{
Level: hclog.Trace,
})
conf, err := config.DevController()
require.NoError(err)
c := controller.NewTestController(t, &controller.TestControllerOpts{
Config: conf,
Logger: logger.Named("controller"),
})
t.Cleanup(c.Shutdown)
kmsWorker, pkiWorker, _, _ := worker.NewTestMultihopWorkers(t, logger, c.Context(), c.ClusterAddrs(),
c.Config().WorkerAuthKms, c.Controller().ServersRepoFn, nil, nil, nil, nil)
t.Cleanup(kmsWorker.Shutdown)
t.Cleanup(pkiWorker.Shutdown)
err = handlers.RegisterUpstreamMessageHandler(testCtx, pbs.MsgType_MSG_TYPE_ECHO, &handlers.TestMockUpstreamMessageHandler{})
require.NoError(err)
resp, err := pkiWorker.Worker().SendUpstreamMessage(testCtx, &pbs.EchoUpstreamMessageRequest{Msg: "ping"})
require.NoError(err)
assert.Empty(cmp.Diff(resp, &pbs.EchoUpstreamMessageResponse{Msg: "ping"}, protocmp.Transform()))
}