From c85dc674bad01a739ecb6022c74736240007181a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 18 Oct 2022 11:24:43 +0200
Subject: [PATCH] Update Terraform libvirt to v0.7.0 (#304)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update Terraform libvirt to v0.7.0

* Use disk block

* Remove nulled disk options

Signed-off-by: Daniel Weiße <dw@edgeless.systems>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 cli/internal/terraform/terraform/qemu/main.tf |  2 +-
 .../qemu/modules/instance_group/main.tf       | 29 +++++--------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/cli/internal/terraform/terraform/qemu/main.tf b/cli/internal/terraform/terraform/qemu/main.tf
index 2db210888..1ecb72e2b 100644
--- a/cli/internal/terraform/terraform/qemu/main.tf
+++ b/cli/internal/terraform/terraform/qemu/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     libvirt = {
       source  = "dmacvicar/libvirt"
-      version = "0.6.14"
+      version = "0.7.0"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/cli/internal/terraform/terraform/qemu/modules/instance_group/main.tf b/cli/internal/terraform/terraform/qemu/modules/instance_group/main.tf
index c39a1d6f7..61693a91e 100644
--- a/cli/internal/terraform/terraform/qemu/modules/instance_group/main.tf
+++ b/cli/internal/terraform/terraform/qemu/modules/instance_group/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     libvirt = {
       source  = "dmacvicar/libvirt"
-      version = "0.6.14"
+      version = "0.7.0"
     }
   }
 }
@@ -22,26 +22,13 @@ resource "libvirt_domain" "instance_group" {
     backend_type    = "emulator"
     backend_version = "2.0"
   }
-  disk = [
-    {
-      volume_id = element(libvirt_volume.boot_volume.*.id, count.index)
-      scsi : true,
-      // fix for https://github.com/dmacvicar/terraform-provider-libvirt/issues/728
-      block_device : null,
-      file : null,
-      url : null,
-      wwn : null
-    },
-    {
-      volume_id = element(libvirt_volume.state_volume.*.id, count.index)
-      // fix for https://github.com/dmacvicar/terraform-provider-libvirt/issues/728
-      block_device : null,
-      file : null,
-      scsi : null,
-      url : null,
-      wwn : null
-    },
-  ]
+  disk {
+    volume_id = element(libvirt_volume.boot_volume.*.id, count.index)
+    scsi      = true
+  }
+  disk {
+    volume_id = element(libvirt_volume.state_volume.*.id, count.index)
+  }
   network_interface {
     network_id     = var.network_id
     hostname       = "${var.role}-${count.index}"