Skip to content

Add validate account before creating #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarcusGoldschmidt merged 4 commits into from
Dec 16, 2025
Merged

Add validate account before creating #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e388cce
add validate account before creating
MarcusGoldschmidt Dec 16, 2025
c68fb16
return user if exists
MarcusGoldschmidt Dec 16, 2025
6b0b588
change log message
MarcusGoldschmidt Dec 16, 2025
77b1c00
remove plain text data
MarcusGoldschmidt Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkg/bsql/provisioning.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import (
"go.uber.org/zap"
)

var ErrUnableFindResourceProvisioning = errors.New("unable to find resource for account provisioning")

// getProvisioningConfig fetches the provisioning config for the given entitlement if it exists.
func (s *SQLSyncer) getProvisioningConfig(ctx context.Context, entitlementID string) (*EntitlementProvisioning, bool) {
l := ctxzap.Extract(ctx)
Expand Down Expand Up @@ -180,7 +182,7 @@ func (s *SQLSyncer) validateAccount(ctx context.Context, accountProvisioning *Ac
}

if ret == nil {
return nil, fmt.Errorf("unable to find resource for account provisioning")
return nil, ErrUnableFindResourceProvisioning
}

return ret, nil
Expand Down
18 changes: 17 additions & 1 deletion pkg/bsql/user_syncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,21 @@ func (s *userSyncer) CreateAccount(
return nil, nil, nil, err
}

previousAccountResource, err := s.validateAccount(ctx, provisioningConfig, queryInputs)
if err != nil {
if !errors.Is(err, ErrUnableFindResourceProvisioning) {
return nil, nil, nil, fmt.Errorf("failed to check existing account: %w", err)
}
}

if previousAccountResource != nil {
logger.Info("account resource is already created", zap.String("resource_id", previousAccountResource.GetId().GetResource()))
Copy link
Contributor

@ggreer ggreer Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's already created, don't we want to update the password based on the credential options?


return &v2.CreateAccountResponse_SuccessResult{
Resource: previousAccountResource,
}, nil, nil, nil
}

// Execute account creation queries
useTransaction := !provisioningConfig.Create.NoTransaction
if err := s.RunProvisioningQueries(ctx, provisioningConfig.Create.Queries, queryInputs, useTransaction); err != nil {
Expand All @@ -149,7 +164,8 @@ func (s *userSyncer) CreateAccount(
}

response := &v2.CreateAccountResponse_SuccessResult{
Resource: accountResource,
IsCreateAccountResult: true,
Resource: accountResource,
}

return response, plaintextDataList, nil, nil
Expand Down