resource/aws_ecs_service: Add public_assign_ip attribute and fix InvalidParameterException handling #3240
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,6 @@ import ( | |
| "time" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go/service/ecs" | ||
| "github.com/hashicorp/terraform/helper/hashcode" | ||
| "github.com/hashicorp/terraform/helper/resource" | ||
|
|
@@ -133,6 +132,11 @@ func resourceAwsEcsService() *schema.Resource { | |
| Elem: &schema.Schema{Type: schema.TypeString}, | ||
| Set: schema.HashString, | ||
| }, | ||
| "assign_public_ip": { | ||
| Type: schema.TypeBool, | ||
| Optional: true, | ||
| Default: false, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
|
|
@@ -236,7 +240,7 @@ func resourceAwsEcsServiceCreate(d *schema.ResourceData, meta interface{}) error | |
| input.Role = aws.String(v.(string)) | ||
| } | ||
|
|
||
| input.NetworkConfiguration = expandEcsNetworkConfiguration(d.Get("network_configuration").([]interface{})) | ||
|
|
||
| strategies := d.Get("placement_strategy").(*schema.Set).List() | ||
| if len(strategies) > 0 { | ||
|
|
@@ -287,21 +291,12 @@ func resourceAwsEcsServiceCreate(d *schema.ResourceData, meta interface{}) error | |
| out, err = conn.CreateService(&input) | ||
|
|
||
| if err != nil { | ||
| if isAWSErr(err, ecs.ErrCodeClusterNotFoundException, "") { | ||
| return resource.RetryableError(err) | ||
| } | ||
| if isAWSErr(err, ecs.ErrCodeInvalidParameterException, "Please verify that the ECS service role being passed has the proper permissions.") { | ||
|
There was a problem hiding this comment. I trust you that you ran all ECS related acceptance tests a couple of times to verify that we're not missing any other message/format here. 😃 |
||
| return resource.RetryableError(err) | ||
| } | ||
| return resource.NonRetryableError(err) | ||
| } | ||
|
|
||
|
|
@@ -399,24 +394,30 @@ func resourceAwsEcsServiceRead(d *schema.ResourceData, meta interface{}) error { | |
| log.Printf("[ERR] Error setting placement_constraints for (%s): %s", d.Id(), err) | ||
| } | ||
|
|
||
| if err := d.Set("network_configuration", flattenEcsNetworkConfiguration(service.NetworkConfiguration)); err != nil { | ||
| return fmt.Errorf("[ERR] Error setting network_configuration for (%s): %s", d.Id(), err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func flattenEcsNetworkConfiguration(nc *ecs.NetworkConfiguration) []interface{} { | ||
| if nc == nil { | ||
| return nil | ||
| } | ||
|
|
||
| result := make(map[string]interface{}) | ||
| result["security_groups"] = schema.NewSet(schema.HashString, flattenStringList(nc.AwsvpcConfiguration.SecurityGroups)) | ||
| result["subnets"] = schema.NewSet(schema.HashString, flattenStringList(nc.AwsvpcConfiguration.Subnets)) | ||
|
|
||
| if nc.AwsvpcConfiguration.AssignPublicIp != nil { | ||
| result["assign_public_ip"] = *nc.AwsvpcConfiguration.AssignPublicIp == ecs.AssignPublicIpEnabled | ||
| } | ||
|
|
||
| return []interface{}{result} | ||
| } | ||
|
|
||
| func expandEcsNetworkConfiguration(nc []interface{}) *ecs.NetworkConfiguration { | ||
| if len(nc) == 0 { | ||
| return nil | ||
| } | ||
|
|
@@ -426,6 +427,13 @@ func expandEcsNetworkConfigration(nc []interface{}) *ecs.NetworkConfiguration { | |
| awsVpcConfig.SecurityGroups = expandStringSet(val.(*schema.Set)) | ||
| } | ||
| awsVpcConfig.Subnets = expandStringSet(raw["subnets"].(*schema.Set)) | ||
| if val, ok := raw["assign_public_ip"].(bool); ok { | ||
| awsVpcConfig.AssignPublicIp = aws.String(ecs.AssignPublicIpDisabled) | ||
| if val { | ||
| awsVpcConfig.AssignPublicIp = aws.String(ecs.AssignPublicIpEnabled) | ||
| } | ||
| } | ||
|
|
||
| return &ecs.NetworkConfiguration{AwsvpcConfiguration: awsVpcConfig} | ||
| } | ||
|
|
||
|
|
@@ -495,24 +503,17 @@ func resourceAwsEcsServiceUpdate(d *schema.ResourceData, meta interface{}) error | |
| } | ||
| } | ||
|
|
||
| if d.HasChange("network_configuration") { | ||
| input.NetworkConfiguration = expandEcsNetworkConfiguration(d.Get("network_configuration").([]interface{})) | ||
| } | ||
|
|
||
| // Retry due to IAM eventual consistency | ||
| err := resource.Retry(2*time.Minute, func() *resource.RetryError { | ||
| out, err := conn.UpdateService(&input) | ||
| if err != nil { | ||
|
There was a problem hiding this comment. Here we're losing the retry on There was a problem hiding this comment. @catsby Interestingly enough, I had just assumed it was some sort of typo that it was included and that retrying on a missing service would be undesirable during an update, but turns out we are currently always calling Looking through the parameters set during Does that sound reasonable? There was a problem hiding this comment. @bflad that sounds like a good idea - as long as all ECS tests still pass 🤷♂️ |
||
| if isAWSErr(err, ecs.ErrCodeInvalidParameterException, "Please verify that the ECS service role being passed has the proper permissions.") { | ||
| return resource.RetryableError(err) | ||
| } | ||
| return resource.NonRetryableError(err) | ||
| } | ||
|
|
||
|
|
@@ -535,11 +536,17 @@ func resourceAwsEcsServiceDelete(d *schema.ResourceData, meta interface{}) error | |
| Cluster: aws.String(d.Get("cluster").(string)), | ||
| }) | ||
| if err != nil { | ||
| if isAWSErr(err, ecs.ErrCodeServiceNotFoundException, "") { | ||
| log.Printf("[DEBUG] Removing ECS Service from state, %q is already gone", d.Id()) | ||
| d.SetId("") | ||
| return nil | ||
| } | ||
| return err | ||
| } | ||
|
|
||
| if len(resp.Services) == 0 { | ||
| log.Printf("[DEBUG] Removing ECS Service from state, %q is already gone", d.Id()) | ||
| d.SetId("") | ||
| return nil | ||
| } | ||
|
|
||
|
|
@@ -562,33 +569,23 @@ func resourceAwsEcsServiceDelete(d *schema.ResourceData, meta interface{}) error | |
| } | ||
| } | ||
|
|
||
| input := ecs.DeleteServiceInput{ | ||
| Service: aws.String(d.Id()), | ||
| Cluster: aws.String(d.Get("cluster").(string)), | ||
| } | ||
| // Wait until the ECS service is drained | ||
| err = resource.Retry(5*time.Minute, func() *resource.RetryError { | ||
| log.Printf("[DEBUG] Trying to delete ECS service %s", input) | ||
| _, err := conn.DeleteService(&input) | ||
| if err != nil { | ||
| if isAWSErr(err, ecs.ErrCodeInvalidParameterException, "The service cannot be stopped while deployments are active.") { | ||
| return resource.RetryableError(err) | ||
| } | ||
| return resource.NonRetryableError(err) | ||
| } | ||
| return nil | ||
| }) | ||
|
|
||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
❤️