feat: move random string to separate package

.dredd/hooks/helpers.go

@@ -3,7 +3,6 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/ansible-semaphore/semaphore/lib"
 	"os"
 	"time"
 
@@ -11,6 +10,7 @@ import (
 	"github.com/ansible-semaphore/semaphore/db/bolt"
 	"github.com/ansible-semaphore/semaphore/db/factory"
 	"github.com/ansible-semaphore/semaphore/db/sql"
+	"github.com/ansible-semaphore/semaphore/pkg/random"
 	"github.com/ansible-semaphore/semaphore/util"
 	"github.com/go-gorp/gorp/v3"
 	"github.com/snikch/goodman/transaction"
@@ -297,7 +297,7 @@ func getUUID() string {
 	if !randSetup {
 		randSetup = true
 	}
-	return lib.RandomString(8)
+	return random.String(8)
 }
 
 func loadConfig() {

api/login.go

@@ -7,7 +7,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"github.com/ansible-semaphore/semaphore/lib"
 	"math/rand"
 	"net/http"
 	"net/url"
@@ -17,17 +16,16 @@ import (
 	"text/template"
 	"time"
 
-	"golang.org/x/crypto/bcrypt"
-	"golang.org/x/oauth2"
-
 	"github.com/ansible-semaphore/semaphore/api/helpers"
 	"github.com/ansible-semaphore/semaphore/db"
+	"github.com/ansible-semaphore/semaphore/pkg/random"
+	"github.com/ansible-semaphore/semaphore/util"
 	"github.com/coreos/go-oidc/v3/oidc"
 	"github.com/go-ldap/ldap/v3"
 	"github.com/gorilla/mux"
-
-	"github.com/ansible-semaphore/semaphore/util"
 	log "github.com/sirupsen/logrus"
+	"golang.org/x/crypto/bcrypt"
+	"golang.org/x/oauth2"
 )
 
 func tryFindLDAPUser(username, password string) (*db.User, error) {
@@ -533,7 +531,7 @@ func claimOidcToken(idToken *oidc.IDToken, provider util.OidcProvider) (res oidc
 }
 
 func getRandomUsername() string {
-	return lib.RandomString(16)
+	return random.String(16)
 }
 
 func getRandomProfileName() string {

api/projects/integrationalias.go

@@ -1,13 +1,14 @@
 package projects
 
 import (
-	"github.com/ansible-semaphore/semaphore/api/helpers"
-	"github.com/ansible-semaphore/semaphore/db"
-	"github.com/ansible-semaphore/semaphore/lib"
-	"github.com/ansible-semaphore/semaphore/util"
-	"github.com/gorilla/context"
 	"net/http"
 	"strings"
+
+	"github.com/ansible-semaphore/semaphore/api/helpers"
+	"github.com/ansible-semaphore/semaphore/db"
+	"github.com/ansible-semaphore/semaphore/pkg/random"
+	"github.com/ansible-semaphore/semaphore/util"
+	"github.com/gorilla/context"
 )
 
 type publicAlias struct {
@@ -70,7 +71,7 @@ func AddIntegrationAlias(w http.ResponseWriter, r *http.Request) {
 	}
 
 	alias, err := helpers.Store(r).CreateIntegrationAlias(db.IntegrationAlias{
-		Alias:         lib.RandomString(16),
+		Alias:         random.String(16),
 		ProjectID:     project.ID,
 		IntegrationID: integrationId,
 	})

lib/RadmomString.go

@@ -1,22 +0,0 @@
-package lib
-
-import (
-	"math/rand"
-	"time"
-)
-
-var r *rand.Rand
-
-func RandomString(strlen int) string {
-	if r == nil {
-		r = rand.New(rand.NewSource(time.Now().UnixNano()))
-	}
-
-	const chars = "abcdefghijklmnopqrstuvwxyz0123456789"
-	result := ""
-	for i := 0; i < strlen; i++ {
-		index := r.Intn(len(chars))
-		result += chars[index : index+1]
-	}
-	return result
-}

pkg/random/string.go

@@ -0,0 +1,31 @@
+package random
+
+import (
+	"math/rand"
+	"time"
+)
+
+var (
+	r *rand.Rand
+)
+
+const (
+	chars = "abcdefghijklmnopqrstuvwxyz0123456789"
+)
+
+func String(strlen int) string {
+	if r == nil {
+		r = rand.New(rand.NewSource(
+			time.Now().UnixNano(),
+		))
+	}
+
+	result := ""
+
+	for i := 0; i < strlen; i++ {
+		index := r.Intn(len(chars))
+		result += chars[index : index+1]
+	}
+
+	return result
+}

services/project/backup.go

@@ -2,8 +2,9 @@ package project
 
 import (
 	"fmt"
+
 	"github.com/ansible-semaphore/semaphore/db"
-	"github.com/ansible-semaphore/semaphore/lib"
+	"github.com/ansible-semaphore/semaphore/pkg/random"
 )
 
 func findNameByID[T db.BackupEntity](ID int, items []T) (*string, error) {
@@ -47,7 +48,7 @@ func getScheduleByTemplate(templateID int, schedules []db.Schedule) *string {
 }
 
 func getRandomName(name string) string {
-	return name + " - " + lib.RandomString(10)
+	return name + " - " + random.String(10)
 }
 
 func makeUniqueNames[T any](items []T, getter func(item *T) string, setter func(item *T, name string)) {