A pair of minor ACC testing improvements

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.4.2 (Unreleased)
+
+IMPROVEMENTS:
+* Use "@foo.test" email addresses in tests
+
 ## 2.4.1 (April 22, 2022)
 IMPROVEMENTS:
 * `resource/pagerduty_user_notification`: Create user/notification rule: allow using existing ones ([#482](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/482))
@@ -19,7 +24,7 @@ IMPROVEMENTS:
 * `resource/maintenance_window`: Ignore error code 405 on delete ([#466](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/466))
 
 
-## 2.3.0 (February 10, 2022) 
+## 2.3.0 (February 10, 2022)
 IMPROVEMENTS:
 * Updated TF SDK to v2.10.1 and added `depends_on` to eventrule tests ([#446](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/446))
 * `resource/pagerduty_schedule`: Added validation to `duration_seconds` ([#433](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/433))
@@ -198,11 +203,11 @@ IMPROVEMENTS:
 * `data_source_pagerduty_ruleset`: Added `routing_keys` field to the `ruleset` object ([#305](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/305))
 
 ## 1.9.3 (February 11, 2021)
-BUG FIXES: 
+BUG FIXES:
 * `resource/pagerduty_service_event_rule`,`resource/pagerduty_ruleset_rule`: Fixed Bug with Event Rule Suppress Action ([#302](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/302))
 
 ## 1.9.2 (February 10, 2021)
-BUG FIXES: 
+BUG FIXES:
 * `resource/pagerduty_service_event_rule`,`resource/pagerduty_ruleset_rule`: Fixed Bug with Event Rule Positioning ([#301](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/301))
 
 ## 1.9.1 (February 8, 2021)
@@ -268,15 +273,15 @@ FEATURES
 * Implement retry logic on all reads ([#208](https://github.com/PagerDuty/terraform-provider-pagerduty/issues/208))
 * Bump golang to v1.14.1 ([#193](https://github.com/PagerDuty/terraform-provider-pagerduty/issues/193))
 
-BUG FIXES: 
+BUG FIXES:
 * data_source_ruleset: add example of Default Global Ruleset in Docs ([#239](https://github.com/PagerDuty/terraform-provider-pagerduty/issues/239))
 
 ## 1.7.2 (June 01, 2020)
 FEATURES
 * **New Data Source:** `pagerduty_ruleset`  ([#237](https://github.com/PagerDuty/terraform-provider-pagerduty/issues/237))
 * Update docs/tests to TF 0.12 syntax ([#223](https://github.com/PagerDuty/terraform-provider-pagerduty/issues/223))
 
-BUG FIXES: 
+BUG FIXES:
 * testing: update sweepers ([#220](https://github.com/PagerDuty/terraform-provider-pagerduty/issues/220))
 * data_source_priority: adding doc to sidebar nav ([#221](https://github.com/PagerDuty/terraform-provider-pagerduty/issues/221))
 
@@ -363,7 +368,7 @@ BUG FIXES:
 IMPROVEMENTS:
 * Switch to standalone Terraform Plugin SDK: ([#158](https://github.com/PagerDuty/terraform-provider-pagerduty/issues/158))
 
-* Add html_url read-only attribute to resource_pagerduty_service, resource_pagerduty_extension, resource_pagerduty_team ([#162](https://github.com/PagerDuty/terraform-provider-pagerduty/issues/162))  
+* Add html_url read-only attribute to resource_pagerduty_service, resource_pagerduty_extension, resource_pagerduty_team ([#162](https://github.com/PagerDuty/terraform-provider-pagerduty/issues/162))
 
 * resource/pagerduty_event_rule: Documentation for `depends_on` field ([#152](https://github.com/PagerDuty/terraform-provider-pagerduty/issues/152)).
 
@@ -397,9 +402,9 @@ BUG FIXES:
 
 BUG FIXES:
 
-* data-source/pagerduty_team: Fix team search issue [[#110](https://github.com/PagerDuty/terraform-provider-pagerduty/issues/110)] 
+* data-source/pagerduty_team: Fix team search issue [[#110](https://github.com/PagerDuty/terraform-provider-pagerduty/issues/110)]
 * resource/pagerduty_maintenance_window: Suppress spurious diff in `start_time` & `end_time` ([#116](https://github.com/PagerDuty/terraform-provider-pagerduty/issues/116))
-* resource/pagerduty_service: Set invitation_sent [[#127](https://github.com/PagerDuty/terraform-provider-pagerduty/issues/127)] 
+* resource/pagerduty_service: Set invitation_sent [[#127](https://github.com/PagerDuty/terraform-provider-pagerduty/issues/127)]
 * resource/pagerduty_escalation_policy: Correctly set teams ([#129](https://github.com/PagerDuty/terraform-provider-pagerduty/issues/129))
 
 IMPROVEMENTS:

README.md

@@ -1,5 +1,4 @@
-Terraform Provider for PagerDuty
-================================
+# Terraform Provider for PagerDuty
 
 - Website: https://registry.terraform.io/providers/PagerDuty/pagerduty/latest
 - Documentation: https://registry.terraform.io/providers/PagerDuty/pagerduty/latest/docs
@@ -8,14 +7,12 @@ Terraform Provider for PagerDuty
 
 [PagerDuty](https://www.pagerduty.com/) is an alarm aggregation and dispatching service for system administrators and support teams. It collects alerts from your monitoring tools, gives you an overall view of all of your monitoring alarms, and alerts an on duty engineer if there’s a problem. The Terraform Pagerduty provider is a plugin for Terraform that allows for the management of PagerDuty resources using HCL (HashiCorp Configuration Language).
 
-Requirements
-------------
+## Requirements
 
 -	[Terraform](https://www.terraform.io/downloads.html) 0.12.x
 -	[Go](https://golang.org/doc/install) 1.11 (to build the provider plugin)
 
-Building The Provider
----------------------
+## Building The Provider
 
 Clone repository to: `$GOPATH/src/github.com/terraform-providers/terraform-provider-pagerduty`
 
@@ -31,14 +28,13 @@ $ cd $GOPATH/src/github.com/PagerDuty/terraform-provider-pagerduty
 $ make build
 ```
 
-Using the provider
-----------------------
+## Using the provider
+
 Please refer to https://registry.terraform.io/providers/PagerDuty/pagerduty/latest/docs for
 examples on how to use the provider and detailed documentation about the
 Resources and Data Sources the provider has.
 
-Developing the Provider
----------------------------
+## Developing the Provider
 
 If you wish to work on the provider, you'll first need [Go](http://www.golang.org) installed on your machine (version 1.11+ is *required*). You'll also need to correctly setup a [GOPATH](http://golang.org/doc/code.html#GOPATH), as well as adding `$GOPATH/bin` to your `$PATH`.
 
@@ -51,6 +47,8 @@ $ $GOPATH/bin/terraform-provider-pagerduty
 ...
 ```
 
+### Testing
+
 In order to test the provider, you can simply run `make test`.
 
 ```sh
@@ -65,4 +63,10 @@ In order to run the full suite of Acceptance tests, run `make testacc`.
 $ make testacc
 ```
 
-*Additional Note:* In order for the tests on the Slack Connection resources to pass you will need valid Slack workspace and channel IDs from a [Slack workspace connected to your PagerDuty account](https://support.pagerduty.com/docs/slack-integration-guide#integration-walkthrough).
+*Additional Note:* In order for the tests on the Slack Connection resources to pass you will need valid Slack workspace and channel IDs from a [Slack workspace connected to your PagerDuty account](https://support.pagerduty.com/docs/slack-integration-guide#integration-walkthrough).
+
+Run a specific subset of tests by name use the `TESTARGS="-run TestName"` option which will run all test functions with "TestName" in their name.
+
+```sh
+$ make testacc TESTARGS="-run TestAccPagerDutyTeam"
+```

pagerduty/data_source_pagerduty_escalation_policy_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestAccDataSourcePagerDutyEscalationPolicy_Basic(t *testing.T) {
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 	escalationPolicy := fmt.Sprintf("tf-%s", acctest.RandString(5))
 
 	resource.Test(t, resource.TestCase{

pagerduty/data_source_pagerduty_schedule_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestAccDataSourcePagerDutySchedule_Basic(t *testing.T) {
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 	schedule := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	location := "Europe/Berlin"
 	start := timeNowInLoc(location).Add(24 * time.Hour).Round(1 * time.Hour).Format(time.RFC3339)

pagerduty/data_source_pagerduty_service_integration_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestAccDataSourcePagerDutyIntegration_Basic(t *testing.T) {
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 	service := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	escalationPolicy := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	serviceIntegration := "Datadog"

pagerduty/data_source_pagerduty_service_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestAccDataSourcePagerDutyService_Basic(t *testing.T) {
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 	service := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	escalationPolicy := fmt.Sprintf("tf-%s", acctest.RandString(5))
 

pagerduty/data_source_pagerduty_user_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestAccDataSourcePagerDutyUser_Basic(t *testing.T) {
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },

pagerduty/import_pagerduty_escalation_policy_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestAccPagerDutyEscalationPolicy_import(t *testing.T) {
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 	escalationPolicy := fmt.Sprintf("tf-%s", acctest.RandString(5))
 
 	resource.Test(t, resource.TestCase{

pagerduty/import_pagerduty_schedule_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestAccPagerDutySchedule_import(t *testing.T) {
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 	schedule := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	location := "Europe/Berlin"
 	start := timeNowInLoc(location).Add(24 * time.Hour).Round(1 * time.Hour).Format(time.RFC3339)

pagerduty/import_pagerduty_service_dependency_test.go

@@ -13,7 +13,7 @@ func TestAccPagerDutyServiceDependency_import(t *testing.T) {
 	service := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	businessService := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 	escalationPolicy := fmt.Sprintf("tf-%s", acctest.RandString(5))
 
 	resource.Test(t, resource.TestCase{

pagerduty/import_pagerduty_service_event_rule_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestAccPagerDutyServiceEventRule_import(t *testing.T) {
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 	escalationPolicy := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	service := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	rule := fmt.Sprintf("tf-%s", acctest.RandString(5))

pagerduty/import_pagerduty_service_integration_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestAccPagerDutyServiceIntegration_import(t *testing.T) {
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 	escalationPolicy := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	service := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	serviceIntegration := fmt.Sprintf("tf-%s", acctest.RandString(5))

pagerduty/import_pagerduty_service_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestAccPagerDutyService_import(t *testing.T) {
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 	escalationPolicy := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	service := fmt.Sprintf("tf-%s", acctest.RandString(5))
 
@@ -34,7 +34,7 @@ func TestAccPagerDutyService_import(t *testing.T) {
 
 func TestAccPagerDutyServiceWithIncidentUrgency_import(t *testing.T) {
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 	escalationPolicy := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	service := fmt.Sprintf("tf-%s", acctest.RandString(5))
 

pagerduty/import_pagerduty_slack_connection_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestAccPagerDutySlackConnection_import(t *testing.T) {
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 	escalationPolicy := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	service := fmt.Sprintf("tf-%s", acctest.RandString(5))
 

pagerduty/import_pagerduty_user_contact_method_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestAccPagerDutyUserContactMethod_import(t *testing.T) {
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },

pagerduty/import_pagerduty_user_notification_rule_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestAccPagerDutyUserNotificationRule_import(t *testing.T) {
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 	contactMethodType := "phone_contact_method"
 
 	resource.Test(t, resource.TestCase{

pagerduty/import_pagerduty_user_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestAccPagerDutyUser_import(t *testing.T) {
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },

pagerduty/import_pagerduty_webhook_subscription_test.go

@@ -11,7 +11,7 @@ import (
 func TestAccPagerDutyWebhookSubscription_import(t *testing.T) {
 	description := fmt.Sprintf("tf-test-%s", acctest.RandString(5))
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 	escalationPolicy := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	service := fmt.Sprintf("tf-%s", acctest.RandString(5))
 

pagerduty/resource_pagerduty_addon_test.go

@@ -63,7 +63,7 @@ func TestAccPagerDutyAddon_Basic(t *testing.T) {
 					resource.TestCheckResourceAttr(
 						"pagerduty_addon.foo", "name", addon),
 					resource.TestCheckResourceAttr(
-						"pagerduty_addon.foo", "src", "https://intranet.foo.com/status"),
+						"pagerduty_addon.foo", "src", "https://intranet.foo.test/status"),
 				),
 			},
 			{
@@ -125,7 +125,7 @@ func testAccCheckPagerDutyAddonConfig(addon string) string {
 	return fmt.Sprintf(`
 resource "pagerduty_addon" "foo" {
   name = "%s"
-  src  = "https://intranet.foo.com/status"
+  src  = "https://intranet.foo.test/status"
 }
 `, addon)
 }

pagerduty/resource_pagerduty_business_service_subscriber_test.go

@@ -13,7 +13,7 @@ import (
 func TestAccPagerDutyBusinessServiceSubscriber_User(t *testing.T) {
 	businessServiceName := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -57,7 +57,7 @@ func TestAccPagerDutyBusinessServiceSubscriber_TeamUser(t *testing.T) {
 	businessServiceName := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	team := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },

pagerduty/resource_pagerduty_escalation_policy_test.go

@@ -52,7 +52,7 @@ func testSweepEscalationPolicy(region string) error {
 
 func TestAccPagerDutyEscalationPolicy_Basic(t *testing.T) {
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 	escalationPolicy := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	escalationPolicyUpdated := fmt.Sprintf("tf-%s", acctest.RandString(5))
 
@@ -102,7 +102,7 @@ func TestAccPagerDutyEscalationPolicy_Basic(t *testing.T) {
 
 func TestAccPagerDutyEscalationPolicyWithTeams_Basic(t *testing.T) {
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
-	email := fmt.Sprintf("%s@foo.com", username)
+	email := fmt.Sprintf("%s@foo.test", username)
 	team := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	escalationPolicy := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	escalationPolicyUpdated := fmt.Sprintf("tf-%s", acctest.RandString(5))

pagerduty/resource_pagerduty_extension_servicenow_test.go

@@ -159,7 +159,7 @@ func testAccCheckPagerDutyExtensionServiceNowConfig(name string, extension_name
 	return fmt.Sprintf(`
 resource "pagerduty_user" "foo" {
   name        = "%[1]v"
-  email       = "%[1]v@foo.com"
+  email       = "%[1]v@foo.test"
   color       = "green"
   role        = "user"
   job_title   = "foo"

pagerduty/resource_pagerduty_extension_test.go

@@ -137,7 +137,7 @@ func testAccCheckPagerDutyExtensionConfig(name string, extension_name string, ur
 	return fmt.Sprintf(`
 resource "pagerduty_user" "foo" {
   name        = "%[1]v"
-  email       = "%[1]v@foo.com"
+  email       = "%[1]v@foo.test"
   color       = "green"
   role        = "user"
   job_title   = "foo"

pagerduty/resource_pagerduty_maintenance_window_test.go

@@ -115,7 +115,7 @@ func testAccCheckPagerDutyMaintenanceWindowConfig(desc, start, end string) strin
 	return fmt.Sprintf(`
 resource "pagerduty_user" "foo" {
   name        = "%[1]v"
-  email       = "%[1]v@foo.com"
+  email       = "%[1]v@foo.test"
   color       = "green"
   role        = "user"
   job_title   = "foo"
@@ -163,7 +163,7 @@ func testAccCheckPagerDutyMaintenanceWindowConfigUpdated(desc, start, end string
 	return fmt.Sprintf(`
 resource "pagerduty_user" "foo" {
   name        = "%[1]v"
-  email       = "%[1]v@foo.com"
+  email       = "%[1]v@foo.test"
   color       = "green"
   role        = "user"
   job_title   = "foo"