* carve out scope into a separate branch for a PR * refactor getOpts to be private * narrowed to just the scope proto * wrap in a transaction * remove user from scopes PR * make scope type immutable * refactored with more referential integrity (thanks mike) * refactor based on pair programming with Mike * better VetForWrite that supports db.Options but that requires GetOpts and Options to be exported. * stop printing out all the db logs * refactor withScope to be private * refactor the VetForWrite a bit based on Todd's PR comment * fix typo Co-authored-by: Michael Gaffney <mgaffney@users.noreply.github.com> * fix ctx propagation and Scope returns * fix ctx propagation and use a const for std retry count * change Std to Crud * fix ctx propagation * make sure update with field masks doesn't update a field not in the mask and force a read after update. * add description * remove comment about future * clean error strings * clean up enum string rep * stdMeta * fix return value to be just nil * fix returns and errors * update test to match new error string * change len of domain to 24 * provide common function for new public ids * use common db.NewPublicId() and provide the correct prefix * move list out of CrudActions and provide a CrudlActions shortcut as well * some comments about the purpose of VetForWrite() * move to random 10 * Adding project API interface. * Creation of Project handler and Tests * Move to using the iam objects. * Setting up testify framework for mocking and assertions. * Fix iam options typo references. * Adding tests for CreateProject and UpdateProject. This also adds some additional argument validation. * Merging in PR 40 * 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 * Adding functionality and tests for update masks. * Additional tests for update. Disable update non existant project test. * Make not providing an update mask be an invalid argument. * Make empty update mask paths and no mutable fields in the path an InvalidArgument error. * Fix get Project test. * Adding back in the Update a non existant project test case. * Adding seperate path structured tests. * Adding delete from repository API call. * Update calls to LookupScope and DeleteScope. * Pass in only what is needed for interfacing with the repo. * Creating delete sdk methods for the first time. * Create delete generation functionality in go sdk. * Use assert for tests instead of if statements. 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>
308 lines
9.2 KiB
Go
308 lines
9.2 KiB
Go
package projects
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"regexp"
|
|
"strings"
|
|
|
|
"github.com/golang/protobuf/ptypes/wrappers"
|
|
"github.com/grpc-ecosystem/grpc-gateway/runtime"
|
|
pb "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes"
|
|
pbs "github.com/hashicorp/watchtower/internal/gen/controller/api/services"
|
|
"github.com/hashicorp/watchtower/internal/iam"
|
|
"google.golang.org/grpc/codes"
|
|
"google.golang.org/grpc/status"
|
|
)
|
|
|
|
var (
|
|
reInvalidID = regexp.MustCompile("[^A-Za-z0-9]")
|
|
// TODO(ICU-28): Find a way to auto update these names and enforce the mappings between wire and storage.
|
|
wireToStorageMask = map[string]string{
|
|
"name": "Name",
|
|
"description": "Description",
|
|
}
|
|
)
|
|
|
|
type Service struct {
|
|
pbs.UnimplementedProjectServiceServer
|
|
repo *iam.Repository
|
|
}
|
|
|
|
func NewService(repo *iam.Repository) *Service {
|
|
if repo == nil {
|
|
return nil
|
|
}
|
|
return &Service{repo: repo}
|
|
}
|
|
|
|
var _ pbs.ProjectServiceServer = &Service{}
|
|
|
|
func (s Service) GetProject(ctx context.Context, req *pbs.GetProjectRequest) (*pbs.GetProjectResponse, error) {
|
|
if err := validateGetProjectRequest(req); err != nil {
|
|
return nil, err
|
|
}
|
|
p, err := s.getFromRepo(ctx, req.GetId())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
resp := &pbs.GetProjectResponse{}
|
|
resp.Item = p
|
|
return resp, nil
|
|
}
|
|
|
|
func (s Service) CreateProject(ctx context.Context, req *pbs.CreateProjectRequest) (*pbs.CreateProjectResponse, error) {
|
|
if err := validateCreateProjectRequest(req); err != nil {
|
|
return nil, err
|
|
}
|
|
p, err := s.createInRepo(ctx, req.GetOrgId(), req.GetItem())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
resp := &pbs.CreateProjectResponse{}
|
|
resp.Uri = fmt.Sprintf("orgs/%s/projects/%s", req.GetOrgId(), p.GetId())
|
|
resp.Item = p
|
|
return resp, nil
|
|
}
|
|
|
|
func (s Service) UpdateProject(ctx context.Context, req *pbs.UpdateProjectRequest) (*pbs.UpdateProjectResponse, error) {
|
|
if err := validateUpdateProjectRequest(req); err != nil {
|
|
return nil, err
|
|
}
|
|
p, err := s.updateInRepo(ctx, req.GetOrgId(), req.GetId(), req.GetUpdateMask().GetPaths(), req.GetItem())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
resp := &pbs.UpdateProjectResponse{}
|
|
resp.Item = p
|
|
return resp, nil
|
|
}
|
|
|
|
func (s Service) DeleteProject(ctx context.Context, req *pbs.DeleteProjectRequest) (*pbs.DeleteProjectResponse, error) {
|
|
if err := validateDeleteProjectRequest(req); err != nil {
|
|
return nil, err
|
|
}
|
|
existed, err := s.deleteFromRepo(ctx, req.GetId())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
resp := &pbs.DeleteProjectResponse{}
|
|
resp.Existed = existed
|
|
return resp, nil
|
|
}
|
|
|
|
func (s Service) getFromRepo(ctx context.Context, id string) (*pb.Project, error) {
|
|
p, err := s.repo.LookupScope(ctx, id)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if p == nil {
|
|
return nil, status.Errorf(codes.NotFound, "Could not find Project with id %q", id)
|
|
}
|
|
return toProto(p), nil
|
|
}
|
|
|
|
func (s Service) createInRepo(ctx context.Context, orgID string, item *pb.Project) (*pb.Project, error) {
|
|
opts := []iam.Option{}
|
|
if item.GetName() != nil {
|
|
opts = append(opts, iam.WithName(item.GetName().GetValue()))
|
|
}
|
|
if item.GetDescription() != nil {
|
|
opts = append(opts, iam.WithDescription(item.GetDescription().GetValue()))
|
|
}
|
|
p, err := iam.NewProject(orgID, opts...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out, err := s.repo.CreateScope(ctx, p)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if out == nil {
|
|
return nil, status.Error(codes.Internal, "Unable to create scope but no error returned from repository.")
|
|
}
|
|
return toProto(out), nil
|
|
}
|
|
|
|
func (s Service) updateInRepo(ctx context.Context, orgID, projID string, mask []string, item *pb.Project) (*pb.Project, error) {
|
|
opts := []iam.Option{iam.WithPublicId(projID)}
|
|
if desc := item.GetDescription(); desc != nil {
|
|
opts = append(opts, iam.WithDescription(desc.GetValue()))
|
|
}
|
|
if name := item.GetName(); name != nil {
|
|
opts = append(opts, iam.WithName(name.GetValue()))
|
|
}
|
|
p, err := iam.NewProject(orgID, opts...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
dbMask, err := toDbUpdateMask(mask)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if len(dbMask) == 0 {
|
|
return nil, status.Errorf(codes.InvalidArgument, "No valid fields included in the update mask.")
|
|
}
|
|
out, _, err := s.repo.UpdateScope(ctx, p, dbMask)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if out == nil {
|
|
return nil, status.Error(codes.NotFound, "Project doesn't exist.")
|
|
}
|
|
return toProto(out), nil
|
|
}
|
|
|
|
func (s Service) deleteFromRepo(ctx context.Context, projId string) (bool, error) {
|
|
rows, err := s.repo.DeleteScope(ctx, projId)
|
|
if err != nil {
|
|
return false, status.Errorf(codes.Internal, "Unable to delete project: %v", err)
|
|
}
|
|
return rows > 0, nil
|
|
}
|
|
|
|
// toDbUpdateMask converts the wire format's FieldMask into a list of strings containing FieldMask paths used
|
|
func toDbUpdateMask(paths []string) ([]string, error) {
|
|
dbPaths := []string{}
|
|
invalid := []string{}
|
|
for _, p := range paths {
|
|
for _, f := range strings.Split(p, ",") {
|
|
if dbField, ok := wireToStorageMask[strings.TrimSpace(f)]; ok {
|
|
dbPaths = append(dbPaths, dbField)
|
|
} else {
|
|
invalid = append(invalid, f)
|
|
}
|
|
}
|
|
}
|
|
if len(invalid) > 0 {
|
|
return nil, status.Errorf(codes.InvalidArgument, "Invalid fields passed in update_update mask: %v", invalid)
|
|
}
|
|
return dbPaths, nil
|
|
}
|
|
|
|
func toProto(in *iam.Scope) *pb.Project {
|
|
out := pb.Project{Id: in.GetPublicId()}
|
|
if in.GetDescription() != "" {
|
|
out.Description = &wrappers.StringValue{Value: in.GetDescription()}
|
|
}
|
|
if in.GetName() != "" {
|
|
out.Name = &wrappers.StringValue{Value: in.GetName()}
|
|
}
|
|
out.CreatedTime = in.GetCreateTime().GetTimestamp()
|
|
out.UpdatedTime = in.GetUpdateTime().GetTimestamp()
|
|
return &out
|
|
}
|
|
|
|
// A validateX method should exist for each method above. These methods do not make calls to any backing service but enforce
|
|
// requirements on the structure of the request. They verify that:
|
|
// * The path passed in is correctly formatted
|
|
// * All required parameters are set
|
|
// * There are no conflicting parameters provided
|
|
// TODO: Populate the error in a way to allow it to be converted to the previously described error format and include all invalid fields instead of just the most recent.
|
|
func validateGetProjectRequest(req *pbs.GetProjectRequest) error {
|
|
if err := validateAncestors(req); err != nil {
|
|
return err
|
|
}
|
|
if err := validateID(req.GetOrgId(), "o_"); err != nil {
|
|
return err
|
|
}
|
|
if err := validateID(req.GetId(), "p_"); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func validateCreateProjectRequest(req *pbs.CreateProjectRequest) error {
|
|
if err := validateAncestors(req); err != nil {
|
|
return err
|
|
}
|
|
if err := validateID(req.GetOrgId(), "o_"); err != nil {
|
|
return err
|
|
}
|
|
item := req.GetItem()
|
|
if item == nil {
|
|
return status.Errorf(codes.InvalidArgument, "A project's fields must be set to something .")
|
|
}
|
|
if item.GetId() != "" {
|
|
return status.Errorf(codes.InvalidArgument, "Cannot set ID when creating a new project.")
|
|
}
|
|
if item.GetCreatedTime() != nil || item.GetUpdatedTime() != nil {
|
|
return status.Errorf(codes.InvalidArgument, "Cannot set Created or Updated time when creating a new project.")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func validateUpdateProjectRequest(req *pbs.UpdateProjectRequest) error {
|
|
if err := validateAncestors(req); err != nil {
|
|
return err
|
|
}
|
|
if err := validateID(req.GetId(), "p_"); err != nil {
|
|
return err
|
|
}
|
|
if err := validateID(req.GetOrgId(), "o_"); err != nil {
|
|
return err
|
|
}
|
|
if req.GetUpdateMask() == nil {
|
|
return status.Errorf(codes.InvalidArgument, "UpdateMask not provided but is required to update a project.")
|
|
}
|
|
item := req.GetItem()
|
|
if item == nil {
|
|
// It is legitimate for no item to be specified in an update request as it indicates all fields provided in
|
|
// the mask will be marked as unset.
|
|
return nil
|
|
}
|
|
|
|
if err := validateID(item.GetId(), "p_"); item.GetId() != "" && err != nil {
|
|
return err
|
|
}
|
|
if item.GetId() != "" && item.GetId() != req.GetId() {
|
|
return status.Errorf(codes.InvalidArgument, "Id in provided item and url must match. Item Id was %q, url id was %q", item.GetId(), req.GetId())
|
|
}
|
|
if item.GetCreatedTime() != nil || item.GetUpdatedTime() != nil {
|
|
return status.Errorf(codes.InvalidArgument, "Cannot set Created or Updated time when updating a project.")
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func validateDeleteProjectRequest(req *pbs.DeleteProjectRequest) error {
|
|
if err := validateAncestors(req); err != nil {
|
|
return err
|
|
}
|
|
if err := validateID(req.GetId(), "p_"); err != nil {
|
|
return err
|
|
}
|
|
if err := validateID(req.GetOrgId(), "o_"); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func validateID(id, prefix string) error {
|
|
if !strings.HasPrefix(id, prefix) {
|
|
return status.Errorf(codes.InvalidArgument, "ID start with a %q prefix, provided %q", prefix, id)
|
|
}
|
|
id = strings.TrimPrefix(id, prefix)
|
|
if reInvalidID.Match([]byte(id)) {
|
|
return status.Errorf(codes.InvalidArgument, "Improperly formatted ID: %q", id)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
type ancestorProvider interface {
|
|
GetOrgId() string
|
|
}
|
|
|
|
// validateAncestors verifies that the ancestors of this call are properly set and provided.
|
|
func validateAncestors(r ancestorProvider) error {
|
|
if r.GetOrgId() == "" {
|
|
return status.Errorf(codes.InvalidArgument, "org_id must be provided.")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// RegisterGrpcGateway satisfies the RegisterGrpcGatewayer interface.
|
|
func (s *Service) RegisterGrpcGateway(mux *runtime.ServeMux) error {
|
|
return pbs.RegisterProjectServiceHandlerServer(context.Background(), mux, s)
|
|
}
|