Revert gRPC client dial change and test VZ block devices

Signed-off-by: Nick Sweeting <git@sweeting.me>

Author: pirate

hack/test-templates.sh

@@ -62,6 +62,7 @@ declare -A CHECKS=(
 	["preserve-env"]="1"
 	["static-port-forwards"]=""
 	["ssh-over-vsock"]=""
+	["vz-block-device"]=""
 )
 
 case "$NAME" in
@@ -70,6 +71,7 @@ case "$NAME" in
 	# "[hostagent] failed to confirm whether /c/Users/runneradmin [remote] is successfully mounted"
 	[ "${OS_HOST}" = "Msys" ] && CHECKS["mount-home"]=
 	[ "${OS_HOST}" = "Darwin" ] && CHECKS["ssh-over-vsock"]="1"
+	[ "${OS_HOST}" = "Darwin" ] && CHECKS["vz-block-device"]="1"
 	;;
 "alpine"*)
 	WARNING "Alpine does not support systemd"
@@ -155,6 +157,90 @@ function diagnose() {
 	set +x -e
 }
 
+function test_vz_block_device() {
+	local name="$1"
+	local host_block_device="$2"
+	local host_block_device_id="$3"
+	local volume_label="$4"
+	local guest_block_device="/dev/disk/by-id/virtio-${host_block_device_id}"
+	local guest_partition_by_id="/dev/disk/by-id/virtio-${host_block_device_id}-part1"
+	local host_partition
+	local host_mount_point
+	local expected_contents
+
+	expected_contents="$(printf 'test\ntest2')"
+
+	INFO "Testing VZ block-device attachment (${host_block_device})"
+	set -x
+	limactl shell "$name" bash -eus -- "$guest_block_device" "$guest_partition_by_id" "$volume_label" <<'EOF'
+guest_block_device="$1"
+guest_partition_by_id="$2"
+volume_label="$3"
+guest_partition="$guest_partition_by_id"
+
+if ! command -v mkfs.exfat >/dev/null 2>&1 || ! command -v parted >/dev/null 2>&1; then
+	sudo apt-get update
+	sudo apt-get install -y exfatprogs parted
+fi
+
+sudo parted -s "$guest_block_device" -- mklabel gpt mkpart primary 1MiB 100%
+sudo udevadm settle
+if [ ! -e "$guest_partition" ]; then
+	guest_partition="$(lsblk -nrpo PATH "$guest_block_device" | sed -n '2p')"
+fi
+test -n "$guest_partition"
+sudo mkfs.exfat -n "$volume_label" "$guest_partition"
+sudo mkdir -p /mnt/test
+sudo mount "$guest_partition" /mnt/test
+	printf 'test\n' | sudo tee /mnt/test/test.txt >/dev/null
+	sudo sync
+	sudo umount /mnt/test
+EOF
+	limactl stop "$name"
+	sudo diskutil mountDisk "$host_block_device"
+	host_partition="$(diskutil list "$host_block_device" | awk '$NF ~ /^disk[0-9]+s[0-9]+$/ {print "/dev/" $NF; exit}')"
+	if [ -z "$host_partition" ]; then
+		set +x
+		ERROR "Failed to determine host partition for ${host_block_device}"
+		exit 1
+	fi
+	host_mount_point="$(mount | awk -v dev="$host_partition" '$1 == dev {print $3; exit}')"
+	if [ -z "$host_mount_point" ]; then
+		set +x
+		ERROR "Failed to determine mount point for ${host_partition}"
+		exit 1
+	fi
+	printf 'test2\n' | sudo tee -a "$host_mount_point/test.txt" >/dev/null
+	if [ "$(cat "$host_mount_point/test.txt")" != "$expected_contents" ]; then
+		set +x
+		ERROR "Host block device contents are incorrect"
+		exit 1
+	fi
+	sudo diskutil unmountDisk force "$host_block_device"
+	limactl start "$name"
+	if [ "$(
+		limactl shell "$name" bash -eus -- "$guest_block_device" "$guest_partition_by_id" <<'EOF'
+guest_block_device="$1"
+guest_partition_by_id="$2"
+guest_partition="$guest_partition_by_id"
+
+if [ ! -e "$guest_partition" ]; then
+	guest_partition="$(lsblk -nrpo PATH "$guest_block_device" | sed -n '2p')"
+fi
+test -n "$guest_partition"
+sudo mkdir -p /mnt/test
+sudo mount "$guest_partition" /mnt/test
+cat /mnt/test/test.txt
+sudo umount /mnt/test
+EOF
+	)" != "$expected_contents" ]; then
+		set +x
+		ERROR "Guest block device contents are incorrect after host write"
+		exit 1
+	fi
+	set +x
+}
+
 export ftp_proxy=http://localhost:2121
 
 INFO "Creating \"$NAME\" from \"$FILE_HOST\""
@@ -176,14 +262,36 @@ set -x
 "${LIMACTL_CREATE[@]}" ${LIMACTL_CREATE_ARGS:-} "$FILE_HOST"
 set +x
 
+VM_TYPE="$(limactl ls "${NAME}" --yq .vmType)"
+START_ARGS=("$NAME")
+VZ_BLOCK_DEVICE_HOST=
+VZ_BLOCK_DEVICE_ID=
+VZ_BLOCK_DEVICE_LABEL=
+
+if [[ -n ${CHECKS["vz-block-device"]} && $VM_TYPE == "vz" ]]; then
+	INFO "Creating host RAM disk for VZ block-device test"
+	set -x
+	VZ_BLOCK_DEVICE_HOST="$(sudo hdiutil attach -nomount ram://524288 | awk 'NR==1 {print $1}')"
+	set +x
+	if [[ -z $VZ_BLOCK_DEVICE_HOST ]]; then
+		ERROR "Failed to create host RAM disk"
+		exit 1
+	fi
+	VZ_BLOCK_DEVICE_ID="$(basename "$VZ_BLOCK_DEVICE_HOST")"
+	VZ_BLOCK_DEVICE_LABEL="LIMABD${RANDOM}"
+	defer "sudo diskutil unmountDisk force \"$VZ_BLOCK_DEVICE_HOST\" >/dev/null 2>&1 || true"
+	defer "sudo hdiutil detach \"$VZ_BLOCK_DEVICE_HOST\" -force >/dev/null 2>&1 || true"
+	START_ARGS=(--block-device "$VZ_BLOCK_DEVICE_HOST" "$NAME")
+fi
+
 if [[ -n ${CHECKS["mount-path-with-spaces"]} ]]; then
 	mkdir -p "/tmp/lima test dir with spaces"
 	echo "test file content" >"/tmp/lima test dir with spaces/test file"
 fi
 
 INFO "Starting \"$NAME\""
 set -x
-if ! limactl start "$NAME"; then
+if ! limactl start "${START_ARGS[@]}"; then
 	ERROR "Failed to start \"$NAME\""
 	diagnose "$NAME"
 	exit 1
@@ -386,6 +494,10 @@ if [[ -n ${CHECKS["ssh-over-vsock"]} ]]; then
 	fi
 fi
 
+if [[ -n ${CHECKS["vz-block-device"]} && -n $VZ_BLOCK_DEVICE_HOST ]]; then
+	test_vz_block_device "$NAME" "$VZ_BLOCK_DEVICE_HOST" "$VZ_BLOCK_DEVICE_ID" "$VZ_BLOCK_DEVICE_LABEL"
+fi
+
 # Use GHCR and ECR to avoid hitting Docker Hub rate limit
 nginx_image="ghcr.io/stargz-containers/nginx:1.19-alpine-org"
 alpine_image="ghcr.io/containerd/alpine:3.14.0"
@@ -610,7 +722,9 @@ fi
 if [[ -n ${CHECKS["user-v2"]} ]]; then
 	INFO "Testing user-v2 network"
 	secondvm="$NAME-1"
+	limactl delete -f "$secondvm" >/dev/null 2>&1 || true
 	"${LIMACTL_CREATE[@]}" --set ".additionalDisks=null" "$FILE_HOST" --name "$secondvm"
+	defer "limactl delete -f \"$secondvm\" >/dev/null 2>&1 || true"
 	if ! limactl start "$secondvm"; then
 		ERROR "Failed to start \"$secondvm\""
 		diagnose "$secondvm"

pkg/driver/external/client/client.go

@@ -10,7 +10,6 @@ import (
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
-	"google.golang.org/grpc/resolver"
 
 	pb "github.com/lima-vm/lima/v2/pkg/driver/external"
 )
@@ -33,8 +32,8 @@ func NewDriverClient(socketPath string, logger *logrus.Logger) (*DriverClient, e
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
 	}
 
-	resolver.SetDefaultScheme("passthrough")
-	conn, err := grpc.NewClient("", opts...)
+	//nolint:staticcheck // grpc.Dial is used for compatibility reasons
+	conn, err := grpc.Dial("unix://"+socketPath, opts...)
 	if err != nil {
 		logger.Errorf("failed to dial gRPC driver client connection: %v", err)
 		return nil, err