Add aws_api_gateway_integration resource

builtin/providers/aws/provider.go

@@ -118,6 +118,7 @@ func Provider() terraform.ResourceProvider {
 			"aws_api_gateway_resource":             resourceAwsApiGatewayResource(),
 			"aws_api_gateway_method":               resourceAwsApiGatewayMethod(),
 			"aws_api_gateway_method_response":      resourceAwsApiGatewayMethodResponse(),
+			"aws_api_gateway_integration":          resourceAwsApiGatewayIntegration(),
 			"aws_app_cookie_stickiness_policy":     resourceAwsAppCookieStickinessPolicy(),
 			"aws_autoscaling_group":                resourceAwsAutoscalingGroup(),
 			"aws_autoscaling_notification":         resourceAwsAutoscalingNotification(),

builtin/providers/aws/resource_aws_api_gateway_integration.go

@@ -0,0 +1,199 @@
+package aws
+
+import (
+	"fmt"
+	"log"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/service/apigateway"
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/helper/schema"
+)
+
+func resourceAwsApiGatewayIntegration() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAwsApiGatewayIntegrationCreate,
+		Read:   resourceAwsApiGatewayIntegrationRead,
+		Update: resourceAwsApiGatewayIntegrationUpdate,
+		Delete: resourceAwsApiGatewayIntegrationDelete,
+
+		Schema: map[string]*schema.Schema{
+			"rest_api_id": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
+			"resource_id": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
+			"http_method": &schema.Schema{
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validateHTTPMethod,
+			},
+
+			"type": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
+					value := v.(string)
+					if value != "MOCK" && value != "AWS" && value != "HTTP" {
+						errors = append(errors, fmt.Errorf(
+							"%q must be one of 'AWS', 'MOCK', 'HTTP'", k))
+					}
+					return
+				},
+			},
+
+			"uri": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+
+			"credentials": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+
+			"integration_http_method": &schema.Schema{
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validateHTTPMethod,
+			},
+
+			"request_templates": &schema.Schema{
+				Type:     schema.TypeMap,
+				Optional: true,
+				Elem:     schema.TypeString,
+			},
+		},
+	}
+}
+
+func resourceAwsApiGatewayIntegrationCreate(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).apigateway
+
+	var integrationHttpMethod *string
+	if v, ok := d.GetOk("integration_http_method"); ok {
+		integrationHttpMethod = aws.String(v.(string))
+	}
+	var uri *string
+	if v, ok := d.GetOk("uri"); ok {
+		uri = aws.String(v.(string))
+	}
+	templates := make(map[string]string)
+	for k, v := range d.Get("request_templates").(map[string]interface{}) {
+		templates[k] = v.(string)
+	}
+
+	var credentials *string
+	if val, ok := d.GetOk("credentials"); ok {
+		credentials = aws.String(val.(string))
+	}
+
+	_, err := conn.PutIntegration(&apigateway.PutIntegrationInput{
+		HttpMethod: aws.String(d.Get("http_method").(string)),
+		ResourceId: aws.String(d.Get("resource_id").(string)),
+		RestApiId:  aws.String(d.Get("rest_api_id").(string)),
+		Type:       aws.String(d.Get("type").(string)),
+		IntegrationHttpMethod: integrationHttpMethod,
+		Uri: uri,
+		// TODO implement once [GH-2143](https://github.com/hashicorp/terraform/issues/2143) has been implemented
+		RequestParameters:  nil,
+		RequestTemplates:   aws.StringMap(templates),
+		Credentials:        credentials,
+		CacheNamespace:     nil,
+		CacheKeyParameters: nil,
+	})
+	if err != nil {
+		return fmt.Errorf("Error creating API Gateway Integration: %s", err)
+	}
+
+	d.SetId(fmt.Sprintf("agi-%s-%s-%s", d.Get("rest_api_id").(string), d.Get("resource_id").(string), d.Get("http_method").(string)))
+
+	return nil
+}
+
+func resourceAwsApiGatewayIntegrationRead(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).apigateway
+
+	log.Printf("[DEBUG] Reading API Gateway Integration %s", d.Id())
+	integration, err := conn.GetIntegration(&apigateway.GetIntegrationInput{
+		HttpMethod: aws.String(d.Get("http_method").(string)),
+		ResourceId: aws.String(d.Get("resource_id").(string)),
+		RestApiId:  aws.String(d.Get("rest_api_id").(string)),
+	})
+	if err != nil {
+		if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == "NotFoundException" {
+			d.SetId("")
+			return nil
+		}
+		return err
+	}
+	log.Printf("[DEBUG] Received API Gateway Integration: %s", integration)
+	d.SetId(fmt.Sprintf("agi-%s-%s-%s", d.Get("rest_api_id").(string), d.Get("resource_id").(string), d.Get("http_method").(string)))
+
+	// AWS converts "" to null on their side, convert it back
+	if v, ok := integration.RequestTemplates["application/json"]; ok && v == nil {
+		integration.RequestTemplates["application/json"] = aws.String("")
+	}
+
+	d.Set("request_templates", aws.StringValueMap(integration.RequestTemplates))
+	d.Set("credentials", integration.Credentials)
+	d.Set("type", integration.Type)
+	d.Set("uri", integration.Uri)
+
+	return nil
+}
+
+func resourceAwsApiGatewayIntegrationUpdate(d *schema.ResourceData, meta interface{}) error {
+	return resourceAwsApiGatewayIntegrationCreate(d, meta)
+}
+
+func resourceAwsApiGatewayIntegrationDelete(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).apigateway
+	log.Printf("[DEBUG] Deleting API Gateway Integration: %s", d.Id())
+
+	resourceId := d.Get("resource_id").(string)
+	if o, n := d.GetChange("resource_id"); o.(string) != n.(string) {
+		resourceId = o.(string)
+	}
+	httpMethod := d.Get("http_method").(string)
+	if o, n := d.GetChange("http_method"); o.(string) != n.(string) {
+		httpMethod = o.(string)
+	}
+	restApiID := d.Get("rest_api_id").(string)
+	if o, n := d.GetChange("rest_api_id"); o.(string) != n.(string) {
+		restApiID = o.(string)
+	}
+
+	return resource.Retry(5*time.Minute, func() error {
+		log.Printf("[DEBUG] schema is %#v", d)
+		_, err := conn.DeleteIntegration(&apigateway.DeleteIntegrationInput{
+			HttpMethod: aws.String(httpMethod),
+			ResourceId: aws.String(resourceId),
+			RestApiId:  aws.String(restApiID),
+		})
+		if err == nil {
+			return nil
+		}
+
+		apigatewayErr, ok := err.(awserr.Error)
+		if apigatewayErr.Code() == "NotFoundException" {
+			return nil
+		}
+
+		if !ok {
+			return resource.RetryError{Err: err}
+		}
+
+		return resource.RetryError{Err: err}
+	})
+}

builtin/providers/aws/resource_aws_api_gateway_integration_test.go

@@ -0,0 +1,216 @@
+package aws
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/service/apigateway"
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+)
+
+func TestAccAWSAPIGatewayIntegration_basic(t *testing.T) {
+	var conf apigateway.Integration
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAWSAPIGatewayIntegrationDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccAWSAPIGatewayIntegrationConfig,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAWSAPIGatewayIntegrationExists("aws_api_gateway_integration.test", &conf),
+					testAccCheckAWSAPIGatewayIntegrationAttributes(&conf),
+					resource.TestCheckResourceAttr(
+						"aws_api_gateway_integration.test", "type", "HTTP"),
+					resource.TestCheckResourceAttr(
+						"aws_api_gateway_integration.test", "integration_http_method", "GET"),
+					resource.TestCheckResourceAttr(
+						"aws_api_gateway_integration.test", "uri", "https://www.google.de"),
+					resource.TestCheckResourceAttr(
+						"aws_api_gateway_integration.test", "request_templates.application/json", ""),
+					resource.TestCheckResourceAttr(
+						"aws_api_gateway_integration.test", "request_templates.application/xml", "#set($inputRoot = $input.path('$'))\n{ }"),
+				),
+			},
+
+			resource.TestStep{
+				Config: testAccAWSAPIGatewayIntegrationConfigUpdate,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAWSAPIGatewayIntegrationExists("aws_api_gateway_integration.test", &conf),
+					testAccCheckAWSAPIGatewayMockIntegrationAttributes(&conf),
+					resource.TestCheckResourceAttr(
+						"aws_api_gateway_integration.test", "type", "MOCK"),
+					resource.TestCheckResourceAttr(
+						"aws_api_gateway_integration.test", "integration_http_method", ""),
+					resource.TestCheckResourceAttr(
+						"aws_api_gateway_integration.test", "uri", ""),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckAWSAPIGatewayMockIntegrationAttributes(conf *apigateway.Integration) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		if *conf.Type != "MOCK" {
+			return fmt.Errorf("Wrong Type: %q", *conf.Type)
+		}
+		return nil
+	}
+}
+
+func testAccCheckAWSAPIGatewayIntegrationAttributes(conf *apigateway.Integration) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		if *conf.HttpMethod == "" {
+			return fmt.Errorf("empty HttpMethod")
+		}
+		if *conf.Uri != "https://www.google.de" {
+			return fmt.Errorf("wrong Uri")
+		}
+		if *conf.Type != "HTTP" {
+			return fmt.Errorf("wrong Type")
+		}
+		if conf.RequestTemplates["application/json"] != nil {
+			return fmt.Errorf("wrong RequestTemplate for application/json")
+		}
+		if *conf.RequestTemplates["application/xml"] != "#set($inputRoot = $input.path('$'))\n{ }" {
+			return fmt.Errorf("wrong RequestTemplate for application/xml")
+		}
+		return nil
+	}
+}
+
+func testAccCheckAWSAPIGatewayIntegrationExists(n string, res *apigateway.Integration) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[n]
+		if !ok {
+			return fmt.Errorf("Not found: %s", n)
+		}
+
+		if rs.Primary.ID == "" {
+			return fmt.Errorf("No API Gateway Method ID is set")
+		}
+
+		conn := testAccProvider.Meta().(*AWSClient).apigateway
+
+		req := &apigateway.GetIntegrationInput{
+			HttpMethod: aws.String("GET"),
+			ResourceId: aws.String(s.RootModule().Resources["aws_api_gateway_resource.test"].Primary.ID),
+			RestApiId:  aws.String(s.RootModule().Resources["aws_api_gateway_rest_api.test"].Primary.ID),
+		}
+		describe, err := conn.GetIntegration(req)
+		if err != nil {
+			return err
+		}
+
+		*res = *describe
+
+		return nil
+	}
+}
+
+func testAccCheckAWSAPIGatewayIntegrationDestroy(s *terraform.State) error {
+	conn := testAccProvider.Meta().(*AWSClient).apigateway
+
+	for _, rs := range s.RootModule().Resources {
+		if rs.Type != "aws_api_gateway_integration" {
+			continue
+		}
+
+		req := &apigateway.GetIntegrationInput{
+			HttpMethod: aws.String("GET"),
+			ResourceId: aws.String(s.RootModule().Resources["aws_api_gateway_resource.test"].Primary.ID),
+			RestApiId:  aws.String(s.RootModule().Resources["aws_api_gateway_rest_api.test"].Primary.ID),
+		}
+		_, err := conn.GetIntegration(req)
+
+		if err == nil {
+			return fmt.Errorf("API Gateway Method still exists")
+		}
+
+		aws2err, ok := err.(awserr.Error)
+		if !ok {
+			return err
+		}
+		if aws2err.Code() != "NotFoundException" {
+			return err
+		}
+
+		return nil
+	}
+
+	return nil
+}
+
+const testAccAWSAPIGatewayIntegrationConfig = `
+resource "aws_api_gateway_rest_api" "test" {
+  name = "test"
+}
+
+resource "aws_api_gateway_resource" "test" {
+  rest_api_id = "${aws_api_gateway_rest_api.test.id}"
+  parent_id = "${aws_api_gateway_rest_api.test.root_resource_id}"
+  path_part = "test"
+}
+
+resource "aws_api_gateway_method" "test" {
+  rest_api_id = "${aws_api_gateway_rest_api.test.id}"
+  resource_id = "${aws_api_gateway_resource.test.id}"
+  http_method = "GET"
+  authorization = "NONE"
+
+  request_models = {
+    "application/json" = "Error"
+  }
+}
+
+resource "aws_api_gateway_integration" "test" {
+  rest_api_id = "${aws_api_gateway_rest_api.test.id}"
+  resource_id = "${aws_api_gateway_resource.test.id}"
+  http_method = "${aws_api_gateway_method.test.http_method}"
+
+  request_templates = {
+    "application/json" = ""
+    "application/xml" = "#set($inputRoot = $input.path('$'))\n{ }"
+  }
+
+  type = "HTTP"
+  uri = "https://www.google.de"
+  integration_http_method = "GET"
+}
+`
+
+const testAccAWSAPIGatewayIntegrationConfigUpdate = `
+resource "aws_api_gateway_rest_api" "test" {
+  name = "test"
+}
+
+resource "aws_api_gateway_resource" "test" {
+  rest_api_id = "${aws_api_gateway_rest_api.test.id}"
+  parent_id = "${aws_api_gateway_rest_api.test.root_resource_id}"
+  path_part = "test"
+}
+
+resource "aws_api_gateway_method" "test" {
+  rest_api_id = "${aws_api_gateway_rest_api.test.id}"
+  resource_id = "${aws_api_gateway_resource.test.id}"
+  http_method = "GET"
+  authorization = "NONE"
+
+  request_models = {
+    "application/json" = "Error"
+  }
+}
+
+resource "aws_api_gateway_integration" "test" {
+  rest_api_id = "${aws_api_gateway_rest_api.test.id}"
+  resource_id = "${aws_api_gateway_resource.test.id}"
+  http_method = "${aws_api_gateway_method.test.http_method}"
+
+  type = "MOCK"
+}
+`

website/source/docs/providers/aws/r/api_gateway_integration.html.markdown

@@ -0,0 +1,52 @@
+---
+layout: "aws"
+page_title: "AWS: aws_api_gateway_integration"
+sidebar_current: "docs-aws-resource-api-gateway-integration"
+description: |-
+  Provides an HTTP Method Integration for an API Gateway Resource.
+---
+
+# aws\_api\_gateway\_integration
+
+Provides an HTTP Method Integration for an API Gateway Resource.
+
+## Example Usage
+
+```
+resource "aws_api_gateway_rest_api" "MyDemoAPI" {
+  name = "MyDemoAPI"
+  description = "This is my API for demonstration purposes"
+}
+
+resource "aws_api_gateway_resource" "MyDemoResource" {
+  rest_api_id = "${aws_api_gateway_rest_api.MyDemoAPI.id}"
+  parent_resource_id = "${aws_api_gateway_rest_api.MyDemoAPI.root_resource_id}"
+  path_part = "mydemoresource"
+}
+
+resource "aws_api_gateway_method" "MyDemoMethod" {
+  rest_api_id = "${aws_api_gateway_rest_api.MyDemoAPI.id}"
+  resource_id = "${aws_api_gateway_resource.MyDemoResource.id}"
+  http_method = "GET"
+  authorization = "NONE"
+}
+
+resource "aws_api_gateway_integration" "MyDemoIntegration" {
+  rest_api_id = "${aws_api_gateway_rest_api.MyDemoAPI.id}"
+  resource_id = "${aws_api_gateway_resource.MyDemoResource.id}"
+  http_method = "${aws_api_gateway_method.MyDemoMethod.http_method}"
+  type = "MOCK"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `rest_api_id` - (Required) API Gateway ID
+* `resource_id` - (Required) API Gateway Resource ID
+* `http_method` - (Required) HTTP Method (GET, POST, PUT, DELETE, HEAD, OPTION)
+* `type` - (Required) Specifies a put integration input's type (HTTP, MOCK, AWS)
+* `uri` - (Optional) Input's  Uniform Resource Identifier (HTTP, AWS)
+* `integration_http_method` - (Optional) Integration HTTP Method (GET, POST, PUT, DELETE, HEAD, OPTION)
+

website/source/layouts/aws.erb

@@ -25,6 +25,9 @@
                         <li<%= sidebar_current("docs-aws-resource-api-gateway-method-response") %>>
                             <a href="/docs/providers/aws/r/api_gateway_method_response.html">aws_api_gateway_method_response</a>
                         </li>
+                        <li<%= sidebar_current("docs-aws-resource-api-gateway-integration") %>>
+                            <a href="/docs/providers/aws/r/api_gateway_integration.html">aws_api_gateway_integration</a>
+                        </li>
                     </ul>
                 </li>