From 4829ea0e9f994f3befa566383142688039147ed2 Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Tue, 30 Jan 2018 23:07:21 +0100
Subject: [PATCH] util: remove retry logic in shortid_generator

Use shortid.MustGenerate() instead of shortid.Generate(). Instead
of returning errors it will panic.
---
 pkg/models/dashboards.go      |  4 ++--
 pkg/util/shortid_generator.go | 13 ++-----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go
index 616ebfeb187..e9b3768578e 100644
--- a/pkg/models/dashboards.go
+++ b/pkg/models/dashboards.go
@@ -65,7 +65,7 @@ type Dashboard struct {
 // NewDashboard creates a new dashboard
 func NewDashboard(title string) *Dashboard {
 	dash := &Dashboard{}
-	dash.Uid, _ = util.GenerateShortUid()
+	dash.Uid = util.GenerateShortUid()
 	dash.Data = simplejson.New()
 	dash.Data.Set("title", title)
 	dash.Title = title
@@ -115,7 +115,7 @@ func NewDashboardFromJson(data *simplejson.Json) *Dashboard {
 	if uid, err := dash.Data.Get("uid").String(); err == nil {
 		dash.Uid = uid
 	} else {
-		dash.Uid, _ = util.GenerateShortUid()
+		dash.Uid = util.GenerateShortUid()
 	}
 
 	return dash
diff --git a/pkg/util/shortid_generator.go b/pkg/util/shortid_generator.go
index ab3b9400f4f..067f7c756ba 100644
--- a/pkg/util/shortid_generator.go
+++ b/pkg/util/shortid_generator.go
@@ -7,18 +7,9 @@ import (
 func init() {
 	gen, _ := shortid.New(1, shortid.DefaultABC, 1)
 	shortid.SetDefault(gen)
-
 }
 
 // GenerateShortUid generates a short unique identifier.
-func GenerateShortUid() (uid string, err error) {
-	if uid, err = shortid.Generate(); err != nil {
-		if uid, err = shortid.Generate(); err != nil {
-			if uid, err = shortid.Generate(); err != nil {
-				return "", err
-			}
-		}
-	}
-
-	return uid, nil
+func GenerateShortUid() string {
+	return shortid.MustGenerate()
 }