faas-rs/faas
1
0
Fork 0
mirror of https://github.com/openfaas/faas.git synced 2025-06-18 20:16:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add unit tests to build. Pin to specific Alpine tag.

Browse Source 
Signed-off-by: Alex Ellis <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis
2017-10-26 21:02:50 +01:00
parent dce748e2a1
commit 12a0c75e91
6 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gateway/Dockerfile
View File

@ -13,9 +13,12 @@ COPY queue queue
COPY plugin plugin COPY plugin plugin
COPY server.go . COPY server.go .
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o gateway . # Run a gofmt and exclude all vendored code.
RUN test -z "$(gofmt -l $(find . -type f -name '*.go' -not -path "./vendor/*"))" \
&& go test $(go list ./... | grep -v integration | grep -v /vendor/ | grep -v /template/) -cover \
&& CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o gateway .
FROM alpine:latest FROM alpine:3.6
WORKDIR /root/ WORKDIR /root/
EXPOSE 8080 EXPOSE 8080

4
gateway/handlers/deletehandler.go
View File

@ -12,11 +12,11 @@ import (
"io/ioutil" "io/ioutil"
"github.com/openfaas/faas/gateway/metrics"
"github.com/openfaas/faas/gateway/requests"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/openfaas/faas/gateway/metrics"
"github.com/openfaas/faas/gateway/requests"
) )
func MakeDeleteFunctionHandler(metricsOptions metrics.MetricOptions, c *client.Client) http.HandlerFunc { func MakeDeleteFunctionHandler(metricsOptions metrics.MetricOptions, c *client.Client) http.HandlerFunc {

2
gateway/handlers/queueproxy.go
View File

@ -10,9 +10,9 @@ import (
"net/url" "net/url"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/gorilla/mux"
"github.com/openfaas/faas/gateway/metrics" "github.com/openfaas/faas/gateway/metrics"
"github.com/openfaas/faas/gateway/queue" "github.com/openfaas/faas/gateway/queue"
"github.com/gorilla/mux"
) )
// MakeQueuedProxy accepts work onto a queue // MakeQueuedProxy accepts work onto a queue

4
gateway/handlers/reader.go
View File

@ -11,11 +11,11 @@ import (
"strings" "strings"
"github.com/openfaas/faas/gateway/metrics"
"github.com/openfaas/faas/gateway/requests"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/openfaas/faas/gateway/metrics"
"github.com/openfaas/faas/gateway/requests"
) )
// MakeFunctionReader gives a summary of Function structs with Docker service stats overlaid with Prometheus counters. // MakeFunctionReader gives a summary of Function structs with Docker service stats overlaid with Prometheus counters.

2
gateway/tests/registryauth_test.go
View File

@ -9,8 +9,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/openfaas/faas/gateway/handlers"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/openfaas/faas/gateway/handlers"
) )
func TestBuildEncodedAuthConfig(t *testing.T) { func TestBuildEncodedAuthConfig(t *testing.T) {

12
gateway/types/readconfig.go
View File

@ -104,25 +104,25 @@ func (ReadConfig) Read(hasEnv HasEnv) GatewayConfig {
type GatewayConfig struct { type GatewayConfig struct {
// HTTP timeout for reading a request from clients. // HTTP timeout for reading a request from clients.
ReadTimeout time.Duration ReadTimeout time.Duration
// HTTP timeout for writing a response from functions. // HTTP timeout for writing a response from functions.
WriteTimeout time.Duration WriteTimeout time.Duration
// URL for alternate functions provider. // URL for alternate functions provider.
FunctionsProviderURL *url.URL FunctionsProviderURL *url.URL
// Address of the NATS service. Required for async mode. // Address of the NATS service. Required for async mode.
NATSAddress *string NATSAddress *string
// Port of the NATS Service. Required for async mode. // Port of the NATS Service. Required for async mode.
NATSPort *int NATSPort *int
// Host to connect to Prometheus. // Host to connect to Prometheus.
PrometheusHost string PrometheusHost string
// Port to connect to Prometheus. // Port to connect to Prometheus.
PrometheusPort int PrometheusPort int
} }
// UseNATS Use NATSor not // UseNATS Use NATSor not