From 6d99fb5368cb27a40e74c90ecf770fe9ed08ca00 Mon Sep 17 00:00:00 2001 From: Brian Picciano Date: Mon, 9 Sep 2024 21:38:10 +0200 Subject: [PATCH] Remove randStr private utility function --- go/daemon/network/jigs.go | 14 -------------- go/daemon/network/network.go | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 go/daemon/network/jigs.go diff --git a/go/daemon/network/jigs.go b/go/daemon/network/jigs.go deleted file mode 100644 index 254a595..0000000 --- a/go/daemon/network/jigs.go +++ /dev/null @@ -1,14 +0,0 @@ -package network - -import ( - "crypto/rand" - "encoding/hex" -) - -func randStr(l int) string { - b := make([]byte, l) - if _, err := rand.Read(b); err != nil { - panic(err) - } - return hex.EncodeToString(b) -} diff --git a/go/daemon/network/network.go b/go/daemon/network/network.go index a8dfd8c..41b059a 100644 --- a/go/daemon/network/network.go +++ b/go/daemon/network/network.go @@ -192,7 +192,7 @@ func instatiateNetwork( stateDir: stateDir, runtimeDir: runtimeDir, opts: opts.withDefaults(), - garageAdminToken: randStr(32), + garageAdminToken: toolkit.RandStr(32), shutdownCh: make(chan struct{}), } } @@ -346,7 +346,7 @@ func Create( return nil, fmt.Errorf("creating nebula CA cert: %w", err) } - garageRPCSecret := randStr(32) + garageRPCSecret := toolkit.RandStr(32) n := instatiateNetwork( logger,