ToddandIrena Rindos
3fbf901739
* Remove the server_id from session table, change it to worker_id on session_connection
This is step 1 in updating the worker table. The worker is becoming a public resource so it must have
a public id. We drop the server_id column on the session_connection table and add the worker_id column
so we can use the wt_public_key type. Since db migrations are applied while the controller is offline,
it should be safe to assume all session connections are not in a running state, thus allowing us to null
out all the worker ids in the session_connection table.
For now we don't have very good enforcement of the wt_public_id contraints, since the id is currently
defined in the worker config, but this will soon change and the worker's id will be generated by the
controller.
* Adding worker tag db writing test.
* Move the server table back to the top.
* Update comment for the worker object.
* Update comment for the worker table.
* Add worker tag sources ("config" or "api")
* Revert renaming of UpsertWorker until later.
* Remove no longer needed files.
* Moving the TestWorker into the servers package. Fix the worker tags test.
* Update internal/proto/controller/storage/servers/store/v1/worker.proto
Co-authored-by: Irena Rindos <irenarindos@users.noreply.github.com>
* Place the repos back together so they can be refactored in a different PR.
Co-authored-by: Irena Rindos <irenarindos@users.noreply.github.com>
101 lines
3.0 KiB
Go
101 lines
3.0 KiB
Go
package servers
|
|
|
|
import (
|
|
"context"
|
|
"math/rand"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/hashicorp/boundary/internal/db"
|
|
"github.com/hashicorp/boundary/internal/db/timestamp"
|
|
"github.com/hashicorp/boundary/internal/iam"
|
|
"github.com/hashicorp/boundary/internal/kms"
|
|
"github.com/hashicorp/boundary/internal/types/scope"
|
|
wrapping "github.com/hashicorp/go-kms-wrapping/v2"
|
|
"github.com/stretchr/testify/require"
|
|
"google.golang.org/protobuf/types/known/timestamppb"
|
|
)
|
|
|
|
const defaultLength = 20
|
|
|
|
// Generate random bytes for byte fields
|
|
func populateBytes(length int) []byte {
|
|
fieldBytes := make([]byte, length)
|
|
rand.Read(fieldBytes)
|
|
return fieldBytes
|
|
}
|
|
|
|
func TestKkmsKey(ctx context.Context, t *testing.T, conn *db.DB, wrapper wrapping.Wrapper) string {
|
|
t.Helper()
|
|
org, _ := iam.TestScopes(t, iam.TestRepo(t, conn, wrapper))
|
|
kmsCache := kms.TestKms(t, conn, wrapper)
|
|
databaseWrapper, err := kmsCache.GetWrapper(context.Background(), org.PublicId, kms.KeyPurposeDatabase)
|
|
require.NoError(t, err)
|
|
testKey, err := databaseWrapper.KeyId(ctx)
|
|
require.NoError(t, err)
|
|
|
|
return testKey
|
|
}
|
|
|
|
func TestRootCertificate(ctx context.Context, t *testing.T, conn *db.DB, kmsKey string) *RootCertificate {
|
|
t.Helper()
|
|
rw := db.New(conn)
|
|
|
|
beforeTimestamp := ×tamp.Timestamp{Timestamp: timestamppb.New(time.Now().Add(-1 * time.Hour))}
|
|
afterTimestamp := ×tamp.Timestamp{Timestamp: timestamppb.New(time.Now().Add(1 * time.Hour))}
|
|
|
|
rootCertKeys := RootCertificateKeys{
|
|
publicKey: populateBytes(defaultLength),
|
|
privateKey: populateBytes(defaultLength),
|
|
}
|
|
|
|
cert, err := newRootCertificate(ctx, rand.Uint64(), populateBytes(defaultLength), beforeTimestamp, afterTimestamp,
|
|
rootCertKeys, kmsKey, CurrentState)
|
|
err = rw.Create(ctx, cert)
|
|
require.NoError(t, err)
|
|
return cert
|
|
}
|
|
|
|
func TestWorkerAuth(ctx context.Context, t *testing.T, conn *db.DB, worker *Worker, kmsKey string) *WorkerAuth {
|
|
t.Helper()
|
|
rw := db.New(conn)
|
|
wSignPubKey := populateBytes(defaultLength)
|
|
wEncPubKey := populateBytes(defaultLength)
|
|
workerKeys := WorkerKeys{workerSigningPubKey: wSignPubKey, workerEncryptionPubKey: wEncPubKey}
|
|
controllerKey := populateBytes(defaultLength)
|
|
nonce := populateBytes(defaultLength)
|
|
opt := []Option{
|
|
WithKeyId(kmsKey),
|
|
WithWorkerKeys(workerKeys),
|
|
WithControllerEncryptionPrivateKey(controllerKey),
|
|
WithNonce(nonce),
|
|
}
|
|
|
|
workerAuth, err := newWorkerAuth(ctx, "worker-key-identifier", worker.PublicId, opt...)
|
|
require.NoError(t, err)
|
|
err = rw.Create(ctx, workerAuth)
|
|
require.NoError(t, err)
|
|
|
|
return workerAuth
|
|
}
|
|
|
|
func TestWorker(t *testing.T, conn *db.DB, wrapper wrapping.Wrapper) *Worker {
|
|
t.Helper()
|
|
rw := db.New(conn)
|
|
kms := kms.TestKms(t, conn, wrapper)
|
|
serversRepo, err := NewRepository(rw, rw, kms)
|
|
require.NoError(t, err)
|
|
|
|
id, err := newWorkerId(context.Background())
|
|
require.NoError(t, err)
|
|
name := "test-worker-" + id
|
|
|
|
worker := NewWorker(scope.Global.String(),
|
|
WithPublicId(id),
|
|
WithName(name),
|
|
WithAddress("127.0.0.1"))
|
|
_, _, err = serversRepo.UpsertWorker(context.Background(), worker)
|
|
require.NoError(t, err)
|
|
return worker
|
|
}
|