Make Cloud test suite pass (#1368)

* Update Cloud client Currently, the main branch is failing. I didn't run the whole test suite on one of the previous PRs * Disable SSO tests
grafana · Feb 23, 2024 · 768b2fc · 768b2fc
1 parent da5da7c
commit 768b2fc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/go-openapi/runtime v0.27.1
 	github.com/go-openapi/strfmt v0.22.0
 	github.com/grafana/amixr-api-go-client v0.0.11
-	github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20240220151716-042876eff9fb
+	github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20240222183727-a8d7259ad9d5
 	github.com/grafana/grafana-openapi-client-go v0.0.0-20240131162504-9263d72bd697
 	github.com/grafana/machine-learning-go-client v0.5.0
 	github.com/grafana/slo-openapi-client/go v0.0.0-20240112175006-de02e75b9d73

diff --git a/go.sum b/go.sum
@@ -98,8 +98,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grafana/amixr-api-go-client v0.0.11 h1:jlE+5t0tRuCtjbpM81j70Dr2J4eCySuWyNGdfLMGdhE=
 github.com/grafana/amixr-api-go-client v0.0.11/go.mod h1:N6x26XUrM5zGtK5zL5vNJnAn2JFMxLFPPLTw/6pDkFE=
-github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20240220151716-042876eff9fb h1:9lMBTa0DTo6/sluXCOA6UO/xxKPq8jWIID57KkoKQj0=
-github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20240220151716-042876eff9fb/go.mod h1:6sYY1qgwYfSDNQhKQA0tar8Oc38cIGfyqwejhxoOsPs=
+github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20240222183727-a8d7259ad9d5 h1:4pWgGiJPtbYzN7FjAU/D8dxr/umEbjYbA+t3olSDTco=
+github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20240222183727-a8d7259ad9d5/go.mod h1:6sYY1qgwYfSDNQhKQA0tar8Oc38cIGfyqwejhxoOsPs=
 github.com/grafana/grafana-openapi-client-go v0.0.0-20240131162504-9263d72bd697 h1:pqQoKCVWXVtPwgCjFcCtuWiElkSNv1a97uUjiYEUl0k=
 github.com/grafana/grafana-openapi-client-go v0.0.0-20240131162504-9263d72bd697/go.mod h1:EapKj5Z1OKDssvRofVwD8XEuJtZUaysLWPFFM2QoK0Q=
 github.com/grafana/machine-learning-go-client v0.5.0 h1:Q1K+MPSy8vfMm2jsk3WQ7O77cGr2fM5hxwtPSoPc5NU=

diff --git a/internal/resources/grafana/resource_sso_settings_test.go b/internal/resources/grafana/resource_sso_settings_test.go
@@ -131,6 +131,8 @@ func TestSSOSettings_customFields(t *testing.T) {
 }
 
 func TestSSOSettings_resourceWithInvalidProvider(t *testing.T) {
+	testutils.CheckOSSTestsEnabled(t)
+
 	provider := "invalid_provider"
 
 	resource.ParallelTest(t, resource.TestCase{
@@ -145,6 +147,8 @@ func TestSSOSettings_resourceWithInvalidProvider(t *testing.T) {
 }
 
 func TestSSOSettings_resourceWithNoSettings(t *testing.T) {
+	testutils.CheckOSSTestsEnabled(t)
+
 	resource.ParallelTest(t, resource.TestCase{
 		ProviderFactories: testutils.ProviderFactories,
 		Steps: []resource.TestStep{
@@ -157,6 +161,8 @@ func TestSSOSettings_resourceWithNoSettings(t *testing.T) {
 }
 
 func TestSSOSettings_resourceWithEmptySettings(t *testing.T) {
+	testutils.CheckOSSTestsEnabled(t)
+
 	resource.ParallelTest(t, resource.TestCase{
 		ProviderFactories: testutils.ProviderFactories,
 		Steps: []resource.TestStep{
@@ -169,6 +175,8 @@ func TestSSOSettings_resourceWithEmptySettings(t *testing.T) {
 }
 
 func TestSSOSettings_resourceWithManySettings(t *testing.T) {
+	testutils.CheckOSSTestsEnabled(t)
+
 	resource.ParallelTest(t, resource.TestCase{
 		ProviderFactories: testutils.ProviderFactories,
 		Steps: []resource.TestStep{
@@ -181,6 +189,8 @@ func TestSSOSettings_resourceWithManySettings(t *testing.T) {
 }
 
 func TestSSOSettings_resourceWithInvalidCustomField(t *testing.T) {
+	testutils.CheckOSSTestsEnabled(t)
+
 	resource.ParallelTest(t, resource.TestCase{
 		ProviderFactories: testutils.ProviderFactories,
 		Steps: []resource.TestStep{
@@ -193,6 +203,8 @@ func TestSSOSettings_resourceWithInvalidCustomField(t *testing.T) {
 }
 
 func TestSSOSettings_resourceWithValidationErrors(t *testing.T) {
+	testutils.CheckOSSTestsEnabled(t)
+
 	for _, config := range testConfigsWithValidationErrors {
 		resource.Test(t, resource.TestCase{
 			ProviderFactories: testutils.ProviderFactories,