Merge pull request #896 from cjgajard/tpf-team

Migrate pack #3 of datasources and resources to terraform plugin framework

pagerduty/data_source_pagerduty_licenses.go

@@ -11,6 +11,7 @@ import (
 	"github.com/heimweh/go-pagerduty/pagerduty"
 )
 
+// Deprecated: Migrated to pagerdutyplugin.dataSourceLicenses. Kept for testing purposes.
 func dataSourcePagerDutyLicenses() *schema.Resource {
 	return &schema.Resource{
 		Read: dataSourcePagerDutyLicensesRead,
@@ -91,3 +92,64 @@ func flattenLicense(l *pagerduty.License) map[string]interface{} {
 
 	return license
 }
+
+var licenseSchema = map[string]*schema.Schema{
+	"id": {
+		Type:     schema.TypeString,
+		Optional: true,
+		Computed: true,
+	},
+	"type": {
+		Type:     schema.TypeString,
+		Optional: true,
+		Computed: true,
+	},
+	"name": {
+		Type:     schema.TypeString,
+		Optional: true,
+		Computed: true,
+	},
+	"summary": {
+		Type:     schema.TypeString,
+		Optional: true,
+		Computed: true,
+	},
+	"description": {
+		Type:     schema.TypeString,
+		Optional: true,
+		Computed: true,
+	},
+	"role_group": {
+		Type:     schema.TypeString,
+		Optional: true,
+		Computed: true,
+	},
+	"current_value": {
+		Type:     schema.TypeInt,
+		Optional: true,
+		Computed: true,
+	},
+	"allocations_available": {
+		Type:     schema.TypeInt,
+		Optional: true,
+		Computed: true,
+	},
+	"valid_roles": {
+		Type:     schema.TypeList,
+		Optional: true,
+		Computed: true,
+		Elem: &schema.Schema{
+			Type: schema.TypeString,
+		},
+	},
+	"self": {
+		Type:     schema.TypeString,
+		Optional: true,
+		Computed: true,
+	},
+	"html_url": {
+		Type:     schema.TypeString,
+		Optional: true,
+		Computed: true,
+	},
+}

pagerduty/data_source_pagerduty_priority.go

@@ -12,6 +12,7 @@ import (
 	"github.com/heimweh/go-pagerduty/pagerduty"
 )
 
+// Deprecated: Migrated to pagerdutyplugin.dataSourcePriority. Kept for testing purposes.
 func dataSourcePagerDutyPriority() *schema.Resource {
 	return &schema.Resource{
 		Read: dataSourcePagerDutyPriorityRead,

pagerduty/provider.go

@@ -90,7 +90,6 @@ func Provider(isMux bool) *schema.Provider {
 			"pagerduty_schedule":                                   dataSourcePagerDutySchedule(),
 			"pagerduty_user":                                       dataSourcePagerDutyUser(),
 			"pagerduty_users":                                      dataSourcePagerDutyUsers(),
-			"pagerduty_license":                                    dataSourcePagerDutyLicense(),
 			"pagerduty_licenses":                                   dataSourcePagerDutyLicenses(),
 			"pagerduty_user_contact_method":                        dataSourcePagerDutyUserContactMethod(),
 			"pagerduty_team":                                       dataSourcePagerDutyTeam(),
@@ -155,11 +154,14 @@ func Provider(isMux bool) *schema.Provider {
 
 	if isMux {
 		delete(p.DataSourcesMap, "pagerduty_business_service")
+		delete(p.DataSourcesMap, "pagerduty_licenses")
+		delete(p.DataSourcesMap, "pagerduty_priority")
 		delete(p.DataSourcesMap, "pagerduty_service")
 		delete(p.DataSourcesMap, "pagerduty_service_integration")
 
 		delete(p.ResourcesMap, "pagerduty_addon")
 		delete(p.ResourcesMap, "pagerduty_business_service")
+		delete(p.ResourcesMap, "pagerduty_team")
 	}
 
 	p.ConfigureContextFunc = func(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {

pagerduty/provider_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/terraform"
 	"github.com/heimweh/go-pagerduty/pagerduty"
 )
 
@@ -189,6 +190,7 @@ resource "pagerduty_service" "foo" {
 }
 `, username, email, escalationPolicy, service)
 }
+
 func testAccCheckPagerDutyProviderAuthWithMultipleMethodsConfig(username, email, escalationPolicy, service string) string {
 	return fmt.Sprintf(`
 provider "pagerduty" {
@@ -331,3 +333,27 @@ func testAccGetPagerDutyAccountDomain(t *testing.T) string {
 	}
 	return accountDomain
 }
+
+func testAccCheckPagerDutyTeamDestroy(s *terraform.State) error {
+	client, _ := testAccProvider.Meta().(*Config).Client()
+	for _, r := range s.RootModule().Resources {
+		if r.Type != "pagerduty_team" {
+			continue
+		}
+
+		if _, _, err := client.Teams.Get(r.Primary.ID); err == nil {
+			return fmt.Errorf("Team still exists")
+		}
+
+	}
+	return nil
+}
+
+func testAccCheckPagerDutyTeamConfig(team string) string {
+	return fmt.Sprintf(`
+
+resource "pagerduty_team" "foo" {
+  name        = "%s"
+  description = "foo"
+}`, team)
+}

pagerduty/resource_pagerduty_team.go

@@ -10,6 +10,7 @@ import (
 	"github.com/heimweh/go-pagerduty/pagerduty"
 )
 
+// Deprecated: Migrated to pagerdutyplugin.resourceTeam. Kept for testing purposes.
 func resourcePagerDutyTeam() *schema.Resource {
 	return &schema.Resource{
 		Create: resourcePagerDutyTeamCreate,