Merge branch 'upstream-master' into fork-master

* upstream-master: (63 commits)
  Remove 429 check on remaining data sources
  capture panic caused by casting nil interface{} in pagerduty_service
  update output interface for `schedule` resource to display `rendered_coverage_performance`
  capture panic caused by casting nil interface{} in pagerduty_service
  Add v2.5.1 to CHANGELOG
  fix conflicts
  add test for custom_header
  [ORCA-3444] Add support for Event Orchestrations (PagerDuty#512)
  update slack integration docs
  Switch to always use @foo.test TLD in our tests & documentation
  refactor: customer_headers => custom_header
  Update website/docs/r/webhook_subscription.html.markdown
  Updated the dependancy hash and example usage
  Update pagerduty/resource_pagerduty_webhook_subscription.go
  Update pagerduty/resource_pagerduty_webhook_subscription.go
  fixing type error
  Adding custom_headers to delivery_method in webhook_subscription resource.
  add acc test for `priorities` attribute in `slack_connection`
  add test for custom_header
  Update CHANGELOG for v2.5.0 Release
  ...

# Conflicts:
#	README.md
#	go.mod
#	go.sum
#	pagerduty/data_source_pagerduty_business_service.go
#	pagerduty/data_source_pagerduty_escalation_policy.go
#	pagerduty/data_source_pagerduty_extension_schema.go
#	pagerduty/data_source_pagerduty_priority.go
#	pagerduty/data_source_pagerduty_ruleset.go
#	pagerduty/data_source_pagerduty_schedule.go
#	pagerduty/data_source_pagerduty_service.go
#	pagerduty/data_source_pagerduty_service_integration.go
#	pagerduty/data_source_pagerduty_tag.go
#	pagerduty/data_source_pagerduty_team.go
#	pagerduty/data_source_pagerduty_user.go
#	pagerduty/data_source_pagerduty_vendor.go
#	pagerduty/resource_pagerduty_service.go
#	pagerduty/resource_pagerduty_slack_connection.go
#	vendor/github.com/heimweh/go-pagerduty/pagerduty/pagerduty.go
#	vendor/github.com/heimweh/go-pagerduty/pagerduty/user.go
#	vendor/modules.txt

.goreleaser.yml

@@ -6,6 +6,8 @@ builds:
     - -trimpath
   ldflags:
     - '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}'
+  tags:
+    - timetzdata
   goos:
     - freebsd
     - windows

CHANGELOG.md

@@ -1,3 +1,42 @@
+## 2.5.1 (June 9, 2022)
+FEATURES:
+* `resource/pagerduty_webhook_subscription`: Adding custom_header to delivery_method ([#455](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/455))
+
+BUG FIXES:
+* `resource/pagerduty_slack_connection`: Addressing pagerduty_slack_connection unable to set "No Priority" vs "Any Priority"([#519](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/519))
+* `data_source/pagerduty_user`,`data_source/pagerduty_schedule`,`data_source/pagerduty_vendor`: Changed logic to retry on all errors returned by PD API. Remedies GOAWAY error. ([#521](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/521))
+
+
+## 2.5.0 (June 1, 2022)
+
+FEATURES:
+* Support for Event Orchestration via several new resources. ([#512](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/512))
+    * `resource/pagerduty_event_orchestration`
+    * `resource/pagerduty_event_orchestration_router`
+    * `resource/pagerduty_event_orchestration_unrouted`
+    * `resource/pagerduty_event_orchestration_service`
+    * `data_source/pagerduty_event_orchestration`
+
+IMPROVEMENTS:
+* `data_source/pagerduty_user`: Add support for pagination. Gets all users. ([#511](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/511))
+
+BUG FIXES: 
+* `resource/pagerduty_service_integration`: Fix permadiff in email_parser with type regex & minor docs update ([#479](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/479))
+
+## 2.4.2 (May 20, 2022)
+
+IMPROVEMENTS:
+* Acceptance Test Improvements: Use "@foo.test" email addresses in tests. ([#491](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/491))
+* Acceptance Test Improvements: Adding better notes to README on running ACC ([#503](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/503)) 
+* `resource/pagerduty_ruleset_rule`: Introduce support for `catch_all` rules. ([#481](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/481))
+* Docs: `resource/pagerduty_slack_connection`: Improved notes on resource supporting Slack V2 Next Generation ([#496](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/496))
+
+BUG FIXES:
+* Documentation: Fixed all broken links to the PagerDuty API documentation ([#464](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/464))
+* Docs: `resource/pagerduty_escalation_policy`: Fixed `user` -> `user_reference` in samples ([#497](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/497))
+* Build Process: Include `timezdata` build tag in goreleaser config ([#488](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/488))
+* `data_source/pagerduty_escalation_policy`,`data_source/pagerduty_ruleset`: Changed logic to retry on all errors returned by PD API. Remedies GOAWAY error. ([#507](https://github.com/PagerDuty/terraform-provider-pagerduty/pull/507))
+
 ## 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 +58,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))
@@ -296,7 +335,7 @@ 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))
 

README.md

@@ -1,21 +1,16 @@
-Terraform Provider for PagerDuty
-================================
+# Terraform Provider for PagerDuty
 
 - Website: https://registry.terraform.io/providers/nordcloud/pagerduty/latest
 - Documentation: https://registry.terraform.io/providers/nordcloud/pagerduty/latest/docs
 
 [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).
 
-This project is a fork of [PagerDuty/terraform-provider-pagerduty](https://github.com/PagerDuty/terraform-provider-pagerduty)
-
-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/nordcloud/terraform-provider-pagerduty`
 
@@ -31,14 +26,13 @@ $ cd $GOPATH/src/github.com/nordcloud/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,13 +45,19 @@ $ $GOPATH/bin/terraform-provider-pagerduty
 ...
 ```
 
+### Testing
+
 In order to test the provider, you can simply run `make test`.
 
 ```sh
 $ make test
 ```
 
-In order to run the full suite of Acceptance tests, run `make testacc`.
+In order to run the full suite of Acceptance tests, run `make testacc`. Running the acceptance tests requires
+that the `PAGERDUTY_TOKEN` environment variable be set to a valid API Token and that the
+`PAGERDUTY_USER_TOKEN` environment variable be set to a valid API User Token. Many tests also
+require that the [Email Domain Restriction](https://support.pagerduty.com/docs/account-settings#email-domain-restriction) feature
+either be disabled *or* be configured to include `foo.test` as an allowed domain.
 
 *Note:* Acceptance tests create real resources, and often cost money to run.
 
@@ -66,3 +66,9 @@ $ 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).
+
+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"
+```

go.mod

@@ -4,19 +4,15 @@ go 1.16
 
 require (
 	github.com/agext/levenshtein v1.2.3 // indirect
-	github.com/fatih/color v1.13.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-plugin v1.4.4 // indirect
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.15.0
-	github.com/hashicorp/terraform-registry-address v0.0.0-20220422185603-6772e136ec01 // indirect
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.18.0
 	github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
-	github.com/nordcloud/go-pagerduty v1.3.0
+	github.com/nordcloud/go-pagerduty v1.4.0
 	github.com/oklog/run v1.1.0 // indirect
 	github.com/vmihailenco/tagparser v0.1.2 // indirect
-	golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect
-	golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
+	golang.org/x/net v0.0.0-20220706163947-c90051bbdb60 // indirect
+	golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20220504150022-98cd25cafc72 // indirect
+	google.golang.org/genproto v0.0.0-20220706185917-7780775163c4 // indirect
 )