From f0b43a33c63a96c1800adae89faaeeca26816877 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 14 Aug 2025 03:09:08 -0600 Subject: [PATCH 1/2] nil pointer fix --- pkg/provider/configure_clients.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/provider/configure_clients.go b/pkg/provider/configure_clients.go index c73612485..a156c061e 100644 --- a/pkg/provider/configure_clients.go +++ b/pkg/provider/configure_clients.go @@ -448,7 +448,7 @@ func getHTTPHeadersMap(providerConfig ProviderConfig) (map[string]string, error) } func createAssertsClientIfConfigured(client *common.Client, providerConfig ProviderConfig) error { - if !providerConfig.Auth.IsNull() { + if !providerConfig.Auth.IsNull() && !providerConfig.URL.IsNull() { return createAssertsClient(client, providerConfig) } return nil From 4010e0435d65bfea42637348de9130ed586aabc7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 14 Aug 2025 03:30:02 -0600 Subject: [PATCH 2/2] added a flag for flakkey test --- internal/resources/asserts/resource_alert_config_test.go | 5 +++++ .../resources/asserts/resource_disabled_alert_config_test.go | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/internal/resources/asserts/resource_alert_config_test.go b/internal/resources/asserts/resource_alert_config_test.go index a5d01ad7e..091c145ac 100644 --- a/internal/resources/asserts/resource_alert_config_test.go +++ b/internal/resources/asserts/resource_alert_config_test.go @@ -209,6 +209,11 @@ resource "grafana_asserts_notification_alerts_config" "test" { func TestAccAssertsAlertConfig_eventualConsistencyStress(t *testing.T) { testutils.CheckCloudInstanceTestsEnabled(t) + // Skip this flaky test unless explicitly enabled + if !testutils.AccTestsEnabled("TF_ACC_STRESS_TESTS") { + t.Skip("TF_ACC_STRESS_TESTS must be set to a truthy value for stress tests") + } + stackID := getTestStackID(t) baseName := fmt.Sprintf("stress-test-%s", acctest.RandString(8)) diff --git a/internal/resources/asserts/resource_disabled_alert_config_test.go b/internal/resources/asserts/resource_disabled_alert_config_test.go index 5e9a901fa..47fa563ab 100644 --- a/internal/resources/asserts/resource_disabled_alert_config_test.go +++ b/internal/resources/asserts/resource_disabled_alert_config_test.go @@ -185,6 +185,11 @@ resource "grafana_asserts_suppressed_assertions_config" "test" { func TestAccAssertsDisabledAlertConfig_eventualConsistencyStress(t *testing.T) { testutils.CheckCloudInstanceTestsEnabled(t) + // Skip this flaky test unless explicitly enabled + if !testutils.AccTestsEnabled("TF_ACC_STRESS_TESTS") { + t.Skip("TF_ACC_STRESS_TESTS must be set to a truthy value for stress tests") + } + stackID := getTestStackID(t) baseName := fmt.Sprintf("stress-disabled-%s", acctest.RandString(8))