Reintroduce direct usage of satori/go.uuid

fixes #610
goadesign · Jul 15, 2016 · 7839d1c · 7839d1c
1 parent a520ec0
commit 7839d1c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/design/random.go b/design/random.go
@@ -6,8 +6,8 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/goadesign/goa/uuid"
 	"github.com/manveru/faker"
+	"github.com/satori/go.uuid"
 )
 
 // RandomGenerator generates consistent random values of different types given a seed.

diff --git a/design/types.go b/design/types.go
@@ -17,7 +17,7 @@ import (
 	"time"
 
 	"github.com/goadesign/goa/dslengine"
-	"github.com/goadesign/goa/uuid"
+	"github.com/satori/go.uuid"
 )
 
 type (

diff --git a/goagen/gen_app/generator.go b/goagen/gen_app/generator.go
@@ -121,7 +121,7 @@ func (g *Generator) generateContexts(api *design.APIDefinition) error {
 		codegen.SimpleImport("strings"),
 		codegen.SimpleImport("time"),
 		codegen.SimpleImport("github.com/goadesign/goa"),
-		codegen.NewImport("uuid", "github.com/goadesign/goa/uuid"),
+		codegen.NewImport("uuid", "github.com/satori/go.uuid"),
 	}
 	g.genfiles = append(g.genfiles, ctxFile)
 	ctxWr.WriteHeader(title, g.target, imports)
@@ -351,7 +351,7 @@ func (g *Generator) generateMediaTypes(api *design.APIDefinition) error {
 		codegen.SimpleImport("github.com/goadesign/goa"),
 		codegen.SimpleImport("fmt"),
 		codegen.SimpleImport("time"),
-		codegen.NewImport("uuid", "github.com/goadesign/goa/uuid"),
+		codegen.NewImport("uuid", "github.com/satori/go.uuid"),
 	}
 	mtWr.WriteHeader(title, g.target, imports)
 	err = api.IterateMediaTypes(func(mt *design.MediaTypeDefinition) error {
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ import ( @@
     	"time"
     	"github.com/goadesign/goa/dslengine"
-    	"github.com/goadesign/goa/uuid"
+    	"github.com/satori/go.uuid"
     )
     type (
@@ Expand Down @@