github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Move rand string func to util for reuse"

Browse Source
This commit is contained in:
Vish Kannan
2015-07-22 12:51:29 -07:00
parent b0a429f356
commit acebe24bf3
3 changed files with 13 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/api/generate.go
View File

@@ -18,8 +18,7 @@ package api
import ( import (
"fmt" "fmt"
"math/rand"
utilrand "github.com/GoogleCloudPlatform/kubernetes/pkg/util/rand"
) )
// NameGenerator generates names for objects. Some backends may have more information // NameGenerator generates names for objects. Some backends may have more information
@@ -60,5 +59,16 @@ func (simpleNameGenerator) GenerateName(base string) string {
if len(base) > maxGeneratedNameLength { if len(base) > maxGeneratedNameLength {
base = base[:maxGeneratedNameLength] base = base[:maxGeneratedNameLength]
} }
return fmt.Sprintf("%s%s", base, utilrand.String(randomLength)) value := randSeq(randomLength)
return fmt.Sprintf("%s%s", base, value)
}
var letters = []rune("abcdefghijklmnopqrstuvwxyz0123456789")
func randSeq(n int) string {
b := make([]rune, n)
for i := range b {
b[i] = letters[rand.Intn(len(letters))]
}
return string(b)
} }

48
pkg/util/rand/rand.go
View File

@@ -1,48 +0,0 @@
/*
Copyright 2015 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
// Package rand provides utilities related to randomization.
package rand
import (
"math/rand"
"sync"
"time"
)
var letters = []rune("abcdefghijklmnopqrstuvwxyz0123456789")
var numLetters = len(letters)
var rng = struct {
rand *rand.Rand
lock sync.Mutex
}{
rand: rand.New(rand.NewSource(time.Now().UTC().UnixNano())),
}
// String generates a random alphanumeric string n characters long. This will
// panic if n is less than zero.
func String(n int) string {
if n < 0 {
panic("out-of-bounds value")
}
b := make([]rune, n)
rng.lock.Lock()
defer rng.lock.Unlock()
for i := range b {
b[i] = letters[rng.rand.Intn(numLetters)]
}
return string(b)
}

37
pkg/util/rand/rand_test.go
View File

@@ -1,37 +0,0 @@
/*
Copyright 2015 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package rand
import (
"strings"
"testing"
)
func TestString(t *testing.T) {
valid := "0123456789abcdefghijklmnopqrstuvwxyz"
for _, l := range []int{0, 1, 2, 10, 123} {
s := String(l)
if len(s) != l {
t.Errorf("expected string of size %d, got %q", l, s)
}
for _, c := range s {
if !strings.ContainsRune(valid, c) {
t.Errorf("expected valid charaters, got %v", c)
}
}
}
}