From 1fdda98130178357d497abf05e44a3d00d75080b Mon Sep 17 00:00:00 2001 From: subroseio <136270129+subroseio@users.noreply.github.com> Date: Sun, 3 Dec 2023 13:32:37 +0000 Subject: [PATCH] Prefix Ids (#58) * prefixes * fix prefixes --- vault/id.go | 7 +++++-- vault/sql.go | 2 +- vault/vault.go | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/vault/id.go b/vault/id.go index 2753ec7..1434875 100644 --- a/vault/id.go +++ b/vault/id.go @@ -1,10 +1,13 @@ package vault import ( + "fmt" + "github.com/segmentio/ksuid" ) -func GenerateId() string { +func GenerateId(prefix string) string { ksuid := ksuid.New() - return ksuid.String() + return fmt.Sprintf("%s_%s", prefix, ksuid.String()) + } diff --git a/vault/sql.go b/vault/sql.go index 5b16433..f876ca2 100644 --- a/vault/sql.go +++ b/vault/sql.go @@ -214,7 +214,7 @@ func (st SqlStore) CreateRecords(ctx context.Context, collectionName string, rec return nil, &ValueError{fmt.Sprintf("expected %d fields, got %d", len(fields), len(record))} } - recordId := GenerateId() + recordId := GenerateId("rec") recordIds[i] = recordId values := make([]interface{}, len(fields)+1) diff --git a/vault/vault.go b/vault/vault.go index b952d53..e2b59e7 100644 --- a/vault/vault.go +++ b/vault/vault.go @@ -591,7 +591,7 @@ func (vault Vault) CreateToken(ctx context.Context, principal Principal, collect return "", err } - tokenId := GenerateId() + tokenId := GenerateId("tok") for recordId := range records { err := vault.Db.CreateToken(ctx, tokenId, fmt.Sprintf("%s/%s/%s/%s", collectionName, recordId, fieldName, returnFormat)) if err != nil {