Added API Gateway v2 HTTP & Websocket support #207

robh007 · 2020-11-08T08:48:59Z

Objective:

Adds support for api_gatewayv2_api

Example output:

 NAME                                      MONTHLY QTY  UNIT      PRICE  HOURLY COST  MONTHLY COST  

  aws_apigatewayv2_api.http                                                                          
  ├─ Requests (first 300m)                      1000000  requests  1e-06       0.0014        1.0000  
  └─ Requests (over 300m)                             0  requests  9e-07       0.0000        0.0000  
  Total                                                                        0.0014        1.0000  
                                                                                                     
  aws_apigatewayv2_api.websocket                                                                     
  ├─ Requests (first 1B message transfers)   1000000000  requests  1e-06       1.3699     1000.0000  
  └─ Requests (over 1B message transfers)             0  requests  8e-07       0.0000        0.0000  
  Total                                                                        1.3699     1000.0000  
                                                                                                     
  OVERALL TOTAL                                                                1.3712     1001.0000

Pricing details:

The aws_apigatewayv2_api provides 4 pricing components described in https://aws.amazon.com/api-gateway/pricing/. This adds support for the API gateway HTTP API & WebSocket API.

alikhajeh1

Nice one! I've added my suggestions. The following comments also apply to this PR:

alikhajeh1 · 2020-11-08T09:43:30Z

internal/providers/terraform/aws/apigatewayv2_api.go

+	return &schema.RegistryItem{
+		Name:  "aws_apigatewayv2_api",
+		Notes: []string{
+			"WebSocket Connection minutes is not yet supported",


I think we can cost components for this:

$ cd infracost/infracost/scripts/price_explorer $ ./2_find_product_families.sh AmazonApiGateway List of Product Families for AmazonApiGateway: Executing query... done [ "API Calls", "Amazon API Gateway Cache", "WebSocket" ] $ ./3_find_attribute_keys.sh AmazonApiGateway WebSocket Executing query... done ##################################### Found 2 different products ------------------ .... "key": "usagetype", - "value": "USE1-ApiGatewayMessage", + "value": "USE1-ApiGatewayMinute",

@alikhajeh1 do you want me to add the cost component in anyway? The reason I left it out was because of the calculation variation on websocket connections. It can be varied per second / minute / hour & the number of connections rate can be per second / minute / hour / day.

@robh007 I think it's helpful to see that, even if there is no infracost provider support for it, e.g.:

└─ Connection duration - 1M minutes 0.025 - -

If we add the provider support, would having average_connection_duration (in minutes) and monthly_connections help? so the user inputs those and we multiply them to calculate the total connection minutes.

internal/providers/terraform/aws/apigatewayv2_api.go

alikhajeh1 · 2020-11-08T09:56:28Z

internal/providers/terraform/aws/apigatewayv2_api.go

+func websocketApiCostComponent(d *schema.ResourceData, u *schema.ResourceData) []*schema.CostComponent {
+	region := d.Get("region").String()
+	monthlyMessages := decimal.Zero
+	messageSize := decimal.NewFromInt(0)


Messages are metered in 32 KB increments.

Should this default to 32KB as that seems to be the minimum?

internal/providers/terraform/aws/apigatewayv2_api.go

alikhajeh1 · 2020-11-08T10:54:12Z

internal/providers/terraform/aws/apigatewayv2_api.go

+
+	return []*schema.CostComponent{
+		{
+			Name:            "Requests (first 1B message transfers)",


Suggested change

Name: "Requests (first 1B message transfers)",

Name: "Messages (first 1B)",

The WebSocket APIs section of https://aws.amazon.com/api-gateway/pricing/ talks about messages, and that's how websocket load tests usually work too (based on number of messages and message size), so I think we can override the Number of Requests title they use in their pricing table. The usagetype also uses the word "message".

alikhajeh1 · 2020-11-08T10:54:32Z

internal/providers/terraform/aws/apigatewayv2_api.go

+	return []*schema.CostComponent{
+		{
+			Name:            "Requests (first 1B message transfers)",
+			Unit:            "requests",


Suggested change

Unit: "requests",

Unit: "messages",

Please also add UnitMultiplier: 1000000,

alikhajeh1 · 2020-11-08T10:57:52Z

internal/providers/terraform/aws/apigatewayv2_api.go

+				Service:       strPtr("AmazonApiGateway"),
+				ProductFamily: strPtr("WebSocket"),
+				AttributeFilters: []*schema.AttributeFilter{
+					{Key: "description", Value: strPtr("WebSocket Messages")},


this isn't needed

alikhajeh1 · 2020-11-08T10:58:56Z

internal/providers/terraform/aws/apigatewayv2_api.go

+			},
+		},
+		{
+			Name:            "Requests (over 1B message transfers)",


Same three comments from above apply here too.

robh007 · 2020-11-09T09:31:14Z

@alikhajeh1 I've updated with the requested changes. I can't assign back to you, I've just managed to un-assign myself from this....

robh007 · 2020-11-09T09:35:19Z

New output

 NAME                            MONTHLY QTY  UNIT         PRICE   HOURLY COST  MONTHLY COST  

  aws_apigatewayv2_api.http                                                                    
  └─ Requests (first 300m)                  1  1M requests  1.0000       0.0014        1.0000  
  Total                                                                  0.0014        1.0000  
                                                                                               
  aws_apigatewayv2_api.websocket                                                               
  └─ Messages (first 1B)                1,000  1M messages  1.0000       1.3699    1,000.0000  
  Total                                                                  1.3699    1,000.0000  
                                                                                               
  OVERALL TOTAL (USD)                                                    1.3712    1,001.0000

alikhajeh1

Thanks @robh007! I added my suggestions, thanks for your patience as I improve the CONTRIBUTING.md file to clarify the tweaks/wording.

btw, maybe run make fmt and make lint to see if that fixes the failed CI build.

alikhajeh1 · 2020-11-09T12:22:31Z

internal/providers/terraform/aws/apigatewayv2_api.go

+				Service:       strPtr("AmazonApiGateway"),
+				ProductFamily: strPtr("API Calls"),
+				AttributeFilters: []*schema.AttributeFilter{
+					{Key: "description", Value: strPtr("HTTP API Requests")},


Suggested change

{Key: "description", Value: strPtr("HTTP API Requests")},

description is needed either (descriptions might change if AWS reword things? I think usagetype is the one that users rely on in the billing CSV too)

alikhajeh1 · 2020-11-09T12:22:50Z

internal/providers/terraform/aws/apigatewayv2_api.go

+				Service:       strPtr("AmazonApiGateway"),
+				ProductFamily: strPtr("API Calls"),
+				AttributeFilters: []*schema.AttributeFilter{
+					{Key: "description", Value: strPtr("HTTP API Requests")},


Suggested change

{Key: "description", Value: strPtr("HTTP API Requests")},

alikhajeh1 · 2020-11-09T12:47:38Z

internal/providers/terraform/aws/apigatewayv2_api.go

+
+	CostComponent := []*schema.CostComponent{
+		{
+			Name:            "Requests (first 300m)",


Suggested change

Name: "Requests (first 300m)",

Name: "Requests (first 300M)",

I'll add this to the CONTRIBUTING.md file

- tiers in names: use the K postfix for thousand, M for million, B for billion and T for trillion, e.g. "Requests (first 300M)" and "Messages (first 1B)". Note the capital case letters.

alikhajeh1 · 2020-11-09T12:47:53Z

internal/providers/terraform/aws/apigatewayv2_api.go

+
+	if apiTierTwo.GreaterThan(decimal.NewFromInt(0)) {
+		CostComponent = append(CostComponent, &schema.CostComponent{
+			Name:            "Requests (over 300m)",


Suggested change

Name: "Requests (over 300m)",

Name: "Requests (over 300M)",

alikhajeh1 · 2020-11-09T12:48:18Z

internal/providers/terraform/aws/apigatewayv2_api_test.go

+			Name: "aws_apigatewayv2_api.http",
+			CostComponentChecks: []testutil.CostComponentCheck{
+				{
+					Name:             "Requests (first 300m)",


Suggested change

Name: "Requests (first 300m)",

Name: "Requests (first 300M)",

internal/providers/terraform/aws/resource_registry.go

alikhajeh1 · 2020-11-09T14:15:18Z

@robh007 I resolved the conflict with master, I think this PR just needs the Connection duration cost component and can be merged.

internal/providers/terraform/aws/resource_registry.go

internal/providers/terraform/aws/free_resources.go

robh007 mentioned this pull request Nov 8, 2020

Added support for AWS API GatewayV2 HTTP & WebSocket API. infracost/terraform-provider-infracost#12

Merged

alikhajeh1 requested changes Nov 8, 2020

View reviewed changes

alikhajeh1 assigned robh007 Nov 8, 2020

Rob Houghton added 2 commits November 9, 2020 07:52

Added API Gateway v2 HTTP & Websocket support

49cdb76

Requested changes

a997acb

robh007 force-pushed the httpApi branch from 63cb605 to a997acb Compare November 9, 2020 09:29

robh007 removed their assignment Nov 9, 2020

alikhajeh1 requested changes Nov 9, 2020

View reviewed changes

alikhajeh1 assigned robh007 Nov 9, 2020

Changes as a result of make fmt & make lint, plus review comments

e9f90ea

alikhajeh1 reviewed Nov 9, 2020

View reviewed changes

internal/providers/terraform/aws/resource_registry.go Outdated Show resolved Hide resolved

Added Message Connection base costs

bc29d00

robh007 force-pushed the httpApi branch from 46ef01c to bc29d00 Compare November 9, 2020 14:23

Rob Houghton and others added 2 commits November 9, 2020 14:46

Added missing cost component from test

2dd8440

Merge branch 'master' into httpApi

aededc0

alikhajeh1 reviewed Nov 9, 2020

View reviewed changes

internal/providers/terraform/aws/resource_registry.go Outdated Show resolved Hide resolved

Update internal/providers/terraform/aws/resource_registry.go

f1dc391

alikhajeh1 reviewed Nov 9, 2020

View reviewed changes

internal/providers/terraform/aws/free_resources.go Outdated Show resolved Hide resolved

Update internal/providers/terraform/aws/free_resources.go

3bca5b7

alikhajeh1 merged commit 3dcaf28 into infracost:master Nov 9, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added API Gateway v2 HTTP & Websocket support #207

Added API Gateway v2 HTTP & Websocket support #207

robh007 commented Nov 8, 2020

alikhajeh1 left a comment

alikhajeh1 Nov 8, 2020

robh007 Nov 9, 2020

alikhajeh1 Nov 9, 2020 •

edited

Loading

alikhajeh1 Nov 8, 2020

alikhajeh1 Nov 8, 2020

alikhajeh1 Nov 8, 2020

alikhajeh1 Nov 8, 2020

alikhajeh1 Nov 8, 2020

robh007 commented Nov 9, 2020

robh007 commented Nov 9, 2020

alikhajeh1 left a comment

alikhajeh1 Nov 9, 2020

alikhajeh1 Nov 9, 2020

alikhajeh1 Nov 9, 2020

alikhajeh1 Nov 9, 2020

alikhajeh1 Nov 9, 2020

alikhajeh1 commented Nov 9, 2020

	Name: "Requests (first 1B message transfers)",
	Name: "Messages (first 1B)",

	Name: "Requests (first 300m)",
	Name: "Requests (first 300M)",

Added API Gateway v2 HTTP & Websocket support #207

Added API Gateway v2 HTTP & Websocket support #207

Conversation

robh007 commented Nov 8, 2020

alikhajeh1 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alikhajeh1 Nov 9, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

robh007 commented Nov 9, 2020

robh007 commented Nov 9, 2020

alikhajeh1 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alikhajeh1 commented Nov 9, 2020

alikhajeh1 Nov 9, 2020 •

edited

Loading