Upgrade terraform-provider-pagerduty to v3.14.3 (#546)

This PR was generated via `$ upgrade-provider pulumi/pulumi-pagerduty`. --- - Upgrading terraform-provider-pagerduty from 3.14.0 to 3.14.3. Fixes #544 Fixes #538 Fixes #540. --------- Co-authored-by: Ian Wahbe <[email protected]>
pulumi · Jun 21, 2024 · 124757f · 124757f
1 parent 98e45c2
commit 124757f
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 353 deletions.
diff --git a/patches/0001-dummy-patch-to-support-submodule-for-module-import.patch b/patches/0001-dummy-patch-to-support-submodule-for-module-import.patch
@@ -0,0 +1 @@
+This patch exists purely so that `patches` folder can be non-empty and the patches workflow can be invoked. See https://github.com/pulumi/pulumi-pagerduty/pull/546 for details.
diff --git a/patches/0001-fixup-update-CHANGELOG.md-v3.8.1.patch b/patches/0001-fixup-update-CHANGELOG.md-v3.8.1.patch
diff --git a/patches/0002-versioned-util-package-for-more-resources.patch b/patches/0002-versioned-util-package-for-more-resources.patch
diff --git a/patches/0003-more-replaces.patch b/patches/0003-more-replaces.patch
diff --git a/patches/0004-more-replaces-3.patch b/patches/0004-more-replaces-3.patch
diff --git a/provider/go.mod b/provider/go.mod
@@ -3,7 +3,7 @@ module github.com/pulumi/pulumi-pagerduty/provider/v4
 go 1.21
 
 require (
-	github.com/PagerDuty/terraform-provider-pagerduty/v3 v3.0.0
+	github.com/PagerDuty/terraform-provider-pagerduty v0.0.0
 	github.com/pulumi/providertest v0.0.11
 	github.com/pulumi/pulumi-terraform-bridge/pf v0.37.0
 	github.com/pulumi/pulumi-terraform-bridge/v3 v3.84.0
@@ -12,7 +12,7 @@ require (
 )
 
 replace (
-	github.com/PagerDuty/terraform-provider-pagerduty/v3 => ../upstream
+	github.com/PagerDuty/terraform-provider-pagerduty => ../upstream
 	github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20240520223432-0c0bf0d65f10
 )
 

diff --git a/provider/resources.go b/provider/resources.go
@@ -26,8 +26,8 @@ import (
 	// tzdata is used to ensure the provider works when deployed to OS-es that do not have it
 	_ "time/tzdata"
 
-	"github.com/PagerDuty/terraform-provider-pagerduty/v3/pagerduty"
-	pagerdutyplugin "github.com/PagerDuty/terraform-provider-pagerduty/v3/pagerdutyplugin"
+	"github.com/PagerDuty/terraform-provider-pagerduty/pagerduty"
+	pagerdutyplugin "github.com/PagerDuty/terraform-provider-pagerduty/pagerdutyplugin"
 
 	pftfbridge "github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"

diff --git a/scripts/upstream.sh b/scripts/upstream.sh
@@ -138,7 +138,7 @@ apply() {
   # apply the patch using a 3-way merge strategy. This mirrors the default behavior of 'git merge'
   cd upstream
   for patch in ../patches/*.patch; do
-    if ! git apply --3way "$patch"; then
+    if ! git apply --3way "$patch" --allow-empty; then
       cat <<EOF
 
 make "$1"' failed to apply ${patch}. This is because there is a conflict between

diff --git a/upstream b/upstream
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		This patch exists purely so that `patches` folder can be non-empty and the patches workflow can be invoked. See https://github.com/pulumi/pulumi-pagerduty/pull/546 for details.
+20 −2		CHANGELOG.md
+8 −0		pagerduty/resource_pagerduty_event_orchestration_path_service.go
+33 −18		pagerduty/resource_pagerduty_service.go
+30 −30		pagerduty/resource_pagerduty_service_test.go
+10 −8		pagerdutyplugin/data_source_pagerduty_integration.go
+0 −0		util/apiutil/all.go