enhance logs functionality to handle build stage log (#48)

* enhance logs functionality to handle build stage log

Signed-off-by: Alex Ji <jilichao@aliyun.com>

Author: James-JLC

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852
 	github.com/openfunction v0.0.0-00010101000000-000000000000
 	github.com/pkg/errors v0.9.1
+	github.com/shipwright-io/build v0.6.0
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5
 	gopkg.in/yaml.v2 v2.4.0

go.sum

@@ -155,7 +155,7 @@ github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb0
 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/OneOfOne/xxhash v1.2.7/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
-github.com/OpenFunction/OpenFunction v0.6.0 h1:VfIqhLBz3I9DBheWBjKuFHZ2L31NdDvf0ZcAkT+P+70=
+github.com/OpenFunction/OpenFunction v0.6.0 h1:BZZCgr4s6OFadPRhrO+vRKpo4BHznknZMMOHQc/I3hs=
 github.com/OpenFunction/OpenFunction v0.6.0/go.mod h1:7Ida4Kxst2Y+EnbIh/OELB22JXlJO81+PoXWJnB0sSw=
 github.com/ProtonMail/go-crypto v0.0.0-20210329181949-3900d675f39b/go.mod h1:HTM9X7e9oLwn7RiqLG0UVwVRJenLs3wN+tQ0NPAfwMQ=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
@@ -1338,6 +1338,7 @@ github.com/sendgrid/sendgrid-go v3.5.0+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/shipwright-io/build v0.6.0 h1:E8jBhnXOUIP/Omyg/sB5StnfTVmj/cJ8nEPcsUeYdrg=
 github.com/shipwright-io/build v0.6.0/go.mod h1:OllxAXgx6J4DjbiTrs+/E8lGHzMfUvf7/qzdRhvzaxg=
 github.com/shirou/gopsutil v3.20.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=

pkg/cmd/subcommand/logs.go

@@ -25,8 +25,10 @@ import (
 	"github.com/OpenFunction/cli/pkg/cmd/util"
 	cc "github.com/OpenFunction/cli/pkg/cmd/util/client"
 	client "github.com/openfunction/pkg/client/clientset/versioned"
+	swclient "github.com/shipwright-io/build/pkg/client/clientset/versioned"
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	k8s "k8s.io/client-go/kubernetes"
@@ -44,29 +46,29 @@ type Logs struct {
 
 	functionClient client.Interface
 	clientSet      *k8s.Clientset
+	swClient       swclient.Interface
 }
 
 // NewCmdLogs builds the `logs` sub command
 func NewCmdLogs(cf *genericclioptions.ConfigFlags, ioStreams genericclioptions.IOStreams) *cobra.Command {
 
 	l := &Logs{
-		IOStreams:     &ioStreams,
-		containerName: "function",
+		IOStreams: &ioStreams,
 	}
 
 	cmd := &cobra.Command{
 		Use:                   `logs [OPTIONS] FUNCTION_NAME [CONTAINER_NAME]`,
 		DisableFlagsInUseLine: true,
-		Short:                 "Get the logs from the serving pods created by the function",
-		Long:                  `Get the logs from the serving pods created by the function`,
+		Short:                 "Get the logs from the build and serving pods created by the function",
+		Long:                  `Get the logs from the build and serving pods created by the function`,
 		Example: `
-  # Get tht logs from the 'function' container in the serving pods created by the function whose name is 'demo-function'
+  # Get tht logs from all container in the build and serving pods created by the function whose name is 'demo-function'
   ofn logs demo-function
 
-  # Get tht logs from the 'extra' container (a container whose name is not 'function') in the serving pods created by the function whose name is 'demo-function'
+  # Get tht logs from the 'extra' container (a container whose name is not 'function') in the build or serving pods created by the function whose name is 'demo-function'
   ofn logs demo-function extra
 
-  # Begin streaming the logs from the 'function' container in the serving pods created by the function whose name is 'demo-function'
+  # Begin streaming the logs from the 'function' container in the build and serving pods created by the function whose name is 'demo-function'
   ofn logs -f demo-function
 `,
 		PreRunE: func(cmd *cobra.Command, args []string) (err error) {
@@ -91,6 +93,7 @@ func (l *Logs) preRun(cf *genericclioptions.ConfigFlags, args []string) error {
 		return err
 	}
 	l.functionClient = client.NewForConfigOrDie(config)
+	l.swClient = swclient.NewForConfigOrDie(config)
 
 	if cf.Namespace != nil && *(cf.Namespace) != "" {
 		l.namespace = *(cf.Namespace)
@@ -116,26 +119,93 @@ func (l *Logs) run() error {
 	if err != nil {
 		return err
 	}
-	if f.Status.Serving == nil {
-		return nil
+
+	// Build stage
+	if f.Status.Build != nil {
+		builderRef := f.Status.Build.ResourceRef
+
+		// get openfunction builder ref
+		builder, err := l.functionClient.CoreV1beta1().Builders(f.Namespace).Get(ctx, builderRef, metav1.GetOptions{})
+		if err != nil {
+			statusError, ok := err.(*k8serrors.StatusError)
+			// builder has been cleaned up
+			if !ok || statusError.Status().Code != 404 {
+				return err
+			}
+		}
+
+		// get shipwright builder-buildrun
+		swbuildrunRef := builder.Status.ResourceRef["shipwright.io/buildRun"]
+		if swbuildrunRef != "" {
+			swBuildRun, err := l.swClient.ShipwrightV1alpha1().BuildRuns(f.Namespace).Get(ctx, swbuildrunRef, metav1.GetOptions{})
+			if err != nil {
+				statusError, ok := err.(*k8serrors.StatusError)
+				// buildrun has been cleaned up
+				if !ok || statusError.Status().Code != 404 {
+					return err
+				}
+			}
+			err = l.logsForPods(ctx, metav1.ListOptions{LabelSelector: fmt.Sprintf("buildrun.shipwright.io/name=%s", swBuildRun.Name)})
+			if err != nil {
+				return err
+			}
+		}
+
+	}
+
+	// Serving stage
+	if f.Status.Serving != nil {
+		serving := f.Status.Serving.ResourceRef
+
+		if l.containerName == "" {
+			l.containerName = "function"
+		}
+		err := l.logsForPods(ctx, metav1.ListOptions{LabelSelector: fmt.Sprintf("openfunction.io/serving=%s", serving)})
+		if err != nil {
+			return err
+		}
 	}
-	serving := f.Status.Serving.ResourceRef
-	listOpt := metav1.ListOptions{LabelSelector: fmt.Sprintf("openfunction.io/serving=%s", serving)}
+
+	return nil
+}
+
+func (l *Logs) logsForPods(ctx context.Context, listOpt metav1.ListOptions) error {
+	// retrieves pod list according to the options
 	podInterface := l.clientSet.CoreV1().Pods(l.namespace)
+	readerList := make([]io.Reader, 0, 5)
 	podList, err := podInterface.List(ctx, listOpt)
 	if err != nil {
 		return err
 	}
-	readerList := make([]io.Reader, 0, len(podList.Items))
+
+	// append stream of each container
 	for _, pod := range podList.Items {
-		logReader, err := podInterface.GetLogs(pod.Name, &corev1.PodLogOptions{Follow: l.Follow, Container: l.containerName}).Stream(ctx)
-		defer logReader.Close()
+		var logReader io.ReadCloser
+		if l.containerName != "" {
+			logReader, err = podInterface.GetLogs(pod.Name, &corev1.PodLogOptions{Follow: l.Follow, Container: l.containerName}).Stream(ctx)
+			if err != nil {
+				return err
+			}
+			defer logReader.Close()
+			readerList = append(readerList, logReader)
+		} else {
+			for _, container := range pod.Spec.Containers {
+				logReader, err = podInterface.GetLogs(pod.Name, &corev1.PodLogOptions{Follow: l.Follow, Container: container.Name}).Stream(ctx)
+				if err != nil {
+					return err
+				}
+
+				defer logReader.Close()
+				readerList = append(readerList, logReader)
+			}
+		}
 		if err != nil {
 			return err
 		}
-		readerList = append(readerList, logReader)
 	}
+
 	reader := io.MultiReader(readerList...)
-	_, err = io.Copy(l.IOStreams.Out, reader)
+	io.Copy(l.IOStreams.Out, reader)
+
 	return err
 }