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

resource/aws_ssm_parameter: Handle data_type retries after creation for asynchronous validation process #14514

Merged
merged 3 commits into from
Aug 18, 2020
Merged

resource/aws_ssm_parameter: Handle data_type retries after creation for asynchronous validation process #14514

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d43ca1
resource/aws_ssm_parameter: Handle data_type retries after creation f…
bflad Aug 7, 2020
734448e
Merge branch 'master' into b-aws_ssm_parameter-data_type-asynchronous
bflad Aug 18, 2020
f40d8ab
Update resource_aws_ssm_parameter.go
bflad Aug 18, 2020
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
29 changes: 26 additions & 3 deletions aws/resource_aws_ssm_parameter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,23 @@ import (
"fmt"
"log"
"strings"
"time"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/arn"
"github.com/aws/aws-sdk-go/service/ssm"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
"github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags"
)

const (
// Maximum amount of time to wait for asynchronous validation on SSM Parameter creation.
ssmParameterCreationValidationTimeout = 2 * time.Minute
)

func resourceAwsSsmParameter() *schema.Resource {
return &schema.Resource{
Create: resourceAwsSsmParameterPut,
Expand Down Expand Up @@ -108,13 +115,29 @@ func resourceAwsSsmParameterRead(d *schema.ResourceData, meta interface{}) error

log.Printf("[DEBUG] Reading SSM Parameter: %s", d.Id())

resp, err := ssmconn.GetParameter(&ssm.GetParameterInput{
input := &ssm.GetParameterInput{
Name: aws.String(d.Id()),
WithDecryption: aws.Bool(true),
}

var resp *ssm.GetParameterOutput
err := resource.Retry(ssmParameterCreationValidationTimeout, func() *resource.RetryError {
var err error
resp, err = ssmconn.GetParameter(input)

if isAWSErr(err, ssm.ErrCodeParameterNotFound, "") && d.IsNewResource() && d.Get("data_type").(string) == "aws:ec2:image" {
return resource.RetryableError(fmt.Errorf("error reading SSM Parameter (%s) after creation: this can indicate that the provided parameter value could not be validated by SSM", d.Id()))
}

if err != nil {
return resource.NonRetryableError(err)
}

return nil
})

if isAWSErr(err, ssm.ErrCodeParameterNotFound, "") && d.IsNewResource() && d.Get("data_type").(string) == "aws:ec2:image" {
return fmt.Errorf("error reading SSM Parameter (%s) after creation: this can indicate that the provided parameter value could not be validated by SSM", d.Id())
if isResourceTimeoutError(err) {
resp, err = ssmconn.GetParameter(input)
}

if isAWSErr(err, ssm.ErrCodeParameterNotFound, "") && !d.IsNewResource() {
Expand Down