From e4bb04887e70c154972700fc98a6e8046b6a6936 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 16 May 2017 11:06:32 -0700 Subject: [PATCH] Rewrite imports to use forks files on gitlab not use githubs. --- api/datastore/bolt/bolt.go | 4 ++-- api/datastore/bolt/bolt_test.go | 2 +- api/datastore/datastore.go | 10 +++++----- api/datastore/internal/datastoretest/test.go | 2 +- .../internal/datastoreutil/validator.go | 2 +- api/datastore/mock.go | 4 ++-- api/datastore/mock_test.go | 2 +- api/datastore/mysql/mysql.go | 4 ++-- api/datastore/mysql/mysql_test.go | 2 +- api/datastore/postgres/postgres.go | 4 ++-- api/datastore/postgres/postgres_test.go | 2 +- api/datastore/redis/redis.go | 4 ++-- api/datastore/redis/redis_test.go | 2 +- api/mqs/bolt.go | 4 ++-- api/mqs/ironmq.go | 2 +- api/mqs/memory.go | 4 ++-- api/mqs/mock.go | 2 +- api/mqs/new.go | 2 +- api/mqs/redis.go | 4 ++-- api/runner/async_runner.go | 6 +++--- api/runner/async_runner_test.go | 6 +++--- api/runner/common/environment.go | 2 +- api/runner/drivers/docker/docker.go | 6 +++--- api/runner/drivers/docker/docker_client.go | 2 +- api/runner/drivers/docker/docker_test.go | 4 ++-- api/runner/drivers/mock/mocker.go | 2 +- api/runner/func_logger.go | 2 +- api/runner/metric_logger.go | 2 +- api/runner/protocol/default.go | 2 +- api/runner/protocol/factory.go | 4 ++-- api/runner/protocol/http.go | 4 ++-- api/runner/runner.go | 12 ++++++------ api/runner/runner_test.go | 4 ++-- api/runner/task.go | 4 ++-- api/runner/task/task.go | 2 +- api/runner/worker.go | 6 +++--- api/server/app_listeners.go | 2 +- api/server/apps_create.go | 4 ++-- api/server/apps_delete.go | 6 +++--- api/server/apps_get.go | 2 +- api/server/apps_list.go | 2 +- api/server/apps_test.go | 8 ++++---- api/server/apps_update.go | 6 +++--- api/server/error_response.go | 4 ++-- api/server/extension_points.go | 4 ++-- api/server/internal/routecache/lru.go | 2 +- api/server/middleware.go | 2 +- api/server/routes_create.go | 6 +++--- api/server/routes_delete.go | 2 +- api/server/routes_get.go | 2 +- api/server/routes_list.go | 4 ++-- api/server/routes_test.go | 6 +++--- api/server/routes_update.go | 6 +++--- api/server/runner.go | 10 +++++----- api/server/runner_async_test.go | 12 ++++++------ api/server/runner_listeners.go | 2 +- api/server/runner_test.go | 10 +++++----- api/server/server.go | 16 ++++++++-------- api/server/server_test.go | 12 ++++++------ api/server/singleflight.go | 2 +- api/server/version.go | 2 +- examples/blog/database/post.go | 2 +- examples/blog/database/user.go | 2 +- examples/blog/function.go | 6 +++--- examples/blog/routes/post_create.go | 4 ++-- examples/blog/routes/post_list.go | 2 +- examples/blog/routes/post_read.go | 2 +- examples/blog/routes/server.go | 4 ++-- examples/extensions/main.go | 4 ++-- examples/middleware/main.go | 4 ++-- fn/common.go | 2 +- fn/init.go | 2 +- fn/main.go | 2 +- fn/version.go | 2 +- lb/fnlb/main.go | 2 +- main.go | 2 +- 76 files changed, 154 insertions(+), 154 deletions(-) diff --git a/api/datastore/bolt/bolt.go b/api/datastore/bolt/bolt.go index 42c1044b3..e8329e84f 100644 --- a/api/datastore/bolt/bolt.go +++ b/api/datastore/bolt/bolt.go @@ -14,8 +14,8 @@ import ( "github.com/Sirupsen/logrus" "github.com/boltdb/bolt" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/datastore/internal/datastoreutil" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoreutil" ) type BoltDatastore struct { diff --git a/api/datastore/bolt/bolt_test.go b/api/datastore/bolt/bolt_test.go index 0f0717ba6..cabe3b89e 100644 --- a/api/datastore/bolt/bolt_test.go +++ b/api/datastore/bolt/bolt_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/treeder/functions/api/datastore/internal/datastoretest" + "gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoretest" ) const tmpBolt = "/tmp/func_test_bolt.db" diff --git a/api/datastore/datastore.go b/api/datastore/datastore.go index 66a8fb838..313d676c5 100644 --- a/api/datastore/datastore.go +++ b/api/datastore/datastore.go @@ -5,11 +5,11 @@ import ( "net/url" "github.com/Sirupsen/logrus" - "github.com/treeder/functions/api/datastore/bolt" - "github.com/treeder/functions/api/datastore/mysql" - "github.com/treeder/functions/api/datastore/postgres" - "github.com/treeder/functions/api/datastore/redis" - "github.com/treeder/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/datastore/bolt" + "gitlab.oracledx.com/odx/functions/api/datastore/mysql" + "gitlab.oracledx.com/odx/functions/api/datastore/postgres" + "gitlab.oracledx.com/odx/functions/api/datastore/redis" + "gitlab.oracledx.com/odx/functions/api/models" ) func New(dbURL string) (models.Datastore, error) { diff --git a/api/datastore/internal/datastoretest/test.go b/api/datastore/internal/datastoretest/test.go index 4ce401735..bb468afa0 100644 --- a/api/datastore/internal/datastoretest/test.go +++ b/api/datastore/internal/datastoretest/test.go @@ -6,7 +6,7 @@ import ( "log" "testing" - "github.com/treeder/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/models" "net/http" "net/url" diff --git a/api/datastore/internal/datastoreutil/validator.go b/api/datastore/internal/datastoreutil/validator.go index 0c865a452..75633ce80 100644 --- a/api/datastore/internal/datastoreutil/validator.go +++ b/api/datastore/internal/datastoreutil/validator.go @@ -3,7 +3,7 @@ package datastoreutil import ( "context" - "github.com/treeder/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/models" ) // Datastore is a copy of models.Datastore, with additional comments on parameter guarantees. diff --git a/api/datastore/mock.go b/api/datastore/mock.go index c3c194e28..b4abd608e 100644 --- a/api/datastore/mock.go +++ b/api/datastore/mock.go @@ -3,8 +3,8 @@ package datastore import ( "context" - "github.com/treeder/functions/api/datastore/internal/datastoreutil" - "github.com/treeder/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoreutil" + "gitlab.oracledx.com/odx/functions/api/models" ) type mock struct { diff --git a/api/datastore/mock_test.go b/api/datastore/mock_test.go index d73196458..063bad739 100644 --- a/api/datastore/mock_test.go +++ b/api/datastore/mock_test.go @@ -3,7 +3,7 @@ package datastore import ( "testing" - "github.com/treeder/functions/api/datastore/internal/datastoretest" + "gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoretest" ) func TestDatastore(t *testing.T) { diff --git a/api/datastore/mysql/mysql.go b/api/datastore/mysql/mysql.go index c4a1a2407..44b55c854 100644 --- a/api/datastore/mysql/mysql.go +++ b/api/datastore/mysql/mysql.go @@ -11,8 +11,8 @@ import ( "github.com/Sirupsen/logrus" "github.com/go-sql-driver/mysql" _ "github.com/go-sql-driver/mysql" - "github.com/treeder/functions/api/datastore/internal/datastoreutil" - "github.com/treeder/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoreutil" + "gitlab.oracledx.com/odx/functions/api/models" ) const routesTableCreate = `CREATE TABLE IF NOT EXISTS routes ( diff --git a/api/datastore/mysql/mysql_test.go b/api/datastore/mysql/mysql_test.go index f7879a93a..33c3e1734 100644 --- a/api/datastore/mysql/mysql_test.go +++ b/api/datastore/mysql/mysql_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/treeder/functions/api/datastore/internal/datastoretest" + "gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoretest" ) const tmpMysql = "mysql://root:root@tcp(%v:3307)/funcs" diff --git a/api/datastore/postgres/postgres.go b/api/datastore/postgres/postgres.go index d689ddedf..fb920b788 100644 --- a/api/datastore/postgres/postgres.go +++ b/api/datastore/postgres/postgres.go @@ -10,8 +10,8 @@ import ( "bytes" "github.com/Sirupsen/logrus" - "github.com/treeder/functions/api/datastore/internal/datastoreutil" - "github.com/treeder/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoreutil" + "gitlab.oracledx.com/odx/functions/api/models" "github.com/lib/pq" _ "github.com/lib/pq" ) diff --git a/api/datastore/postgres/postgres_test.go b/api/datastore/postgres/postgres_test.go index c9266699f..34a4ea5b2 100644 --- a/api/datastore/postgres/postgres_test.go +++ b/api/datastore/postgres/postgres_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/treeder/functions/api/datastore/internal/datastoretest" + "gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoretest" ) const tmpPostgres = "postgres://postgres@%v:15432/funcs?sslmode=disable" diff --git a/api/datastore/redis/redis.go b/api/datastore/redis/redis.go index a349bf235..3de6dce11 100644 --- a/api/datastore/redis/redis.go +++ b/api/datastore/redis/redis.go @@ -12,8 +12,8 @@ import ( "github.com/Sirupsen/logrus" "github.com/garyburd/redigo/redis" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/datastore/internal/datastoreutil" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoreutil" ) type RedisDataStore struct { diff --git a/api/datastore/redis/redis_test.go b/api/datastore/redis/redis_test.go index 639c8b44e..540d1fb8b 100644 --- a/api/datastore/redis/redis_test.go +++ b/api/datastore/redis/redis_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/garyburd/redigo/redis" - "github.com/treeder/functions/api/datastore/internal/datastoretest" + "gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoretest" ) const tmpRedis = "redis://%v:6301/" diff --git a/api/mqs/bolt.go b/api/mqs/bolt.go index d566f326a..e294865cd 100644 --- a/api/mqs/bolt.go +++ b/api/mqs/bolt.go @@ -13,8 +13,8 @@ import ( "github.com/Sirupsen/logrus" "github.com/boltdb/bolt" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/runner/common" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/runner/common" ) type BoltDbMQ struct { diff --git a/api/mqs/ironmq.go b/api/mqs/ironmq.go index 923ed2a27..38f1cd4a1 100644 --- a/api/mqs/ironmq.go +++ b/api/mqs/ironmq.go @@ -12,7 +12,7 @@ import ( "github.com/Sirupsen/logrus" mq_config "github.com/iron-io/iron_go3/config" ironmq "github.com/iron-io/iron_go3/mq" - "github.com/treeder/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/models" ) type assoc struct { diff --git a/api/mqs/memory.go b/api/mqs/memory.go index 15151040a..fe9ce9e30 100644 --- a/api/mqs/memory.go +++ b/api/mqs/memory.go @@ -9,8 +9,8 @@ import ( "github.com/Sirupsen/logrus" "github.com/google/btree" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/runner/common" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/runner/common" ) type MemoryMQ struct { diff --git a/api/mqs/mock.go b/api/mqs/mock.go index 695ece0e5..1157e5c73 100644 --- a/api/mqs/mock.go +++ b/api/mqs/mock.go @@ -3,7 +3,7 @@ package mqs import ( "context" - "github.com/treeder/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/models" ) type Mock struct { diff --git a/api/mqs/new.go b/api/mqs/new.go index 078fd601e..afd337045 100644 --- a/api/mqs/new.go +++ b/api/mqs/new.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/Sirupsen/logrus" - "github.com/treeder/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/models" ) // New will parse the URL and return the correct MQ implementation. diff --git a/api/mqs/redis.go b/api/mqs/redis.go index 03403913d..3706c0438 100644 --- a/api/mqs/redis.go +++ b/api/mqs/redis.go @@ -11,8 +11,8 @@ import ( "github.com/Sirupsen/logrus" "github.com/garyburd/redigo/redis" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/runner/common" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/runner/common" ) type RedisMQ struct { diff --git a/api/runner/async_runner.go b/api/runner/async_runner.go index 50315b177..5abeb13d4 100644 --- a/api/runner/async_runner.go +++ b/api/runner/async_runner.go @@ -13,9 +13,9 @@ import ( "time" "github.com/Sirupsen/logrus" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/runner/task" - "github.com/treeder/functions/api/runner/common" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/runner/task" + "gitlab.oracledx.com/odx/functions/api/runner/common" ) func getTask(ctx context.Context, url string) (*models.Task, error) { diff --git a/api/runner/async_runner_test.go b/api/runner/async_runner_test.go index e63d425fa..d7554336a 100644 --- a/api/runner/async_runner_test.go +++ b/api/runner/async_runner_test.go @@ -15,9 +15,9 @@ import ( "github.com/Sirupsen/logrus" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/mqs" - "github.com/treeder/functions/api/runner/task" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/mqs" + "gitlab.oracledx.com/odx/functions/api/runner/task" ) func setLogBuffer() *bytes.Buffer { diff --git a/api/runner/common/environment.go b/api/runner/common/environment.go index d6b3e5c42..fdd578e6e 100644 --- a/api/runner/common/environment.go +++ b/api/runner/common/environment.go @@ -15,7 +15,7 @@ package common import ( - "github.com/treeder/functions/api/runner/common/stats" + "gitlab.oracledx.com/odx/functions/api/runner/common/stats" ) // An Environment is a long lived object that carries around 'configuration' diff --git a/api/runner/drivers/docker/docker.go b/api/runner/drivers/docker/docker.go index 29a93cf6b..9931733ed 100644 --- a/api/runner/drivers/docker/docker.go +++ b/api/runner/drivers/docker/docker.go @@ -32,9 +32,9 @@ import ( manifest "github.com/docker/distribution/manifest/schema1" "github.com/fsouza/go-dockerclient" "github.com/heroku/docker-registry-client/registry" - "github.com/treeder/functions/api/runner/common" - "github.com/treeder/functions/api/runner/common/stats" - "github.com/treeder/functions/api/runner/drivers" + "gitlab.oracledx.com/odx/functions/api/runner/common" + "gitlab.oracledx.com/odx/functions/api/runner/common/stats" + "gitlab.oracledx.com/odx/functions/api/runner/drivers" ) const hubURL = "https://registry.hub.docker.com" diff --git a/api/runner/drivers/docker/docker_client.go b/api/runner/drivers/docker/docker_client.go index ecc492f3b..ee70fd746 100644 --- a/api/runner/drivers/docker/docker_client.go +++ b/api/runner/drivers/docker/docker_client.go @@ -28,7 +28,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/fsouza/go-dockerclient" - "github.com/treeder/functions/api/runner/common" + "gitlab.oracledx.com/odx/functions/api/runner/common" ) const ( diff --git a/api/runner/drivers/docker/docker_test.go b/api/runner/drivers/docker/docker_test.go index 88f407c3b..45798ad2e 100644 --- a/api/runner/drivers/docker/docker_test.go +++ b/api/runner/drivers/docker/docker_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/treeder/functions/api/runner/common" - "github.com/treeder/functions/api/runner/drivers" + "gitlab.oracledx.com/odx/functions/api/runner/common" + "gitlab.oracledx.com/odx/functions/api/runner/drivers" "github.com/vrischmann/envconfig" ) diff --git a/api/runner/drivers/mock/mocker.go b/api/runner/drivers/mock/mocker.go index f09f87226..6d5c959fe 100644 --- a/api/runner/drivers/mock/mocker.go +++ b/api/runner/drivers/mock/mocker.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "github.com/treeder/functions/api/runner/drivers" + "gitlab.oracledx.com/odx/functions/api/runner/drivers" ) func New() drivers.Driver { diff --git a/api/runner/func_logger.go b/api/runner/func_logger.go index aaf264bb1..77237a283 100644 --- a/api/runner/func_logger.go +++ b/api/runner/func_logger.go @@ -6,7 +6,7 @@ import ( "context" "github.com/Sirupsen/logrus" - "github.com/treeder/functions/api/runner/common" + "gitlab.oracledx.com/odx/functions/api/runner/common" ) type FuncLogger interface { diff --git a/api/runner/metric_logger.go b/api/runner/metric_logger.go index 37f94e5e6..be67ad27b 100644 --- a/api/runner/metric_logger.go +++ b/api/runner/metric_logger.go @@ -5,7 +5,7 @@ import ( "time" "github.com/Sirupsen/logrus" - "github.com/treeder/functions/api/runner/common" + "gitlab.oracledx.com/odx/functions/api/runner/common" ) type MetricLogger interface { diff --git a/api/runner/protocol/default.go b/api/runner/protocol/default.go index 71e9bbd4b..fbb2f4b86 100644 --- a/api/runner/protocol/default.go +++ b/api/runner/protocol/default.go @@ -3,7 +3,7 @@ package protocol import ( "context" - "github.com/treeder/functions/api/runner/task" + "gitlab.oracledx.com/odx/functions/api/runner/task" ) // DefaultProtocol is the protocol used by cold-containers diff --git a/api/runner/protocol/factory.go b/api/runner/protocol/factory.go index 39276aa20..29b2d4ac9 100644 --- a/api/runner/protocol/factory.go +++ b/api/runner/protocol/factory.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/runner/task" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/runner/task" ) var errInvalidProtocol = errors.New("Invalid Protocol") diff --git a/api/runner/protocol/http.go b/api/runner/protocol/http.go index 39081a17b..7e9890d66 100644 --- a/api/runner/protocol/http.go +++ b/api/runner/protocol/http.go @@ -10,8 +10,8 @@ import ( "net/http/httputil" "time" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/runner/task" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/runner/task" ) // HTTPProtocol converts stdin/stdout streams into HTTP/1.1 compliant diff --git a/api/runner/runner.go b/api/runner/runner.go index 6fd0eb346..b2b1b8bcb 100644 --- a/api/runner/runner.go +++ b/api/runner/runner.go @@ -14,12 +14,12 @@ import ( "time" "github.com/Sirupsen/logrus" - "github.com/treeder/functions/api/runner/common" - "github.com/treeder/functions/api/runner/drivers" - driverscommon "github.com/treeder/functions/api/runner/drivers" - "github.com/treeder/functions/api/runner/drivers/docker" - "github.com/treeder/functions/api/runner/drivers/mock" - "github.com/treeder/functions/api/runner/task" + "gitlab.oracledx.com/odx/functions/api/runner/common" + "gitlab.oracledx.com/odx/functions/api/runner/drivers" + driverscommon "gitlab.oracledx.com/odx/functions/api/runner/drivers" + "gitlab.oracledx.com/odx/functions/api/runner/drivers/docker" + "gitlab.oracledx.com/odx/functions/api/runner/drivers/mock" + "gitlab.oracledx.com/odx/functions/api/runner/task" ) type Runner struct { diff --git a/api/runner/runner_test.go b/api/runner/runner_test.go index ea5ec8bb0..a8e716981 100644 --- a/api/runner/runner_test.go +++ b/api/runner/runner_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/runner/task" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/runner/task" ) func TestRunnerHello(t *testing.T) { diff --git a/api/runner/task.go b/api/runner/task.go index e3cb0971c..f701296b0 100644 --- a/api/runner/task.go +++ b/api/runner/task.go @@ -11,8 +11,8 @@ import ( "github.com/moby/moby/cli/config/configfile" docker "github.com/fsouza/go-dockerclient" - "github.com/treeder/functions/api/runner/task" - "github.com/treeder/functions/api/runner/drivers" + "gitlab.oracledx.com/odx/functions/api/runner/task" + "gitlab.oracledx.com/odx/functions/api/runner/drivers" ) var registries dockerRegistries diff --git a/api/runner/task/task.go b/api/runner/task/task.go index b8a639878..ecf73a77c 100644 --- a/api/runner/task/task.go +++ b/api/runner/task/task.go @@ -5,7 +5,7 @@ import ( "io" "time" - "github.com/treeder/functions/api/runner/drivers" + "gitlab.oracledx.com/odx/functions/api/runner/drivers" ) type Config struct { diff --git a/api/runner/worker.go b/api/runner/worker.go index 6878d6c03..b7d7e4e45 100644 --- a/api/runner/worker.go +++ b/api/runner/worker.go @@ -9,9 +9,9 @@ import ( "time" "github.com/Sirupsen/logrus" - "github.com/treeder/functions/api/runner/protocol" - "github.com/treeder/functions/api/runner/task" - "github.com/treeder/functions/api/runner/drivers" + "gitlab.oracledx.com/odx/functions/api/runner/protocol" + "gitlab.oracledx.com/odx/functions/api/runner/task" + "gitlab.oracledx.com/odx/functions/api/runner/drivers" ) // hot functions - theory of operation diff --git a/api/server/app_listeners.go b/api/server/app_listeners.go index 75d689148..75858e659 100644 --- a/api/server/app_listeners.go +++ b/api/server/app_listeners.go @@ -3,7 +3,7 @@ package server import ( "context" - "github.com/treeder/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/models" ) type AppListener interface { diff --git a/api/server/apps_create.go b/api/server/apps_create.go index ed8d40512..43ff4282f 100644 --- a/api/server/apps_create.go +++ b/api/server/apps_create.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/runner/common" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/runner/common" ) func (s *Server) handleAppCreate(c *gin.Context) { diff --git a/api/server/apps_delete.go b/api/server/apps_delete.go index 3038a24ad..62e10e2f9 100644 --- a/api/server/apps_delete.go +++ b/api/server/apps_delete.go @@ -5,9 +5,9 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/runner/common" + "gitlab.oracledx.com/odx/functions/api" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/runner/common" ) func (s *Server) handleAppDelete(c *gin.Context) { diff --git a/api/server/apps_get.go b/api/server/apps_get.go index c8a4ec04f..454fed2e7 100644 --- a/api/server/apps_get.go +++ b/api/server/apps_get.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api" + "gitlab.oracledx.com/odx/functions/api" ) func (s *Server) handleAppGet(c *gin.Context) { diff --git a/api/server/apps_list.go b/api/server/apps_list.go index 565b9f821..2414db4bd 100644 --- a/api/server/apps_list.go +++ b/api/server/apps_list.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/models" ) func (s *Server) handleAppList(c *gin.Context) { diff --git a/api/server/apps_test.go b/api/server/apps_test.go index c2b97a7f9..752208c26 100644 --- a/api/server/apps_test.go +++ b/api/server/apps_test.go @@ -9,10 +9,10 @@ import ( "github.com/Sirupsen/logrus" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api/datastore" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/mqs" - "github.com/treeder/functions/api/runner/task" + "gitlab.oracledx.com/odx/functions/api/datastore" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/mqs" + "gitlab.oracledx.com/odx/functions/api/runner/task" ) func setLogBuffer() *bytes.Buffer { diff --git a/api/server/apps_update.go b/api/server/apps_update.go index 032ca7d14..c6fdd97b7 100644 --- a/api/server/apps_update.go +++ b/api/server/apps_update.go @@ -5,9 +5,9 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/runner/common" + "gitlab.oracledx.com/odx/functions/api" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/runner/common" ) func (s *Server) handleAppUpdate(c *gin.Context) { diff --git a/api/server/error_response.go b/api/server/error_response.go index 5cc775a85..c4b25bf9a 100644 --- a/api/server/error_response.go +++ b/api/server/error_response.go @@ -4,8 +4,8 @@ import ( "context" "errors" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/runner/common" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/runner/common" "net/http" ) diff --git a/api/server/extension_points.go b/api/server/extension_points.go index 605a0b0c9..4099cbaef 100644 --- a/api/server/extension_points.go +++ b/api/server/extension_points.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api" - "github.com/treeder/functions/api/models" + "gitlab.oracledx.com/odx/functions/api" + "gitlab.oracledx.com/odx/functions/api/models" ) type ApiHandlerFunc func(w http.ResponseWriter, r *http.Request) diff --git a/api/server/internal/routecache/lru.go b/api/server/internal/routecache/lru.go index 70206eadc..82e1b5983 100644 --- a/api/server/internal/routecache/lru.go +++ b/api/server/internal/routecache/lru.go @@ -8,7 +8,7 @@ package routecache import ( "container/list" - "github.com/treeder/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/models" ) // Cache holds an internal linkedlist for hotness management. It is not safe diff --git a/api/server/middleware.go b/api/server/middleware.go index 284ea7ae1..a88d63daf 100644 --- a/api/server/middleware.go +++ b/api/server/middleware.go @@ -7,7 +7,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/models" ) // Middleware is the interface required for implementing functions middlewar diff --git a/api/server/routes_create.go b/api/server/routes_create.go index 5660433c7..7ac5ddac0 100644 --- a/api/server/routes_create.go +++ b/api/server/routes_create.go @@ -5,9 +5,9 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/runner/common" + "gitlab.oracledx.com/odx/functions/api" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/runner/common" ) func (s *Server) handleRouteCreate(c *gin.Context) { diff --git a/api/server/routes_delete.go b/api/server/routes_delete.go index 7c37376de..6539758c0 100644 --- a/api/server/routes_delete.go +++ b/api/server/routes_delete.go @@ -6,7 +6,7 @@ import ( "path" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api" + "gitlab.oracledx.com/odx/functions/api" ) func (s *Server) handleRouteDelete(c *gin.Context) { diff --git a/api/server/routes_get.go b/api/server/routes_get.go index ebc399614..cfef2b750 100644 --- a/api/server/routes_get.go +++ b/api/server/routes_get.go @@ -6,7 +6,7 @@ import ( "path" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api" + "gitlab.oracledx.com/odx/functions/api" ) func (s *Server) handleRouteGet(c *gin.Context) { diff --git a/api/server/routes_list.go b/api/server/routes_list.go index df960dfc0..5b2df03a2 100644 --- a/api/server/routes_list.go +++ b/api/server/routes_list.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api" - "github.com/treeder/functions/api/models" + "gitlab.oracledx.com/odx/functions/api" + "gitlab.oracledx.com/odx/functions/api/models" ) func (s *Server) handleRouteList(c *gin.Context) { diff --git a/api/server/routes_test.go b/api/server/routes_test.go index aa9219f9c..e38e52769 100644 --- a/api/server/routes_test.go +++ b/api/server/routes_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/treeder/functions/api/datastore" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/mqs" + "gitlab.oracledx.com/odx/functions/api/datastore" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/mqs" ) func TestRouteCreate(t *testing.T) { diff --git a/api/server/routes_update.go b/api/server/routes_update.go index 867e9cbd4..f2aa767be 100644 --- a/api/server/routes_update.go +++ b/api/server/routes_update.go @@ -6,9 +6,9 @@ import ( "path" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/runner/common" + "gitlab.oracledx.com/odx/functions/api" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/runner/common" ) func (s *Server) handleRouteUpdate(c *gin.Context) { diff --git a/api/server/runner.go b/api/server/runner.go index 9baa387a1..95ecd08f9 100644 --- a/api/server/runner.go +++ b/api/server/runner.go @@ -14,11 +14,11 @@ import ( "github.com/Sirupsen/logrus" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/runner" - "github.com/treeder/functions/api/runner/task" - "github.com/treeder/functions/api/runner/common" + "gitlab.oracledx.com/odx/functions/api" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/runner" + "gitlab.oracledx.com/odx/functions/api/runner/task" + "gitlab.oracledx.com/odx/functions/api/runner/common" uuid "github.com/satori/go.uuid" ) diff --git a/api/server/runner_async_test.go b/api/server/runner_async_test.go index 220f7443a..7206406fe 100644 --- a/api/server/runner_async_test.go +++ b/api/server/runner_async_test.go @@ -9,12 +9,12 @@ import ( "testing" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api/datastore" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/mqs" - "github.com/treeder/functions/api/runner" - "github.com/treeder/functions/api/runner/task" - "github.com/treeder/functions/api/server/internal/routecache" + "gitlab.oracledx.com/odx/functions/api/datastore" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/mqs" + "gitlab.oracledx.com/odx/functions/api/runner" + "gitlab.oracledx.com/odx/functions/api/runner/task" + "gitlab.oracledx.com/odx/functions/api/server/internal/routecache" ) func testRouterAsync(ds models.Datastore, mq models.MessageQueue, rnr *runner.Runner, tasks chan task.Request, enqueue models.Enqueue) *gin.Engine { diff --git a/api/server/runner_listeners.go b/api/server/runner_listeners.go index 84dab1d30..798e1b0ed 100644 --- a/api/server/runner_listeners.go +++ b/api/server/runner_listeners.go @@ -2,7 +2,7 @@ package server import ( "context" - "github.com/treeder/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/models" ) type RunnerListener interface { diff --git a/api/server/runner_test.go b/api/server/runner_test.go index fe757dbb5..567ef89a6 100644 --- a/api/server/runner_test.go +++ b/api/server/runner_test.go @@ -7,11 +7,11 @@ import ( "strings" "testing" - "github.com/treeder/functions/api/datastore" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/mqs" - "github.com/treeder/functions/api/runner" - "github.com/treeder/functions/api/runner/task" + "gitlab.oracledx.com/odx/functions/api/datastore" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/mqs" + "gitlab.oracledx.com/odx/functions/api/runner" + "gitlab.oracledx.com/odx/functions/api/runner/task" ) func testRunner(t *testing.T) (*runner.Runner, context.CancelFunc) { diff --git a/api/server/server.go b/api/server/server.go index 46fddd7c1..8ac14f2d9 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -14,14 +14,14 @@ import ( "github.com/Sirupsen/logrus" "github.com/ccirello/supervisor" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api" - "github.com/treeder/functions/api/datastore" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/mqs" - "github.com/treeder/functions/api/runner" - "github.com/treeder/functions/api/runner/task" - "github.com/treeder/functions/api/server/internal/routecache" - "github.com/treeder/functions/api/runner/common" + "gitlab.oracledx.com/odx/functions/api" + "gitlab.oracledx.com/odx/functions/api/datastore" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/mqs" + "gitlab.oracledx.com/odx/functions/api/runner" + "gitlab.oracledx.com/odx/functions/api/runner/task" + "gitlab.oracledx.com/odx/functions/api/server/internal/routecache" + "gitlab.oracledx.com/odx/functions/api/runner/common" "github.com/spf13/viper" ) diff --git a/api/server/server_test.go b/api/server/server_test.go index 4031360e8..adb8773c2 100644 --- a/api/server/server_test.go +++ b/api/server/server_test.go @@ -12,12 +12,12 @@ import ( "testing" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api/datastore" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/mqs" - "github.com/treeder/functions/api/runner" - "github.com/treeder/functions/api/runner/task" - "github.com/treeder/functions/api/server/internal/routecache" + "gitlab.oracledx.com/odx/functions/api/datastore" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/mqs" + "gitlab.oracledx.com/odx/functions/api/runner" + "gitlab.oracledx.com/odx/functions/api/runner/task" + "gitlab.oracledx.com/odx/functions/api/server/internal/routecache" ) var tmpBolt = "/tmp/func_test_bolt.db" diff --git a/api/server/singleflight.go b/api/server/singleflight.go index 7282950ac..cd5184e67 100644 --- a/api/server/singleflight.go +++ b/api/server/singleflight.go @@ -5,7 +5,7 @@ package server import ( "sync" - "github.com/treeder/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/models" ) // call is an in-flight or completed do call diff --git a/api/server/version.go b/api/server/version.go index a26118c5d..8e8d85107 100644 --- a/api/server/version.go +++ b/api/server/version.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/treeder/functions/api/version" + "gitlab.oracledx.com/odx/functions/api/version" ) func handleVersion(c *gin.Context) { diff --git a/examples/blog/database/post.go b/examples/blog/database/post.go index 7c8a1401a..3b624431d 100644 --- a/examples/blog/database/post.go +++ b/examples/blog/database/post.go @@ -3,7 +3,7 @@ package database import ( "errors" - "github.com/treeder/functions/examples/blog/models" + "gitlab.oracledx.com/odx/functions/examples/blog/models" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" ) diff --git a/examples/blog/database/user.go b/examples/blog/database/user.go index f77a509d5..e2f35e1a2 100644 --- a/examples/blog/database/user.go +++ b/examples/blog/database/user.go @@ -1,7 +1,7 @@ package database import ( - "github.com/treeder/functions/examples/blog/models" + "gitlab.oracledx.com/odx/functions/examples/blog/models" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" ) diff --git a/examples/blog/function.go b/examples/blog/function.go index c095cae26..1860a9402 100644 --- a/examples/blog/function.go +++ b/examples/blog/function.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "github.com/treeder/functions/examples/blog/database" - "github.com/treeder/functions/examples/blog/models" - "github.com/treeder/functions/examples/blog/routes" + "gitlab.oracledx.com/odx/functions/examples/blog/database" + "gitlab.oracledx.com/odx/functions/examples/blog/models" + "gitlab.oracledx.com/odx/functions/examples/blog/routes" ) var noAuth = map[string]interface{}{} diff --git a/examples/blog/routes/post_create.go b/examples/blog/routes/post_create.go index fb6328e98..b47b92be4 100644 --- a/examples/blog/routes/post_create.go +++ b/examples/blog/routes/post_create.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/treeder/functions/examples/blog/database" - "github.com/treeder/functions/examples/blog/models" + "gitlab.oracledx.com/odx/functions/examples/blog/database" + "gitlab.oracledx.com/odx/functions/examples/blog/models" ) func HandlePostCreate(db *database.Database, auth map[string]interface{}) { diff --git a/examples/blog/routes/post_list.go b/examples/blog/routes/post_list.go index 445743988..35873767a 100644 --- a/examples/blog/routes/post_list.go +++ b/examples/blog/routes/post_list.go @@ -1,7 +1,7 @@ package route import ( - "github.com/treeder/functions/examples/blog/database" + "gitlab.oracledx.com/odx/functions/examples/blog/database" "gopkg.in/mgo.v2/bson" ) diff --git a/examples/blog/routes/post_read.go b/examples/blog/routes/post_read.go index 4f958434d..0836e97c8 100644 --- a/examples/blog/routes/post_read.go +++ b/examples/blog/routes/post_read.go @@ -3,7 +3,7 @@ package route import ( "os" - "github.com/treeder/functions/examples/blog/database" + "gitlab.oracledx.com/odx/functions/examples/blog/database" ) func HandlePostRead(db *database.Database, auth map[string]interface{}) { diff --git a/examples/blog/routes/server.go b/examples/blog/routes/server.go index 1e355e0db..9782764dc 100644 --- a/examples/blog/routes/server.go +++ b/examples/blog/routes/server.go @@ -8,8 +8,8 @@ import ( "time" "github.com/dgrijalva/jwt-go" - "github.com/treeder/functions/examples/blog/database" - "github.com/treeder/functions/examples/blog/models" + "gitlab.oracledx.com/odx/functions/examples/blog/database" + "gitlab.oracledx.com/odx/functions/examples/blog/models" "golang.org/x/crypto/bcrypt" ) diff --git a/examples/extensions/main.go b/examples/extensions/main.go index f5f0b2923..c08c3ff8a 100644 --- a/examples/extensions/main.go +++ b/examples/extensions/main.go @@ -6,8 +6,8 @@ import ( "html" "net/http" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/server" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/server" ) func main() { diff --git a/examples/middleware/main.go b/examples/middleware/main.go index ea081f7fb..3852077b3 100644 --- a/examples/middleware/main.go +++ b/examples/middleware/main.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/treeder/functions/api/models" - "github.com/treeder/functions/api/server" + "gitlab.oracledx.com/odx/functions/api/models" + "gitlab.oracledx.com/odx/functions/api/server" ) func main() { diff --git a/fn/common.go b/fn/common.go index b4408dedb..9d0c8a074 100644 --- a/fn/common.go +++ b/fn/common.go @@ -11,7 +11,7 @@ import ( "strings" "text/template" - "github.com/treeder/functions/fn/langs" + "gitlab.oracledx.com/odx/functions/fn/langs" ) func verbwriter(verbose bool) io.Writer { diff --git a/fn/init.go b/fn/init.go index c6dc74049..4e46293f8 100644 --- a/fn/init.go +++ b/fn/init.go @@ -17,7 +17,7 @@ import ( "strings" - "github.com/treeder/functions/fn/langs" + "gitlab.oracledx.com/odx/functions/fn/langs" "github.com/urfave/cli" ) diff --git a/fn/main.go b/fn/main.go index 3138e84e8..d7fa3280e 100644 --- a/fn/main.go +++ b/fn/main.go @@ -7,7 +7,7 @@ import ( "os" "strings" - vers "github.com/treeder/functions/api/version" + vers "gitlab.oracledx.com/odx/functions/api/version" functions "github.com/iron-io/functions_go" "github.com/urfave/cli" ) diff --git a/fn/version.go b/fn/version.go index 1b72e73bb..ec4e01ada 100644 --- a/fn/version.go +++ b/fn/version.go @@ -5,7 +5,7 @@ import ( "net/url" "os" - vers "github.com/treeder/functions/api/version" + vers "gitlab.oracledx.com/odx/functions/api/version" functions "github.com/iron-io/functions_go" "github.com/urfave/cli" ) diff --git a/lb/fnlb/main.go b/lb/fnlb/main.go index 7e21d28ca..66066fc5f 100644 --- a/lb/fnlb/main.go +++ b/lb/fnlb/main.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "github.com/treeder/functions/lb" + "gitlab.oracledx.com/odx/functions/lb" ) var ( diff --git a/main.go b/main.go index 07d9a4872..725627bdd 100644 --- a/main.go +++ b/main.go @@ -3,7 +3,7 @@ package main import ( "context" - "github.com/treeder/functions/api/server" + "gitlab.oracledx.com/odx/functions/api/server" ) func main() {