fix(system): improve timeout handling and test error cases

- Refined timeout loop and error handling in system datasource
- Adjusted snooze logic to account for actual remaining time
- Added/expanded tests for broken endpoints and ignore_errors flag
- Changed test config endpoint port for improved error simulation

Author: rschmied

internal/provider/datasource/system/system.go

@@ -127,17 +127,36 @@ func (d *SystemDataSource) Read(ctx context.Context, req datasource.ReadRequest,
 			return
 		}
 
-		// if no timeout was specified, break immediately
+		// if no timeout was specified, break immediately after the first check
+		if tov <= 0 {
+			break
+		}
+
 		if time.Now().After(endTime) {
+			if !ignoreErrors {
+				resp.Diagnostics.AddError(
+					common.ErrorLabel,
+					fmt.Sprintf("ran into timeout (max %s)", timeout),
+				)
+				return
+			}
 			break
 		}
 
+		waitFor := snoozeFor
+		if remaining := time.Until(endTime); remaining < waitFor {
+			waitFor = remaining
+		}
+
 		select {
-		case <-time.After(snoozeFor):
+		case <-time.After(waitFor):
 		case <-ctx.Done():
 			return
 		}
 		if time.Now().After(endTime) {
+			if ignoreErrors {
+				break
+			}
 			resp.Diagnostics.AddError(
 				common.ErrorLabel,
 				fmt.Sprintf("ran into timeout (max %s)", timeout),

internal/provider/datasource/system/system_test.go

@@ -2,6 +2,7 @@ package system_test
 
 import (
 	"fmt"
+	"regexp"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-framework/providerserver"
@@ -25,12 +26,18 @@ func testAccPreCheck(t *testing.T) {
 func TestSystemDataSource(t *testing.T) {
 	cfg.SkipUnlessAcc(t)
 
+	brokenEndpointError := regexp.MustCompile(`(?s)(ran into timeout|CML client error|connection refused|connect: cannot assign requested address)`)
+
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t) },
 		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
-				Config: testSystemDataSourceConfig(cfg.CfgBroken, 8),
+				Config:      testSystemDataSourceConfig(cfg.CfgBroken, 2),
+				ExpectError: brokenEndpointError,
+			},
+			{
+				Config: testSystemDataSourceConfigWithIgnoreErrors(cfg.CfgBroken, 2, true),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckOutput("bla", "false"),
 				),
@@ -52,13 +59,18 @@ func TestSystemDataSource(t *testing.T) {
 }
 
 func testSystemDataSourceConfig(cfg string, timeout int) string {
+	return testSystemDataSourceConfigWithIgnoreErrors(cfg, timeout, false)
+}
+
+func testSystemDataSourceConfigWithIgnoreErrors(cfg string, timeout int, ignoreErrors bool) string {
 	return fmt.Sprintf(`
 	%[1]s
 	data "cml2_system" "test" {
 		timeout = "%[2]ds"
+		ignore_errors = %[3]t
 	}
 	output "bla" {
 		value = data.cml2_system.test.ready
 	}
-	`, cfg, timeout)
+	`, cfg, timeout, ignoreErrors)
 }

internal/testing/config.go

@@ -107,7 +107,7 @@ variable "request_headers" {
 }
 provider "cml2" {
 	# something non-existent
-	address = "https://127.0.0.1:5555"
+	address = "https://127.0.0.1:1"
 	username = var.username
 	password = var.password
 	token = var.token