Migrate away from requests package for Function structs

The function deployment and status structs have been moved away
into the faas-provider package.

Tested with a build, running tests, and CI.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis (OpenFaaS Ltd)
2019-08-05 12:37:53 +01:00
committed by Alex Ellis
parent 8767514527
commit df97efafae
13 changed files with 125 additions and 105 deletions

View File

@ -15,14 +15,14 @@ import (
"log"
"github.com/openfaas/faas-provider/auth"
"github.com/openfaas/faas/gateway/requests"
types "github.com/openfaas/faas-provider/types"
"github.com/prometheus/client_golang/prometheus"
)
// Exporter is a prometheus exporter
type Exporter struct {
metricOptions MetricOptions
services []requests.Function
services []types.FunctionStatus
credentials *auth.BasicAuthCredentials
}
@ -30,7 +30,7 @@ type Exporter struct {
func NewExporter(options MetricOptions, credentials *auth.BasicAuthCredentials) *Exporter {
return &Exporter{
metricOptions: options,
services: []requests.Function{},
services: []types.FunctionStatus{},
credentials: credentials,
}
}
@ -95,7 +95,7 @@ func (e *Exporter) StartServiceWatcher(endpointURL url.URL, metricsOptions Metri
get.SetBasicAuth(e.credentials.User, e.credentials.Password)
}
services := []requests.Function{}
services := []types.FunctionStatus{}
res, err := proxyClient.Do(get)
if err != nil {
log.Println(err)