[WIP] Fix deps

Gopkg.toml

@@ -1,192 +1,158 @@
 
-## Gopkg.toml example (these lines may be deleted)
-
-## "required" lists a set of packages (not projects) that must be included in
-## Gopkg.lock. This list is merged with the set of packages imported by the current
-## project. Use it when your project needs a package it doesn't explicitly import -
-## including "main" packages.
-# required = ["github.com/user/thing/cmd/thing"]
-
-## "ignored" lists a set of packages (not projects) that are ignored when
-## dep statically analyzes source code. Ignored packages can be in this project,
-## or in a dependency.
-# ignored = ["github.com/user/project/badpkg"]
-
-## Dependencies define constraints on dependent projects. They are respected by
-## dep whether coming from the Gopkg.toml of the current project or a dependency.
-# [[dependencies]]
-## Required: the root import path of the project being constrained.
-# name = "github.com/user/project"
+# Gopkg.toml example
 #
-## Recommended: the version constraint to enforce for the project.
-## Only one of "branch", "version" or "revision" can be specified.
-# version = "1.0.0"
-# branch = "master"
-# revision = "abc123"
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
 #
-## Optional: an alternate location (URL or import path) for the project's source.
-# source = "https://github.com/myfork/package.git"
-
-## Overrides have the same structure as [[dependencies]], but supercede all
-## [[dependencies]] declarations from all projects. Only the current project's
-## [[overrides]] are applied.
-##
-## Overrides are a sledgehammer. Use them only as a last resort.
-# [[overrides]]
-## Required: the root import path of the project being constrained.
-# name = "github.com/user/project"
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
 #
-## Optional: specifying a version constraint override will cause all other
-## constraints on this project to be ignored; only the overriden constraint
-## need be satisfied.
-## Again, only one of "branch", "version" or "revision" can be specified.
-# version = "1.0.0"
-# branch = "master"
-# revision = "abc123"
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
 #
-## Optional: specifying an alternate source location as an override will
-## enforce that the alternate location is used for that project, regardless of
-## what source location any dependent projects specify.
-# source = "https://github.com/myfork/package.git"
-
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
 
 
-[[dependencies]]
-  name = "github.com/Sirupsen/logrus"
-  version = "^0.11.5"
+[[constraint]]
+  name = "cirello.io/supervisor"
+  version = "0.5.3"
 
-[[dependencies]]
+[[constraint]]
   name = "github.com/aws/aws-sdk-go"
-  version = "^1.8.30"
+  version = "1.12.34"
 
-[[dependencies]]
-  branch = "master"
+[[constraint]]
   name = "github.com/boltdb/bolt"
+  version = "1.3.1"
 
-[[dependencies]]
-  name = "github.com/ucirello/supervisor"
-  version = "^0.5.3"
+[[constraint]]
+  branch = "master"
+  name = "github.com/c0ze/runner"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/dghubble/go-twitter"
 
-[[dependencies]]
+[[constraint]]
   name = "github.com/dghubble/oauth1"
-  version = "^0.4.0"
+  version = "0.4.0"
 
-[[dependencies]]
+[[constraint]]
   name = "github.com/dgrijalva/jwt-go"
-  version = "^3.0.0"
+  version = "3.1.0"
 
-[[dependencies]]
-  name = "github.com/docker/docker"
-  version = "^17.5.0-ce-rc3"
-
-[[dependencies]]
-  branch = "master"
+[[constraint]]
   name = "github.com/fsouza/go-dockerclient"
+  version = "1.1.0"
 
-[[dependencies]]
+[[constraint]]
   name = "github.com/garyburd/redigo"
-  version = "^1.1.0"
+  version = "1.3.0"
 
-[[dependencies]]
+[[constraint]]
   name = "github.com/giantswarm/semver-bump"
-  version = "^1.1.1"
+  version = "1.1.1"
 
-[[dependencies]]
+[[constraint]]
   name = "github.com/gin-gonic/gin"
-  version = "^1.1.4"
+  version = "1.2.0"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/go-openapi/errors"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/go-openapi/loads"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/go-openapi/runtime"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/go-openapi/spec"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/go-openapi/strfmt"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/go-openapi/swag"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/go-openapi/validate"
 
-[[dependencies]]
+[[constraint]]
   name = "github.com/go-sql-driver/mysql"
-  version = "^1.3.0"
+  version = "1.3.0"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/golang/groupcache"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/google/btree"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/iron-io/functions_go"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/iron-io/iron_go3"
 
-[[dependencies]]
-  branch = "master"
-  name = "github.com/iron-io/runner"
-
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/jmoiron/jsonq"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/lib/pq"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
+  name = "github.com/moby/moby"
+
+[[constraint]]
   name = "github.com/pkg/errors"
+  version = "0.8.0"
 
-[[dependencies]]
+[[constraint]]
   name = "github.com/satori/go.uuid"
-  version = "^1.1.0"
+  version = "1.1.0"
 
-[[dependencies]]
-  branch = "master"
+[[constraint]]
+  name = "github.com/sirupsen/logrus"
+  version = "1.0.3"
+
+[[constraint]]
   name = "github.com/spf13/viper"
+  version = "1.0.0"
 
-[[dependencies]]
+[[constraint]]
   name = "github.com/urfave/cli"
-  version = "^1.19.1"
+  version = "1.20.0"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "golang.org/x/crypto"
 
-[[dependencies]]
-  branch = "master"
-  name = "golang.org/x/sys"
-
-[[dependencies]]
+[[constraint]]
   branch = "v2"
   name = "gopkg.in/mgo.v2"
 
-[[dependencies]]
+[[constraint]]
   branch = "v2"
   name = "gopkg.in/yaml.v2"

api/datastore/bolt/bolt.go

@@ -12,10 +12,10 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/boltdb/bolt"
 	"github.com/iron-io/functions/api/datastore/internal/datastoreutil"
 	"github.com/iron-io/functions/api/models"
+	"github.com/sirupsen/logrus"
 )
 
 type BoltDatastore struct {

api/datastore/datastore.go

@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/iron-io/functions/api/datastore/bolt"
 	"github.com/iron-io/functions/api/datastore/mysql"
 	"github.com/iron-io/functions/api/datastore/postgres"
 	"github.com/iron-io/functions/api/datastore/redis"
 	"github.com/iron-io/functions/api/models"
+	"github.com/sirupsen/logrus"
 )
 
 func New(dbURL string) (models.Datastore, error) {

api/datastore/internal/datastoretest/test.go

@@ -13,8 +13,8 @@ import (
 	"os"
 	"reflect"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
+	"github.com/sirupsen/logrus"
 )
 
 func setLogBuffer() *bytes.Buffer {

api/datastore/mysql/mysql.go

@@ -8,11 +8,11 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/go-sql-driver/mysql"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/iron-io/functions/api/datastore/internal/datastoreutil"
 	"github.com/iron-io/functions/api/models"
+	"github.com/sirupsen/logrus"
 )
 
 const routesTableCreate = `CREATE TABLE IF NOT EXISTS routes (

api/datastore/postgres/postgres.go

@@ -9,11 +9,11 @@ import (
 	"context"
 
 	"bytes"
-	"github.com/Sirupsen/logrus"
 	"github.com/iron-io/functions/api/datastore/internal/datastoreutil"
 	"github.com/iron-io/functions/api/models"
 	"github.com/lib/pq"
 	_ "github.com/lib/pq"
+	"github.com/sirupsen/logrus"
 )
 
 const routesTableCreate = `

api/datastore/redis/redis.go

@@ -10,10 +10,10 @@ import (
 
 	"context"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/garyburd/redigo/redis"
 	"github.com/iron-io/functions/api/datastore/internal/datastoreutil"
 	"github.com/iron-io/functions/api/models"
+	"github.com/sirupsen/logrus"
 )
 
 type RedisDataStore struct {

api/mqs/bolt.go

@@ -11,10 +11,10 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/boltdb/bolt"
+	"github.com/c0ze/runner/common"
 	"github.com/iron-io/functions/api/models"
-	"github.com/iron-io/runner/common"
+	"github.com/sirupsen/logrus"
 )
 
 type BoltDbMQ struct {

api/mqs/ironmq.go

@@ -9,10 +9,10 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/iron-io/functions/api/models"
 	mq_config "github.com/iron-io/iron_go3/config"
 	ironmq "github.com/iron-io/iron_go3/mq"
+	"github.com/sirupsen/logrus"
 )
 
 type assoc struct {

api/mqs/memory.go

@@ -7,10 +7,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/c0ze/runner/common"
 	"github.com/google/btree"
 	"github.com/iron-io/functions/api/models"
-	"github.com/iron-io/runner/common"
+	"github.com/sirupsen/logrus"
 )
 
 type MemoryMQ struct {

api/mqs/new.go

@@ -5,8 +5,8 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/iron-io/functions/api/models"
+	"github.com/sirupsen/logrus"
 )
 
 // New will parse the URL and return the correct MQ implementation.

api/mqs/redis.go

@@ -9,10 +9,10 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/c0ze/runner/common"
 	"github.com/garyburd/redigo/redis"
 	"github.com/iron-io/functions/api/models"
-	"github.com/iron-io/runner/common"
+	"github.com/sirupsen/logrus"
 )
 
 type RedisMQ struct {