Merge pull request #2535 from openziti/alphanumber-id-prefix

Require first character of generated ids to be alphanumberic. Fixes #2534
openziti · Nov 12, 2024 · 31af3f7 · 31af3f7
2 parents ef4ac01 + 6d42467
commit 31af3f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/controller/idgen/id.go b/controller/idgen/id.go
@@ -33,20 +33,15 @@ func New() string {
 
 type Generator interface {
 	NextId() (string, error)
-	NextAlphaNumericPrefixedId() (string, error)
 }
 
 type shortIdGenerator struct {
 	*shortid.Shortid
 }
 
 func (self *shortIdGenerator) NextId() (string, error) {
-	return self.Generate()
-}
-
-func (self *shortIdGenerator) NextAlphaNumericPrefixedId() (string, error) {
 	for {
-		id, err := self.NextId()
+		id, err := self.Generate()
 		if err != nil {
 			return "", err
 		}

diff --git a/controller/network/network.go b/controller/network/network.go
@@ -555,7 +555,7 @@ func (network *Network) CreateCircuit(params model.CreateCircuitParams) (*model.
 	instanceId, serviceId := parseInstanceIdAndService(service)
 
 	// 1: Allocate Circuit Identifier
-	circuitId, err := network.circuitIdGenerator.NextAlphaNumericPrefixedId()
+	circuitId, err := network.circuitIdGenerator.NextId()
 	if err != nil {
 		network.CircuitFailedEvent(circuitId, params, startTime, nil, nil, CircuitFailureIdGenerationError)
 		return nil, err