Add util.term, ARD and reflection fixes

Also bump NOTICE date

NOTICE

@@ -1,5 +1,5 @@
 Kutil
-Copyright 2020-2021 Tal Liron
+Copyright 2020-2022 Tal Liron
 
 ---
 

ard/yaml.go

@@ -9,23 +9,18 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
-func ToYAMLDocumentNode(value Value, verbose bool) *yaml.Node {
-	var node *yaml.Node
-	var ok bool
-	if node, ok = ToYAMLNode(value, verbose); !ok {
-		// Try again after canonicalization
-		var err error
-		if value, err = Canonicalize(value); err == nil {
-			if node, ok = ToYAMLNode(value, verbose); !ok {
-				panic(fmt.Sprintf("unsupported value type: %T", value))
-			}
+func ToYAMLDocumentNode(value Value, verbose bool) (*yaml.Node, error) {
+	if value_, err := Canonicalize(value); err == nil {
+		if node, ok := ToYAMLNode(value_, verbose); ok {
+			return &yaml.Node{
+				Kind:    yaml.DocumentNode,
+				Content: []*yaml.Node{node},
+			}, nil
 		} else {
-			panic(err)
+			return nil, fmt.Errorf("unsupported value type: %T", value_)
 		}
-	}
-	return &yaml.Node{
-		Kind:    yaml.DocumentNode,
-		Content: []*yaml.Node{node},
+	} else {
+		return nil, err
 	}
 }
 

kubernetes/rest.go

@@ -70,7 +70,7 @@ func Exec(rest restpkg.Interface, config *restpkg.Config, namespace string, podN
 		if err = executor.Stream(streamOptions); err == nil {
 			return nil
 		} else {
-			return NewExecError(err, stderrCapture.String())
+			return NewExecError(err, strings.TrimRight(stderrCapture.String(), "\n"))
 		}
 	} else {
 		return err

reflection/traverse.go

@@ -40,12 +40,6 @@ func TraverseEntities(entity any, locking bool, traverse EntityTraverser) {
 			continue
 		}
 
-		// Ignore if has "lookup" tag
-		// TODO: should this be *here*?
-		if _, ok := structField.Tag.Lookup("lookup"); ok {
-			continue
-		}
-
 		field := value.FieldByName(structField.Name)
 
 		// Ignore unexported fields
@@ -55,26 +49,10 @@ func TraverseEntities(entity any, locking bool, traverse EntityTraverser) {
 
 		fieldType := field.Type()
 
-		if IsPointerToStruct(fieldType) && !field.IsNil() {
+		if IsPointerToStruct(fieldType) {
 			// Compatible with *struct{}
-			value := field.Interface()
-			if lock != nil {
-				lock.Unlock()
-			}
-			TraverseEntities(value, locking, traverse)
-			if lock != nil {
-				lock.Lock()
-			}
-		} else if IsSliceOfPointerToStruct(fieldType) {
-			// Compatible with []*struct{}
-			length := field.Len()
-			elements := make([]reflect.Value, length)
-			for index := 0; index < length; index++ {
-				elements[index] = field.Index(index)
-			}
-
-			for _, element := range elements {
-				value := element.Interface()
+			if !field.IsNil() {
+				value := field.Interface()
 				if lock != nil {
 					lock.Unlock()
 				}
@@ -83,22 +61,44 @@ func TraverseEntities(entity any, locking bool, traverse EntityTraverser) {
 					lock.Lock()
 				}
 			}
+		} else if IsSliceOfPointerToStruct(fieldType) {
+			// Compatible with []*struct{}
+			if !field.IsNil() {
+				length := field.Len()
+				elements := make([]reflect.Value, length)
+				for index := 0; index < length; index++ {
+					elements[index] = field.Index(index)
+				}
+
+				for _, element := range elements {
+					value := element.Interface()
+					if lock != nil {
+						lock.Unlock()
+					}
+					TraverseEntities(value, locking, traverse)
+					if lock != nil {
+						lock.Lock()
+					}
+				}
+			}
 		} else if IsMapOfStringToPointerToStruct(fieldType) {
 			// Compatible with map[string]*struct{}
-			keys := field.MapKeys()
-			elements := make([]reflect.Value, len(keys))
-			for index, key := range keys {
-				elements[index] = field.MapIndex(key)
-			}
-
-			for _, element := range elements {
-				value := element.Interface()
-				if lock != nil {
-					lock.Unlock()
+			if !field.IsNil() {
+				keys := field.MapKeys()
+				elements := make([]reflect.Value, len(keys))
+				for index, key := range keys {
+					elements[index] = field.MapIndex(key)
 				}
-				TraverseEntities(value, locking, traverse)
-				if lock != nil {
-					lock.Lock()
+
+				for _, element := range elements {
+					value := element.Interface()
+					if lock != nil {
+						lock.Unlock()
+					}
+					TraverseEntities(value, locking, traverse)
+					if lock != nil {
+						lock.Lock()
+					}
 				}
 			}
 		}

transcribe/write.go

@@ -54,7 +54,10 @@ func Write(value any, format string, indent string, strict bool, writer io.Write
 
 func WriteYAML(value any, writer io.Writer, indent string, strict bool) error {
 	if strict {
-		value = ard.ToYAMLDocumentNode(value, true)
+		var err error
+		if value, err = ard.ToYAMLDocumentNode(value, true); err != nil {
+			return err
+		}
 	}
 
 	encoder := yaml.NewEncoder(writer)

util/term.go

@@ -0,0 +1,29 @@
+package util
+
+import (
+	"os"
+
+	"golang.org/x/term"
+)
+
+func ToRawTerminal(f func() error) {
+	stdin := int(os.Stdin.Fd())
+	state, err := term.MakeRaw(stdin)
+	FailOnError(err)
+
+	handle := OnExitError(func() error {
+		os.Stdout.WriteString("\r")
+		return term.Restore(stdin, state)
+	})
+
+	err = f()
+
+	if err == nil {
+		Exit(0)
+	} else {
+		handle.Cancel()
+		os.Stdout.WriteString("\r")
+		term.Restore(stdin, state)
+		FailOnError(err)
+	}
+}