Move LogRequestor into k8s package

This allows the code to be vendored into the openfaas-operator.

Tested with go build.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>

Author: alexellis

handlers/log.go renamed to k8s/log.go

@@ -1,13 +1,12 @@
 // Copyright 2019 OpenFaaS Author(s)
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-package handlers
+package k8s
 
 import (
 	"context"
 	"log"
 
-	"github.com/openfaas/faas-netes/k8s"
 	"github.com/openfaas/faas-provider/logs"
 	"k8s.io/client-go/kubernetes"
 )
@@ -30,13 +29,13 @@ func NewLogRequestor(client kubernetes.Interface, functionNamespace string) *Log
 // This implementation ignores the r.Limit value because the OF-Provider already handles server side
 // line limits.
 func (l LogRequestor) Query(ctx context.Context, r logs.Request) (<-chan logs.Message, error) {
-	logStream, err := k8s.GetLogs(ctx, l.client, r.Name, l.functionNamespace, int64(r.Tail), r.Since, r.Follow)
+	logStream, err := GetLogs(ctx, l.client, r.Name, l.functionNamespace, int64(r.Tail), r.Since, r.Follow)
 	if err != nil {
 		log.Printf("LogRequestor: get logs failed: %s\n", err)
 		return nil, err
 	}
 
-	msgStream := make(chan logs.Message, k8s.LogBufferSize)
+	msgStream := make(chan logs.Message, LogBufferSize)
 	go func() {
 		defer close(msgStream)
 		// here we depend on the fact that logStream will close when the context is cancelled,

main.go

@@ -107,7 +107,7 @@ func main() {
 		HealthHandler:        handlers.MakeHealthHandler(),
 		InfoHandler:          handlers.MakeInfoHandler(version.BuildVersion(), version.GitCommit),
 		SecretHandler:        handlers.MakeSecretHandler(functionNamespace, clientset),
-		LogHandler:           logs.NewLogHandlerFunc(handlers.NewLogRequestor(clientset, functionNamespace), cfg.FaaSConfig.WriteTimeout),
+		LogHandler:           logs.NewLogHandlerFunc(k8s.NewLogRequestor(clientset, functionNamespace), cfg.FaaSConfig.WriteTimeout),
 		ListNamespaceHandler: handlers.MakeNamespacesLister(functionNamespace, clientset),
 	}