feat: add very basic component log display

Fixes #87

pkg/hal/cli/component/component.go

@@ -33,6 +33,7 @@ func NewCmdComponent(parent string) *cobra.Command {
  push,
  mode,
  bind,
+ NewCmdLog(fullName),
  )
 
  return hal

pkg/hal/cli/component/log.go

@@ -0,0 +1,56 @@
+package component
+
+import (
+ "fmt"
+ "github.com/spf13/cobra"
+ "halkyon.io/api/component/v1beta1"
+ "halkyon.io/hal/pkg/cmdutil"
+ "halkyon.io/hal/pkg/k8s"
+)
+
+const logCommandName = "log"
+
+type logOptions struct {
+ component *v1beta1.Component
+ *cmdutil.ComponentTargetingOptions
+}
+
+func (o *logOptions) SetTargetingOptions(options *cmdutil.ComponentTargetingOptions) {
+ o.ComponentTargetingOptions = options
+}
+
+func (o *logOptions) Complete(name string, cmd *cobra.Command, args []string) (err error) {
+ // get the targeted component
+ o.component, err = Entity.GetTyped(o.GetTargetedComponentName())
+ if err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (o *logOptions) Validate() error {
+ return nil
+}
+
+func (o *logOptions) Run() error {
+ podName := o.component.Status.GetAssociatedPodName()
+ if err := k8s.Logs(podName); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func NewCmdLog(fullParentName string) *cobra.Command {
+ o := &logOptions{}
+ bind := &cobra.Command{
+ Use: fmt.Sprintf("%s [flags]", logCommandName),
+ Short: "Retrieve the logs for the component",
+ Long: `Retrieve the logs for the component.`,
+ Example: fmt.Sprintf(modeExample, cmdutil.CommandName(logCommandName, fullParentName)),
+ Args: cobra.NoArgs,
+ }
+ cmdutil.ConfigureRunnableAndCommandWithTargeting(o, bind)
+ return bind
+}

pkg/k8s/kubectl.go

@@ -30,14 +30,22 @@ func IsJarPresent(podName string) bool {
  return runKubectl([]string{"exec", podName, "--", "ls", JarPathInContainer}...) == nil
 }
 
+func Logs(podName string) error {
+ command, interceptor := configureKubectlCmd("logs", "--since=10s", podName)
+ command.Stdout = os.Stdout // so that we can print the output of the command
+ return runKubectlCmd(command, interceptor)
+}
+
 func Apply(path, namespace string) error {
  return runKubectl([]string{"apply", "-f", path, "-n", namespace}...)
 }
 
 func runKubectl(args ...string) error {
- command := exec.Command(kubectl, args...)
- interceptor := log.GetErrorInterceptor()
- command.Stderr = interceptor
+ command, interceptor := configureKubectlCmd(args...)
+ return runKubectlCmd(command, interceptor)
+}
+
+func runKubectlCmd(command *exec.Cmd, interceptor *log.ErrorInterceptor) error {
  err := command.Run()
  if err != nil {
  if len(interceptor.ErrorMsg) > 0 {
@@ -48,6 +56,13 @@ func runKubectl(args ...string) error {
  return nil
 }
 
+func configureKubectlCmd(args ...string) (*exec.Cmd, *log.ErrorInterceptor) {
+ command := exec.Command(kubectl, args...)
+ interceptor := log.GetErrorInterceptor()
+ command.Stderr = interceptor
+ return command, interceptor
+}
+
 func GetK8SClientFlavor() string {
  return kubectl
 }