ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace big retry func with resource.Retry

This commit is contained in:
clint shryock 2015-11-11 10:53:23 -06:00
parent 1ddfd7ced3
commit b51f425dac
1 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
builtin/providers/aws/resource_aws_autoscaling_lifecycle_hook.go
View File

@ -59,18 +59,24 @@ func resourceAwsAutoscalingLifecycleHook() *schema.Resource {
}
func resourceAwsAutoscalingLifecycleHookPut(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).autoscalingconn
params := getAwsAutoscalingPutLifecycleHookInput(d)
log.Printf("[DEBUG] AutoScaling PutLifecyleHook: %#v", params)
stateConf := &resource.StateChangeConf{
Pending: []string{"retrying"},
Target: "success",
Refresh: resourceAwsAutoscalingLifecycleHookRefreshFunc(meta, params),
Timeout: 1 * time.Minute,
MinTimeout: 3 * time.Second,
}
log.Printf("[DEBUG] AutoScaling PutLifecyleHook: %s", params)
err := resource.Retry(5*time.Minute, func() error {
_, err := conn.PutLifecycleHook(&params)
if err != nil {
if awsErr, ok := err.(awserr.Error); ok {
if strings.Contains(awsErr.Message(), "Unable to publish test message to notification target") {
return fmt.Errorf("[DEBUG] Retrying AWS AutoScaling Lifecycle Hook: %s", params)
}
}
return resource.RetryError{Err: fmt.Errorf("Error putting lifecycle hook: %s", err)}
}
return nil
})
_, err := stateConf.WaitForState()
if err != nil {
return err
}
@ -80,25 +86,6 @@ func resourceAwsAutoscalingLifecycleHookPut(d *schema.ResourceData, meta interfa
return resourceAwsAutoscalingLifecycleHookRead(d, meta)
}
func resourceAwsAutoscalingLifecycleHookRefreshFunc(
meta interface{}, params autoscaling.PutLifecycleHookInput) resource.StateRefreshFunc {
return func() (interface{}, string, error) {
conn := meta.(*AWSClient).autoscalingconn
_, err := conn.PutLifecycleHook(&params)
if err != nil {
if awsErr, ok := err.(awserr.Error); ok {
if strings.Contains(awsErr.Message(), "Unable to publish test message to notification target") {
log.Printf("[DEBUG] Retrying AWS AutoScaling Lifecycle Hook: %s", params)
return 41, "retrying", nil
}
}
return nil, "failed", fmt.Errorf("Error putting lifecycle hook: %s", err)
}
return 42, "success", nil
}
}
func resourceAwsAutoscalingLifecycleHookRead(d *schema.ResourceData, meta interface{}) error {
p, err := getAwsAutoscalingLifecycleHook(d, meta)
if err != nil {