Skip to content

Commit 768b2fc

Browse files
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
1 parent da5da7c commit 768b2fc

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/go-openapi/runtime v0.27.1
1010
github.com/go-openapi/strfmt v0.22.0
1111
github.com/grafana/amixr-api-go-client v0.0.11
12-
github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20240220151716-042876eff9fb
12+
github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20240222183727-a8d7259ad9d5
1313
github.com/grafana/grafana-openapi-client-go v0.0.0-20240131162504-9263d72bd697
1414
github.com/grafana/machine-learning-go-client v0.5.0
1515
github.com/grafana/slo-openapi-client/go v0.0.0-20240112175006-de02e75b9d73

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
9898
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
9999
github.com/grafana/amixr-api-go-client v0.0.11 h1:jlE+5t0tRuCtjbpM81j70Dr2J4eCySuWyNGdfLMGdhE=
100100
github.com/grafana/amixr-api-go-client v0.0.11/go.mod h1:N6x26XUrM5zGtK5zL5vNJnAn2JFMxLFPPLTw/6pDkFE=
101-
github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20240220151716-042876eff9fb h1:9lMBTa0DTo6/sluXCOA6UO/xxKPq8jWIID57KkoKQj0=
102-
github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20240220151716-042876eff9fb/go.mod h1:6sYY1qgwYfSDNQhKQA0tar8Oc38cIGfyqwejhxoOsPs=
101+
github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20240222183727-a8d7259ad9d5 h1:4pWgGiJPtbYzN7FjAU/D8dxr/umEbjYbA+t3olSDTco=
102+
github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20240222183727-a8d7259ad9d5/go.mod h1:6sYY1qgwYfSDNQhKQA0tar8Oc38cIGfyqwejhxoOsPs=
103103
github.com/grafana/grafana-openapi-client-go v0.0.0-20240131162504-9263d72bd697 h1:pqQoKCVWXVtPwgCjFcCtuWiElkSNv1a97uUjiYEUl0k=
104104
github.com/grafana/grafana-openapi-client-go v0.0.0-20240131162504-9263d72bd697/go.mod h1:EapKj5Z1OKDssvRofVwD8XEuJtZUaysLWPFFM2QoK0Q=
105105
github.com/grafana/machine-learning-go-client v0.5.0 h1:Q1K+MPSy8vfMm2jsk3WQ7O77cGr2fM5hxwtPSoPc5NU=

internal/resources/grafana/resource_sso_settings_test.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ func TestSSOSettings_customFields(t *testing.T) {
131131
}
132132

133133
func TestSSOSettings_resourceWithInvalidProvider(t *testing.T) {
134+
testutils.CheckOSSTestsEnabled(t)
135+
134136
provider := "invalid_provider"
135137

136138
resource.ParallelTest(t, resource.TestCase{
@@ -145,6 +147,8 @@ func TestSSOSettings_resourceWithInvalidProvider(t *testing.T) {
145147
}
146148

147149
func TestSSOSettings_resourceWithNoSettings(t *testing.T) {
150+
testutils.CheckOSSTestsEnabled(t)
151+
148152
resource.ParallelTest(t, resource.TestCase{
149153
ProviderFactories: testutils.ProviderFactories,
150154
Steps: []resource.TestStep{
@@ -157,6 +161,8 @@ func TestSSOSettings_resourceWithNoSettings(t *testing.T) {
157161
}
158162

159163
func TestSSOSettings_resourceWithEmptySettings(t *testing.T) {
164+
testutils.CheckOSSTestsEnabled(t)
165+
160166
resource.ParallelTest(t, resource.TestCase{
161167
ProviderFactories: testutils.ProviderFactories,
162168
Steps: []resource.TestStep{
@@ -169,6 +175,8 @@ func TestSSOSettings_resourceWithEmptySettings(t *testing.T) {
169175
}
170176

171177
func TestSSOSettings_resourceWithManySettings(t *testing.T) {
178+
testutils.CheckOSSTestsEnabled(t)
179+
172180
resource.ParallelTest(t, resource.TestCase{
173181
ProviderFactories: testutils.ProviderFactories,
174182
Steps: []resource.TestStep{
@@ -181,6 +189,8 @@ func TestSSOSettings_resourceWithManySettings(t *testing.T) {
181189
}
182190

183191
func TestSSOSettings_resourceWithInvalidCustomField(t *testing.T) {
192+
testutils.CheckOSSTestsEnabled(t)
193+
184194
resource.ParallelTest(t, resource.TestCase{
185195
ProviderFactories: testutils.ProviderFactories,
186196
Steps: []resource.TestStep{
@@ -193,6 +203,8 @@ func TestSSOSettings_resourceWithInvalidCustomField(t *testing.T) {
193203
}
194204

195205
func TestSSOSettings_resourceWithValidationErrors(t *testing.T) {
206+
testutils.CheckOSSTestsEnabled(t)
207+
196208
for _, config := range testConfigsWithValidationErrors {
197209
resource.Test(t, resource.TestCase{
198210
ProviderFactories: testutils.ProviderFactories,

0 commit comments

Comments
 (0)