From a8b1b7eb0b12614dd992424f708b2fb2dcfc9393 Mon Sep 17 00:00:00 2001 From: Julien Duchesne Date: Tue, 12 Mar 2024 11:48:55 -0400 Subject: [PATCH] Upgrade Grafana versions in tests Also, remove TODOs and run tests 10.4 tests on local instances when appropriate --- .github/workflows/acc-tests.yml | 12 ++++++------ GNUmakefile | 2 +- internal/resources/examples_test.go | 8 ++------ .../grafana/resource_alerting_rule_group_test.go | 2 +- internal/resources/grafana/resource_folder_test.go | 2 +- .../resources/grafana/resource_sso_settings_test.go | 4 ++-- 6 files changed, 13 insertions(+), 17 deletions(-) diff --git a/.github/workflows/acc-tests.yml b/.github/workflows/acc-tests.yml index 2f74a6e10..86797e14f 100644 --- a/.github/workflows/acc-tests.yml +++ b/.github/workflows/acc-tests.yml @@ -53,26 +53,26 @@ jobs: fail-fast: false # Let all versions run, even if one fails matrix: # OSS tests, run on all versions - version: ['10.3.1', '10.2.3', '9.5.15', '8.5.27'] + version: ['10.4.0', '10.3.4', '9.5.17', '8.5.27'] type: ['oss'] subset: ['basic', 'other', 'long'] include: - - version: '10.3.1' + - version: '10.4.0' type: 'oss' subset: examples # TLS proxy tests, run only on latest version - - version: '10.3.1' + - version: '10.4.0' type: 'tls' subset: 'basic' # Sub-path tests. Runs tests on localhost:3000/grafana/ - - version: '10.3.1' + - version: '10.4.0' type: 'subpath' subset: 'basic' - - version: '10.3.1' + - version: '10.4.0' type: 'subpath' subset: 'other' # Enterprise tests, run only on latest version - - version: '10.3.1' + - version: '10.4.0' type: 'enterprise' subset: 'all' name: ${{ matrix.version }} - ${{ matrix.type }} - ${{ matrix.subset }} diff --git a/GNUmakefile b/GNUmakefile index 1354a2d3c..a5785e4f3 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,4 +1,4 @@ -GRAFANA_VERSION ?= 10.3.1 +GRAFANA_VERSION ?= 10.4.0 DOCKER_COMPOSE_ARGS ?= --force-recreate --detach --remove-orphans --wait testacc: diff --git a/internal/resources/examples_test.go b/internal/resources/examples_test.go index 57ee00967..2b84afbe0 100644 --- a/internal/resources/examples_test.go +++ b/internal/resources/examples_test.go @@ -38,17 +38,13 @@ func TestAccExamples(t *testing.T) { { category: "Alerting", testCheck: func(t *testing.T, filename string) { - testutils.CheckOSSTestsEnabled(t, ">=10.2.0") // Only run on latest OSS version. The examples should be updated to reflect their latest working config. + testutils.CheckOSSTestsEnabled(t, ">=10.4.0") // Only run on latest OSS version. The examples should be updated to reflect their latest working config. }, }, { category: "Grafana OSS", testCheck: func(t *testing.T, filename string) { - if strings.Contains(filename, "sso_settings") { - testutils.CheckCloudInstanceTestsEnabled(t) // TODO: Run on v10.4.0 once it's released - } else { - testutils.CheckOSSTestsEnabled(t, ">=10.2.0") // Only run on latest OSS version. The examples should be updated to reflect their latest working config. - } + testutils.CheckOSSTestsEnabled(t, ">=10.4.0") // Only run on latest OSS version. The examples should be updated to reflect their latest working config. }, }, { diff --git a/internal/resources/grafana/resource_alerting_rule_group_test.go b/internal/resources/grafana/resource_alerting_rule_group_test.go index 0cc17e4d9..3cbeb5ebf 100644 --- a/internal/resources/grafana/resource_alerting_rule_group_test.go +++ b/internal/resources/grafana/resource_alerting_rule_group_test.go @@ -365,7 +365,7 @@ func TestAccAlertRule_zeroSeconds(t *testing.T) { } func TestAccAlertRule_NotificationSettings(t *testing.T) { - testutils.CheckCloudInstanceTestsEnabled(t) // TODO: Run on v10.4.0 once it's released + testutils.CheckOSSTestsEnabled(t, ">=10.4.0") var group models.AlertRuleGroup var name = acctest.RandString(10) diff --git a/internal/resources/grafana/resource_folder_test.go b/internal/resources/grafana/resource_folder_test.go index 6a7f6ab8e..46234798f 100644 --- a/internal/resources/grafana/resource_folder_test.go +++ b/internal/resources/grafana/resource_folder_test.go @@ -98,7 +98,7 @@ func TestAccFolder_basic(t *testing.T) { } func TestAccFolder_nested(t *testing.T) { - testutils.CheckCloudInstanceTestsEnabled(t) // TODO: Switch to OSS once nested folders are enabled by default + testutils.CheckOSSTestsEnabled(t, ">=10.3.0") var parentFolder models.Folder var childFolder1 models.Folder diff --git a/internal/resources/grafana/resource_sso_settings_test.go b/internal/resources/grafana/resource_sso_settings_test.go index 8e74c25d6..445731bc6 100644 --- a/internal/resources/grafana/resource_sso_settings_test.go +++ b/internal/resources/grafana/resource_sso_settings_test.go @@ -17,7 +17,7 @@ import ( ) func TestSSOSettings_basic(t *testing.T) { - testutils.CheckCloudInstanceTestsEnabled(t) // TODO: Run on v10.4.0 once it's released + testutils.CheckOSSTestsEnabled(t, ">=10.4.0") providers := []string{"gitlab", "google", "generic_oauth", "azuread", "okta"} @@ -65,7 +65,7 @@ func TestSSOSettings_basic(t *testing.T) { } func TestSSOSettings_customFields(t *testing.T) { - testutils.CheckCloudInstanceTestsEnabled(t) // TODO: Run on v10.4.0 once it's released + testutils.CheckOSSTestsEnabled(t, ">=10.4.0") api := grafana.OAPIGlobalClient(testutils.Provider.Meta())