Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

r/aws_apigatewayv2_api: Add CORS configuration and quick start attributes #12452

Merged
merged 1 commit into from
Apr 17, 2020
Merged

r/aws_apigatewayv2_api: Add CORS configuration and quick start attributes #12452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 138 additions & 1 deletion aws/resource_aws_apigatewayv2_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,53 @@ func resourceAwsApiGatewayV2Api() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"cors_configuration": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"allow_credentials": {
Type: schema.TypeBool,
Optional: true,
},
"allow_headers": {
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
Set: hashStringCaseInsensitive,
},
"allow_methods": {
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
Set: hashStringCaseInsensitive,
},
"allow_origins": {
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
Set: hashStringCaseInsensitive,
},
"expose_headers": {
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
Set: hashStringCaseInsensitive,
},
"max_age": {
Type: schema.TypeInt,
Optional: true,
},
},
},
},
"credentials_arn": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
ValidateFunc: validateArn,
},
"description": {
Type: schema.TypeString,
Optional: true,
Expand All @@ -63,12 +110,22 @@ func resourceAwsApiGatewayV2Api() *schema.Resource {
apigatewayv2.ProtocolTypeWebsocket,
}, false),
},
"route_key": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
"route_selection_expression": {
Type: schema.TypeString,
Optional: true,
Default: "$request.method $request.path",
},
"tags": tagsSchema(),
"target": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
"version": {
Type: schema.TypeString,
Optional: true,
Expand All @@ -90,12 +147,24 @@ func resourceAwsApiGatewayV2ApiCreate(d *schema.ResourceData, meta interface{})
if v, ok := d.GetOk("api_key_selection_expression"); ok {
req.ApiKeySelectionExpression = aws.String(v.(string))
}
if v, ok := d.GetOk("cors_configuration"); ok {
req.CorsConfiguration = expandApiGateway2CorsConfiguration(v.([]interface{}))
}
if v, ok := d.GetOk("credentials_arn"); ok {
req.CredentialsArn = aws.String(v.(string))
}
if v, ok := d.GetOk("description"); ok {
req.Description = aws.String(v.(string))
}
if v, ok := d.GetOk("route_key"); ok {
req.RouteKey = aws.String(v.(string))
}
if v, ok := d.GetOk("route_selection_expression"); ok {
req.RouteSelectionExpression = aws.String(v.(string))
}
if v, ok := d.GetOk("target"); ok {
req.Target = aws.String(v.(string))
}
if v, ok := d.GetOk("version"); ok {
req.Version = aws.String(v.(string))
}
Expand Down Expand Up @@ -135,6 +204,9 @@ func resourceAwsApiGatewayV2ApiRead(d *schema.ResourceData, meta interface{}) er
Resource: fmt.Sprintf("/apis/%s", d.Id()),
}.String()
d.Set("arn", apiArn)
if err := d.Set("cors_configuration", flattenApiGateway2CorsConfiguration(resp.CorsConfiguration)); err != nil {
return fmt.Errorf("error setting cors_configuration: %s", err)
}
d.Set("description", resp.Description)
executionArn := arn.ARN{
Partition: meta.(*AWSClient).partition,
Expand All @@ -158,14 +230,34 @@ func resourceAwsApiGatewayV2ApiRead(d *schema.ResourceData, meta interface{}) er
func resourceAwsApiGatewayV2ApiUpdate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).apigatewayv2conn

if d.HasChanges("api_key_selection_expression", "description", "name", "route_selection_expression", "version") {
deleteCorsConfiguration := false
if d.HasChange("cors_configuration") {
v := d.Get("cors_configuration")
if len(v.([]interface{})) == 0 {
deleteCorsConfiguration = true

log.Printf("[DEBUG] Deleting CORS configuration for API Gateway v2 API (%s)", d.Id())
_, err := conn.DeleteCorsConfiguration(&apigatewayv2.DeleteCorsConfigurationInput{
ApiId: aws.String(d.Id()),
})
if err != nil {
return fmt.Errorf("error deleting CORS configuration for API Gateway v2 API (%s): %s", d.Id(), err)
}
}
}

if d.HasChanges("api_key_selection_expression", "description", "name", "route_selection_expression", "version") ||
(d.HasChange("cors_configuration") && !deleteCorsConfiguration) {
req := &apigatewayv2.UpdateApiInput{
ApiId: aws.String(d.Id()),
}

if d.HasChange("api_key_selection_expression") {
req.ApiKeySelectionExpression = aws.String(d.Get("api_key_selection_expression").(string))
}
if d.HasChange("cors_configuration") {
req.CorsConfiguration = expandApiGateway2CorsConfiguration(d.Get("cors_configuration").([]interface{}))
}
if d.HasChange("description") {
req.Description = aws.String(d.Get("description").(string))
}
Expand Down Expand Up @@ -212,3 +304,48 @@ func resourceAwsApiGatewayV2ApiDelete(d *schema.ResourceData, meta interface{})

return nil
}

func expandApiGateway2CorsConfiguration(vConfiguration []interface{}) *apigatewayv2.Cors {
configuration := &apigatewayv2.Cors{}

if len(vConfiguration) == 0 || vConfiguration[0] == nil {
return configuration
}
mConfiguration := vConfiguration[0].(map[string]interface{})

if vAllowCredentials, ok := mConfiguration["allow_credentials"].(bool); ok {
configuration.AllowCredentials = aws.Bool(vAllowCredentials)
}
if vAllowHeaders, ok := mConfiguration["allow_headers"].(*schema.Set); ok {
configuration.AllowHeaders = expandStringSet(vAllowHeaders)
}
if vAllowMethods, ok := mConfiguration["allow_methods"].(*schema.Set); ok {
configuration.AllowMethods = expandStringSet(vAllowMethods)
}
if vAllowOrigins, ok := mConfiguration["allow_origins"].(*schema.Set); ok {
configuration.AllowOrigins = expandStringSet(vAllowOrigins)
}
if vExposeHeaders, ok := mConfiguration["expose_headers"].(*schema.Set); ok {
configuration.ExposeHeaders = expandStringSet(vExposeHeaders)
}
if vMaxAge, ok := mConfiguration["max_age"].(int); ok {
configuration.MaxAge = aws.Int64(int64(vMaxAge))
}

return configuration
}

func flattenApiGateway2CorsConfiguration(configuration *apigatewayv2.Cors) []interface{} {
if configuration == nil {
return []interface{}{}
}

return []interface{}{map[string]interface{}{
"allow_credentials": aws.BoolValue(configuration.AllowCredentials),
"allow_headers": flattenCaseInsensitiveStringSet(configuration.AllowHeaders),
"allow_methods": flattenCaseInsensitiveStringSet(configuration.AllowMethods),
"allow_origins": flattenCaseInsensitiveStringSet(configuration.AllowOrigins),
"expose_headers": flattenCaseInsensitiveStringSet(configuration.ExposeHeaders),
"max_age": int(aws.Int64Value(configuration.MaxAge)),
}}
}
Loading