Merge pull request #2076 from Ninir/b-usageplan-ratelimit

resource/aws_api_gateway_usag_plan: Fixed setting of rate_limit
hashicorp · Oct 27, 2017 · b66f6b6 · b66f6b6
2 parents 35fe15d + dca0899
commit b66f6b6
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/aws/resource_aws_api_gateway_usage_plan.go b/aws/resource_aws_api_gateway_usage_plan.go
@@ -92,7 +92,7 @@ func resourceAwsApiGatewayUsagePlan() *schema.Resource {
 						},
 
 						"rate_limit": {
-							Type:     schema.TypeInt,
+							Type:     schema.TypeFloat,
 							Default:  0,
 							Optional: true,
 						},
@@ -188,7 +188,7 @@ func resourceAwsApiGatewayUsagePlanCreate(d *schema.ResourceData, meta interface
 		}
 
 		if sv, ok := q["rate_limit"].(float64); ok {
-			ts.RateLimit = aws.Float64(float64(sv))
+			ts.RateLimit = aws.Float64(sv)
 		}
 
 		params.Throttle = ts
@@ -355,7 +355,7 @@ func resourceAwsApiGatewayUsagePlanUpdate(d *schema.ResourceData, meta interface
 				operations = append(operations, &apigateway.PatchOperation{
 					Op:    aws.String("replace"),
 					Path:  aws.String("/throttle/rateLimit"),
-					Value: aws.String(strconv.Itoa(d["rate_limit"].(int))),
+					Value: aws.String(strconv.FormatFloat(d["rate_limit"].(float64), 'f', -1, 64)),
 				})
 				operations = append(operations, &apigateway.PatchOperation{
 					Op:    aws.String("replace"),
@@ -369,7 +369,7 @@ func resourceAwsApiGatewayUsagePlanUpdate(d *schema.ResourceData, meta interface
 				operations = append(operations, &apigateway.PatchOperation{
 					Op:    aws.String("add"),
 					Path:  aws.String("/throttle/rateLimit"),
-					Value: aws.String(strconv.Itoa(d["rate_limit"].(int))),
+					Value: aws.String(strconv.FormatFloat(d["rate_limit"].(float64), 'f', -1, 64)),
 				})
 				operations = append(operations, &apigateway.PatchOperation{
 					Op:    aws.String("add"),

diff --git a/aws/resource_aws_api_gateway_usage_plan_test.go b/aws/resource_aws_api_gateway_usage_plan_test.go
@@ -190,6 +190,27 @@ func TestAccAWSAPIGatewayUsagePlan_throttling(t *testing.T) {
 	})
 }
 
+// https://github.com/terraform-providers/terraform-provider-aws/issues/2057
+func TestAccAWSAPIGatewayUsagePlan_throttlingInitialRateLimit(t *testing.T) {
+	var conf apigateway.UsagePlan
+	name := acctest.RandString(10)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAWSAPIGatewayUsagePlanDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAWSApiGatewayUsagePlanThrottlingConfig(name),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAWSAPIGatewayUsagePlanExists("aws_api_gateway_usage_plan.main", &conf),
+					resource.TestCheckResourceAttr("aws_api_gateway_usage_plan.main", "throttle_settings.4173790118.rate_limit", "5"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccAWSAPIGatewayUsagePlan_quota(t *testing.T) {
 	var conf apigateway.UsagePlan
 	name := acctest.RandString(10)