Handler project (#44)
* Renamed fakeRepo to mockRepo * Changing around TODOs to capture current plans with the code. * Remove the repo interface and use a real DB for tests. * Fixed a few tests. * Adding checks for properly formatted identifiers. * Updating code to account for recent merges. Relaxing some restrictions on what an id can look like. * Added small comment explaining why RegisterGrpcGatewayer interface exists. * Move project service up a call level. Long term I think it would make sense to define these services even higher up the call stack, potentially at the initialization of the controller server, near where the DB is initialized. * Making these fields align with those in the resources under hosts/... * Hard code the service initialization in the handler registration code. * Regenerate project related code proto code. * Removing type field for project. * Adds basic project handling in CLI/SDK (#47) * Adds SDK for creating and reading projects * Reorganizes a bit * Adds CLI for creating and reading projects * Fixes some some generation bugs * Adds redirect support for default org ID * Fix protobuf import references being moved. * Update client test to look for "orgs" and "projects" instead of "org" and "project" * Update expected segments test * Fix setAddr handling when default organization is in use * Set client in target after create or read Co-authored-by: Jim Lambert <jimlambrt@Jims-MBP-3.home> Co-authored-by: Jim <jlambert@hashicorp.com> Co-authored-by: Michael Gaffney <mgaffney@users.noreply.github.com> Co-authored-by: Jeff Mitchell <jeffrey.mitchell@gmail.com>
This commit is contained in:
36 files changed
+4104
-112
No files matched your search
@@ -7,6 +7,8 @@ import (
|
||||
|
||||
"github.com/hashicorp/go-hclog"
|
||||
"github.com/hashicorp/vault/sdk/helper/mlock"
|
||||
"github.com/hashicorp/watchtower/internal/db"
|
||||
"github.com/hashicorp/watchtower/internal/iam"
|
||||
)
|
||||
|
||||
type Controller struct {
|
||||
@@ -15,6 +17,9 @@ type Controller struct {
|
||||
|
||||
baseContext context.Context
|
||||
baseCancel context.CancelFunc
|
||||
|
||||
// Repos
|
||||
IamRepo *iam.Repository
|
||||
}
|
||||
|
||||
func New(conf *Config) (*Controller, error) {
|
||||
@@ -45,6 +50,15 @@ func New(conf *Config) (*Controller, error) {
|
||||
|
||||
c.baseContext, c.baseCancel = context.WithCancel(context.Background())
|
||||
|
||||
// Set up repo stuff
|
||||
var err error
|
||||
|
||||
dbase := db.New(c.conf.Database)
|
||||
c.IamRepo, err = iam.NewRepository(dbase, dbase, c.conf.ControllerKMS)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("unable to create iam repo: %w", err)
|
||||
}
|
||||
|
||||
return c, nil
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user