Fix oncall api url (#603)

Innokentii Konstantinov · web-flow · commit 680307259e3a · 2022-08-23T07:30:02.000-04:00
diff --git a/grafana/data_source_oncall_action_test.go b/grafana/data_source_oncall_action_test.go
@@ -10,7 +10,6 @@ import (
 )
 
 func TestAccDataSourceOnCallAction_Basic(t *testing.T) {
-	t.Skip("TODO: un-skip me! this test fails against cloud instances, skipping to unblock CI")
 	CheckCloudInstanceTestsEnabled(t)
 
 	actionName := fmt.Sprintf("test-acc-%s", acctest.RandString(8))
diff --git a/grafana/data_source_oncall_outgoing_webhook_test.go b/grafana/data_source_oncall_outgoing_webhook_test.go
@@ -10,7 +10,6 @@ import (
 )
 
 func TestAccDataSourceOnCallOutgoingWebhook_Basic(t *testing.T) {
-	t.Skip("TODO: un-skip me! this test fails against cloud instances, skipping to unblock CI")
 	CheckCloudInstanceTestsEnabled(t)
 
 	outgoingWebhookName := fmt.Sprintf("test-acc-%s", acctest.RandString(8))
diff --git a/grafana/data_source_oncall_schedule_test.go b/grafana/data_source_oncall_schedule_test.go
@@ -10,7 +10,6 @@ import (
 )
 
 func TestAccDataSourceOnCallSchedule_Basic(t *testing.T) {
-	t.Skip("TODO: un-skip me! this test fails against cloud instances, skipping to unblock CI")
 	CheckCloudInstanceTestsEnabled(t)
 
 	scheduleName := fmt.Sprintf("test-acc-%s", acctest.RandString(8))
diff --git a/grafana/data_source_oncall_slack_channel_test.go b/grafana/data_source_oncall_slack_channel_test.go
@@ -10,7 +10,6 @@ import (
 )
 
 func TestAccDataSourceOnCallSlackChannel_Basic(t *testing.T) {
-	t.Skip("TODO: un-skip me! this test fails against cloud instances, skipping to unblock CI")
 	CheckCloudInstanceTestsEnabled(t)
 
 	slackChannelName := fmt.Sprintf("test-acc-%s", acctest.RandString(8))
diff --git a/grafana/data_source_oncall_team_test.go b/grafana/data_source_oncall_team_test.go
@@ -10,7 +10,6 @@ import (
 )
 
 func TestAccDataSourceOnCallTeam_Basic(t *testing.T) {
-	t.Skip("TODO: un-skip me! this test fails against cloud instances, skipping to unblock CI")
 	CheckCloudInstanceTestsEnabled(t)
 
 	teamName := fmt.Sprintf("test-acc-%s", acctest.RandString(8))
diff --git a/grafana/data_source_oncall_user_group_test.go b/grafana/data_source_oncall_user_group_test.go
@@ -10,7 +10,6 @@ import (
 )
 
 func TestAccDataSourceOnCallUserGroup_Basic(t *testing.T) {
-	t.Skip("TODO: un-skip me! this test fails against cloud instances, skipping to unblock CI")
 	CheckCloudInstanceTestsEnabled(t)
 
 	slackHandle := fmt.Sprintf("test-acc-%s", acctest.RandString(8))
diff --git a/grafana/data_source_oncall_user_test.go b/grafana/data_source_oncall_user_test.go
@@ -10,7 +10,6 @@ import (
 )
 
 func TestAccDataSourceOnCallUser_Basic(t *testing.T) {
-	t.Skip("TODO: un-skip me! this test fails against cloud instances, skipping to unblock CI")
 	CheckCloudInstanceTestsEnabled(t)
 
 	username := fmt.Sprintf("test-acc-%s", acctest.RandString(8))
diff --git a/grafana/provider.go b/grafana/provider.go
@@ -152,7 +152,7 @@ func Provider(version string) func() *schema.Provider {
 				"oncall_url": {
 					Type:         schema.TypeString,
 					Optional:     true,
-					DefaultFunc:  schema.EnvDefaultFunc("GRAFANA_ONCALL_URL", "https://a-prod-us-central-0.grafana.net/"),
+					DefaultFunc:  schema.EnvDefaultFunc("GRAFANA_ONCALL_URL", "https://oncall-prod-us-central-0.grafana.net/oncall"),
 					Description:  "An Grafana OnCall backend address. May alternatively be set via the `GRAFANA_ONCALL_URL` environment variable.",
 					ValidateFunc: validation.IsURLWithHTTPorHTTPS,
 				},
diff --git a/grafana/resource_oncall_escalation_test.go b/grafana/resource_oncall_escalation_test.go
@@ -11,7 +11,6 @@ import (
 )
 
 func TestAccOnCallEscalation_basic(t *testing.T) {
-	t.Skip("TODO: un-skip me! this test fails against cloud instances, skipping to unblock CI")
 	CheckCloudInstanceTestsEnabled(t)
 
 	riName := fmt.Sprintf("test-acc-%s", acctest.RandString(8))
diff --git a/grafana/resource_oncall_integration_test.go b/grafana/resource_oncall_integration_test.go
@@ -11,7 +11,6 @@ import (
 )
 
 func TestAccOnCallIntegration_basic(t *testing.T) {
-	t.Skip("TODO: un-skip me! this test fails against cloud instances, skipping to unblock CI")
 	CheckCloudInstanceTestsEnabled(t)
 
 	rName := fmt.Sprintf("test-acc-%s", acctest.RandString(8))
diff --git a/grafana/resource_oncall_on_call_shift_test.go b/grafana/resource_oncall_on_call_shift_test.go
@@ -11,7 +11,6 @@ import (
 )
 
 func TestAccOnCallOnCallShift_basic(t *testing.T) {
-	t.Skip("TODO: un-skip me! this test fails against cloud instances, skipping to unblock CI")
 	CheckCloudInstanceTestsEnabled(t)
 
 	scheduleName := fmt.Sprintf("schedule-%s", acctest.RandString(8))
diff --git a/grafana/resource_oncall_outgoing_webhook_test.go b/grafana/resource_oncall_outgoing_webhook_test.go
@@ -11,7 +11,6 @@ import (
 )
 
 func TestAccOnCallOutgoingWebhook_basic(t *testing.T) {
-	t.Skip("TODO: un-skip me! this test fails against cloud instances, skipping to unblock CI")
 	CheckCloudInstanceTestsEnabled(t)
 
 	webhookName := fmt.Sprintf("name-%s", acctest.RandString(8))
diff --git a/grafana/resource_oncall_route_test.go b/grafana/resource_oncall_route_test.go
@@ -11,7 +11,6 @@ import (
 )
 
 func TestAccOnCallRoute_basic(t *testing.T) {
-	t.Skip("TODO: un-skip me! this test fails against cloud instances, skipping to unblock CI")
 	CheckCloudInstanceTestsEnabled(t)
 
 	riName := fmt.Sprintf("integration-%s", acctest.RandString(8))
diff --git a/grafana/resource_oncall_schedule_test.go b/grafana/resource_oncall_schedule_test.go
@@ -11,7 +11,6 @@ import (
 )
 
 func TestAccOnCallSchedule_basic(t *testing.T) {
-	t.Skip("TODO: un-skip me! this test fails against cloud instances, skipping to unblock CI")
 	CheckCloudInstanceTestsEnabled(t)
 
 	scheduleName := fmt.Sprintf("schedule-%s", acctest.RandString(8))

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ import (`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func TestAccDataSourceOnCallAction_Basic(t *testing.T) {`
`13`		`- t.Skip("TODO: un-skip me! this test fails against cloud instances, skipping to unblock CI")`
`14`	`13`	`CheckCloudInstanceTestsEnabled(t)`
`15`	`14`
`16`	`15`	`actionName := fmt.Sprintf("test-acc-%s", acctest.RandString(8))`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ import (`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func TestAccOnCallEscalation_basic(t *testing.T) {`
`14`		`- t.Skip("TODO: un-skip me! this test fails against cloud instances, skipping to unblock CI")`
`15`	`14`	`CheckCloudInstanceTestsEnabled(t)`
`16`	`15`
`17`	`16`	`riName := fmt.Sprintf("test-acc-%s", acctest.RandString(8))`