Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add interfaces for executor/fetcher/storagesvc clients (#2867)

Browse Source 
Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
Sanket Sudake
2023-11-06 16:09:51 +05:30
committed by GitHub
parent b099db38d7
commit 27132975c4
17 changed files with 79 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -99,7 +99,7 @@ generate-cli-docs:
go run tools/cmd-docs/main.go -o "../fission.io/content/en/docs/reference/fission-cli" go run tools/cmd-docs/main.go -o "../fission.io/content/en/docs/reference/fission-cli"
install-crd-ref-docs: install-crd-ref-docs:
go install github.com/elastic/crd-ref-docs@v0.0.9 go install github.com/elastic/crd-ref-docs@v0.0.10
generate-crd-ref-docs: install-crd-ref-docs generate-crd-ref-docs: install-crd-ref-docs
# crd-ref-docs: https://github.com/elastic/crd-ref-docs # crd-ref-docs: https://github.com/elastic/crd-ref-docs
cmd/fission-bundle/main.go
+2 -1
View File
@@ -32,6 +32,7 @@ import (
"github.com/fission/fission/pkg/canaryconfigmgr" "github.com/fission/fission/pkg/canaryconfigmgr"
"github.com/fission/fission/pkg/crd" "github.com/fission/fission/pkg/crd"
"github.com/fission/fission/pkg/executor" "github.com/fission/fission/pkg/executor"
eclient "github.com/fission/fission/pkg/executor/client"
"github.com/fission/fission/pkg/info" "github.com/fission/fission/pkg/info"
"github.com/fission/fission/pkg/kubewatcher" "github.com/fission/fission/pkg/kubewatcher"
functionLogger "github.com/fission/fission/pkg/logger" functionLogger "github.com/fission/fission/pkg/logger"
@@ -55,7 +56,7 @@ func runCanaryConfigServer(ctx context.Context, clientGen crd.ClientGeneratorInt
} }
func runRouter(ctx context.Context, clientGen crd.ClientGeneratorInterface, logger *zap.Logger, port int, executorUrl string) error { func runRouter(ctx context.Context, clientGen crd.ClientGeneratorInterface, logger *zap.Logger, port int, executorUrl string) error {
return router.Start(ctx, clientGen, logger, port, executorUrl) return router.Start(ctx, clientGen, logger, port, eclient.MakeClient(logger, executorUrl))
} }
func runExecutor(ctx context.Context, clientGen crd.ClientGeneratorInterface, logger *zap.Logger, port int) error { func runExecutor(ctx context.Context, clientGen crd.ClientGeneratorInterface, logger *zap.Logger, port int) error {
cmd/fission-bundle/mqtrigger/mqtrigger.go
+1 -1
View File
@@ -40,7 +40,7 @@ func Start(ctx context.Context, clientGen crd.ClientGeneratorInterface, logger *
return errors.Wrap(err, "failed to get fission client") return errors.Wrap(err, "failed to get fission client")
} }
err = crd.WaitForCRDs(ctx, logger, fissionClient) err = crd.WaitForFunctionCRDs(ctx, logger, fissionClient)
if err != nil { if err != nil {
return errors.Wrap(err, "error waiting for CRDs") return errors.Wrap(err, "error waiting for CRDs")
} }
pkg/builder/client/client.go
+8 -4
View File
@@ -35,25 +35,29 @@ import (
) )
type ( type (
Client struct { ClientInterface interface {
Build(context.Context, *builder.PackageBuildRequest) (*builder.PackageBuildResponse, error)
}
client struct {
logger *zap.Logger logger *zap.Logger
url string url string
httpClient *retryablehttp.Client httpClient *retryablehttp.Client
} }
) )
func MakeClient(logger *zap.Logger, builderUrl string) *Client { func MakeClient(logger *zap.Logger, builderUrl string) ClientInterface {
hc := retryablehttp.NewClient() hc := retryablehttp.NewClient()
hc.ErrorHandler = retryablehttp.PassthroughErrorHandler hc.ErrorHandler = retryablehttp.PassthroughErrorHandler
hc.HTTPClient.Transport = otelhttp.NewTransport(hc.HTTPClient.Transport) hc.HTTPClient.Transport = otelhttp.NewTransport(hc.HTTPClient.Transport)
return &Client{ return &client{
logger: logger.Named("builder_client"), logger: logger.Named("builder_client"),
url: strings.TrimSuffix(builderUrl, "/"), url: strings.TrimSuffix(builderUrl, "/"),
httpClient: hc, httpClient: hc,
} }
} }
func (c *Client) Build(ctx context.Context, req *builder.PackageBuildRequest) (*builder.PackageBuildResponse, error) { func (c *client) Build(ctx context.Context, req *builder.PackageBuildRequest) (*builder.PackageBuildResponse, error) {
logger := otelUtils.LoggerWithTraceID(ctx, c.logger) logger := otelUtils.LoggerWithTraceID(ctx, c.logger)
body, err := json.Marshal(req) body, err := json.Marshal(req)
pkg/buildermgr/buildermgr.go
+1 -1
View File
@@ -44,7 +44,7 @@ func Start(ctx context.Context, clientGen crd.ClientGeneratorInterface, logger *
return errors.Wrap(err, "failed to get kubernetes client") return errors.Wrap(err, "failed to get kubernetes client")
} }
err = crd.WaitForCRDs(ctx, logger, fissionClient) err = crd.WaitForFunctionCRDs(ctx, logger, fissionClient)
if err != nil { if err != nil {
return errors.Wrap(err, "error waiting for CRDs") return errors.Wrap(err, "error waiting for CRDs")
} }
pkg/crd/client.go
+5 -5
View File
@@ -18,7 +18,7 @@ package crd
import ( import (
"context" "context"
"errors" "fmt"
"time" "time"
"go.uber.org/zap" "go.uber.org/zap"
@@ -110,13 +110,13 @@ func NewClientGeneratorWithRestConfig(restConfig *rest.Config) *ClientGenerator
return &ClientGenerator{restConfig: restConfig} return &ClientGenerator{restConfig: restConfig}
} }
// WaitForCRDs does a timeout to check if CRDs have been installed // WaitForFunctionCRDs does a timeout to check if CRDs have been installed
func WaitForCRDs(ctx context.Context, logger *zap.Logger, fissionClient versioned.Interface) error { func WaitForFunctionCRDs(ctx context.Context, logger *zap.Logger, fissionClient versioned.Interface) error {
logger.Info("Waiting for CRDs to be installed")
defaultNs := utils.DefaultNSResolver().DefaultNamespace defaultNs := utils.DefaultNSResolver().DefaultNamespace
if defaultNs == "" { if defaultNs == "" {
defaultNs = metav1.NamespaceDefault defaultNs = metav1.NamespaceDefault
} }
logger.Info("Checking function CRD access", zap.String("namespace", defaultNs), zap.String("timeout", "30s"))
start := time.Now() start := time.Now()
for { for {
fi := fissionClient.CoreV1().Functions(defaultNs) fi := fissionClient.CoreV1().Functions(defaultNs)
@@ -128,7 +128,7 @@ func WaitForCRDs(ctx context.Context, logger *zap.Logger, fissionClient versione
} }
if time.Since(start) > 30*time.Second { if time.Since(start) > 30*time.Second {
return errors.New("timeout waiting for CRDs") return fmt.Errorf("timeout waiting for function CRD access")
} }
} }
} }
pkg/executor/client/client.go
+15 -9
View File
@@ -36,8 +36,14 @@ import (
) )
type ( type (
// Client is wrapper on a HTTP client. // ClientInterface is the interface for executor client.
Client struct { ClientInterface interface {
GetServiceForFunction(ctx context.Context, fn *fv1.Function) (string, error)
TapService(fnMeta metav1.ObjectMeta, executorType fv1.ExecutorType, serviceURL url.URL)
UnTapService(ctx context.Context, fnMeta metav1.ObjectMeta, executorType fv1.ExecutorType, serviceURL *url.URL) error
}
// client is wrapper on a HTTP client.
client struct {
logger *zap.Logger logger *zap.Logger
executorURL string executorURL string
tappedByURL map[string]TapServiceRequest tappedByURL map[string]TapServiceRequest
@@ -54,10 +60,10 @@ type (
) )
// MakeClient initializes and returns a Client instance. // MakeClient initializes and returns a Client instance.
func MakeClient(logger *zap.Logger, executorURL string) *Client { func MakeClient(logger *zap.Logger, executorURL string) ClientInterface {
hc := retryablehttp.NewClient() hc := retryablehttp.NewClient()
hc.HTTPClient.Transport = otelhttp.NewTransport(hc.HTTPClient.Transport) hc.HTTPClient.Transport = otelhttp.NewTransport(hc.HTTPClient.Transport)
c := &Client{ c := &client{
logger: logger.Named("executor_client"), logger: logger.Named("executor_client"),
executorURL: strings.TrimSuffix(executorURL, "/"), executorURL: strings.TrimSuffix(executorURL, "/"),
tappedByURL: make(map[string]TapServiceRequest), tappedByURL: make(map[string]TapServiceRequest),
@@ -69,7 +75,7 @@ func MakeClient(logger *zap.Logger, executorURL string) *Client {
} }
// GetServiceForFunction returns the service name for a given function. // GetServiceForFunction returns the service name for a given function.
func (c *Client) GetServiceForFunction(ctx context.Context, fn *fv1.Function) (string, error) { func (c *client) GetServiceForFunction(ctx context.Context, fn *fv1.Function) (string, error) {
executorURL := c.executorURL + "/v2/getServiceForFunction" executorURL := c.executorURL + "/v2/getServiceForFunction"
body, err := json.Marshal(fn) body, err := json.Marshal(fn)
@@ -102,7 +108,7 @@ func (c *Client) GetServiceForFunction(ctx context.Context, fn *fv1.Function) (s
} }
// UnTapService sends a request to /v2/unTapService. // UnTapService sends a request to /v2/unTapService.
func (c *Client) UnTapService(ctx context.Context, fnMeta metav1.ObjectMeta, executorType fv1.ExecutorType, serviceURL *url.URL) error { func (c *client) UnTapService(ctx context.Context, fnMeta metav1.ObjectMeta, executorType fv1.ExecutorType, serviceURL *url.URL) error {
url := c.executorURL + "/v2/unTapService" url := c.executorURL + "/v2/unTapService"
tapSvc := TapServiceRequest{ tapSvc := TapServiceRequest{
FnMetadata: fnMeta, FnMetadata: fnMeta,
@@ -133,7 +139,7 @@ func (c *Client) UnTapService(ctx context.Context, fnMeta metav1.ObjectMeta, exe
return nil return nil
} }
func (c *Client) service() { func (c *client) service() {
ticker := time.NewTicker(time.Second * 5) ticker := time.NewTicker(time.Second * 5)
for { for {
select { select {
@@ -163,7 +169,7 @@ func (c *Client) service() {
} }
// TapService sends a TapServiceRequest over the request channel. // TapService sends a TapServiceRequest over the request channel.
func (c *Client) TapService(fnMeta metav1.ObjectMeta, executorType fv1.ExecutorType, serviceURL url.URL) { func (c *client) TapService(fnMeta metav1.ObjectMeta, executorType fv1.ExecutorType, serviceURL url.URL) {
c.requestChan <- TapServiceRequest{ c.requestChan <- TapServiceRequest{
FnMetadata: metav1.ObjectMeta{ FnMetadata: metav1.ObjectMeta{
Name: fnMeta.Name, Name: fnMeta.Name,
@@ -178,7 +184,7 @@ func (c *Client) TapService(fnMeta metav1.ObjectMeta, executorType fv1.ExecutorT
} }
} }
func (c *Client) _tapService(ctx context.Context, tapSvcReqs []TapServiceRequest) error { func (c *client) _tapService(ctx context.Context, tapSvcReqs []TapServiceRequest) error {
executorURL := c.executorURL + "/v2/tapServices" executorURL := c.executorURL + "/v2/tapServices"
body, err := json.Marshal(tapSvcReqs) body, err := json.Marshal(tapSvcReqs)
pkg/executor/executor.go
+1 -1
View File
@@ -266,7 +266,7 @@ func StartExecutor(ctx context.Context, clientGen crd.ClientGeneratorInterface,
logger.Error("error making the metrics client", zap.Error(err)) logger.Error("error making the metrics client", zap.Error(err))
} }
err = crd.WaitForCRDs(ctx, logger, fissionClient) err = crd.WaitForFunctionCRDs(ctx, logger, fissionClient)
if err != nil { if err != nil {
return errors.Wrap(err, "error waiting for CRDs") return errors.Wrap(err, "error waiting for CRDs")
} }
pkg/fetcher/client/client.go
+14 -9
View File
@@ -19,45 +19,50 @@ import (
) )
type ( type (
Client struct { ClientInterface interface {
Specialize(context.Context, *fetcher.FunctionSpecializeRequest) error
Fetch(context.Context, *fetcher.FunctionFetchRequest) error
Upload(context.Context, *fetcher.ArchiveUploadRequest) (*fetcher.ArchiveUploadResponse, error)
}
client struct {
logger *zap.Logger logger *zap.Logger
url string url string
httpClient *http.Client httpClient *http.Client
} }
) )
func MakeClient(logger *zap.Logger, fetcherUrl string) *Client { func MakeClient(logger *zap.Logger, fetcherUrl string) ClientInterface {
hc := &http.Client{Transport: otelhttp.NewTransport(http.DefaultTransport)} hc := &http.Client{Transport: otelhttp.NewTransport(http.DefaultTransport)}
return &Client{ return &client{
logger: logger.Named("fetcher_client"), logger: logger.Named("fetcher_client"),
url: strings.TrimSuffix(fetcherUrl, "/"), url: strings.TrimSuffix(fetcherUrl, "/"),
httpClient: hc, httpClient: hc,
} }
} }
func (c *Client) getSpecializeUrl() string { func (c *client) getSpecializeUrl() string {
return c.url + "/specialize" return c.url + "/specialize"
} }
func (c *Client) getFetchUrl() string { func (c *client) getFetchUrl() string {
return c.url + "/fetch" return c.url + "/fetch"
} }
func (c *Client) getUploadUrl() string { func (c *client) getUploadUrl() string {
return c.url + "/upload" return c.url + "/upload"
} }
func (c *Client) Specialize(ctx context.Context, req *fetcher.FunctionSpecializeRequest) error { func (c *client) Specialize(ctx context.Context, req *fetcher.FunctionSpecializeRequest) error {
_, err := sendRequest(c.logger, ctx, c.httpClient, req, c.getSpecializeUrl()) _, err := sendRequest(c.logger, ctx, c.httpClient, req, c.getSpecializeUrl())
return err return err
} }
func (c *Client) Fetch(ctx context.Context, fr *fetcher.FunctionFetchRequest) error { func (c *client) Fetch(ctx context.Context, fr *fetcher.FunctionFetchRequest) error {
_, err := sendRequest(c.logger, ctx, c.httpClient, fr, c.getFetchUrl()) _, err := sendRequest(c.logger, ctx, c.httpClient, fr, c.getFetchUrl())
return err return err
} }
func (c *Client) Upload(ctx context.Context, fr *fetcher.ArchiveUploadRequest) (*fetcher.ArchiveUploadResponse, error) { func (c *client) Upload(ctx context.Context, fr *fetcher.ArchiveUploadRequest) (*fetcher.ArchiveUploadResponse, error) {
body, err := sendRequest(c.logger, ctx, c.httpClient, fr, c.getUploadUrl()) body, err := sendRequest(c.logger, ctx, c.httpClient, fr, c.getUploadUrl())
if err != nil { if err != nil {
return nil, err return nil, err
pkg/kubewatcher/main.go
+1 -1
View File
@@ -36,7 +36,7 @@ func Start(ctx context.Context, clientGen crd.ClientGeneratorInterface, logger *
return errors.Wrap(err, "failed to get kubernetes client") return errors.Wrap(err, "failed to get kubernetes client")
} }
err = crd.WaitForCRDs(ctx, logger, fissionClient) err = crd.WaitForFunctionCRDs(ctx, logger, fissionClient)
if err != nil { if err != nil {
return errors.Wrap(err, "error waiting for CRDs") return errors.Wrap(err, "error waiting for CRDs")
} }
pkg/mqtrigger/scalermanager.go
+1 -1
View File
@@ -154,7 +154,7 @@ func StartScalerManager(ctx context.Context, clientGen crd.ClientGeneratorInterf
return errors.Wrap(err, "failed to get dynamic client") return errors.Wrap(err, "failed to get dynamic client")
} }
err = crd.WaitForCRDs(ctx, logger, fissionClient) err = crd.WaitForFunctionCRDs(ctx, logger, fissionClient)
if err != nil { if err != nil {
return errors.Wrap(err, "error waiting for CRDs") return errors.Wrap(err, "error waiting for CRDs")
} }
pkg/router/functionHandler.go
+2 -2
View File
@@ -38,7 +38,7 @@ import (
"github.com/fission/fission/pkg/crd" "github.com/fission/fission/pkg/crd"
ferror "github.com/fission/fission/pkg/error" ferror "github.com/fission/fission/pkg/error"
"github.com/fission/fission/pkg/error/network" "github.com/fission/fission/pkg/error/network"
executorClient "github.com/fission/fission/pkg/executor/client" eclient "github.com/fission/fission/pkg/executor/client"
"github.com/fission/fission/pkg/throttler" "github.com/fission/fission/pkg/throttler"
"github.com/fission/fission/pkg/utils" "github.com/fission/fission/pkg/utils"
otelUtils "github.com/fission/fission/pkg/utils/otel" otelUtils "github.com/fission/fission/pkg/utils/otel"
@@ -56,7 +56,7 @@ type (
functionHandler struct { functionHandler struct {
logger *zap.Logger logger *zap.Logger
fmap *functionServiceMap fmap *functionServiceMap
executor *executorClient.Client executor eclient.ClientInterface
function *fv1.Function function *fv1.Function
httpTrigger *fv1.HTTPTrigger httpTrigger *fv1.HTTPTrigger
functionMap map[string]*fv1.Function functionMap map[string]*fv1.Function
pkg/router/httpTriggers.go
+3 -3
View File
@@ -32,7 +32,7 @@ import (
fv1 "github.com/fission/fission/pkg/apis/core/v1" fv1 "github.com/fission/fission/pkg/apis/core/v1"
ferror "github.com/fission/fission/pkg/error" ferror "github.com/fission/fission/pkg/error"
executorClient "github.com/fission/fission/pkg/executor/client" eclient "github.com/fission/fission/pkg/executor/client"
config "github.com/fission/fission/pkg/featureconfig" config "github.com/fission/fission/pkg/featureconfig"
"github.com/fission/fission/pkg/generated/clientset/versioned" "github.com/fission/fission/pkg/generated/clientset/versioned"
"github.com/fission/fission/pkg/info" "github.com/fission/fission/pkg/info"
@@ -49,7 +49,7 @@ type HTTPTriggerSet struct {
logger *zap.Logger logger *zap.Logger
fissionClient versioned.Interface fissionClient versioned.Interface
kubeClient kubernetes.Interface kubeClient kubernetes.Interface
executor *executorClient.Client executor eclient.ClientInterface
resolver *functionReferenceResolver resolver *functionReferenceResolver
triggers []fv1.HTTPTrigger triggers []fv1.HTTPTrigger
triggerInformer map[string]k8sCache.SharedIndexInformer triggerInformer map[string]k8sCache.SharedIndexInformer
@@ -64,7 +64,7 @@ type HTTPTriggerSet struct {
} }
func makeHTTPTriggerSet(logger *zap.Logger, fmap *functionServiceMap, fissionClient versioned.Interface, func makeHTTPTriggerSet(logger *zap.Logger, fmap *functionServiceMap, fissionClient versioned.Interface,
kubeClient kubernetes.Interface, executor *executorClient.Client, params *tsRoundTripperParams, isDebugEnv bool, unTapServiceTimeout time.Duration, actionThrottler *throttler.Throttler) (*HTTPTriggerSet, error) { kubeClient kubernetes.Interface, executor eclient.ClientInterface, params *tsRoundTripperParams, isDebugEnv bool, unTapServiceTimeout time.Duration, actionThrottler *throttler.Throttler) (*HTTPTriggerSet, error) {
httpTriggerSet := &HTTPTriggerSet{ httpTriggerSet := &HTTPTriggerSet{
logger: logger.Named("http_trigger_set"), logger: logger.Named("http_trigger_set"),
pkg/router/router.go
+3 -5
View File
@@ -52,7 +52,7 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
"github.com/fission/fission/pkg/crd" "github.com/fission/fission/pkg/crd"
executorClient "github.com/fission/fission/pkg/executor/client" eclient "github.com/fission/fission/pkg/executor/client"
"github.com/fission/fission/pkg/throttler" "github.com/fission/fission/pkg/throttler"
"github.com/fission/fission/pkg/utils/httpserver" "github.com/fission/fission/pkg/utils/httpserver"
"github.com/fission/fission/pkg/utils/metrics" "github.com/fission/fission/pkg/utils/metrics"
@@ -98,7 +98,7 @@ func serve(ctx context.Context, logger *zap.Logger, port int,
} }
// Start starts a router // Start starts a router
func Start(ctx context.Context, clientGen crd.ClientGeneratorInterface, logger *zap.Logger, port int, executorURL string) error { func Start(ctx context.Context, clientGen crd.ClientGeneratorInterface, logger *zap.Logger, port int, executor eclient.ClientInterface) error {
fmap := makeFunctionServiceMap(logger, time.Minute) fmap := makeFunctionServiceMap(logger, time.Minute)
fissionClient, err := clientGen.GetFissionClient() fissionClient, err := clientGen.GetFissionClient()
@@ -110,13 +110,11 @@ func Start(ctx context.Context, clientGen crd.ClientGeneratorInterface, logger *
return errors.Wrap(err, "error making the kube client") return errors.Wrap(err, "error making the kube client")
} }
err = crd.WaitForCRDs(ctx, logger, fissionClient) err = crd.WaitForFunctionCRDs(ctx, logger, fissionClient)
if err != nil { if err != nil {
return errors.Wrap(err, "error waiting for CRDs") return errors.Wrap(err, "error waiting for CRDs")
} }
executor := executorClient.MakeClient(logger, executorURL)
timeoutStr := os.Getenv("ROUTER_ROUND_TRIP_TIMEOUT") timeoutStr := os.Getenv("ROUTER_ROUND_TRIP_TIMEOUT")
timeout, err := time.ParseDuration(timeoutStr) timeout, err := time.ParseDuration(timeoutStr)
if err != nil { if err != nil {
pkg/storagesvc/client/client.go
+17 -9
View File
@@ -36,16 +36,24 @@ import (
) )
type ( type (
Client struct { ClientInterface interface {
Upload(ctx context.Context, filePath string, metadata *map[string]string) (string, error)
GetUrl(id string) string
List(ctx context.Context) ([]string, error)
Download(ctx context.Context, id string, filePath string) error
GetFile(ctx context.Context, id string) (*http.Response, error)
Delete(ctx context.Context, id string) error
}
client struct {
url string url string
httpClient *http.Client httpClient *http.Client
} }
) )
// Client creates a storage service client. // Client creates a storage service client.
func MakeClient(url string) *Client { func MakeClient(url string) ClientInterface {
hc := &http.Client{Transport: otelhttp.NewTransport(http.DefaultTransport)} hc := &http.Client{Transport: otelhttp.NewTransport(http.DefaultTransport)}
return &Client{ return &client{
url: strings.TrimSuffix(url, "/") + "/v1", url: strings.TrimSuffix(url, "/") + "/v1",
httpClient: hc, httpClient: hc,
} }
@@ -54,7 +62,7 @@ func MakeClient(url string) *Client {
// Upload sends the local file pointed to by filePath to the storage // Upload sends the local file pointed to by filePath to the storage
// service, along with the metadata. It returns a file ID that can be // service, along with the metadata. It returns a file ID that can be
// used to retrieve the file. // used to retrieve the file.
func (c *Client) Upload(ctx context.Context, filePath string, metadata *map[string]string) (string, error) { func (c *client) Upload(ctx context.Context, filePath string, metadata *map[string]string) (string, error) {
fi, err := os.Stat(filePath) fi, err := os.Stat(filePath)
if err != nil { if err != nil {
return "", err return "", err
@@ -112,11 +120,11 @@ func (c *Client) Upload(ctx context.Context, filePath string, metadata *map[stri
} }
// GetUrl returns an HTTP URL that can be used to download the file pointed to by ID // GetUrl returns an HTTP URL that can be used to download the file pointed to by ID
func (c *Client) GetUrl(id string) string { func (c *client) GetUrl(id string) string {
return fmt.Sprintf("%v/archive?id=%v", c.url, url.PathEscape(id)) return fmt.Sprintf("%v/archive?id=%v", c.url, url.PathEscape(id))
} }
func (c *Client) List(ctx context.Context) ([]string, error) { func (c *client) List(ctx context.Context) ([]string, error) {
req, err := http.NewRequest(http.MethodGet, c.url+"/archive", nil) req, err := http.NewRequest(http.MethodGet, c.url+"/archive", nil)
if err != nil { if err != nil {
return []string{}, err return []string{}, err
@@ -145,7 +153,7 @@ func (c *Client) List(ctx context.Context) ([]string, error) {
// Download fetches the file identified by ID to the local file path. // Download fetches the file identified by ID to the local file path.
// filePath must not exist. // filePath must not exist.
func (c *Client) Download(ctx context.Context, id string, filePath string) error { func (c *client) Download(ctx context.Context, id string, filePath string) error {
// url for id // url for id
url := c.GetUrl(id) url := c.GetUrl(id)
@@ -187,7 +195,7 @@ func (c *Client) Download(ctx context.Context, id string, filePath string) error
// Download fetches the file identified by ID to the local file path. // Download fetches the file identified by ID to the local file path.
// filePath must not exist. // filePath must not exist.
func (c *Client) GetFile(ctx context.Context, id string) (resp *http.Response, err error) { func (c *client) GetFile(ctx context.Context, id string) (resp *http.Response, err error) {
// url for id // url for id
url := c.GetUrl(id) url := c.GetUrl(id)
@@ -200,7 +208,7 @@ func (c *Client) GetFile(ctx context.Context, id string) (resp *http.Response, e
return resp, err return resp, err
} }
func (c *Client) Delete(ctx context.Context, id string) error { func (c *client) Delete(ctx context.Context, id string) error {
url := c.GetUrl(id) url := c.GetUrl(id)
req, err := http.NewRequest(http.MethodDelete, url, nil) req, err := http.NewRequest(http.MethodDelete, url, nil)
pkg/timer/main.go
+1 -1
View File
@@ -32,7 +32,7 @@ func Start(ctx context.Context, clientGen crd.ClientGeneratorInterface, logger *
return errors.Wrap(err, "failed to get fission client") return errors.Wrap(err, "failed to get fission client")
} }
err = crd.WaitForCRDs(ctx, logger, fissionClient) err = crd.WaitForFunctionCRDs(ctx, logger, fissionClient)
if err != nil { if err != nil {
return errors.Wrap(err, "error waiting for CRDs") return errors.Wrap(err, "error waiting for CRDs")
} }
test/e2e/framework/services/services.go
+3 -1
View File
@@ -7,6 +7,7 @@ import (
"github.com/fission/fission/pkg/buildermgr" "github.com/fission/fission/pkg/buildermgr"
"github.com/fission/fission/pkg/executor" "github.com/fission/fission/pkg/executor"
eclient "github.com/fission/fission/pkg/executor/client"
"github.com/fission/fission/pkg/router" "github.com/fission/fission/pkg/router"
"github.com/fission/fission/pkg/storagesvc" "github.com/fission/fission/pkg/storagesvc"
"github.com/fission/fission/pkg/utils" "github.com/fission/fission/pkg/utils"
@@ -93,7 +94,8 @@ func StartServices(ctx context.Context, f *framework.Framework) error {
if err != nil { if err != nil {
return fmt.Errorf("error toggling metric address: %v", err) return fmt.Errorf("error toggling metric address: %v", err)
} }
err = router.Start(ctx, f.ClientGen(), f.Logger(), routerPort, fmt.Sprintf("http://localhost:%d", executorPort)) executor := eclient.MakeClient(f.Logger(), fmt.Sprintf("http://localhost:%d", executorPort))
err = router.Start(ctx, f.ClientGen(), f.Logger(), routerPort, executor)
if err != nil { if err != nil {
return fmt.Errorf("error starting router: %v", err) return fmt.Errorf("error starting router: %v", err)
} }