alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename to GitHub (#3)

Browse Source 
* circle

* Rename to github and fn->cli

*  Rename to github and fn->cli
This commit is contained in:
Travis Reeder
2017-07-26 10:50:19 -07:00
committed by GitHub
parent 27b665422d
commit 48e3781d5e
9861 changed files with 213 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
.circleci/config.yml
View File

@@ -5,9 +5,34 @@ version: 2
jobs: jobs:
build: build:
machine: true machine: true
working_directory: /go/src/github.com/{{ORG_NAME}}/{{REPO_NAME}}
steps:
- checkout
# update docker # update docker
- run: docker version - run: docker version
- run: sudo service docker stop - run: sudo service docker stop
- run: curl -fsSL https://get.docker.com/ | sudo sh - run: curl -fsSL https://get.docker.com/ | sudo sh
- run: docker version - run: docker version
- run: ./test.sh - run: ./test.sh
# docker:
# # specify the version
# - image: circleci/golang:1.8
# # Specify service dependencies here if necessary
# # CircleCI maintains a library of pre-built images
# # documented at https://circleci.com/docs/2.0/circleci-images/
# # - image: circleci/postgres:9.4
# #### TEMPLATE_NOTE: go expects specific checkout path representing url
# #### expecting it in the form of
# #### /go/src/github.com/circleci/go-tool
# #### /go/src/bitbucket.org/circleci/go-tool
# working_directory: /go/src/github.com/{{ORG_NAME}}/{{REPO_NAME}}
# steps:
# - checkout
# # specify any bash command here prefixed with `run: `
# # - run: go get -v -t -d ./...
# - run: ./test.sh

2
.gitlab-ci.yml
View File

@@ -13,7 +13,7 @@ stages:
before_script: before_script:
- mkdir -p "${GOPATH}/src/gitlab-odx.oracle.com/odx/" - mkdir -p "${GOPATH}/src/gitlab-odx.oracle.com/odx/"
- ln -s `pwd` "${GOPATH}/src/gitlab-odx.oracle.com/odx/" - ln -s `pwd` "${GOPATH}/src/gitlab-odx.oracle.com/odx/"
- cd "${GOPATH}/src/gitlab-odx.oracle.com/odx/functions" - cd "${GOPATH}/src/github.com/fnproject/fn"
build_job: build_job:
stage: build stage: build

10
Makefile
View File

@@ -30,11 +30,11 @@ run: build
docker-dep: docker-dep:
# todo: need to create a dep tool image for this (or just ditch this) # todo: need to create a dep tool image for this (or just ditch this)
docker run --rm -it -v ${CURDIR}:/go/src/gitlab-odx.oracle.com/odx/functions -w /go/src/gitlab-odx.oracle.com/odx/functions treeder/glide install -v docker run --rm -it -v ${CURDIR}:/go/src/github.com/fnproject/fn -w /go/src/github.com/fnproject/fn treeder/glide install -v
docker-build: docker-build:
docker pull funcy/go:dev docker pull funcy/go:dev
docker run --rm -v ${CURDIR}:/go/src/gitlab-odx.oracle.com/odx/functions -w /go/src/gitlab-odx.oracle.com/odx/functions funcy/go:dev go build -o functions-alpine docker run --rm -v ${CURDIR}:/go/src/github.com/fnproject/fn -w /go/src/github.com/fnproject/fn funcy/go:dev go build -o functions-alpine
docker build --build-arg HTTP_PROXY -t funcy/functions:latest . docker build --build-arg HTTP_PROXY -t funcy/functions:latest .
docker-run: docker-build docker-run: docker-build
@@ -52,9 +52,9 @@ docker-test-run-with-postgres:
docker-test: docker-test:
docker run -ti --privileged --rm -e LOG_LEVEL=debug \ docker run -ti --privileged --rm -e LOG_LEVEL=debug \
-v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/docker.sock:/var/run/docker.sock \
-v ${CURDIR}:/go/src/gitlab-odx.oracle.com/odx/functions \ -v ${CURDIR}:/go/src/github.com/fnproject/fn \
-w /go/src/gitlab-odx.oracle.com/odx/functions \ -w /go/src/github.com/fnproject/fn \
funcy/go:dev go test \ funcy/go:dev go test \
-v $(shell docker run --rm -ti -v ${CURDIR}:/go/src/gitlab-odx.oracle.com/odx/functions -w /go/src/gitlab-odx.oracle.com/odx/functions -e GOPATH=/go golang:alpine sh -c 'go list ./... | grep -v vendor | grep -v examples | grep -v tool | grep -v fn') -v $(shell docker run --rm -ti -v ${CURDIR}:/go/src/github.com/fnproject/fn -w /go/src/github.com/fnproject/fn -e GOPATH=/go golang:alpine sh -c 'go list ./... | grep -v vendor | grep -v examples | grep -v tool | grep -v fn')
all: dep build all: dep build

6
README.md
View File

@@ -1,4 +1,4 @@
# Oracle Functions [![build status](https://gitlab-odx.oracle.com/odx/functions/badges/master/build.svg)](https://gitlab-odx.oracle.com/odx/functions/commits/master) # Oracle Functions [![build status](https://github.com/fnproject/fn/badges/master/build.svg)](https://github.com/fnproject/fn/commits/master)
<!-- [![GoDoc](https://godoc.org/github.com/treeder/functions?status.svg)](https://godoc.org/github.com/treeder/functions) --> <!-- [![GoDoc](https://godoc.org/github.com/treeder/functions?status.svg)](https://godoc.org/github.com/treeder/functions) -->
@@ -52,7 +52,7 @@ export API_URL=http://129.146.10.253:80
Download the pre-built CLI binary: Download the pre-built CLI binary:
1. Visit: https://gitlab-odx.oracle.com/odx/functions/tree/master/fn/releases/download/0.3.2 1. Visit: https://github.com/fnproject/fn/tree/master/fn/releases/download/0.3.2
2. Download the CLI for your platform 2. Download the CLI for your platform
3. Put in /usr/local/bin 3. Put in /usr/local/bin
4. chmod +x 4. chmod +x
@@ -139,7 +139,7 @@ you can update your code and run `fn deploy myapp` again.
- TODO: Slack or Discord community - TODO: Slack or Discord community
- Learn how to [contribute](CONTRIBUTING.md) - Learn how to [contribute](CONTRIBUTING.md)
- See [milestones](https://gitlab-odx.oracle.com/odx/functions/milestones) for detailed issues - See [milestones](https://github.com/fnproject/fn/milestones) for detailed issues
## User Interface ## User Interface

6
api/datastore/datastore.go
View File

@@ -5,9 +5,9 @@ import (
"net/url" "net/url"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"gitlab-odx.oracle.com/odx/functions/api/datastore/internal/datastoreutil" "github.com/fnproject/fn/api/datastore/internal/datastoreutil"
"gitlab-odx.oracle.com/odx/functions/api/datastore/sql" "github.com/fnproject/fn/api/datastore/sql"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
func New(dbURL string) (models.Datastore, error) { func New(dbURL string) (models.Datastore, error) {

4
api/datastore/internal/datastoretest/test.go
View File

@@ -6,8 +6,8 @@ import (
"log" "log"
"testing" "testing"
"gitlab-odx.oracle.com/odx/functions/api/id" "github.com/fnproject/fn/api/id"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"net/http" "net/http"
"reflect" "reflect"

2
api/datastore/internal/datastoreutil/metrics.go
View File

@@ -5,7 +5,7 @@ import (
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
func MetricDS(ds models.Datastore) models.Datastore { func MetricDS(ds models.Datastore) models.Datastore {

2
api/datastore/internal/datastoreutil/validator.go
View File

@@ -5,7 +5,7 @@ import (
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
// NewValidator returns a models.Datastore which validates certain arguments before delegating to ds. // NewValidator returns a models.Datastore which validates certain arguments before delegating to ds.

6
api/datastore/mock.go
View File

@@ -5,9 +5,9 @@ import (
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"gitlab-odx.oracle.com/odx/functions/api/datastore/internal/datastoreutil" "github.com/fnproject/fn/api/datastore/internal/datastoreutil"
"gitlab-odx.oracle.com/odx/functions/api/logs" "github.com/fnproject/fn/api/logs"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
type mock struct { type mock struct {

2
api/datastore/mock_test.go
View File

@@ -3,7 +3,7 @@ package datastore
import ( import (
"testing" "testing"
"gitlab-odx.oracle.com/odx/functions/api/datastore/internal/datastoretest" "github.com/fnproject/fn/api/datastore/internal/datastoretest"
) )
func TestDatastore(t *testing.T) { func TestDatastore(t *testing.T) {

2
api/datastore/sql/sql.go
View File

@@ -20,7 +20,7 @@ import (
_ "github.com/lib/pq" _ "github.com/lib/pq"
"github.com/mattn/go-sqlite3" "github.com/mattn/go-sqlite3"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
// this aims to be an ANSI-SQL compliant package that uses only question // this aims to be an ANSI-SQL compliant package that uses only question

4
api/logs/log.go
View File

@@ -5,8 +5,8 @@ import (
"net/url" "net/url"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"gitlab-odx.oracle.com/odx/functions/api/datastore/sql" "github.com/fnproject/fn/api/datastore/sql"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
func New(dbURL string) (models.FnLog, error) { func New(dbURL string) (models.FnLog, error) {

4
api/logs/log_test.go
View File

@@ -5,8 +5,8 @@ import (
"os" "os"
"testing" "testing"
"gitlab-odx.oracle.com/odx/functions/api/datastore/sql" "github.com/fnproject/fn/api/datastore/sql"
logTesting "gitlab-odx.oracle.com/odx/functions/api/logs/testing" logTesting "github.com/fnproject/fn/api/logs/testing"
) )
const tmpLogDb = "/tmp/func_test_log.db" const tmpLogDb = "/tmp/func_test_log.db"

2
api/logs/mock.go
View File

@@ -3,7 +3,7 @@ package logs
import ( import (
"context" "context"
"github.com/pkg/errors" "github.com/pkg/errors"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
type mock struct { type mock struct {

4
api/logs/testing/test.go
View File

@@ -7,8 +7,8 @@ import (
"time" "time"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"gitlab-odx.oracle.com/odx/functions/api/id" "github.com/fnproject/fn/api/id"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
var testApp = &models.App{ var testApp = &models.App{

2
api/logs/validator.go
View File

@@ -3,7 +3,7 @@ package logs
import ( import (
"context" "context"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
type FnLog interface { type FnLog interface {

4
api/mqs/bolt.go
View File

@@ -13,8 +13,8 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/boltdb/bolt" "github.com/boltdb/bolt"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/runner/common" "github.com/fnproject/fn/api/runner/common"
) )
type BoltDbMQ struct { type BoltDbMQ struct {

2
api/mqs/ironmq.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
mq_config "github.com/iron-io/iron_go3/config" mq_config "github.com/iron-io/iron_go3/config"
ironmq "github.com/iron-io/iron_go3/mq" ironmq "github.com/iron-io/iron_go3/mq"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
type assoc struct { type assoc struct {

4
api/mqs/memory.go
View File

@@ -9,8 +9,8 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/google/btree" "github.com/google/btree"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/runner/common" "github.com/fnproject/fn/api/runner/common"
) )
type MemoryMQ struct { type MemoryMQ struct {

2
api/mqs/mock.go
View File

@@ -3,7 +3,7 @@ package mqs
import ( import (
"context" "context"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
type Mock struct { type Mock struct {

2
api/mqs/new.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
// New will parse the URL and return the correct MQ implementation. // New will parse the URL and return the correct MQ implementation.

4
api/mqs/redis.go
View File

@@ -11,8 +11,8 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/garyburd/redigo/redis" "github.com/garyburd/redigo/redis"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/runner/common" "github.com/fnproject/fn/api/runner/common"
) )
type RedisMQ struct { type RedisMQ struct {

6
api/runner/async_runner.go
View File

@@ -16,9 +16,9 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/runner/common" "github.com/fnproject/fn/api/runner/common"
"gitlab-odx.oracle.com/odx/functions/api/runner/task" "github.com/fnproject/fn/api/runner/task"
) )
func getTask(ctx context.Context, url string) (*models.Task, error) { func getTask(ctx context.Context, url string) (*models.Task, error) {

12
api/runner/async_runner_test.go
View File

@@ -15,12 +15,12 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab-odx.oracle.com/odx/functions/api/datastore" "github.com/fnproject/fn/api/datastore"
"gitlab-odx.oracle.com/odx/functions/api/logs" "github.com/fnproject/fn/api/logs"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/mqs" "github.com/fnproject/fn/api/mqs"
"gitlab-odx.oracle.com/odx/functions/api/runner/drivers" "github.com/fnproject/fn/api/runner/drivers"
"gitlab-odx.oracle.com/odx/functions/api/runner/task" "github.com/fnproject/fn/api/runner/task"
) )
func setLogBuffer() *bytes.Buffer { func setLogBuffer() *bytes.Buffer {

2
api/runner/common/environment.go
View File

@@ -1,7 +1,7 @@
package common package common
import ( import (
"gitlab-odx.oracle.com/odx/functions/api/runner/common/stats" "github.com/fnproject/fn/api/runner/common/stats"
) )
// An Environment is a long lived object that carries around 'configuration' // An Environment is a long lived object that carries around 'configuration'

4
api/runner/drivers/docker/docker.go
View File

@@ -18,8 +18,8 @@ import (
"github.com/fsouza/go-dockerclient" "github.com/fsouza/go-dockerclient"
"github.com/heroku/docker-registry-client/registry" "github.com/heroku/docker-registry-client/registry"
"github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go"
"gitlab-odx.oracle.com/odx/functions/api/runner/common" "github.com/fnproject/fn/api/runner/common"
"gitlab-odx.oracle.com/odx/functions/api/runner/drivers" "github.com/fnproject/fn/api/runner/drivers"
) )
const hubURL = "https://registry.hub.docker.com" const hubURL = "https://registry.hub.docker.com"

2
api/runner/drivers/docker/docker_client.go
View File

@@ -16,7 +16,7 @@ import (
"github.com/fsouza/go-dockerclient" "github.com/fsouza/go-dockerclient"
"github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go"
"github.com/opentracing/opentracing-go/log" "github.com/opentracing/opentracing-go/log"
"gitlab-odx.oracle.com/odx/functions/api/runner/common" "github.com/fnproject/fn/api/runner/common"
) )
const ( const (

4
api/runner/drivers/docker/docker_test.go
View File

@@ -10,8 +10,8 @@ import (
"time" "time"
"github.com/vrischmann/envconfig" "github.com/vrischmann/envconfig"
"gitlab-odx.oracle.com/odx/functions/api/runner/common" "github.com/fnproject/fn/api/runner/common"
"gitlab-odx.oracle.com/odx/functions/api/runner/drivers" "github.com/fnproject/fn/api/runner/drivers"
) )
type taskDockerTest struct { type taskDockerTest struct {

2
api/runner/drivers/mock/mocker.go
View File

@@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"time" "time"
"gitlab-odx.oracle.com/odx/functions/api/runner/drivers" "github.com/fnproject/fn/api/runner/drivers"
) )
func New() drivers.Driver { func New() drivers.Driver {

4
api/runner/func_logger.go
View File

@@ -9,8 +9,8 @@ import (
"sync" "sync"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/runner/common" "github.com/fnproject/fn/api/runner/common"
) )
// TODO kind of no reason to have FuncLogger interface... we can just do the thing. // TODO kind of no reason to have FuncLogger interface... we can just do the thing.

2
api/runner/protocol/default.go
View File

@@ -3,7 +3,7 @@ package protocol
import ( import (
"context" "context"
"gitlab-odx.oracle.com/odx/functions/api/runner/task" "github.com/fnproject/fn/api/runner/task"
) )
// DefaultProtocol is the protocol used by cold-containers // DefaultProtocol is the protocol used by cold-containers

4
api/runner/protocol/factory.go
View File

@@ -5,8 +5,8 @@ import (
"errors" "errors"
"io" "io"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/runner/task" "github.com/fnproject/fn/api/runner/task"
) )
var errInvalidProtocol = errors.New("Invalid Protocol") var errInvalidProtocol = errors.New("Invalid Protocol")

4
api/runner/protocol/http.go
View File

@@ -10,8 +10,8 @@ import (
"net/http/httputil" "net/http/httputil"
"time" "time"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/runner/task" "github.com/fnproject/fn/api/runner/task"
) )
// HTTPProtocol converts stdin/stdout streams into HTTP/1.1 compliant // HTTPProtocol converts stdin/stdout streams into HTTP/1.1 compliant

12
api/runner/runner.go
View File

@@ -16,12 +16,12 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go"
"github.com/opentracing/opentracing-go/log" "github.com/opentracing/opentracing-go/log"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/runner/common" "github.com/fnproject/fn/api/runner/common"
"gitlab-odx.oracle.com/odx/functions/api/runner/drivers" "github.com/fnproject/fn/api/runner/drivers"
"gitlab-odx.oracle.com/odx/functions/api/runner/drivers/docker" "github.com/fnproject/fn/api/runner/drivers/docker"
"gitlab-odx.oracle.com/odx/functions/api/runner/drivers/mock" "github.com/fnproject/fn/api/runner/drivers/mock"
"gitlab-odx.oracle.com/odx/functions/api/runner/task" "github.com/fnproject/fn/api/runner/task"
) )
// TODO clean all of this up, the exposed API is huge and incohesive, // TODO clean all of this up, the exposed API is huge and incohesive,

10
api/runner/runner_test.go
View File

@@ -8,11 +8,11 @@ import (
"testing" "testing"
"time" "time"
"gitlab-odx.oracle.com/odx/functions/api/datastore" "github.com/fnproject/fn/api/datastore"
"gitlab-odx.oracle.com/odx/functions/api/id" "github.com/fnproject/fn/api/id"
"gitlab-odx.oracle.com/odx/functions/api/logs" "github.com/fnproject/fn/api/logs"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/runner/task" "github.com/fnproject/fn/api/runner/task"
) )
func TestRunnerHello(t *testing.T) { func TestRunnerHello(t *testing.T) {

4
api/runner/task.go
View File

@@ -11,8 +11,8 @@ import (
"github.com/docker/cli/cli/config/configfile" "github.com/docker/cli/cli/config/configfile"
docker "github.com/fsouza/go-dockerclient" docker "github.com/fsouza/go-dockerclient"
"gitlab-odx.oracle.com/odx/functions/api/runner/drivers" "github.com/fnproject/fn/api/runner/drivers"
"gitlab-odx.oracle.com/odx/functions/api/runner/task" "github.com/fnproject/fn/api/runner/task"
) )
var registries dockerRegistries var registries dockerRegistries

2
api/runner/task/task.go
View File

@@ -5,7 +5,7 @@ import (
"io" "io"
"time" "time"
"gitlab-odx.oracle.com/odx/functions/api/runner/drivers" "github.com/fnproject/fn/api/runner/drivers"
) )
type Config struct { type Config struct {

10
api/runner/worker.go
View File

@@ -11,11 +11,11 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go"
"gitlab-odx.oracle.com/odx/functions/api/id" "github.com/fnproject/fn/api/id"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/runner/drivers" "github.com/fnproject/fn/api/runner/drivers"
"gitlab-odx.oracle.com/odx/functions/api/runner/protocol" "github.com/fnproject/fn/api/runner/protocol"
"gitlab-odx.oracle.com/odx/functions/api/runner/task" "github.com/fnproject/fn/api/runner/task"
) )
// hot functions - theory of operation // hot functions - theory of operation

2
api/server/app_listeners.go
View File

@@ -3,7 +3,7 @@ package server
import ( import (
"context" "context"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
// AppListener is an interface used to inject custom code at key points in app lifecycle. // AppListener is an interface used to inject custom code at key points in app lifecycle.

2
api/server/apps_create.go
View File

@@ -4,7 +4,7 @@ import (
"net/http" "net/http"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
func (s *Server) handleAppCreate(c *gin.Context) { func (s *Server) handleAppCreate(c *gin.Context) {

6
api/server/apps_delete.go
View File

@@ -4,9 +4,9 @@ import (
"net/http" "net/http"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab-odx.oracle.com/odx/functions/api" "github.com/fnproject/fn/api"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/runner/common" "github.com/fnproject/fn/api/runner/common"
) )
func (s *Server) handleAppDelete(c *gin.Context) { func (s *Server) handleAppDelete(c *gin.Context) {

2
api/server/apps_get.go
View File

@@ -4,7 +4,7 @@ import (
"net/http" "net/http"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab-odx.oracle.com/odx/functions/api" "github.com/fnproject/fn/api"
) )
func (s *Server) handleAppGet(c *gin.Context) { func (s *Server) handleAppGet(c *gin.Context) {

2
api/server/apps_list.go
View File

@@ -4,7 +4,7 @@ import (
"net/http" "net/http"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
func (s *Server) handleAppList(c *gin.Context) { func (s *Server) handleAppList(c *gin.Context) {

8
api/server/apps_test.go
View File

@@ -9,10 +9,10 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab-odx.oracle.com/odx/functions/api/datastore" "github.com/fnproject/fn/api/datastore"
"gitlab-odx.oracle.com/odx/functions/api/logs" "github.com/fnproject/fn/api/logs"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/mqs" "github.com/fnproject/fn/api/mqs"
) )
func setLogBuffer() *bytes.Buffer { func setLogBuffer() *bytes.Buffer {

4
api/server/apps_update.go
View File

@@ -4,8 +4,8 @@ import (
"net/http" "net/http"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab-odx.oracle.com/odx/functions/api" "github.com/fnproject/fn/api"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
func (s *Server) handleAppUpdate(c *gin.Context) { func (s *Server) handleAppUpdate(c *gin.Context) {

2
api/server/call_get.go
View File

@@ -4,7 +4,7 @@ import (
"net/http" "net/http"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab-odx.oracle.com/odx/functions/api" "github.com/fnproject/fn/api"
) )
func (s *Server) handleCallGet(c *gin.Context) { func (s *Server) handleCallGet(c *gin.Context) {

4
api/server/call_list.go
View File

@@ -4,8 +4,8 @@ import (
"net/http" "net/http"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab-odx.oracle.com/odx/functions/api" "github.com/fnproject/fn/api"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
func (s *Server) handleCallList(c *gin.Context) { func (s *Server) handleCallList(c *gin.Context) {

2
api/server/call_logs.go
View File

@@ -4,7 +4,7 @@ import (
"net/http" "net/http"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab-odx.oracle.com/odx/functions/api" "github.com/fnproject/fn/api"
) )
func (s *Server) handleCallLogGet(c *gin.Context) { func (s *Server) handleCallLogGet(c *gin.Context) {

4
api/server/error_response.go
View File

@@ -7,8 +7,8 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/runner/common" "github.com/fnproject/fn/api/runner/common"
) )
// ErrInternalServerError returned when something exceptional happens. // ErrInternalServerError returned when something exceptional happens.

4
api/server/extension_points.go
View File

@@ -5,8 +5,8 @@ import (
"net/http" "net/http"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab-odx.oracle.com/odx/functions/api" "github.com/fnproject/fn/api"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
type ApiHandlerFunc func(w http.ResponseWriter, r *http.Request) type ApiHandlerFunc func(w http.ResponseWriter, r *http.Request)

2
api/server/middleware.go
View File

@@ -4,7 +4,7 @@ import (
"context" "context"
"net/http" "net/http"
"gitlab-odx.oracle.com/odx/functions/api/runner/common" "github.com/fnproject/fn/api/runner/common"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

4
api/server/routes_create_update.go
View File

@@ -7,8 +7,8 @@ import (
"strings" "strings"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab-odx.oracle.com/odx/functions/api" "github.com/fnproject/fn/api"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
/* handleRouteCreateOrUpdate is used to handle POST PUT and PATCH for routes. /* handleRouteCreateOrUpdate is used to handle POST PUT and PATCH for routes.

2
api/server/routes_delete.go
View File

@@ -5,7 +5,7 @@ import (
"path" "path"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab-odx.oracle.com/odx/functions/api" "github.com/fnproject/fn/api"
) )
func (s *Server) handleRouteDelete(c *gin.Context) { func (s *Server) handleRouteDelete(c *gin.Context) {

2
api/server/routes_get.go
View File

@@ -5,7 +5,7 @@ import (
"path" "path"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab-odx.oracle.com/odx/functions/api" "github.com/fnproject/fn/api"
) )
func (s *Server) handleRouteGet(c *gin.Context) { func (s *Server) handleRouteGet(c *gin.Context) {

4
api/server/routes_list.go
View File

@@ -4,8 +4,8 @@ import (
"net/http" "net/http"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab-odx.oracle.com/odx/functions/api" "github.com/fnproject/fn/api"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
func (s *Server) handleRouteList(c *gin.Context) { func (s *Server) handleRouteList(c *gin.Context) {

8
api/server/routes_test.go
View File

@@ -6,10 +6,10 @@ import (
"strings" "strings"
"testing" "testing"
"gitlab-odx.oracle.com/odx/functions/api/datastore" "github.com/fnproject/fn/api/datastore"
"gitlab-odx.oracle.com/odx/functions/api/logs" "github.com/fnproject/fn/api/logs"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/mqs" "github.com/fnproject/fn/api/mqs"
) )
type routeTestCase struct { type routeTestCase struct {

12
api/server/runner.go
View File

@@ -15,12 +15,12 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
cache "github.com/patrickmn/go-cache" cache "github.com/patrickmn/go-cache"
"gitlab-odx.oracle.com/odx/functions/api" "github.com/fnproject/fn/api"
"gitlab-odx.oracle.com/odx/functions/api/id" "github.com/fnproject/fn/api/id"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/runner" "github.com/fnproject/fn/api/runner"
"gitlab-odx.oracle.com/odx/functions/api/runner/common" "github.com/fnproject/fn/api/runner/common"
"gitlab-odx.oracle.com/odx/functions/api/runner/task" "github.com/fnproject/fn/api/runner/task"
) )
type runnerResponse struct { type runnerResponse struct {

8
api/server/runner_async_test.go
View File

@@ -11,10 +11,10 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
cache "github.com/patrickmn/go-cache" cache "github.com/patrickmn/go-cache"
"gitlab-odx.oracle.com/odx/functions/api/datastore" "github.com/fnproject/fn/api/datastore"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/mqs" "github.com/fnproject/fn/api/mqs"
"gitlab-odx.oracle.com/odx/functions/api/runner" "github.com/fnproject/fn/api/runner"
) )
func testRouterAsync(ds models.Datastore, mq models.MessageQueue, rnr *runner.Runner, enqueue models.Enqueue) *gin.Engine { func testRouterAsync(ds models.Datastore, mq models.MessageQueue, rnr *runner.Runner, enqueue models.Enqueue) *gin.Engine {

2
api/server/runner_listeners.go
View File

@@ -2,7 +2,7 @@ package server
import ( import (
"context" "context"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
type RunnerListener interface { type RunnerListener interface {

10
api/server/runner_test.go
View File

@@ -8,11 +8,11 @@ import (
"testing" "testing"
"errors" "errors"
"gitlab-odx.oracle.com/odx/functions/api/datastore" "github.com/fnproject/fn/api/datastore"
"gitlab-odx.oracle.com/odx/functions/api/logs" "github.com/fnproject/fn/api/logs"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/mqs" "github.com/fnproject/fn/api/mqs"
"gitlab-odx.oracle.com/odx/functions/api/runner" "github.com/fnproject/fn/api/runner"
) )
func testRunner(t *testing.T) (*runner.Runner, context.CancelFunc) { func testRunner(t *testing.T) (*runner.Runner, context.CancelFunc) {

16
api/server/server.go
View File

@@ -20,14 +20,14 @@ import (
"github.com/openzipkin/zipkin-go-opentracing" "github.com/openzipkin/zipkin-go-opentracing"
"github.com/patrickmn/go-cache" "github.com/patrickmn/go-cache"
"github.com/spf13/viper" "github.com/spf13/viper"
"gitlab-odx.oracle.com/odx/functions/api" "github.com/fnproject/fn/api"
"gitlab-odx.oracle.com/odx/functions/api/datastore" "github.com/fnproject/fn/api/datastore"
"gitlab-odx.oracle.com/odx/functions/api/id" "github.com/fnproject/fn/api/id"
"gitlab-odx.oracle.com/odx/functions/api/logs" "github.com/fnproject/fn/api/logs"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/mqs" "github.com/fnproject/fn/api/mqs"
"gitlab-odx.oracle.com/odx/functions/api/runner" "github.com/fnproject/fn/api/runner"
"gitlab-odx.oracle.com/odx/functions/api/runner/common" "github.com/fnproject/fn/api/runner/common"
) )
const ( const (

8
api/server/server_test.go
View File

@@ -14,10 +14,10 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
cache "github.com/patrickmn/go-cache" cache "github.com/patrickmn/go-cache"
"gitlab-odx.oracle.com/odx/functions/api/datastore" "github.com/fnproject/fn/api/datastore"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
"gitlab-odx.oracle.com/odx/functions/api/mqs" "github.com/fnproject/fn/api/mqs"
"gitlab-odx.oracle.com/odx/functions/api/runner" "github.com/fnproject/fn/api/runner"
) )
var tmpDatastoreTests = "/tmp/func_test_datastore.db" var tmpDatastoreTests = "/tmp/func_test_datastore.db"

2
api/server/special_handler.go
View File

@@ -3,7 +3,7 @@ package server
import ( import (
"net/http" "net/http"
"gitlab-odx.oracle.com/odx/functions/api/models" "github.com/fnproject/fn/api/models"
) )
// SpecialHandler verysimilar to a handler but since it is not used as middle ware no way // SpecialHandler verysimilar to a handler but since it is not used as middle ware no way

2
api/server/version.go
View File

@@ -4,7 +4,7 @@ import (
"net/http" "net/http"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab-odx.oracle.com/odx/functions/api/version" "github.com/fnproject/fn/api/version"
) )
func handleVersion(c *gin.Context) { func handleVersion(c *gin.Context) {

0
fn/.gitignore → cli/.gitignore vendored
View File

0
fn/CONTRIBUTING.md → cli/CONTRIBUTING.md
View File

0
fn/Dockerfile → cli/Dockerfile
View File

2
fn/Makefile → cli/Makefile
View File

@@ -25,4 +25,4 @@ release:
GOOS=linux go build -o fn_linux GOOS=linux go build -o fn_linux
GOOS=darwin go build -o fn_mac GOOS=darwin go build -o fn_mac
GOOS=windows go build -o fn.exe GOOS=windows go build -o fn.exe
docker run --rm -v ${PWD}:/go/src/gitlab-odx.oracle.com/odx/functions/fn -w /go/src/gitlab-odx.oracle.com/odx/functions/fn funcy/go:dev go build -o fn_alpine docker run --rm -v ${PWD}:/go/src/github.com/fnproject/fn/cli -w /go/src/github.com/fnproject/fn/cli funcy/go:dev go build -o fn_alpine

0
fn/README.md → cli/README.md
View File

2
fn/apps.go → cli/apps.go
View File

@@ -9,12 +9,12 @@ import (
"context" "context"
"strings" "strings"
client "github.com/fnproject/fn/cli/client"
fnclient "github.com/funcy/functions_go/client" fnclient "github.com/funcy/functions_go/client"
apiapps "github.com/funcy/functions_go/client/apps" apiapps "github.com/funcy/functions_go/client/apps"
"github.com/funcy/functions_go/models" "github.com/funcy/functions_go/models"
"github.com/jmoiron/jsonq" "github.com/jmoiron/jsonq"
"github.com/urfave/cli" "github.com/urfave/cli"
client "gitlab-odx.oracle.com/odx/functions/fn/client"
) )
type appsCmd struct { type appsCmd struct {

0
fn/build.go → cli/build.go
View File

0
fn/bump.go → cli/bump.go
View File

2
fn/calls.go → cli/calls.go
View File

@@ -8,7 +8,7 @@ import (
apicall "github.com/funcy/functions_go/client/call" apicall "github.com/funcy/functions_go/client/call"
"github.com/funcy/functions_go/models" "github.com/funcy/functions_go/models"
"github.com/urfave/cli" "github.com/urfave/cli"
client "gitlab-odx.oracle.com/odx/functions/fn/client" client "github.com/fnproject/fn/cli/client"
) )
type callsCmd struct { type callsCmd struct {

0
fn/client/api.go → cli/client/api.go
View File

0
fn/client/call_fn.go → cli/client/call_fn.go
View File

2
fn/common.go → cli/common.go
View File

@@ -16,7 +16,7 @@ import (
"github.com/coreos/go-semver/semver" "github.com/coreos/go-semver/semver"
"gitlab-odx.oracle.com/odx/functions/fn/langs" "github.com/fnproject/fn/cli/langs"
) )
const ( const (

2
fn/deploy.go → cli/deploy.go
View File

@@ -13,7 +13,7 @@ import (
functions "github.com/funcy/functions_go" functions "github.com/funcy/functions_go"
"github.com/funcy/functions_go/models" "github.com/funcy/functions_go/models"
"github.com/urfave/cli" "github.com/urfave/cli"
client "gitlab-odx.oracle.com/odx/functions/fn/client" client "github.com/fnproject/fn/cli/client"
) )
func deploy() cli.Command { func deploy() cli.Command {

0
fn/entrypoint.sh → cli/entrypoint.sh
View File

0
fn/errors.go → cli/errors.go
View File

0
fn/funcfile.go → cli/funcfile.go
View File

0
fn/glide.lock → cli/glide.lock generated
View File

2
fn/glide.yaml → cli/glide.yaml
View File

@@ -1,4 +1,4 @@
package: gitlab-odx.oracle.com/odx/functions/fn package: github.com/fnproject/fn/cli
import: import:
- package: github.com/Sirupsen/logrus - package: github.com/Sirupsen/logrus
repo: https://github.com/sirupsen/logrus repo: https://github.com/sirupsen/logrus

0
fn/images.go → cli/images.go
View File

2
fn/init.go → cli/init.go
View File

@@ -18,7 +18,7 @@ import (
"strings" "strings"
"github.com/urfave/cli" "github.com/urfave/cli"
"gitlab-odx.oracle.com/odx/functions/fn/langs" "github.com/fnproject/fn/cli/langs"
) )
var ( var (

4
fn/install → cli/install
View File

@@ -54,7 +54,7 @@ else
exit 1 exit 1
fi fi
url='https://gitlab-odx.oracle.com/odx/functions/fn/releases/download' url='https://github.com/fnproject/fn/cli/releases/download'
# perform some very rudimentary platform detection # perform some very rudimentary platform detection
case "$(uname)" in case "$(uname)" in
@@ -84,7 +84,7 @@ cat >&2 <<'EOF'
installer script (yet - PRs welcome! [fn/install]). installer script (yet - PRs welcome! [fn/install]).
Please visit the following URL for more detailed installation instructions: Please visit the following URL for more detailed installation instructions:
https://gitlab-odx.oracle.com/odx/functions https://github.com/fnproject/fn
EOF EOF
exit 1 exit 1

4
fn/install.sh → cli/install.sh
View File

@@ -54,7 +54,7 @@ else
exit 1 exit 1
fi fi
url='https://gitlab-odx.oracle.com/odx/functions/fn/releases/download' url='https://github.com/fnproject/fn/cli/releases/download'
# perform some very rudimentary platform detection # perform some very rudimentary platform detection
case "$(uname)" in case "$(uname)" in
@@ -84,7 +84,7 @@ cat >&2 <<'EOF'
installer script (yet - PRs welcome! [fn/install]). installer script (yet - PRs welcome! [fn/install]).
Please visit the following URL for more detailed installation instructions: Please visit the following URL for more detailed installation instructions:
https://gitlab-odx.oracle.com/odx/functions https://github.com/fnproject/fn
EOF EOF
exit 1 exit 1

0
fn/lambda.go → cli/lambda.go
View File

0
fn/lambda/node-4/Dockerfile → cli/lambda/node-4/Dockerfile
View File

0
fn/lambda/node-4/bootstrap.js → cli/lambda/node-4/bootstrap.js vendored
View File

0
fn/lambda/node-4/build.sh → cli/lambda/node-4/build.sh
View File

0
fn/lambda/node-4/release.sh → cli/lambda/node-4/release.sh
View File

0
fn/lambda/node-6/Dockerfile → cli/lambda/node-6/Dockerfile
View File

0
fn/lambda/node-6/build.sh → cli/lambda/node-6/build.sh
View File

0
fn/lambda/node-6/release.sh → cli/lambda/node-6/release.sh
View File

0
fn/lambda/release.sh → cli/lambda/release.sh
View File

0
fn/langs/base.go → cli/langs/base.go
View File

0
fn/langs/dotnet.go → cli/langs/dotnet.go
View File

0
fn/langs/go.go → cli/langs/go.go
View File

0
fn/langs/java.go → cli/langs/java.go
View File

0
fn/langs/lambda_node.go → cli/langs/lambda_node.go
View File

Some files were not shown because too many files have changed in this diff Show More