# This is a combination of 2 commits.
# This is the 1st commit message: Changed package names to match the new organization # This is the commit message #2: Forgot Cache
This commit is contained in:
Vendored
+1
-1
@@ -21,7 +21,7 @@ import (
|
|||||||
|
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
)
|
)
|
||||||
|
|
||||||
type requestType int
|
type requestType int
|
||||||
|
|||||||
+1
-1
@@ -26,7 +26,7 @@ import (
|
|||||||
"github.com/gorilla/handlers"
|
"github.com/gorilla/handlers"
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
)
|
)
|
||||||
|
|
||||||
type API struct {
|
type API struct {
|
||||||
|
|||||||
@@ -28,8 +28,8 @@ import (
|
|||||||
etcdClient "github.com/coreos/etcd/client"
|
etcdClient "github.com/coreos/etcd/client"
|
||||||
"golang.org/x/net/context"
|
"golang.org/x/net/context"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
"github.com/platform9/fission/controller/client"
|
"github.com/fission/fission/controller/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
var g struct {
|
var g struct {
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ import (
|
|||||||
|
|
||||||
log "github.com/Sirupsen/logrus"
|
log "github.com/Sirupsen/logrus"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
)
|
)
|
||||||
|
|
||||||
type (
|
type (
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ import (
|
|||||||
log "github.com/Sirupsen/logrus"
|
log "github.com/Sirupsen/logrus"
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (api *API) EnvironmentApiList(w http.ResponseWriter, r *http.Request) {
|
func (api *API) EnvironmentApiList(w http.ResponseWriter, r *http.Request) {
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ package controller
|
|||||||
import (
|
import (
|
||||||
"github.com/satori/go.uuid"
|
"github.com/satori/go.uuid"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
)
|
)
|
||||||
|
|
||||||
type EnvironmentStore struct {
|
type EnvironmentStore struct {
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ import (
|
|||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
|
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (api *API) FunctionApiList(w http.ResponseWriter, r *http.Request) {
|
func (api *API) FunctionApiList(w http.ResponseWriter, r *http.Request) {
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ package controller
|
|||||||
import (
|
import (
|
||||||
log "github.com/Sirupsen/logrus"
|
log "github.com/Sirupsen/logrus"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
)
|
)
|
||||||
|
|
||||||
type FunctionStore struct {
|
type FunctionStore struct {
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ import (
|
|||||||
log "github.com/Sirupsen/logrus"
|
log "github.com/Sirupsen/logrus"
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (api *API) HTTPTriggerApiList(w http.ResponseWriter, r *http.Request) {
|
func (api *API) HTTPTriggerApiList(w http.ResponseWriter, r *http.Request) {
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ package controller
|
|||||||
import (
|
import (
|
||||||
"github.com/satori/go.uuid"
|
"github.com/satori/go.uuid"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
)
|
)
|
||||||
|
|
||||||
type HTTPTriggerStore struct {
|
type HTTPTriggerStore struct {
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ import (
|
|||||||
log "github.com/Sirupsen/logrus"
|
log "github.com/Sirupsen/logrus"
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (api *API) WatchApiList(w http.ResponseWriter, r *http.Request) {
|
func (api *API) WatchApiList(w http.ResponseWriter, r *http.Request) {
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ package controller
|
|||||||
import (
|
import (
|
||||||
"github.com/satori/go.uuid"
|
"github.com/satori/go.uuid"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
)
|
)
|
||||||
|
|
||||||
type WatchStore struct {
|
type WatchStore struct {
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"github.com/docopt/docopt-go"
|
"github.com/docopt/docopt-go"
|
||||||
"github.com/platform9/fission/controller"
|
"github.com/fission/fission/controller"
|
||||||
"github.com/platform9/fission/kubewatcher"
|
"github.com/fission/fission/kubewatcher"
|
||||||
"github.com/platform9/fission/poolmgr"
|
"github.com/fission/fission/poolmgr"
|
||||||
"github.com/platform9/fission/router"
|
"github.com/fission/fission/router"
|
||||||
)
|
)
|
||||||
|
|
||||||
func runController(port int, etcdUrl string, filepath string) {
|
func runController(port int, etcdUrl string, filepath string) {
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/platform9/fission/controller/client"
|
"github.com/fission/fission/controller/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
func fatal(msg string) {
|
func fatal(msg string) {
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import (
|
|||||||
|
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
"os"
|
"os"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -26,7 +26,7 @@ import (
|
|||||||
"github.com/satori/go.uuid"
|
"github.com/satori/go.uuid"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
)
|
)
|
||||||
|
|
||||||
func fnCreate(c *cli.Context) error {
|
func fnCreate(c *cli.Context) error {
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ import (
|
|||||||
"github.com/satori/go.uuid"
|
"github.com/satori/go.uuid"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
)
|
)
|
||||||
|
|
||||||
// returns one of http.Method*
|
// returns one of http.Method*
|
||||||
|
|||||||
+1
-1
@@ -24,7 +24,7 @@ import (
|
|||||||
"github.com/satori/go.uuid"
|
"github.com/satori/go.uuid"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
)
|
)
|
||||||
|
|
||||||
func wCreate(c *cli.Context) error {
|
func wCreate(c *cli.Context) error {
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ import (
|
|||||||
"k8s.io/client-go/1.5/pkg/runtime"
|
"k8s.io/client-go/1.5/pkg/runtime"
|
||||||
"k8s.io/client-go/1.5/pkg/watch"
|
"k8s.io/client-go/1.5/pkg/watch"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
)
|
)
|
||||||
|
|
||||||
type requestType int
|
type requestType int
|
||||||
|
|||||||
+1
-1
@@ -22,7 +22,7 @@ import (
|
|||||||
"k8s.io/client-go/1.5/kubernetes"
|
"k8s.io/client-go/1.5/kubernetes"
|
||||||
"k8s.io/client-go/1.5/rest"
|
"k8s.io/client-go/1.5/rest"
|
||||||
|
|
||||||
"github.com/platform9/fission/controller/client"
|
"github.com/fission/fission/controller/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Get a kubernetes client using the pod's service account.
|
// Get a kubernetes client using the pod's service account.
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ import (
|
|||||||
"log"
|
"log"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/platform9/fission/controller/client"
|
"github.com/fission/fission/controller/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
type (
|
type (
|
||||||
|
|||||||
+3
-3
@@ -29,9 +29,9 @@ import (
|
|||||||
"github.com/gorilla/handlers"
|
"github.com/gorilla/handlers"
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
"github.com/platform9/fission/cache"
|
"github.com/fission/fission/cache"
|
||||||
controllerclient "github.com/platform9/fission/controller/client"
|
controllerclient "github.com/fission/fission/controller/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
type funcSvc struct {
|
type funcSvc struct {
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import (
|
|||||||
|
|
||||||
"bytes"
|
"bytes"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"net/url"
|
"net/url"
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -20,8 +20,8 @@ import (
|
|||||||
"log"
|
"log"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
"github.com/platform9/fission/cache"
|
"github.com/fission/fission/cache"
|
||||||
)
|
)
|
||||||
|
|
||||||
type fscRequestType int
|
type fscRequestType int
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import (
|
|||||||
"log"
|
"log"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -36,7 +36,7 @@ import (
|
|||||||
"k8s.io/client-go/1.5/pkg/labels"
|
"k8s.io/client-go/1.5/pkg/labels"
|
||||||
"k8s.io/client-go/1.5/pkg/util/intstr"
|
"k8s.io/client-go/1.5/pkg/util/intstr"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
)
|
)
|
||||||
|
|
||||||
type (
|
type (
|
||||||
|
|||||||
+2
-2
@@ -22,8 +22,8 @@ import (
|
|||||||
|
|
||||||
"k8s.io/client-go/1.5/kubernetes"
|
"k8s.io/client-go/1.5/kubernetes"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
"github.com/platform9/fission/controller/client"
|
"github.com/fission/fission/controller/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
type (
|
type (
|
||||||
|
|||||||
+1
-1
@@ -23,7 +23,7 @@ import (
|
|||||||
"k8s.io/client-go/1.5/kubernetes"
|
"k8s.io/client-go/1.5/kubernetes"
|
||||||
"k8s.io/client-go/1.5/rest"
|
"k8s.io/client-go/1.5/rest"
|
||||||
|
|
||||||
controllerclient "github.com/platform9/fission/controller/client"
|
controllerclient "github.com/fission/fission/controller/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Get a kubernetes client using the pod's service account. This only
|
// Get a kubernetes client using the pod's service account. This only
|
||||||
|
|||||||
@@ -25,8 +25,8 @@ import (
|
|||||||
"net/url"
|
"net/url"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
poolmgrClient "github.com/platform9/fission/poolmgr/client"
|
poolmgrClient "github.com/fission/fission/poolmgr/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
type functionHandler struct {
|
type functionHandler struct {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ import (
|
|||||||
"net/url"
|
"net/url"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
)
|
)
|
||||||
|
|
||||||
func createBackendService(testResponseString string) *url.URL {
|
func createBackendService(testResponseString string) *url.URL {
|
||||||
|
|||||||
@@ -21,8 +21,8 @@ import (
|
|||||||
"net/url"
|
"net/url"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
"github.com/platform9/fission/cache"
|
"github.com/fission/fission/cache"
|
||||||
)
|
)
|
||||||
|
|
||||||
type functionServiceMap struct {
|
type functionServiceMap struct {
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ import (
|
|||||||
"net/url"
|
"net/url"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestFunctionServiceMap(t *testing.T) {
|
func TestFunctionServiceMap(t *testing.T) {
|
||||||
|
|||||||
@@ -24,9 +24,9 @@ import (
|
|||||||
|
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
controllerClient "github.com/platform9/fission/controller/client"
|
controllerClient "github.com/fission/fission/controller/client"
|
||||||
poolmgrClient "github.com/platform9/fission/poolmgr/client"
|
poolmgrClient "github.com/fission/fission/poolmgr/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
type HTTPTriggerSet struct {
|
type HTTPTriggerSet struct {
|
||||||
|
|||||||
+2
-2
@@ -49,8 +49,8 @@ import (
|
|||||||
"github.com/gorilla/handlers"
|
"github.com/gorilla/handlers"
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
|
|
||||||
controllerClient "github.com/platform9/fission/controller/client"
|
controllerClient "github.com/fission/fission/controller/client"
|
||||||
poolmgrClient "github.com/platform9/fission/poolmgr/client"
|
poolmgrClient "github.com/fission/fission/poolmgr/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
// request url ---[mux]---> Function(name,uid) ----[fmap]----> k8s service url
|
// request url ---[mux]---> Function(name,uid) ----[fmap]----> k8s service url
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/platform9/fission"
|
"github.com/fission/fission"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestRouter(t *testing.T) {
|
func TestRouter(t *testing.T) {
|
||||||
|
|||||||
Reference in New Issue
Block a user