Update dependencies and replace uuid library (#100)

Gopkg.toml

@@ -59,10 +59,6 @@ required = ["github.com/valyala/fasthttp"]
  name = "github.com/rs/cors"
  version = "1.2.0"
 
-[[constraint]]
- name = "github.com/satori/go.uuid"
- version = "1.2.0"
-
 [[constraint]]
  name = "github.com/sirupsen/logrus"
  version = "1.0.4"

acmetxt.go

@@ -4,7 +4,7 @@ import (
  "encoding/json"
  "net"
 
- "github.com/satori/go.uuid"
+ "github.com/google/uuid"
  log "github.com/sirupsen/logrus"
 )
 
@@ -76,8 +76,8 @@ func (a ACMETxt) allowedFromList(ips []string) bool {
 func newACMETxt() ACMETxt {
  var a = ACMETxt{}
  password := generatePassword(40)
- a.Username = uuid.NewV4()
+ a.Username = uuid.New()
  a.Password = password
- a.Subdomain = uuid.NewV4().String()
+ a.Subdomain = uuid.New().String()
  return a
 }

api_test.go

@@ -9,9 +9,9 @@ import (
  "testing"
 
  "github.com/gavv/httpexpect"
+ "github.com/google/uuid"
  "github.com/julienschmidt/httprouter"
  "github.com/rs/cors"
- "github.com/satori/go.uuid"
  "gopkg.in/DATA-DOG/go-sqlmock.v1"
 )
 
@@ -25,7 +25,7 @@ func noAuth(update httprouter.Handle) httprouter.Handle {
  dec := json.NewDecoder(r.Body)
  _ = dec.Decode(&postData)
  // Set user info to the decoded ACMETxt object
- postData.Username, _ = uuid.FromString(uname)
+ postData.Username, _ = uuid.Parse(uname)
  postData.Password = passwd
  // Set the ACMETxt struct to context to pull in from update function
  ctx := r.Context()

db.go

@@ -9,9 +9,9 @@ import (
  "strconv"
  "time"
 
+ "github.com/google/uuid"
  _ "github.com/lib/pq"
  _ "github.com/mattn/go-sqlite3"
- "github.com/satori/go.uuid"
  log "github.com/sirupsen/logrus"
  "golang.org/x/crypto/bcrypt"
 )

types.go

@@ -2,9 +2,10 @@ package main
 
 import (
  "database/sql"
- "github.com/miekg/dns"
- "github.com/satori/go.uuid"
  "sync"
+
+ "github.com/google/uuid"
+ "github.com/miekg/dns"
 )
 
 // Config is global configuration struct

validation.go

@@ -3,12 +3,12 @@ package main
 import (
  "unicode/utf8"
 
- "github.com/satori/go.uuid"
+ "github.com/google/uuid"
  "golang.org/x/crypto/bcrypt"
 )
 
 func getValidUsername(u string) (uuid.UUID, error) {
- uname, err := uuid.FromString(u)
+ uname, err := uuid.Parse(u)
  if err != nil {
  return uuid.UUID{}, err
  }
@@ -25,7 +25,7 @@ func validKey(k string) bool {
 }
 
 func validSubdomain(s string) bool {
- _, err := uuid.FromString(s)
+ _, err := uuid.Parse(s)
  if err == nil {
  return true
  }

validation_test.go

@@ -1,12 +1,13 @@
 package main
 
 import (
- "github.com/satori/go.uuid"
  "testing"
+
+ "github.com/google/uuid"
 )
 
 func TestGetValidUsername(t *testing.T) {
- v1, _ := uuid.FromString("a097455b-52cc-4569-90c8-7a4b97c6eba8")
+ v1, _ := uuid.Parse("a097455b-52cc-4569-90c8-7a4b97c6eba8")
  for i, test := range []struct {
  uname string
  output uuid.UUID