resource/api_gateway_integration: support vpc link #3428

loivis · 2018-02-17T13:05:02Z

Follow up on #2512 to enable vpc link support for resource aws_api_gateway_integration

loivis · 2018-02-17T13:25:02Z

⎇  make testacc TEST=./aws TESTARGS='-run=TestAccAWSAPIGatewayIntegration_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -run=TestAccAWSAPIGatewayIntegration_ -timeout 120m
=== RUN   TestAccAWSAPIGatewayIntegration_basic
--- PASS: TestAccAWSAPIGatewayIntegration_basic (73.78s)
=== RUN   TestAccAWSAPIGatewayIntegration_contentHandling
--- PASS: TestAccAWSAPIGatewayIntegration_contentHandling (45.96s)
=== RUN   TestAccAWSAPIGatewayIntegration_cache_key_parameters
--- PASS: TestAccAWSAPIGatewayIntegration_cache_key_parameters (19.35s)
=== RUN   TestAccAWSAPIGatewayIntegration_vpcLink
--- PASS: TestAccAWSAPIGatewayIntegration_vpcLink (564.25s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	703.385s

AlexCousens · 2018-02-23T11:03:43Z

Would love to have this ASAP!

gazmania-mccarthyfinch · 2018-02-27T21:12:49Z

Can we get this merged and relaeased ASAP please? The previous vpc_link resource is great but it's useless without the integration piece.

saxonww · 2018-02-28T17:29:12Z

FWIW we've moved on from using the integration directly and are using the swagger import feature of aws_api_gateway_rest_api. You can set the VPC links there, not sure if that is an option for you.

…

On Tue, Feb 27, 2018 at 4:12 PM, Gary Poore ***@***.***> wrote: Can we get this merged and relaeased ASAP please? The previous vpc_link resource is great but it's useless without the integration piece. — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#3428 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AFDPgSNODD77X9Xv9ifWxnauiRYL6rcjks5tZG_agaJpZM4SJTd9> .

gazmania-mccarthyfinch · 2018-02-28T21:35:30Z

I'd like to move away from integrations aswell as they are pretty cumbersome, but AFAIK swagger import only supports Swagger2 and not the new OAS3 which all of our stuff is defined in. i guess that will come eventually.

saxonww · 2018-02-28T21:50:42Z

Yeah it only supports 2.0 and even then only a subset of it; their importer is kind of strict. But this is an API Gateway detail, even if you define all your models and everything in TF you have to conform to what the API Gateway supports.

…

On Wed, Feb 28, 2018 at 4:35 PM, Gary Poore ***@***.***> wrote: I'd like to move away from integrations aswell as they are pretty cumbersome, but AFAIK swagger import only supports Swagger2 and not the new OAS3 which all of our stuff is defined in. — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#3428 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AFDPgYxNe4K4gwpKZL3gV37UwccCUdnFks5tZcalgaJpZM4SJTd9> .

atrakic · 2018-03-10T11:08:15Z

Would like to see this PR merged soon. Thx

…nt 'type'

loivis · 2018-03-15T16:12:53Z

resolve conflicts with master.

loivis · 2018-03-19T12:05:46Z

Some attention on this feature?

grahamlyons · 2018-03-29T09:04:31Z

Without wanting to be that guy who just +1s it, I'd like to see this feature in soon too.

bamdadd · 2018-04-05T14:26:48Z

Any chance that this will get merged?

bflad

Thanks so much for this! Can you please add the two missing d.Set()? Then hopefully this is ready to ship. 🚀

bflad · 2018-04-05T19:26:45Z

aws/resource_aws_api_gateway_integration.go

+	var connectionId *string
+	if *connectionType == apigateway.ConnectionTypeVpcLink {
+		if _, ok := d.GetOk("connection_id"); !ok {
+			return fmt.Errorf("connection_id required when connection_type set to VPC_LINK")


We can move this to a CustomizeDiff for plan time validation at some point 👍

I tried but didn't manage to do it because of question hashicorp/terraform#17595

bflad · 2018-04-05T19:30:42Z

aws/resource_aws_api_gateway_integration.go

@@ -55,6 +55,21 @@ func resourceAwsApiGatewayIntegration() *schema.Resource {
 				}, false),
 			},

+			"connection_type": {


We're missing d.Set("connection_type", integration.ConnectionType) in the read function 😄

bflad · 2018-04-05T19:30:58Z

aws/resource_aws_api_gateway_integration.go

+				}, false),
+			},
+
+			"connection_id": {


We're missing d.Set("connection_id", integration.ConnectionId) in the read function 😄

loivis · 2018-04-06T12:15:39Z

just realized update is not handled at all 😱

…id in read function

loivis · 2018-04-06T19:59:19Z

⎇  make fmt; and echo > aws/debug.log ; and make testacc TEST=./aws TESTARGS='-run=TestAccAWSAPIGatewayIntegration_integrationType'
gofmt -w $(find . -name '*.go' |grep -v vendor)
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -run=TestAccAWSAPIGatewayIntegration_integrationType -timeout 120m
=== RUN   TestAccAWSAPIGatewayIntegration_integrationType
--- PASS: TestAccAWSAPIGatewayIntegration_integrationType (701.09s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	701.128s

bamdadd · 2018-04-11T09:42:49Z

Thanks for working on this. We also really need this functionality.

bflad · 2018-04-11T21:54:08Z

aws/resource_aws_api_gateway_integration.go

@@ -240,6 +269,8 @@ func resourceAwsApiGatewayIntegrationRead(d *schema.ResourceData, meta interface
 	d.Set("request_parameters", aws.StringValueMap(integration.RequestParameters))
 	d.Set("request_parameters_in_json", aws.StringValueMap(integration.RequestParameters))
 	d.Set("passthrough_behavior", integration.PassthroughBehavior)
+	d.Set("connection_type", integration.ConnectionType)


Looks like this might not always be returned? Maybe we should set it to INTERNET if nil

--- FAIL: TestAccAWSAPIGatewayIntegrationResponse_basic (110.48s) testing.go:518: Step 0 error: After applying this step, the plan was not empty: DIFF: UPDATE: aws_api_gateway_integration.test connection_type: "" => "INTERNET"

Updated but a bit curious though.
I think I covered the attribute check in TestAccAWSAPIGatewayIntegration_integrationType. Is "not always" behavior caused by regional difference from aws api? If so, it looks tricky to discover.

Not really sure, honestly. It seems some service APIs always return everything and others don't. 🙁

bflad

Thanks so much for this @loivis!! 🚀

5 tests passed (all tests)
=== RUN   TestAccAWSAPIGatewayIntegration_cache_key_parameters
--- PASS: TestAccAWSAPIGatewayIntegration_cache_key_parameters (7.02s)
=== RUN   TestAccAWSAPIGatewayIntegration_basic
--- PASS: TestAccAWSAPIGatewayIntegration_basic (38.42s)
=== RUN   TestAccAWSAPIGatewayIntegrationResponse_basic
--- PASS: TestAccAWSAPIGatewayIntegrationResponse_basic (96.08s)
=== RUN   TestAccAWSAPIGatewayIntegration_contentHandling
--- PASS: TestAccAWSAPIGatewayIntegration_contentHandling (124.82s)
=== RUN   TestAccAWSAPIGatewayIntegration_integrationType
--- PASS: TestAccAWSAPIGatewayIntegration_integrationType (644.46s)

bflad · 2018-04-18T18:20:42Z

This has been released in version 1.15.0 of the AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

ghost · 2020-04-06T17:43:05Z

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

ghost added the size/L Managed by automation to categorize the size of a PR. label Feb 17, 2018

radeksimko added enhancement Requests to existing resources that expand the functionality or scope. service/apigateway Issues and PRs that pertain to the apigateway service. labels Feb 19, 2018

austinbutler mentioned this pull request Mar 3, 2018

[FR] Support for VPC Link integration type on API GW #2511

Closed

xiaowei.wang added 3 commits March 15, 2018 17:05

resource/api_gateway_integration: drop custom ValidateFunc for argume…

3b6a5c5

…nt 'type'

resource/api_gateway_integration: support vpc link

128e1e6

resource/api_gateway_integration: add acceptance test for vpc link

cc5dbd1

loivis force-pushed the resource-api-gateway-integration-type-vpc-link branch from 07273ef to 995c78e Compare March 15, 2018 16:05

ghost added the size/L Managed by automation to categorize the size of a PR. label Mar 15, 2018

loivis force-pushed the resource-api-gateway-integration-type-vpc-link branch from 995c78e to 7382e36 Compare March 15, 2018 16:08

ghost added the size/L Managed by automation to categorize the size of a PR. label Mar 15, 2018

loivis force-pushed the resource-api-gateway-integration-type-vpc-link branch from 7382e36 to d06948c Compare March 15, 2018 16:10

ghost added the size/L Managed by automation to categorize the size of a PR. label Mar 15, 2018

resource/api_gateway_integration: update document for vpc link

05a41d2

loivis force-pushed the resource-api-gateway-integration-type-vpc-link branch from d06948c to 05a41d2 Compare March 19, 2018 12:03

ghost added the size/L Managed by automation to categorize the size of a PR. label Mar 19, 2018

bflad reviewed Apr 5, 2018

View reviewed changes

bflad self-assigned this Apr 5, 2018

bflad added the waiting-response Maintainers are waiting on response from community or contributor. label Apr 5, 2018

ghost added the size/L Managed by automation to categorize the size of a PR. label Apr 6, 2018

bflad removed the waiting-response Maintainers are waiting on response from community or contributor. label Apr 6, 2018

resource/api_gateway_integration: set connection_type and connection_…

b146a80

…id in read function

loivis force-pushed the resource-api-gateway-integration-type-vpc-link branch from bc1423e to b146a80 Compare April 6, 2018 12:19

ghost added the size/L Managed by automation to categorize the size of a PR. label Apr 6, 2018

bflad added this to the v1.15.0 milestone Apr 11, 2018

bflad reviewed Apr 11, 2018

View reviewed changes

resource/api_gateway_integration: handle integration_type update

54c6734

loivis force-pushed the resource-api-gateway-integration-type-vpc-link branch from 727d04d to 54c6734 Compare April 12, 2018 07:17

ghost added the size/L Managed by automation to categorize the size of a PR. label Apr 12, 2018

bflad approved these changes Apr 12, 2018

View reviewed changes

bflad merged commit 1dc66af into hashicorp:master Apr 12, 2018

bflad added a commit that referenced this pull request Apr 12, 2018

Update CHANGELOG for #3428

56e10a9

ghost locked and limited conversation to collaborators Apr 6, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

resource/api_gateway_integration: support vpc link #3428

resource/api_gateway_integration: support vpc link #3428

loivis commented Feb 17, 2018

loivis commented Feb 17, 2018

AlexCousens commented Feb 23, 2018

gazmania-mccarthyfinch commented Feb 27, 2018

saxonww commented Feb 28, 2018 via email

gazmania-mccarthyfinch commented Feb 28, 2018 •

edited

Loading

saxonww commented Feb 28, 2018 via email

atrakic commented Mar 10, 2018 •

edited

Loading

loivis commented Mar 15, 2018

loivis commented Mar 19, 2018

grahamlyons commented Mar 29, 2018

bamdadd commented Apr 5, 2018

bflad left a comment

bflad Apr 5, 2018

loivis Apr 6, 2018

bflad Apr 5, 2018

bflad Apr 5, 2018

loivis commented Apr 6, 2018

loivis commented Apr 6, 2018

bamdadd commented Apr 11, 2018

bflad Apr 11, 2018

loivis Apr 12, 2018

bflad Apr 12, 2018

bflad left a comment

bflad commented Apr 18, 2018

ghost commented Apr 6, 2020

resource/api_gateway_integration: support vpc link #3428

resource/api_gateway_integration: support vpc link #3428

Conversation

loivis commented Feb 17, 2018

loivis commented Feb 17, 2018

AlexCousens commented Feb 23, 2018

gazmania-mccarthyfinch commented Feb 27, 2018

saxonww commented Feb 28, 2018 via email

gazmania-mccarthyfinch commented Feb 28, 2018 • edited Loading

saxonww commented Feb 28, 2018 via email

atrakic commented Mar 10, 2018 • edited Loading

loivis commented Mar 15, 2018

loivis commented Mar 19, 2018

grahamlyons commented Mar 29, 2018

bamdadd commented Apr 5, 2018

bflad left a comment

Choose a reason for hiding this comment

bflad Apr 5, 2018

Choose a reason for hiding this comment

loivis Apr 6, 2018

Choose a reason for hiding this comment

bflad Apr 5, 2018

Choose a reason for hiding this comment

bflad Apr 5, 2018

Choose a reason for hiding this comment

loivis commented Apr 6, 2018

loivis commented Apr 6, 2018

bamdadd commented Apr 11, 2018

bflad Apr 11, 2018

Choose a reason for hiding this comment

loivis Apr 12, 2018

Choose a reason for hiding this comment

bflad Apr 12, 2018

Choose a reason for hiding this comment

bflad left a comment

Choose a reason for hiding this comment

bflad commented Apr 18, 2018

ghost commented Apr 6, 2020

gazmania-mccarthyfinch commented Feb 28, 2018 •

edited

Loading

atrakic commented Mar 10, 2018 •

edited

Loading