3.12.0 upgrade (#492)

had some conflicts so had to do it manually

fixes #490

patches/0001-fixup-update-CHANGELOG.md-v3.8.1.patch

@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ian Wahbe <ian@wahbe.com>
-Date: Wed, 21 Feb 2024 20:32:54 +0100
-Subject: [PATCH 1/2] fixup! update CHANGELOG.md v3.8.1
+From: Venelin <venelin@pulumi.com>
+Date: Fri, 10 May 2024 18:03:03 +0100
+Subject: [PATCH] fixup! update CHANGELOG.md v3.8.1
 
 
 diff --git a/go.mod b/go.mod
-index 967b43a7..5e116702 100644
+index f30298c2..7d3d0c2e 100644
 --- a/go.mod
 +++ b/go.mod
 @@ -1,4 +1,4 @@
@@ -45,7 +45,7 @@ index 4b0dcc1e..923000cd 100644
 
  func timeToUTC(v string) (time.Time, error) {
 diff --git a/pagerdutyplugin/config.go b/pagerdutyplugin/config.go
-index 5b9fee0e..d4963b1f 100644
+index 48b05a47..7cb7f247 100644
 --- a/pagerdutyplugin/config.go
 +++ b/pagerdutyplugin/config.go
 @@ -11,9 +11,10 @@ import (
@@ -61,14 +61,21 @@ index 5b9fee0e..d4963b1f 100644
 
  // Config defines the configuration options for the PagerDuty client
 diff --git a/pagerdutyplugin/provider_test.go b/pagerdutyplugin/provider_test.go
-index 66e63338..23c6b8ff 100644
+index ea839e2b..7c589313 100644
 --- a/pagerdutyplugin/provider_test.go
 +++ b/pagerdutyplugin/provider_test.go
-@@ -11,7 +11,7 @@ import (
- 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
- 	"github.com/hashicorp/terraform-plugin-testing/terraform"
+@@ -6,13 +6,14 @@ import (
+ 	"testing"
+ 	"time"
 
 -	pd "github.com/PagerDuty/terraform-provider-pagerduty/pagerduty"
+ 	"github.com/PagerDuty/terraform-provider-pagerduty/util"
+ 	"github.com/hashicorp/terraform-plugin-framework/providerserver"
+ 	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
+ 	"github.com/hashicorp/terraform-plugin-mux/tf5muxserver"
+ 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+ 	"github.com/hashicorp/terraform-plugin-testing/terraform"
++
 +	pd "github.com/PagerDuty/terraform-provider-pagerduty/v3/pagerduty"
  )
 

patches/0002-versioned-util-package-for-more-resources.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: guineveresaenger <[email protected]>
 Date: Fri, 22 Mar 2024 10:23:37 -0700
-Subject: [PATCH 2/2] versioned util package for more resources
+Subject: [PATCH] versioned util package for more resources
 
 
 diff --git a/pagerduty/resource_pagerduty_schedule.go b/pagerduty/resource_pagerduty_schedule.go
@@ -18,7 +18,7 @@ index 11a75167..e3dedc0d 100644
  	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
  	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 diff --git a/pagerduty/resource_pagerduty_service.go b/pagerduty/resource_pagerduty_service.go
-index 41b51a07..f89dd98f 100644
+index 17224545..608eee66 100644
 --- a/pagerduty/resource_pagerduty_service.go
 +++ b/pagerduty/resource_pagerduty_service.go
 @@ -8,7 +8,7 @@ import (

patches/0003-more-replaces.patch

@@ -0,0 +1,110 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Venelin <[email protected]>
+Date: Fri, 10 May 2024 18:16:24 +0100
+Subject: [PATCH] more replaces
+
+
+diff --git a/pagerdutyplugin/data_source_pagerduty_extension_schema.go b/pagerdutyplugin/data_source_pagerduty_extension_schema.go
+index 3f0db919..b5be392e 100644
+--- a/pagerdutyplugin/data_source_pagerduty_extension_schema.go
++++ b/pagerdutyplugin/data_source_pagerduty_extension_schema.go
+@@ -8,7 +8,7 @@ import (
+ 	"time"
+
+ 	"github.com/PagerDuty/go-pagerduty"
+-	"github.com/PagerDuty/terraform-provider-pagerduty/util"
++	"github.com/PagerDuty/terraform-provider-pagerduty/v3/util"
+ 	"github.com/hashicorp/terraform-plugin-framework/datasource"
+ 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
+ 	"github.com/hashicorp/terraform-plugin-framework/path"
+diff --git a/pagerdutyplugin/data_source_pagerduty_tag.go b/pagerdutyplugin/data_source_pagerduty_tag.go
+index f162bb49..c25f9c7f 100644
+--- a/pagerdutyplugin/data_source_pagerduty_tag.go
++++ b/pagerdutyplugin/data_source_pagerduty_tag.go
+@@ -7,7 +7,7 @@ import (
+ 	"time"
+
+ 	"github.com/PagerDuty/go-pagerduty"
+-	"github.com/PagerDuty/terraform-provider-pagerduty/util"
++	"github.com/PagerDuty/terraform-provider-pagerduty/v3/util"
+ 	"github.com/hashicorp/terraform-plugin-framework/datasource"
+ 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
+ 	"github.com/hashicorp/terraform-plugin-framework/path"
+diff --git a/pagerdutyplugin/provider_test.go b/pagerdutyplugin/provider_test.go
+index 7c589313..9c74b115 100644
+--- a/pagerdutyplugin/provider_test.go
++++ b/pagerdutyplugin/provider_test.go
+@@ -6,7 +6,7 @@ import (
+ 	"testing"
+ 	"time"
+
+-	"github.com/PagerDuty/terraform-provider-pagerduty/util"
++	"github.com/PagerDuty/terraform-provider-pagerduty/v3/util"
+ 	"github.com/hashicorp/terraform-plugin-framework/providerserver"
+ 	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
+ 	"github.com/hashicorp/terraform-plugin-mux/tf5muxserver"
+diff --git a/pagerdutyplugin/resource_pagerduty_extension.go b/pagerdutyplugin/resource_pagerduty_extension.go
+index 476653e0..05d1f62b 100644
+--- a/pagerdutyplugin/resource_pagerduty_extension.go
++++ b/pagerdutyplugin/resource_pagerduty_extension.go
+@@ -8,7 +8,7 @@ import (
+ 	"time"
+
+ 	"github.com/PagerDuty/go-pagerduty"
+-	"github.com/PagerDuty/terraform-provider-pagerduty/util"
++	"github.com/PagerDuty/terraform-provider-pagerduty/v3/util"
+ 	"github.com/hashicorp/terraform-plugin-framework/attr"
+ 	"github.com/hashicorp/terraform-plugin-framework/diag"
+ 	"github.com/hashicorp/terraform-plugin-framework/path"
+diff --git a/pagerdutyplugin/resource_pagerduty_extension_servicenow.go b/pagerdutyplugin/resource_pagerduty_extension_servicenow.go
+index 7abf7e4e..6bdf5b40 100644
+--- a/pagerdutyplugin/resource_pagerduty_extension_servicenow.go
++++ b/pagerdutyplugin/resource_pagerduty_extension_servicenow.go
+@@ -8,7 +8,7 @@ import (
+ 	"time"
+
+ 	"github.com/PagerDuty/go-pagerduty"
+-	"github.com/PagerDuty/terraform-provider-pagerduty/util"
++	"github.com/PagerDuty/terraform-provider-pagerduty/v3/util"
+ 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
+ 	"github.com/hashicorp/terraform-plugin-framework/attr"
+ 	"github.com/hashicorp/terraform-plugin-framework/diag"
+diff --git a/pagerdutyplugin/resource_pagerduty_extension_test.go b/pagerdutyplugin/resource_pagerduty_extension_test.go
+index c63934d5..49f6d726 100644
+--- a/pagerdutyplugin/resource_pagerduty_extension_test.go
++++ b/pagerdutyplugin/resource_pagerduty_extension_test.go
+@@ -8,7 +8,7 @@ import (
+ 	"testing"
+
+ 	"github.com/PagerDuty/go-pagerduty"
+-	"github.com/PagerDuty/terraform-provider-pagerduty/util"
++	"github.com/PagerDuty/terraform-provider-pagerduty/v3/util"
+ 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/id"
+ 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+ 	"github.com/hashicorp/terraform-plugin-testing/terraform"
+diff --git a/pagerdutyplugin/resource_pagerduty_tag.go b/pagerdutyplugin/resource_pagerduty_tag.go
+index 6a9d75f3..a332f0e1 100644
+--- a/pagerdutyplugin/resource_pagerduty_tag.go
++++ b/pagerdutyplugin/resource_pagerduty_tag.go
+@@ -7,7 +7,7 @@ import (
+ 	"time"
+
+ 	"github.com/PagerDuty/go-pagerduty"
+-	"github.com/PagerDuty/terraform-provider-pagerduty/util"
++	"github.com/PagerDuty/terraform-provider-pagerduty/v3/util"
+ 	"github.com/hashicorp/terraform-plugin-framework/path"
+ 	"github.com/hashicorp/terraform-plugin-framework/resource"
+ 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
+diff --git a/pagerdutyplugin/resource_pagerduty_tag_assignment.go b/pagerdutyplugin/resource_pagerduty_tag_assignment.go
+index 0acc1538..5fbb7578 100644
+--- a/pagerdutyplugin/resource_pagerduty_tag_assignment.go
++++ b/pagerdutyplugin/resource_pagerduty_tag_assignment.go
+@@ -8,7 +8,7 @@ import (
+ 	"time"
+
+ 	"github.com/PagerDuty/go-pagerduty"
+-	"github.com/PagerDuty/terraform-provider-pagerduty/util"
++	"github.com/PagerDuty/terraform-provider-pagerduty/v3/util"
+ 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
+ 	"github.com/hashicorp/terraform-plugin-framework/diag"
+ 	"github.com/hashicorp/terraform-plugin-framework/resource"

provider/cmd/pulumi-resource-pagerduty/bridge-metadata.json

@@ -450,6 +450,9 @@
                 "current": "pagerduty:index/incidentWorkflowTrigger:IncidentWorkflowTrigger",
                 "majorVersion": 4,
                 "fields": {
+                    "permissions": {
+                        "maxItemsOne": true
+                    },
                     "services": {
                         "maxItemsOne": false
                     }
@@ -1159,8 +1162,8 @@
             "pagerduty:index/eventOrchestrationServiceCacheVariable:EventOrchestrationServiceCacheVariable": 0,
             "pagerduty:index/eventOrchestrationUnrouted:EventOrchestrationUnrouted": 0,
             "pagerduty:index/eventRule:EventRule": 0,
-            "pagerduty:index/extension:Extension": 0,
-            "pagerduty:index/extensionServiceNow:ExtensionServiceNow": 0,
+            "pagerduty:index/extension:Extension": 1,
+            "pagerduty:index/extensionServiceNow:ExtensionServiceNow": 1,
             "pagerduty:index/incidentCustomField:IncidentCustomField": 0,
             "pagerduty:index/incidentCustomFieldOption:IncidentCustomFieldOption": 0,
             "pagerduty:index/incidentWorkflow:IncidentWorkflow": 0,
@@ -1175,8 +1178,8 @@
             "pagerduty:index/serviceEventRule:ServiceEventRule": 0,
             "pagerduty:index/serviceIntegration:ServiceIntegration": 0,
             "pagerduty:index/slackConnection:SlackConnection": 0,
-            "pagerduty:index/tag:Tag": 0,
-            "pagerduty:index/tagAssignment:TagAssignment": 0,
+            "pagerduty:index/tag:Tag": 1,
+            "pagerduty:index/tagAssignment:TagAssignment": 1,
             "pagerduty:index/team:Team": 0,
             "pagerduty:index/teamMembership:TeamMembership": 0,
             "pagerduty:index/user:User": 0,
@@ -1194,7 +1197,7 @@
             "pagerduty:index/getEventOrchestrationIntegration:getEventOrchestrationIntegration": 0,
             "pagerduty:index/getEventOrchestrationServiceCacheVariable:getEventOrchestrationServiceCacheVariable": 0,
             "pagerduty:index/getEventOrchestrations:getEventOrchestrations": 0,
-            "pagerduty:index/getExtensionSchema:getExtensionSchema": 0,
+            "pagerduty:index/getExtensionSchema:getExtensionSchema": 1,
             "pagerduty:index/getIncidentCustomField:getIncidentCustomField": 0,
             "pagerduty:index/getIncidentWorkflow:getIncidentWorkflow": 0,
             "pagerduty:index/getLicense:getLicense": 0,
@@ -1207,7 +1210,7 @@
             "pagerduty:index/getStandards:getStandards": 1,
             "pagerduty:index/getStandardsResourceScores:getStandardsResourceScores": 1,
             "pagerduty:index/getStandardsResourcesScores:getStandardsResourcesScores": 1,
-            "pagerduty:index/getTag:getTag": 0,
+            "pagerduty:index/getTag:getTag": 1,
             "pagerduty:index/getTeam:getTeam": 0,
             "pagerduty:index/getTeamMembers:getTeamMembers": 0,
             "pagerduty:index/getUser:getUser": 0,