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

Upgrade to Go 1.7 (#128)

Browse Source 
* Upgrade to stdlib context package
* Modernized syntax
This commit is contained in:
C Cirello
2016-10-06 20:10:00 +02:00
committed by Seif Lotfy سيف لطفي
parent e90a109ed5
commit 3ca137a01c
27 changed files with 40 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/server/apps_create.go
View File

@@ -1,10 +1,9 @@
package server
import (
"context"
"net/http"
"golang.org/x/net/context"
"github.com/gin-gonic/gin"
"github.com/iron-io/functions/api/models"
"github.com/iron-io/runner/common"

3
api/server/apps_delete.go
View File

@@ -1,10 +1,9 @@
package server
import (
"context"
"net/http"
"golang.org/x/net/context"
"github.com/gin-gonic/gin"
"github.com/iron-io/functions/api/models"
"github.com/iron-io/runner/common"

3
api/server/apps_get.go
View File

@@ -1,10 +1,9 @@
package server
import (
"context"
"net/http"
"golang.org/x/net/context"
"github.com/gin-gonic/gin"
"github.com/iron-io/functions/api/models"
"github.com/iron-io/runner/common"

3
api/server/apps_list.go
View File

@@ -1,10 +1,9 @@
package server
import (
"context"
"net/http"
"golang.org/x/net/context"
"github.com/gin-gonic/gin"
"github.com/iron-io/functions/api/models"
"github.com/iron-io/runner/common"

3
api/server/apps_update.go
View File

@@ -1,10 +1,9 @@
package server
import (
"context"
"net/http"
"golang.org/x/net/context"
"github.com/gin-gonic/gin"
"github.com/iron-io/functions/api/models"
"github.com/iron-io/runner/common"

3
api/server/helpers.go
View File

@@ -1,6 +1,7 @@
package server
import (
"context"
"encoding/json"
"io"
"io/ioutil"
@@ -8,8 +9,6 @@ import (
"net/http/httptest"
"testing"
"golang.org/x/net/context"
"github.com/gin-gonic/gin"
"github.com/iron-io/functions/api/models"
"github.com/iron-io/functions/api/runner"

3
api/server/routes_create.go
View File

@@ -1,10 +1,9 @@
package server
import (
"context"
"net/http"
"golang.org/x/net/context"
"github.com/gin-gonic/gin"
"github.com/iron-io/functions/api/models"
"github.com/iron-io/functions/api/runner"

3
api/server/routes_delete.go
View File

@@ -1,10 +1,9 @@
package server
import (
"context"
"net/http"
"golang.org/x/net/context"
"github.com/gin-gonic/gin"
"github.com/iron-io/functions/api/models"
"github.com/iron-io/runner/common"

3
api/server/routes_get.go
View File

@@ -1,10 +1,9 @@
package server
import (
"context"
"net/http"
"golang.org/x/net/context"
"github.com/Sirupsen/logrus"
"github.com/gin-gonic/gin"
"github.com/iron-io/functions/api/models"

3
api/server/routes_list.go
View File

@@ -1,10 +1,9 @@
package server
import (
"context"
"net/http"
"golang.org/x/net/context"
"github.com/Sirupsen/logrus"
"github.com/gin-gonic/gin"
"github.com/iron-io/functions/api/models"

3
api/server/routes_update.go
View File

@@ -1,10 +1,9 @@
package server
import (
"context"
"net/http"
"golang.org/x/net/context"
"github.com/gin-gonic/gin"
"github.com/iron-io/functions/api/models"
"github.com/iron-io/runner/common"

6
api/server/runner.go
View File

@@ -2,16 +2,14 @@ package server
import (
"bytes"
"context"
"encoding/json"
"fmt"
"io/ioutil"
"net/http"
"strings"
"time"
"golang.org/x/net/context"
"encoding/json"
"github.com/Sirupsen/logrus"
"github.com/gin-gonic/gin"
"github.com/iron-io/functions/api/models"

12
api/server/runner_test.go
View File

@@ -97,8 +97,8 @@ func TestRouteRunnerExecution(t *testing.T) {
{Name: "myapp", Config: models.Config{}},
},
FakeRoutes: []*models.Route{
{Path: "/myroute", AppName: "myapp", Image: "iron/hello", Headers: map[string][]string{"X-Function": []string{"Test"}}},
{Path: "/myerror", AppName: "myapp", Image: "iron/error", Headers: map[string][]string{"X-Function": []string{"Test"}}},
{Path: "/myroute", AppName: "myapp", Image: "iron/hello", Headers: map[string][]string{"X-Function": {"Test"}}},
{Path: "/myerror", AppName: "myapp", Image: "iron/error", Headers: map[string][]string{"X-Function": {"Test"}}},
},
}, &mqs.Mock{}, testRunner(t))
router := testRouter()
@@ -109,12 +109,12 @@ func TestRouteRunnerExecution(t *testing.T) {
expectedCode int
expectedHeaders map[string][]string
}{
{"/r/myapp/myroute", ``, http.StatusOK, map[string][]string{"X-Function": []string{"Test"}}},
{"/r/myapp/myerror", ``, http.StatusInternalServerError, map[string][]string{"X-Function": []string{"Test"}}},
{"/r/myapp/myroute", ``, http.StatusOK, map[string][]string{"X-Function": {"Test"}}},
{"/r/myapp/myerror", ``, http.StatusInternalServerError, map[string][]string{"X-Function": {"Test"}}},
// Added same tests again to check if time is reduced by the auth cache
{"/r/myapp/myroute", ``, http.StatusOK, map[string][]string{"X-Function": []string{"Test"}}},
{"/r/myapp/myerror", ``, http.StatusInternalServerError, map[string][]string{"X-Function": []string{"Test"}}},
{"/r/myapp/myroute", ``, http.StatusOK, map[string][]string{"X-Function": {"Test"}}},
{"/r/myapp/myerror", ``, http.StatusInternalServerError, map[string][]string{"X-Function": {"Test"}}},
} {
body := bytes.NewBuffer([]byte(test.body))
_, rec := routerRequest(t, router, "GET", test.path, body)

3
api/server/server.go
View File

@@ -1,13 +1,12 @@
package server
import (
"context"
"encoding/json"
"io/ioutil"
"net/http"
"path"
"golang.org/x/net/context"
"github.com/Sirupsen/logrus"
"github.com/gin-gonic/gin"
"github.com/iron-io/functions/api/ifaces"