Merge branch 'add-teammember-with-role' of https://github.com/dtan4/t…

…erraform-provider-pagerduty into dtan4-add-teammember-with-role

pagerduty/import_pagerduty_team_membership_test.go

@@ -29,3 +29,26 @@ func TestAccPagerDutyTeamMembership_import(t *testing.T) {
 		},
 	})
 }
+
+func TestAccPagerDutyTeamMembership_importWithRole(t *testing.T) {
+	user := fmt.Sprintf("tf-%s", acctest.RandString(5))
+	team := fmt.Sprintf("tf-%s", acctest.RandString(5))
+	role := "manager"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckPagerDutyTeamMembershipDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckPagerDutyTeamMembershipWithRoleConfig(user, team, role),
+			},
+
+			{
+				ResourceName:      "pagerduty_team_membership.foo",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}

pagerduty/resource_pagerduty_team_membership.go

@@ -15,6 +15,7 @@ func resourcePagerDutyTeamMembership() *schema.Resource {
 	return &schema.Resource{
 		Create: resourcePagerDutyTeamMembershipCreate,
 		Read:   resourcePagerDutyTeamMembershipRead,
+		Update: resourcePagerDutyTeamMembershipUpdate,
 		Delete: resourcePagerDutyTeamMembershipDelete,
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
@@ -30,6 +31,16 @@ func resourcePagerDutyTeamMembership() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+			"role": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "manager",
+				ValidateFunc: validateValueFunc([]string{
+					"observer",
+					"responder",
+					"manager",
+				}),
+			},
 		},
 	}
 }
@@ -38,11 +49,12 @@ func resourcePagerDutyTeamMembershipCreate(d *schema.ResourceData, meta interfac
 
 	userID := d.Get("user_id").(string)
 	teamID := d.Get("team_id").(string)
+	role := d.Get("role").(string)
 
-	log.Printf("[DEBUG] Adding user: %s to team: %s", userID, teamID)
+	log.Printf("[DEBUG] Adding user: %s to team: %s with role: %s", userID, teamID, role)
 
 	retryErr := resource.Retry(2*time.Minute, func() *resource.RetryError {
-		if _, err := client.Teams.AddUser(teamID, userID); err != nil {
+		if _, err := client.Teams.AddUserWithRole(teamID, userID, role); err != nil {
 			if isErrCode(err, 500) {
 				return resource.RetryableError(err)
 			}
@@ -68,18 +80,53 @@ func resourcePagerDutyTeamMembershipRead(d *schema.ResourceData, meta interface{
 
 	log.Printf("[DEBUG] Reading user: %s from team: %s", userID, teamID)
 
-	user, _, err := client.Users.Get(userID, &pagerduty.GetUserOptions{})
+	resp, _, err := client.Teams.GetMembers(teamID, &pagerduty.GetMembersOptions{})
 	if err != nil {
 		return handleNotFoundError(err, d)
 	}
 
-	if !isTeamMember(user, teamID) {
-		log.Printf("[WARN] Removing %s since the user: %s is not a member of: %s", d.Id(), userID, teamID)
-		d.SetId("")
+	for _, member := range resp.Members {
+		if member.User.ID == userID {
+			d.Set("user_id", userID)
+			d.Set("team_id", teamID)
+			d.Set("role", member.Role)
+
+			return nil
+		}
+	}
+
+	log.Printf("[WARN] Removing %s since the user: %s is not a member of: %s", d.Id(), userID, teamID)
+	d.SetId("")
+
+	return nil
+}
+
+func resourcePagerDutyTeamMembershipUpdate(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*pagerduty.Client)
+
+	userID := d.Get("user_id").(string)
+	teamID := d.Get("team_id").(string)
+	role := d.Get("role").(string)
+
+	log.Printf("[DEBUG] Updating user: %s to team: %s with role: %s", userID, teamID, role)
+
+	// To update existing membership resource, We can use the same API as creating a new membership.
+	retryErr := resource.Retry(2*time.Minute, func() *resource.RetryError {
+		if _, err := client.Teams.AddUserWithRole(teamID, userID, role); err != nil {
+			if isErrCode(err, 500) {
+				return resource.RetryableError(err)
+			}
+
+			return resource.NonRetryableError(err)
+		}
+
+		return nil
+	})
+	if retryErr != nil {
+		return retryErr
 	}
 
-	d.Set("user_id", userID)
-	d.Set("team_id", teamID)
+	d.SetId(fmt.Sprintf("%s:%s", userID, teamID))
 
 	return nil
 }

pagerduty/resource_pagerduty_team_membership_test.go

@@ -29,6 +29,26 @@ func TestAccPagerDutyTeamMembership_Basic(t *testing.T) {
 	})
 }
 
+func TestAccPagerDutyTeamMembership_WithRole(t *testing.T) {
+	user := fmt.Sprintf("tf-%s", acctest.RandString(5))
+	team := fmt.Sprintf("tf-%s", acctest.RandString(5))
+	role := "manager"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckPagerDutyTeamMembershipDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckPagerDutyTeamMembershipWithRoleConfig(user, team, role),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckPagerDutyTeamMembershipExists("pagerduty_team_membership.foo"),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckPagerDutyTeamMembershipDestroy(s *terraform.State) error {
 	client := testAccProvider.Meta().(*pagerduty.Client)
 	for _, r := range s.RootModule().Resources {
@@ -62,6 +82,7 @@ func testAccCheckPagerDutyTeamMembershipExists(n string) resource.TestCheckFunc
 
 		userID := rs.Primary.Attributes["user_id"]
 		teamID := rs.Primary.Attributes["team_id"]
+		role := rs.Primary.Attributes["role"]
 
 		user, _, err := client.Users.Get(userID, &pagerduty.GetUserOptions{})
 		if err != nil {
@@ -72,6 +93,19 @@ func testAccCheckPagerDutyTeamMembershipExists(n string) resource.TestCheckFunc
 			return fmt.Errorf("%s is not a member of: %s", userID, teamID)
 		}
 
+		resp, _, err := client.Teams.GetMembers(teamID, &pagerduty.GetMembersOptions{})
+		if err != nil {
+			return err
+		}
+
+		for _, member := range resp.Members {
+			if member.User.ID == userID {
+				if member.Role != role {
+					return fmt.Errorf("%s does not have the role: %s in: %s", userID, role, teamID)
+				}
+			}
+		}
+
 		return nil
 	}
 }
@@ -94,3 +128,23 @@ resource "pagerduty_team_membership" "foo" {
 }
 `, user, team)
 }
+
+func testAccCheckPagerDutyTeamMembershipWithRoleConfig(user, team, role string) string {
+	return fmt.Sprintf(`
+resource "pagerduty_user" "foo" {
+  name = "%[1]v"
+  email = "%[1]v@foo.com"
+}
+
+resource "pagerduty_team" "foo" {
+  name        = "%[2]v"
+  description = "foo"
+}
+
+resource "pagerduty_team_membership" "foo" {
+  user_id = "${pagerduty_user.foo.id}"
+  team_id = "${pagerduty_team.foo.id}"
+  role    = "%[3]v"
+}
+`, user, team, role)
+}

vendor/modules.txt

@@ -182,7 +182,7 @@ github.com/hashicorp/terraform-svchost/auth
 github.com/hashicorp/terraform-svchost/disco
 # github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d
 github.com/hashicorp/yamux
-# github.com/heimweh/go-pagerduty v0.0.0-20190807171021-2a6540956dc5
+# github.com/heimweh/go-pagerduty v0.0.0-20190903123207-5a16d0d0290f
 github.com/heimweh/go-pagerduty/pagerduty
 # github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af
 github.com/jmespath/go-jmespath

website/docs/r/team_membership.html.markdown

@@ -26,6 +26,7 @@ resource "pagerduty_team" "foo" {
 resource "pagerduty_team_membership" "foo" {
   user_id = "${pagerduty_user.foo.id}"
   team_id = "${pagerduty_team.foo.id}"
+  role    = "manager"
 }
 ```
 
@@ -35,13 +36,15 @@ The following arguments are supported:
 
   * `user_id` - (Required) The ID of the user to add to the team.
   * `team_id` - (Required) The ID of the team in which the user will belong.
+  * `role`    - (Optional) The role of the user in the team. One of `observer`, `responder`, or `manager`. Defaults to `observer`.
 
 ## Attributes Reference
 
 The following attributes are exported:
 
   * `user_id` - The ID of the user belonging to the team.
   * `team_id` - The team ID the user belongs to.
+  * `role`    - The role of the user in the team.
 
 
 ## Import