feedback

oVirt · May 30, 2022 · 6b8ac42 · 6b8ac42
1 parent 8777e15
commit 6b8ac42
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/internal/ovirt/resource_ovirt_vm.go b/internal/ovirt/resource_ovirt_vm.go
@@ -202,6 +202,7 @@ func (p *provider) vmCreate(
 	var diags diag.Diagnostics
 	params := ovirtclient.NewCreateVMParams()
 	for _, f := range []func(
+		ovirtclient.Client,
 		*schema.ResourceData,
 		ovirtclient.BuildableVMParameters,
 		diag.Diagnostics,
@@ -210,15 +211,14 @@ func (p *provider) vmCreate(
 		handleVMCPUParameters,
 		handleVMOSType,
 		handleVMInitialization,
+		handleVMPlacementPolicy,
 		handleTemplateDiskAttachmentOverride,
 		handleVMMemory,
 		handleVMMemoryPolicy,
 		handleVMSerialConsole,
 	} {
-		diags = f(data, params, diags)
+		diags = f(client, data, params, diags)
 	}
-
-	diags = handleVMPlacementPolicy(client, data, params, diags)
 	if diags.HasError() {
 		return diags
 	}
@@ -243,6 +243,7 @@ func (p *provider) vmCreate(
 }
 
 func handleVMSerialConsole(
+	_ ovirtclient.Client,
 	data *schema.ResourceData,
 	params ovirtclient.BuildableVMParameters,
 	diags diag.Diagnostics,
@@ -256,6 +257,7 @@ func handleVMSerialConsole(
 }
 
 func handleTemplateDiskAttachmentOverride(
+	_ ovirtclient.Client,
 	data *schema.ResourceData,
 	params ovirtclient.BuildableVMParameters,
 	diags diag.Diagnostics,
@@ -298,6 +300,7 @@ func handleTemplateDiskAttachmentOverride(
 }
 
 func handleVMMemoryPolicy(
+	_ ovirtclient.Client,
 	data *schema.ResourceData,
 	params ovirtclient.BuildableVMParameters,
 	diags diag.Diagnostics,
@@ -331,6 +334,7 @@ func handleVMMemoryPolicy(
 }
 
 func handleVMMemory(
+	_ ovirtclient.Client,
 	data *schema.ResourceData,
 	params ovirtclient.BuildableVMParameters,
 	diags diag.Diagnostics,
@@ -384,7 +388,12 @@ func handleVMPlacementPolicy(
 	}
 
 	if hasPlacementPolicy {
-		if isSupported, _ := client.SupportsFeature(ovirtclient.FeaturePlacementPolicy); !isSupported {
+		isSupported, err := client.SupportsFeature(ovirtclient.FeaturePlacementPolicy)
+		if err != nil {
+			diags = append(diags, errorToDiag("check feature support", err))
+			return diags
+		}
+		if !isSupported {
 			diags = append(diags, diag.Diagnostic{
 				Severity: diag.Error,
 				Summary:  "Feature not supported",
@@ -398,6 +407,7 @@ func handleVMPlacementPolicy(
 }
 
 func handleVMOSType(
+	_ ovirtclient.Client,
 	data *schema.ResourceData,
 	params ovirtclient.BuildableVMParameters,
 	diags diag.Diagnostics,
@@ -413,6 +423,7 @@ func handleVMOSType(
 }
 
 func handleVMCPUParameters(
+	_ ovirtclient.Client,
 	data *schema.ResourceData,
 	params ovirtclient.BuildableVMParameters,
 	diags diag.Diagnostics,
@@ -461,6 +472,7 @@ func handleVMCPUParameters(
 }
 
 func handleVMComment(
+	_ ovirtclient.Client,
 	data *schema.ResourceData,
 	params ovirtclient.BuildableVMParameters,
 	diags diag.Diagnostics,
@@ -482,6 +494,7 @@ func handleVMComment(
 }
 
 func handleVMInitialization(
+	_ ovirtclient.Client,
 	data *schema.ResourceData,
 	params ovirtclient.BuildableVMParameters,
 	diags diag.Diagnostics,