Fix stack timeout message to work for creation and deletion

allisaurus · allisaurus · commit 20ba7139005e · 2018-05-22T12:54:39.000-07:00
diff --git a/ecs-cli/modules/clients/aws/cloudformation/client.go b/ecs-cli/modules/clients/aws/cloudformation/client.go
@@ -107,7 +107,7 @@ type cloudformationClient struct {
 }
 
 // NewCloudformationClient creates an instance of cloudFormationClient object.
-func NewCloudformationClient(config *config.CommandConfig) CloudformationClient  {
+func NewCloudformationClient(config *config.CommandConfig) CloudformationClient {
 	cfnClient := cloudformation.New(config.Session)
 	cfnClient.Handlers.Build.PushBackNamed(clients.CustomUserAgentHandler())
 
@@ -260,7 +260,7 @@ func (c *cloudformationClient) waitUntilComplete(stackName string, hasFailed fai
 		c.sleeper.Sleep(delayWait)
 	}
 
-	return fmt.Errorf("Timeout waiting for stack creation to complete")
+	return fmt.Errorf("Timeout waiting for stack operation to complete")
 }
 
 // latestStackEvent describes stack events and gets the latest event.

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ type cloudformationClient struct {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`// NewCloudformationClient creates an instance of cloudFormationClient object.`
`110`		`-func NewCloudformationClient(config *config.CommandConfig) CloudformationClient {`
	`110`	`+func NewCloudformationClient(config *config.CommandConfig) CloudformationClient {`
`111`	`111`	`cfnClient := cloudformation.New(config.Session)`
`112`	`112`	`cfnClient.Handlers.Build.PushBackNamed(clients.CustomUserAgentHandler())`
`113`	`113`
`@@ -260,7 +260,7 @@ func (c *cloudformationClient) waitUntilComplete(stackName string, hasFailed fai`
`260`	`260`	`c.sleeper.Sleep(delayWait)`
`261`	`261`	`}`
`262`	`262`
`263`		`- return fmt.Errorf("Timeout waiting for stack creation to complete")`
	`263`	`+ return fmt.Errorf("Timeout waiting for stack operation to complete")`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`// latestStackEvent describes stack events and gets the latest event.`