From 21605670172a9b887bfaf68308044bd46b423ef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Dost=C3=A1l?= <pdostal@suse.cz>
Date: Thu, 31 Aug 2023 11:22:29 +0200
Subject: [PATCH] PC: Do not define cpu_options when not needed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pavel Dostál <pdostal@suse.cz>
---
 data/publiccloud/terraform/ec2.tf | 7 +++++--
 lib/publiccloud/ec2.pm            | 6 ++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/data/publiccloud/terraform/ec2.tf b/data/publiccloud/terraform/ec2.tf
index 82f3ebeb3b88..480e5393af9a 100644
--- a/data/publiccloud/terraform/ec2.tf
+++ b/data/publiccloud/terraform/ec2.tf
@@ -120,8 +120,11 @@ resource "aws_instance" "openqa" {
         create = var.vm_create_timeout
     }
 
-    cpu_options {
-        amd_sev_snp = var.enable_confidential_vm
+    dynamic "cpu_options" {
+        for_each = var.enable_confidential_vm == "disabled" ? [] : [1]
+        content {
+            amd_sev_snp = var.enable_confidential_vm
+        }
     }
 }
 
diff --git a/lib/publiccloud/ec2.pm b/lib/publiccloud/ec2.pm
index 77e57fac34a6..4293ddf169b3 100644
--- a/lib/publiccloud/ec2.pm
+++ b/lib/publiccloud/ec2.pm
@@ -168,6 +168,12 @@ sub upload_img {
     record_info('INFO', "AMI: $ami");    # Show the ami-* number, could be useful
 }
 
+sub terraform_apply {
+    my ($self, %args) = @_;
+    $args{confidential_compute} = get_var("PUBLIC_CLOUD_CONFIDENTIAL_VM", 0);
+    return $self->SUPER::terraform_apply(%args);
+}
+
 sub img_proof {
     my ($self, %args) = @_;