From e6300a16758334996ad5f5083bea04da6a6015a0 Mon Sep 17 00:00:00 2001
From: Jim Lambert <jimlambrt@Jims-MBP-3.home>
Date: Thu, 14 May 2020 14:37:57 -0400
Subject: [PATCH] refactor to use db.NewPublicId()

---
 internal/iam/auth_method.go | 3 +--
 internal/iam/group.go       | 3 +--
 internal/iam/role.go        | 3 +--
 internal/iam/role_grant.go  | 3 +--
 internal/iam/user.go        | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/internal/iam/auth_method.go b/internal/iam/auth_method.go
index e2895433cf..523f4ad73d 100644
--- a/internal/iam/auth_method.go
+++ b/internal/iam/auth_method.go
@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/hashicorp/vault/sdk/helper/base62"
 	"github.com/hashicorp/watchtower/internal/db"
 	"github.com/hashicorp/watchtower/internal/iam/store"
 	"google.golang.org/protobuf/proto"
@@ -50,7 +49,7 @@ func NewAuthMethod(organizationId string, authType AuthType, opt ...Option) (*Au
 	if organizationId == "" {
 		return nil, errors.New("error organization id is unset for new auth method")
 	}
-	publicId, err := base62.Random(20)
+	publicId, err := db.NewPublicId("authm")
 	if err != nil {
 		return nil, fmt.Errorf("error generating public id %w for new auth method", err)
 	}
diff --git a/internal/iam/group.go b/internal/iam/group.go
index 15b8c1ba4a..ab7d112386 100644
--- a/internal/iam/group.go
+++ b/internal/iam/group.go
@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/hashicorp/vault/sdk/helper/base62"
 	"github.com/hashicorp/watchtower/internal/db"
 	"github.com/hashicorp/watchtower/internal/iam/store"
 	"google.golang.org/protobuf/proto"
@@ -31,7 +30,7 @@ func NewGroup(scopeId string, opt ...Option) (*Group, error) {
 	if scopeId == "" {
 		return nil, errors.New("error the group scope id is unset")
 	}
-	publicId, err := base62.Random(20)
+	publicId, err := db.NewPublicId("g")
 	if err != nil {
 		return nil, fmt.Errorf("error generating public id %w for new group", err)
 	}
diff --git a/internal/iam/role.go b/internal/iam/role.go
index 744fc96e4e..cedf457525 100644
--- a/internal/iam/role.go
+++ b/internal/iam/role.go
@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/hashicorp/vault/sdk/helper/base62"
 	"github.com/hashicorp/watchtower/internal/db"
 	"github.com/hashicorp/watchtower/internal/iam/store"
 	"google.golang.org/protobuf/proto"
@@ -31,7 +30,7 @@ func NewRole(scopeId string, opt ...Option) (*Role, error) {
 	if scopeId == "" {
 		return nil, errors.New("error the role scope id is unset")
 	}
-	publicId, err := base62.Random(20)
+	publicId, err := db.NewPublicId("r")
 	if err != nil {
 		return nil, fmt.Errorf("error generating public id %w for new role", err)
 	}
diff --git a/internal/iam/role_grant.go b/internal/iam/role_grant.go
index 2d9952edd8..41a29c6412 100644
--- a/internal/iam/role_grant.go
+++ b/internal/iam/role_grant.go
@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/hashicorp/vault/sdk/helper/base62"
 	"github.com/hashicorp/watchtower/internal/db"
 	"github.com/hashicorp/watchtower/internal/iam/store"
 	"google.golang.org/protobuf/proto"
@@ -30,7 +29,7 @@ func NewRoleGrant(role *Role, grant string, opt ...Option) (*RoleGrant, error) {
 	if role.PublicId == "" {
 		return nil, errors.New("error role id is unset")
 	}
-	publicId, err := base62.Random(20)
+	publicId, err := db.NewPublicId("rg")
 	if err != nil {
 		return nil, fmt.Errorf("error generating public id %w for new role grant", err)
 	}
diff --git a/internal/iam/user.go b/internal/iam/user.go
index f0e34865e9..70eeb756d5 100644
--- a/internal/iam/user.go
+++ b/internal/iam/user.go
@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/hashicorp/vault/sdk/helper/base62"
 	"github.com/hashicorp/watchtower/internal/db"
 	"github.com/hashicorp/watchtower/internal/iam/store"
 	"google.golang.org/protobuf/proto"
@@ -27,7 +26,7 @@ var _ db.VetForWriter = (*User)(nil)
 func NewUser(organizationPublicId string, opt ...Option) (*User, error) {
 	opts := getOpts(opt...)
 	withName := opts.withName
-	publicId, err := base62.Random(20)
+	publicId, err := db.NewPublicId("u")
 	if err != nil {
 		return nil, fmt.Errorf("error generating public ID %w for new user", err)
 	}