Merge pull request PagerDuty#816 from cjgajard/tpf-tag

Migrate pack of datasources and resources to terraform plugin framework
imjaroiswebdev · May 2, 2024 · 109d59e · 109d59e
2 parents 991aecc + 40ea47a
commit 109d59e
Show file tree

Hide file tree

Showing 49 changed files with 3,011 additions and 1,290 deletions.
diff --git a/go.mod b/go.mod
@@ -10,6 +10,7 @@ require (
 	github.com/hashicorp/terraform-exec v0.20.0
 	github.com/hashicorp/terraform-json v0.20.0
 	github.com/hashicorp/terraform-plugin-framework v1.5.0
+	github.com/hashicorp/terraform-plugin-framework-jsontypes v0.1.0
 	github.com/hashicorp/terraform-plugin-framework-validators v0.12.0
 	github.com/hashicorp/terraform-plugin-go v0.20.0
 	github.com/hashicorp/terraform-plugin-mux v0.13.0

diff --git a/go.sum b/go.sum
@@ -75,6 +75,8 @@ github.com/hashicorp/terraform-json v0.20.0 h1:cJcvn4gIOTi0SD7pIy+xiofV1zFA3hza+
 github.com/hashicorp/terraform-json v0.20.0/go.mod h1:qdeBs11ovMzo5puhrRibdD6d2Dq6TyE/28JiU4tIQxk=
 github.com/hashicorp/terraform-plugin-framework v1.5.0 h1:8kcvqJs/x6QyOFSdeAyEgsenVOUeC/IyKpi2ul4fjTg=
 github.com/hashicorp/terraform-plugin-framework v1.5.0/go.mod h1:6waavirukIlFpVpthbGd2PUNYaFedB0RwW3MDzJ/rtc=
+github.com/hashicorp/terraform-plugin-framework-jsontypes v0.1.0 h1:b8vZYB/SkXJT4YPbT3trzE6oJ7dPyMy68+9dEDKsJjE=
+github.com/hashicorp/terraform-plugin-framework-jsontypes v0.1.0/go.mod h1:tP9BC3icoXBz72evMS5UTFvi98CiKhPdXF6yLs1wS8A=
 github.com/hashicorp/terraform-plugin-framework-validators v0.12.0 h1:HOjBuMbOEzl7snOdOoUfE2Jgeto6JOjLVQ39Ls2nksc=
 github.com/hashicorp/terraform-plugin-framework-validators v0.12.0/go.mod h1:jfHGE/gzjxYz6XoUwi/aYiiKrJDeutQNUtGQXkaHklg=
 github.com/hashicorp/terraform-plugin-go v0.20.0 h1:oqvoUlL+2EUbKNsJbIt3zqqZ7wi6lzn4ufkn/UA51xQ=

diff --git a/pagerduty/data_source_pagerduty_extension_schema.go b/pagerduty/data_source_pagerduty_extension_schema.go
diff --git a/pagerduty/data_source_pagerduty_extension_schema_test.go b/pagerduty/data_source_pagerduty_extension_schema_test.go
diff --git a/pagerduty/data_source_pagerduty_tag.go b/pagerduty/data_source_pagerduty_tag.go
diff --git a/pagerduty/provider.go b/pagerduty/provider.go
@@ -89,13 +89,11 @@ func Provider(isMux bool) *schema.Provider {
 			"pagerduty_user_contact_method":                        dataSourcePagerDutyUserContactMethod(),
 			"pagerduty_team":                                       dataSourcePagerDutyTeam(),
 			"pagerduty_vendor":                                     dataSourcePagerDutyVendor(),
-			"pagerduty_extension_schema":                           dataSourcePagerDutyExtensionSchema(),
 			"pagerduty_service":                                    dataSourcePagerDutyService(),
 			"pagerduty_service_integration":                        dataSourcePagerDutyServiceIntegration(),
 			"pagerduty_business_service":                           dataSourcePagerDutyBusinessService(),
 			"pagerduty_priority":                                   dataSourcePagerDutyPriority(),
 			"pagerduty_ruleset":                                    dataSourcePagerDutyRuleset(),
-			"pagerduty_tag":                                        dataSourcePagerDutyTag(),
 			"pagerduty_event_orchestration":                        dataSourcePagerDutyEventOrchestration(),
 			"pagerduty_event_orchestrations":                       dataSourcePagerDutyEventOrchestrations(),
 			"pagerduty_event_orchestration_integration":            dataSourcePagerDutyEventOrchestrationIntegration(),
@@ -120,16 +118,12 @@ func Provider(isMux bool) *schema.Provider {
 			"pagerduty_user":                                          resourcePagerDutyUser(),
 			"pagerduty_user_contact_method":                           resourcePagerDutyUserContactMethod(),
 			"pagerduty_user_notification_rule":                        resourcePagerDutyUserNotificationRule(),
-			"pagerduty_extension":                                     resourcePagerDutyExtension(),
-			"pagerduty_extension_servicenow":                          resourcePagerDutyExtensionServiceNow(),
 			"pagerduty_event_rule":                                    resourcePagerDutyEventRule(),
 			"pagerduty_ruleset":                                       resourcePagerDutyRuleset(),
 			"pagerduty_ruleset_rule":                                  resourcePagerDutyRulesetRule(),
 			"pagerduty_business_service":                              resourcePagerDutyBusinessService(),
 			"pagerduty_service_dependency":                            resourcePagerDutyServiceDependency(),
 			"pagerduty_response_play":                                 resourcePagerDutyResponsePlay(),
-			"pagerduty_tag":                                           resourcePagerDutyTag(),
-			"pagerduty_tag_assignment":                                resourcePagerDutyTagAssignment(),
 			"pagerduty_service_event_rule":                            resourcePagerDutyServiceEventRule(),
 			"pagerduty_slack_connection":                              resourcePagerDutySlackConnection(),
 			"pagerduty_business_service_subscriber":                   resourcePagerDutyBusinessServiceSubscriber(),
@@ -156,6 +150,7 @@ func Provider(isMux bool) *schema.Provider {
 
 	if isMux {
 		delete(p.DataSourcesMap, "pagerduty_business_service")
+
 		delete(p.ResourcesMap, "pagerduty_business_service")
 	}
 
@@ -213,7 +208,7 @@ func handleNotFoundError(err error, d *schema.ResourceData) error {
 	return genError(err, d)
 }
 
-func providerConfigureContextFunc(ctx context.Context, data *schema.ResourceData, terraformVersion string) (interface{}, diag.Diagnostics) {
+func providerConfigureContextFunc(_ context.Context, data *schema.ResourceData, terraformVersion string) (interface{}, diag.Diagnostics) {
 	var diags diag.Diagnostics
 	serviceRegion := strings.ToLower(data.Get("service_region").(string))
 
@@ -243,7 +238,7 @@ func providerConfigureContextFunc(ctx context.Context, data *schema.ResourceData
 		if err := validateAuthMethodConfig(data); err != nil {
 			diag := diag.Diagnostic{
 				Severity: diag.Warning,
-				Summary:  fmt.Sprint("`token` and `use_app_oauth_scoped_token` are both configured at the same time"),
+				Summary:  "`token` and `use_app_oauth_scoped_token` are both configured at the same time",
 				Detail:   err.Error(),
 			}
 			diags = append(diags, diag)