Use Computed flag for CNI configuration account/domain/project fields

Instead of using GetOk conditionals in the Read function to avoid drift,
mark account, domain_id, and project_id as Computed: true in the schema.
This is the standard Terraform pattern used throughout the codebase and
allows Terraform to properly handle values returned by the API that weren't
explicitly set in the configuration.

Also fix testAccPreCheckCniSupport to create its own CloudStack client
from environment variables instead of relying on testAccProvider.Meta(),
which is nil during PreCheck execution. This follows the pattern used in
other PreCheck functions like checkCKSEnabled and testAccPreCheckQuotaSupport.

Author: bhouse-nexthop

cloudstack/resource_cloudstack_cni_configuration.go

@@ -55,20 +55,23 @@ func resourceCloudStackCniConfiguration() *schema.Resource {
 			"account": {
 				Type:        schema.TypeString,
 				Optional:    true,
+				Computed:    true,
 				ForceNew:    true,
 				Description: "An optional account for the CNI configuration. Must be used with domain_id.",
 			},
 
 			"domain_id": {
 				Type:        schema.TypeString,
 				Optional:    true,
+				Computed:    true,
 				ForceNew:    true,
 				Description: "An optional domain ID for the CNI configuration. If the account parameter is used, domain_id must also be used.",
 			},
 
 			"project_id": {
 				Type:        schema.TypeString,
 				Optional:    true,
+				Computed:    true,
 				ForceNew:    true,
 				Description: "An optional project for the CNI configuration",
 			},
@@ -188,18 +191,9 @@ func resourceCloudStackCniConfigurationRead(d *schema.ResourceData, meta interfa
 
 	d.Set("name", config.CniConfiguration[0].Name)
 	d.Set("cni_config", config.CniConfiguration[0].Userdata)
-
-	// Only set account and domain_id if they were originally provided by the user
-	// to avoid drift when CloudStack returns default values
-	if _, ok := d.GetOk("account"); ok {
-		d.Set("account", config.CniConfiguration[0].Account)
-	}
-	if _, ok := d.GetOk("domain_id"); ok {
-		d.Set("domain_id", config.CniConfiguration[0].Domainid)
-	}
-	if _, ok := d.GetOk("project_id"); ok {
-		d.Set("project_id", config.CniConfiguration[0].Projectid)
-	}
+	d.Set("account", config.CniConfiguration[0].Account)
+	d.Set("domain_id", config.CniConfiguration[0].Domainid)
+	d.Set("project_id", config.CniConfiguration[0].Projectid)
 
 	if config.CniConfiguration[0].Params != "" {
 		paramsList := strings.Split(config.CniConfiguration[0].Params, ",")

cloudstack/resource_cloudstack_cni_configuration_test.go

@@ -21,6 +21,7 @@ package cloudstack
 
 import (
 	"fmt"
+	"os"
 	"testing"
 
 	"github.com/apache/cloudstack-go/v2/cloudstack"
@@ -142,11 +143,22 @@ resource "cloudstack_cni_configuration" "foo" {
 `
 
 func testAccPreCheckCniSupport(t *testing.T) {
-	cs := testAccProvider.Meta().(*cloudstack.CloudStackClient)
+	cfg := Config{
+		APIURL:      os.Getenv("CLOUDSTACK_API_URL"),
+		APIKey:      os.Getenv("CLOUDSTACK_API_KEY"),
+		SecretKey:   os.Getenv("CLOUDSTACK_SECRET_KEY"),
+		HTTPGETOnly: true,
+		Timeout:     60,
+	}
+	cs, err := cfg.NewClient()
+	if err != nil {
+		t.Skipf("Failed to create CloudStack client: %v", err)
+		return
+	}
 
 	// Try to list CNI configurations to check if the feature is available
 	p := cs.Configuration.NewListCniConfigurationParams()
-	_, err := cs.Configuration.ListCniConfiguration(p)
+	_, err = cs.Configuration.ListCniConfiguration(p)
 	if err != nil {
 		t.Skipf("CNI configuration not supported in this CloudStack version (requires 4.21.0+): %v", err)
 	}