Fix IPv6 metadata collection in agent, fix errTuple coercion for scripts

Author: KCarretto

pkg/agent/metadata.go

@@ -68,16 +68,22 @@ func (agent *Agent) collectMetadata() {
 	// Always update primary IP
 	ipAddrs, err := iface.Addrs()
 	if err != nil || len(ipAddrs) < 1 {
-		agent.Log.Error("Failed to collect machine primary IP")
+		agent.Log.Error("Failed to collect machine primary IP", zap.Error(err))
 		return
 	}
 
-	ip, _, err := net.ParseCIDR(ipAddrs[0].String())
-	if err != nil {
-		agent.Log.Error("Failed to collect machine primary IP")
-		return
+	for _, ipAddr := range ipAddrs {
+		ip, _, err := net.ParseCIDR(ipAddr.String())
+		if err != nil {
+			agent.Log.Error("Failed to collect machine primary IP", zap.Error(err))
+			continue
+		}
+		if !ip.IsLoopback() && !ip.IsLinkLocalUnicast() && !ip.IsGlobalUnicast() {
+			continue
+		}
+		agent.Metadata.PrimaryIP = ip.String()
 	}
-	agent.Metadata.PrimaryIP = ip.String()
+
 }
 
 // isMulticastCapable reports whether ifi is an IP multicast-capable
@@ -150,7 +156,7 @@ func routableIP(network string, ip net.IP) net.IP {
 			return ip
 		}
 	case "ip6":
-		if ip.IsLoopback() { // addressing scope of the loopback address depends on each implementation
+		if ip.IsLoopback() || ip.IsLinkLocalUnicast() { // addressing scope of the loopback address depends on each implementation
 			return nil
 		}
 		if ip := ip.To16(); ip != nil && ip.To4() == nil {

pkg/script/convert.go

@@ -16,15 +16,15 @@ func convertToStarlark(value interface{}) (starlark.Value, error) {
 	case starlark.Value:
 		return v, nil
 	case errTuple:
+		var starlarkErr starlark.Value = starlark.None
 		if v.err != nil {
-			return starlark.Tuple{starlark.None, starlark.String(v.err.Error())}, nil
+			starlarkErr = starlark.String(v.err.Error())
 		}
-
 		retVal, err := convertToStarlark(v.val)
 		if err != nil {
 			return starlark.None, fmt.Errorf("failed to convert contained value: %w", err)
 		}
-		return starlark.Tuple{retVal, starlark.None}, nil
+		return starlark.Tuple{retVal, starlarkErr}, nil
 	case bool:
 		return starlark.Bool(v), nil
 	case int: