Apply suggestions from code review

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Author: bhouse-nexthop

README.md

@@ -126,14 +126,14 @@ In order to run the full suite of Acceptance tests you will need to run the Clou
 ### Step 1: Start the CloudStack Simulator
 
 ```sh
-# Pull the simulator image (recommended versions: 4.20.1.0 or 4.23.0.0-SNAPSHOT)
-docker pull apache/cloudstack-simulator:4.20.1.0
+# Pull the simulator image (recommended versions: 4.20.2.0 or 4.23.0.0-SNAPSHOT)
+docker pull apache/cloudstack-simulator:4.20.2.0
 
 # Start the simulator container
-docker run --name simulator -p 8080:5050 -d apache/cloudstack-simulator:4.20.1.0
+docker run --name simulator -p 8080:5050 -d apache/cloudstack-simulator:4.20.2.0
 ```
 
-**Note:** Version 4.22.0.0 has a known bug with updating load balancer rules and is not recommended for testing.
+**Note:** Version 4.22.0.0 has a known bug with updating load balancer rules. CI currently tests against this version, but for local testing we recommend using 4.20.2.0 or 4.23.0.0-SNAPSHOT to avoid this issue.
 
 ### Step 2: Wait for Simulator to be Ready
 

cloudstack/resource_cloudstack_loadbalancer_rule_test.go

@@ -58,6 +58,7 @@ func TestAccCloudStackLoadBalancerRule_update(t *testing.T) {
 	// that causes "530 Internal Server Error" when updating load balancer rules.
 	// This bug does not exist in 4.20.1.0, 4.22.1.0+, or 4.23.0.0+.
 	// See: https://github.com/apache/cloudstack/issues/XXXXX (if applicable)
+	testAccPreCheck(t)
 	version := getCloudStackVersion(t)
 	if version == "4.22.0.0" {
 		t.Skip("Skipping TestAccCloudStackLoadBalancerRule_update on CloudStack 4.22.0.0 due to known simulator bug (Error 530: Internal Server Error)")

cloudstack/service_offering_util.go

@@ -81,7 +81,7 @@ func (state *serviceOfferingCommonResourceModel) commonRead(ctx context.Context,
 	// Only set DiskOfferingId if it was already set in the state (i.e., user explicitly provided it)
 	// When using disk_offering block, CloudStack creates an internal disk offering and returns its ID,
 	// but we should not populate disk_offering_id in that case to avoid drift
-	if cs.Diskofferingid != "" && !state.DiskOfferingId.IsNull() {
+	if cs.Diskofferingid != "" && !state.DiskOfferingId.IsNull() && !state.DiskOfferingId.IsUnknown() {
 		state.DiskOfferingId = types.StringValue(cs.Diskofferingid)
 	}
 	if cs.Displaytext != "" {