Added basic admin page

Author: lgo

Makefile

@@ -1,25 +1,29 @@
-all:golinks_linux_x86 golinks_linux_x64 golinks_osx_x86 golinks_osx_x64 golinks_windows_x86.exe golinks_windows_x64.exe
+all: golinks_linux_x86 golinks_linux_x64 golinks_osx_x86 golinks_osx_x64 golinks_windows_x86.exe golinks_windows_x64.exe
+
+dev: export ADMIN_KEY := test
+dev:
+	go run main.go
 
 golinks_linux_x86:
-	GOOS=linux GOARCH=386 go build -o $@
+	GOOS=linux GOARCH=386 go build -o build/$@
 
 golinks_osx_x86:
-	GOOS=darwin GOARCH=386 go build -o $@
+	GOOS=darwin GOARCH=386 go build -o build/$@
 
 golinks_windows_x86.exe:
-	GOOS=windows GOARCH=386 go build -o $@
+	GOOS=windows GOARCH=386 go build -o build/$@
 
 golinks_linux_x64:
-	GOOS=linux GOARCH=amd64 go build -o $@
+	GOOS=linux GOARCH=amd64 go build -o build/$@
 
 golinks_osx_x64:
-	GOOS=darwin GOARCH=amd64 go build -o $@
+	GOOS=darwin GOARCH=amd64 go build -o build/$@
 
 golinks_windows_x64.exe:
-	GOOS=windows GOARCH=amd64 go build -o $@
+	GOOS=windows GOARCH=amd64 go build -o build/$@
 
 
 clean:
-	rm golinks_*
+	rm -rf build/
 
 .PHONY: golinks_linux_x86 golinks_linux_x64 golinks_osx_x86 golinks_osx_x64 golinks_windows_x86.exe golinks_windows_x64.exe clean

backend/abstract.go

@@ -5,6 +5,7 @@ package backend
  */
 type AbstractBackend interface {
 	Start()
+	GetAll() (map[string]string, error)
 	Store(string, string) error
 	Get(string) (string, error)
 	Delete(string) bool

backend/dict.go

@@ -48,15 +48,26 @@ func (b *Dict) Get(key string) (string, error) {
 	defer b.linksLock.RUnlock()
 	if str, ok := b.links[key]; ok {
 		return str, nil
-	} else {
-		return "", errors.New("No key found.")
 	}
+	return "", errors.New("no key found")
+}
+
+/**
+ * GetAll ...
+ * @return (url, true) if present
+ *         (_, false) if no value present
+ */
+func (b *Dict) GetAll() (map[string]string, error) {
+	b.linksLock.RLock()
+	defer b.linksLock.RUnlock()
+	return b.links, nil
 }
 
 /**
  * Delete ...
  * @return true if deleted
  *         false if not present
+ * FIXME: should return an error also
  */
 func (b *Dict) Delete(key string) bool {
 	b.linksLock.Lock()
@@ -89,7 +100,6 @@ func (b *Dict) MetricGet(key string) uint {
 	defer b.metricsLock.Unlock()
 	if val, ok := b.metrics[key]; ok {
 		return val
-	} else {
-		return 0
 	}
+	return 0
 }

backend/dict_test.go

@@ -0,0 +1,54 @@
+package backend
+
+import (
+	"errors"
+	"strings"
+	"testing"
+)
+
+func TestDictBackendKeyStorage(t *testing.T) {
+	backend := Dict{}
+	backend.Start()
+
+	if err := backend.Store("key", "val"); err != nil {
+		t.Errorf("Store(\"key\") got unexpected error: %s", err)
+	}
+
+	if val, err := backend.Get("key"); err != nil {
+		t.Errorf("Get(\"key\") got unexpected error: %s", err)
+	} else if val != "val" {
+		t.Errorf("Get(\"key\") expected:%q actual:%q", "val", val)
+	}
+
+	if val, err := backend.Get("notkey"); err == nil {
+		t.Errorf("Get(\"notkey\") expected error:%q instead got value:%q", errors.New("no key found"), val)
+	} else if !strings.Contains(err.Error(), "no key found") {
+		t.Errorf("Get(\"notkey\") expected error:%q actual:%q", "no key found", err.Error())
+	}
+
+	if err := backend.Store("key", "newval"); err != nil {
+		t.Errorf("Store(\"key\") unexpected expected error:%s", err)
+	}
+
+	if err := backend.Store("key", "newval"); err != nil {
+		t.Errorf("Store(\"key\") unexpected expected error:%s", err)
+	}
+
+	if val, err := backend.Get("key"); err != nil {
+		t.Errorf("Get(\"key\") got unexpected error: %s", err)
+	} else if val != "newval" {
+		t.Errorf("Get(\"key\") expected:%q actual:%q", "newval", val)
+	}
+
+	if val := backend.Delete("key"); val != true {
+		t.Errorf("Delete(\"key\") expected success")
+	}
+
+	if val := backend.Delete("key"); val != false {
+		t.Errorf("Delete(\"key\") expected failure")
+	}
+
+	if val := backend.Delete("notkey"); val != false {
+		t.Errorf("Delete(\"key\") expected failure")
+	}
+}

backend/redis.go

@@ -43,6 +43,16 @@ func (b *Redis) Get(key string) (string, error) {
 	return str, err
 }
 
+/**
+ * Get ...
+ * @return (url, true) if present
+ *         (_, false) if no value present
+ */
+func (b *Redis) GetAll() (map[string]string, error) {
+	str, err := b.client.HGetAll("links").Result()
+	return str, err
+}
+
 /**
  * Delete ...
  * @return true if deleted
@@ -68,7 +78,6 @@ func (b *Redis) MetricIncrement(key string) {
 func (b *Redis) MetricGet(key string) uint {
 	if val, err := b.client.HGet("metrics", key).Uint64(); err == nil {
 		return uint(val)
-	} else {
-		return 0
 	}
+	return 0
 }

endpoint/admin_dashboard.go

@@ -1,14 +1,48 @@
 package endpoint
 
 import (
-	"fmt"
 	"net/http"
+
+	"github.com/aymerick/raymond"
+	"github.com/xLegoz/go-links/backend"
 )
 
+//
+// var template *raymond.Template
+//
+// func init() {
+// 	// parse template
+// 	var err error
+// 	template, err = raymond.Parse("templates/admin.html.mustache")
+// 	if err != nil {
+// 		panic(err)
+// 	}
+// }
+
 /**
  * AdminDashboardHandler
  * @type {String}
  */
 func AdminDashboardHandler(w http.ResponseWriter, r *http.Request) {
-	fmt.Fprintf(w, "Hi there!")
+	links, err := backend.ActiveBackend.GetAll()
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+	}
+
+	ctx := map[string]interface{}{
+		"links": links,
+	}
+
+	template, err := raymond.ParseFile("templates/admin.html.mustache")
+	if err != nil {
+		panic(err)
+	}
+
+	// render template
+	result, err := template.Exec(ctx)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+	}
+
+	w.Write([]byte(result))
 }

main.go

@@ -2,17 +2,18 @@ package main
 
 import (
 	"fmt"
+	"net/http"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+
 	"github.com/go-redis/redis"
 	"github.com/gorilla/mux"
 	log "github.com/sirupsen/logrus"
 	"github.com/xLegoz/go-links/backend"
 	"github.com/xLegoz/go-links/endpoint"
 	"github.com/xLegoz/go-links/util"
-	"net/http"
-	"os"
-	"strconv"
-	"strings"
-	"time"
 )
 
 var AdminKey string
@@ -23,7 +24,7 @@ var Store string
 
 func init() {
 	// set logger level
-	switch LogLevel = util.Getenv("GOLINK_LOGLEVEL", "info"); LogLevel {
+	switch LogLevel = util.Getenv("GOLINKS_LOGLEVEL", "info"); LogLevel {
 	case "debug":
 		log.SetLevel(log.DebugLevel)
 	case "info":
@@ -48,10 +49,10 @@ func init() {
 
 	// get secret admin key
 	AdminKey = util.Getenv("ADMIN_KEY", "")
-	if len(AdminKey) < 16 {
+	if len(AdminKey) < 4 {
 		log.WithFields(log.Fields{
 			"AdminKey": AdminKey,
-		}).Fatal("Invalid ADMIN_KEY environment variable: needs to be at least 16 characters.")
+		}).Fatal("Invalid ADMIN_KEY environment variable: needs to be at least 4 characters.")
 		os.Exit(1)
 	}
 

templates/admin.html.mustache

@@ -0,0 +1,15 @@
+<html>
+<head>
+  <title>go-links | admin dashboard</title>
+</head>
+<body>
+
+  <ul>
+    {{#each links}}
+      <li>
+        {{@key}}: {{this}}
+      </li>
+    {{/each}}
+  </ul>
+</body>
+</html>