Add aws_codebuild_webhook resource for creating GitHub webhooks for CodeBuild projects

aws/provider.go

@@ -330,6 +330,7 @@ func Provider() terraform.ResourceProvider {
 			"aws_codecommit_repository":                    resourceAwsCodeCommitRepository(),
 			"aws_codecommit_trigger":                       resourceAwsCodeCommitTrigger(),
 			"aws_codebuild_project":                        resourceAwsCodeBuildProject(),
+			"aws_codebuild_webhook":                        resourceAwsCodeBuildWebhook(),
 			"aws_codepipeline":                             resourceAwsCodePipeline(),
 			"aws_customer_gateway":                         resourceAwsCustomerGateway(),
 			"aws_dax_cluster":                              resourceAwsDaxCluster(),

aws/resource_aws_codebuild_project_test.go

@@ -2,6 +2,7 @@ package aws
 
 import (
 	"fmt"
+	"os"
 	"regexp"
 	"strings"
 	"testing"
@@ -290,6 +291,18 @@ func testAccCheckAWSCodeBuildProjectDestroy(s *terraform.State) error {
 }
 
 func testAccAWSCodeBuildProjectConfig_basic(rName, vpcConfig, vpcResources string) string {
+	// This is used for testing aws_codebuild_webhook as well as aws_codebuild_project.
+	// In order for that resource to work the Terraform AWS user must have done a GitHub
+	// OAuth dance.
+	//
+	// Additionally, the GitHub user that the Terraform AWS user logs in as must have
+	// access to the GitHub repository. This allows others to run tests for the webhook
+	// without having to have access to the Packer GitHub repository.
+	sourceURL, ok := os.LookupEnv("CODEBUILD_GITHUB_SOURCE_URL")
+	if !ok {
+		sourceURL = "https://github.com/hashicorp/packer.git"
+	}
+
 	return fmt.Sprintf(`
 resource "aws_iam_role" "codebuild_role" {
   name = "codebuild-role-%s"
@@ -375,7 +388,7 @@ resource "aws_codebuild_project" "foo" {
 
   source {
     type     = "GITHUB"
-    location = "https://github.com/hashicorp/packer.git"
+    location = "%s"
   }
 
   tags {
@@ -384,7 +397,7 @@ resource "aws_codebuild_project" "foo" {
 	%s
 }
 %s
-`, rName, rName, rName, rName, vpcConfig, vpcResources)
+`, rName, rName, rName, rName, sourceURL, vpcConfig, vpcResources)
 }
 
 func testAccAWSCodeBuildProjectConfig_basicUpdated(rName string) string {

aws/resource_aws_codebuild_webhook.go

@@ -0,0 +1,112 @@
+package aws
+
+import (
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/codebuild"
+	"github.com/hashicorp/terraform/helper/schema"
+)
+
+func resourceAwsCodeBuildWebhook() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAwsCodeBuildWebhookCreate,
+		Read:   resourceAwsCodeBuildWebhookRead,
+		Delete: resourceAwsCodeBuildWebhookDelete,
+		Update: resourceAwsCodeBuildWebhookUpdate,
+
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+			"branch_filter": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+			"url": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func resourceAwsCodeBuildWebhookCreate(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).codebuildconn
+
+	resp, err := conn.CreateWebhook(&codebuild.CreateWebhookInput{
+		ProjectName:  aws.String(d.Get("name").(string)),
+		BranchFilter: aws.String(d.Get("branch_filter").(string)),
+	})
+	if err != nil {
+		return err
+	}
+
+	d.SetId(d.Get("name").(string))
+	d.Set("branch_filter", d.Get("branch_filter").(string))
+	d.Set("url", resp.Webhook.Url)
+	return nil
+}
+
+func resourceAwsCodeBuildWebhookRead(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).codebuildconn
+
+	resp, err := conn.BatchGetProjects(&codebuild.BatchGetProjectsInput{
+		Names: []*string{
+			aws.String(d.Id()),
+		},
+	})
+
+	if err != nil {
+		return err
+	}
+
+	if len(resp.Projects) == 0 {
+		d.SetId("")
+		return nil
+	}
+
+	project := resp.Projects[0]
+	d.Set("branch_filter", project.Webhook.BranchFilter)
+	d.Set("url", project.Webhook.Url)
+	return nil
+}
+
+func resourceAwsCodeBuildWebhookUpdate(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).codebuildconn
+
+	if !d.HasChange("branch_filter") {
+		return nil
+	}
+
+	_, err := conn.UpdateWebhook(&codebuild.UpdateWebhookInput{
+		ProjectName:  aws.String(d.Id()),
+		BranchFilter: aws.String(d.Get("branch_filter").(string)),
+		RotateSecret: aws.Bool(false),
+	})
+
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func resourceAwsCodeBuildWebhookDelete(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).codebuildconn
+
+	_, err := conn.DeleteWebhook(&codebuild.DeleteWebhookInput{
+		ProjectName: aws.String(d.Id()),
+	})
+
+	if err != nil {
+		if isAWSErr(err, codebuild.ErrCodeResourceNotFoundException, "") {
+			d.SetId("")
+			return nil
+		}
+		return err
+	}
+
+	d.SetId("")
+	return nil
+}

aws/resource_aws_codebuild_webhook_test.go

@@ -0,0 +1,78 @@
+package aws
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/codebuild"
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+)
+
+func TestAccAwsCodeBuildWebhook_basic(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAwsCodeBuildWebhookDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCodeBuildWebhookConfig_basic(acctest.RandString(5)),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAwsCodeBuildWebhookExists("aws_codebuild_webhook.test"),
+					resource.TestCheckResourceAttrSet("aws_codebuild_webhook.test", "url"),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckAwsCodeBuildWebhookDestroy(s *terraform.State) error {
+	conn := testAccProvider.Meta().(*AWSClient).codebuildconn
+
+	for _, rs := range s.RootModule().Resources {
+		if rs.Type != "aws_codebuild_webhook" {
+			continue
+		}
+
+		resp, err := conn.BatchGetProjects(&codebuild.BatchGetProjectsInput{
+			Names: []*string{
+				aws.String(rs.Primary.ID),
+			},
+		})
+
+		if err != nil {
+			return err
+		}
+
+		if len(resp.Projects) == 0 {
+			return nil
+		}
+
+		project := resp.Projects[0]
+		if project.Webhook != nil && project.Webhook.Url != nil {
+			return fmt.Errorf("Found CodeBuild Webhook: %s", rs.Primary.ID)
+		}
+	}
+	return nil
+}
+
+func testAccCheckAwsCodeBuildWebhookExists(name string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		_, ok := s.RootModule().Resources[name]
+		if !ok {
+			return fmt.Errorf("Not found: %s", name)
+		}
+
+		return nil
+	}
+}
+
+func testAccCodeBuildWebhookConfig_basic(rName string) string {
+	return fmt.Sprintf(testAccAWSCodeBuildProjectConfig_basic(rName, "", "") + `
+resource "aws_codebuild_webhook" "test" {
+  name = "${aws_codebuild_project.foo.name}"
+}
+`)
+}

website/aws.erb

@@ -541,6 +541,10 @@
                             <a href="/docs/providers/aws/r/codebuild_project.html">aws_codebuild_project</a>
                         </li>
 
+                        <li<%= sidebar_current("docs-aws-resource-codebuild-webhook") %>>
+                            <a href="/docs/providers/aws/r/codebuild_webhook.html">aws_codebuild_webhook</a>
+                        </li>
+
                     </ul>
                 </li>
 

website/docs/r/codebuild_webhook.html.markdown

@@ -0,0 +1,35 @@
+---
+layout: "aws"
+page_title: "AWS: aws_codebuild_webhook"
+sidebar_current: "docs-aws-resource-codebuild-webhook"
+description: |-
+  Provides a CodeBuild Webhook resource.
+---
+
+# aws_codebuild_webhook
+
+Provides a CodeBuild Webhook resource.
+
+~> **Note:** The AWS account that Terraform uses to create this resource *must* have authorized CodeBuild to access GitHub's OAuth API. This is a manual step that must be done *before* creating webhooks with this resource. If OAuth is not configured, AWS will return an error similar to `ResourceNotFoundException: Could not find access token for server type github`.
+
+## Example Usage
+
+```hcl
+resource "aws_codebuild_webhook" "github" {
+  name = "${aws_codebuild_project.my_project.name}"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `name` - (Required) The name of the build project.
+* `branch_filter` - (Optional) A regular expression used to determine which branches get built. Default is all branches are built.
+
+## Attributes Reference
+
+The following attributes are exported:
+
+* `id` - The name of the build project.
+* `url` - The URL to the webhook.