Merge branch 'master' into feature/add-required-approving-review-count-#89

Author: Andy Gertjejansen

CHANGELOG.md

@@ -1,4 +1,8 @@
-## 1.3.1 (Unreleased)
+## 1.4.0 (Unreleased)
+
+FEATURES:
+
+* **New Resource:** `github_user_invitation_accepter` [GH-161]
 
 BUG FIXES:
 

github/provider.go

@@ -5,10 +5,8 @@ import (
 	"github.com/hashicorp/terraform/terraform"
 )
 
-// Provider returns a terraform.ResourceProvider.
 func Provider() terraform.ResourceProvider {
 	var p *schema.Provider
-	// The actual provider
 	p = &schema.Provider{
 		Schema: map[string]*schema.Schema{
 			"token": &schema.Schema{
@@ -38,22 +36,23 @@ func Provider() terraform.ResourceProvider {
 		},
 
 		ResourcesMap: map[string]*schema.Resource{
-			"github_branch_protection":       resourceGithubBranchProtection(),
-			"github_issue_label":             resourceGithubIssueLabel(),
-			"github_membership":              resourceGithubMembership(),
-			"github_organization_project":    resourceGithubOrganizationProject(),
-			"github_organization_webhook":    resourceGithubOrganizationWebhook(),
-			"github_project_column":          resourceGithubProjectColumn(),
-			"github_repository":              resourceGithubRepository(),
-			"github_repository_collaborator": resourceGithubRepositoryCollaborator(),
-			"github_repository_deploy_key":   resourceGithubRepositoryDeployKey(),
-			"github_repository_project":      resourceGithubRepositoryProject(),
-			"github_repository_webhook":      resourceGithubRepositoryWebhook(),
-			"github_team":                    resourceGithubTeam(),
-			"github_team_membership":         resourceGithubTeamMembership(),
-			"github_team_repository":         resourceGithubTeamRepository(),
-			"github_user_gpg_key":            resourceGithubUserGpgKey(),
-			"github_user_ssh_key":            resourceGithubUserSshKey(),
+			"github_branch_protection":        resourceGithubBranchProtection(),
+			"github_issue_label":              resourceGithubIssueLabel(),
+			"github_membership":               resourceGithubMembership(),
+			"github_organization_project":     resourceGithubOrganizationProject(),
+			"github_organization_webhook":     resourceGithubOrganizationWebhook(),
+			"github_project_column":           resourceGithubProjectColumn(),
+			"github_repository":               resourceGithubRepository(),
+			"github_repository_collaborator":  resourceGithubRepositoryCollaborator(),
+			"github_repository_deploy_key":    resourceGithubRepositoryDeployKey(),
+			"github_repository_project":       resourceGithubRepositoryProject(),
+			"github_repository_webhook":       resourceGithubRepositoryWebhook(),
+			"github_team":                     resourceGithubTeam(),
+			"github_team_membership":          resourceGithubTeamMembership(),
+			"github_team_repository":          resourceGithubTeamRepository(),
+			"github_user_gpg_key":             resourceGithubUserGpgKey(),
+			"github_user_invitation_accepter": resourceGithubUserInvitationAccepter(),
+			"github_user_ssh_key":             resourceGithubUserSshKey(),
 		},
 
 		DataSourcesMap: map[string]*schema.Resource{

github/provider_test.go

@@ -19,6 +19,7 @@ var testUser string = os.Getenv("GITHUB_TEST_USER")
 var testCollaborator string = os.Getenv("GITHUB_TEST_COLLABORATOR")
 
 var testAccProviders map[string]terraform.ResourceProvider
+var testAccProviderFactories func(providers *[]*schema.Provider) map[string]terraform.ResourceProviderFactory
 var testAccProvider *schema.Provider
 
 func init() {
@@ -27,6 +28,15 @@ func init() {
 		"github": testAccProvider,
 		"tls":    tls.Provider(),
 	}
+	testAccProviderFactories = func(providers *[]*schema.Provider) map[string]terraform.ResourceProviderFactory {
+		return map[string]terraform.ResourceProviderFactory{
+			"github": func() (terraform.ResourceProvider, error) {
+				p := Provider()
+				*providers = append(*providers, p.(*schema.Provider))
+				return p, nil
+			},
+		}
+	}
 }
 
 func TestProvider(t *testing.T) {

github/resource_github_repository_collaborator.go

@@ -2,6 +2,7 @@ package github
 
 import (
 	"context"
+	"fmt"
 	"log"
 
 	"github.com/google/go-github/github"
@@ -36,6 +37,10 @@ func resourceGithubRepositoryCollaborator() *schema.Resource {
 				Default:      "push",
 				ValidateFunc: validateValueFunc([]string{"pull", "push", "admin"}),
 			},
+			"invitation_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -90,6 +95,7 @@ func resourceGithubRepositoryCollaboratorRead(d *schema.ResourceData, meta inter
 		d.Set("repository", repoName)
 		d.Set("username", username)
 		d.Set("permission", permissionName)
+		d.Set("invitation_id", fmt.Sprintf("%d", invitation.GetID()))
 		return nil
 	}
 

github/resource_github_repository_collaborator_test.go

@@ -3,6 +3,7 @@ package github
 import (
 	"context"
 	"fmt"
+	"regexp"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/acctest"
@@ -13,6 +14,7 @@ import (
 const expectedPermission string = "admin"
 
 func TestAccGithubRepositoryCollaborator_basic(t *testing.T) {
+	resourceName := "github_repository_collaborator.test_repo_collaborator"
 	repoName := fmt.Sprintf("tf-acc-test-collab-%s", acctest.RandString(5))
 
 	resource.Test(t, resource.TestCase{
@@ -23,8 +25,10 @@ func TestAccGithubRepositoryCollaborator_basic(t *testing.T) {
 			{
 				Config: testAccGithubRepositoryCollaboratorConfig(repoName),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckGithubRepositoryCollaboratorExists("github_repository_collaborator.test_repo_collaborator"),
-					testAccCheckGithubRepositoryCollaboratorPermission("github_repository_collaborator.test_repo_collaborator"),
+					testAccCheckGithubRepositoryCollaboratorExists(resourceName),
+					testAccCheckGithubRepositoryCollaboratorPermission(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "permission", expectedPermission),
+					resource.TestMatchResourceAttr(resourceName, "invitation_id", regexp.MustCompile(`^[0-9]+$`)),
 				),
 			},
 		},

github/resource_github_user_invitation_accepter.go

@@ -0,0 +1,47 @@
+package github
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"strconv"
+
+	"github.com/hashicorp/terraform/helper/schema"
+)
+
+func resourceGithubUserInvitationAccepter() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceGithubUserInvitationAccepterCreate,
+		Read:   schema.Noop, // Nothing to read as invitation is removed after it's accepted
+		Delete: schema.Noop, // Nothing to remove as invitation is removed after it's accepted
+
+		Schema: map[string]*schema.Schema{
+			"invitation_id": {
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+		},
+	}
+}
+
+func resourceGithubUserInvitationAccepterCreate(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*Organization).client
+
+	invitationIdString := d.Get("invitation_id").(string)
+	invitationId, err := strconv.Atoi(invitationIdString)
+	if err != nil {
+		return fmt.Errorf("Failed to parse invitation ID: %s", err)
+	}
+	ctx := context.Background()
+
+	log.Printf("[DEBUG] Accepting invitation: %d", invitationId)
+	_, err = client.Users.AcceptInvitation(ctx, int64(invitationId))
+	if err != nil {
+		return err
+	}
+
+	d.SetId(invitationIdString)
+
+	return nil
+}

github/resource_github_user_invitation_accepter_test.go

@@ -0,0 +1,74 @@
+package github
+
+import (
+	"fmt"
+	"os"
+	"regexp"
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform/terraform"
+)
+
+func TestAccGithubUserInvitationAccepter_basic(t *testing.T) {
+	resourceName := "github_repository_collaborator.test"
+	repoName := fmt.Sprintf("tf-acc-test-collab-%s", acctest.RandString(5))
+
+	inviteeToken := os.Getenv("GITHUB_TEST_COLLABORATOR_TOKEN")
+	if inviteeToken == "" {
+		t.Skip("GITHUB_TEST_COLLABORATOR_TOKEN was not provided, skipping test")
+	}
+
+	var providers []*schema.Provider
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: testAccProviderFactories(&providers),
+		CheckDestroy:      testAccCheckGithubUserInvitationAccepterDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccGithubUserInvitationAccepterConfig(inviteeToken, repoName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "permission", "push"),
+					resource.TestMatchResourceAttr(resourceName, "invitation_id", regexp.MustCompile(`^[0-9]+$`)),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckGithubUserInvitationAccepterDestroy(s *terraform.State) error {
+	return nil
+}
+
+func testAccGithubUserInvitationAccepterConfig(inviteeToken, repoName string) string {
+	return fmt.Sprintf(`
+provider "github" {
+  alias = "main"
+}
+
+provider "github" {
+  alias = "invitee"
+  token = "%s"
+}
+
+resource "github_repository" "test" {
+  provider = "github.main"
+  name = "%s"
+}
+
+resource "github_repository_collaborator" "test" {
+  provider = "github.main"
+  repository = "${github_repository.test.name}"
+  username = "%s"
+  permission = "push"
+}
+
+resource "github_user_invitation_accepter" "test" {
+  provider = "github.invitee"
+  invitation_id = "${github_repository_collaborator.test.invitation_id}"
+}
+`, inviteeToken, repoName, testCollaborator)
+}

website/docs/r/repository_collaborator.html.markdown

@@ -44,6 +44,11 @@ The following arguments are supported:
 * `permission` - (Optional) The permission of the outside collaborator for the repository.
             Must be one of `pull`, `push`, or `admin`. Defaults to `push`.
 
+## Attribute Reference
+
+In addition to the above arguments, the following attributes are exported:
+
+* `invitation_id` - ID of the invitation to be used in [`github_user_invitation_accepter`](./user_invitation_accepter.html)
 
 ## Import
 

website/docs/r/user_invitation_accepter.html.markdown

@@ -0,0 +1,41 @@
+---
+layout: "github"
+page_title: "GitHub: github_user_invitation_accepter"
+sidebar_current: "docs-github-resource-user-invitation-accepter"
+description: |-
+  Provides a resource to manage GitHub repository collaborator invitations.
+---
+
+# github_user_invitation_accepter
+
+Provides a resource to manage GitHub repository collaborator invitations.
+
+## Example Usage
+
+```hcl
+resource "github_repository" "example" {
+  name = "example-repo"
+}
+
+resource "github_repository_collaborator" "example" {
+  repository = "${github_repository.example.name}"
+  username = "example-username"
+  permission = "push"
+}
+
+provider "github" {
+  alias = "invitee"
+  token = "${var.invitee_token}"
+}
+
+resource "github_user_invitation_accepter" "example" {
+  provider = "github.invitee"
+  invitation_id = "${github_repository_collaborator.example.invitation_id}"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `invitation_id` - (Required) ID of the invitation to accept

website/github.erb

@@ -79,6 +79,9 @@
           <li<%= sidebar_current("docs-github-resource-user-gpg-key") %>>
             <a href="/docs/providers/github/r/user_gpg_key.html">github_user_gpg_key</a>
           </li>
+          <li<%= sidebar_current("docs-github-resource-user-invitation-accepter") %>>
+            <a href="/docs/providers/github/r/user_invitation_accepter.html">github_user_invitation_accepter</a>
+          </li>
           <li<%= sidebar_current("docs-github-resource-user-ssh-key") %>>
             <a href="/docs/providers/github/r/user_ssh_key.html">github_user_ssh_key</a>
           </li>