Fix for GitHub issue #hashicorp#11061

Failed ES domain upgrade error isn't helpful

internal/service/elasticsearch/wait.go

@@ -21,7 +21,7 @@ const (
 func waitUpgradeSucceeded(conn *elasticsearch.ElasticsearchService, name string, timeout time.Duration) (*elasticsearch.GetUpgradeStatusOutput, error) {
 	stateConf := &resource.StateChangeConf{
 		Pending:    []string{elasticsearch.UpgradeStatusInProgress},
-		Target:     []string{elasticsearch.UpgradeStatusSucceeded},
+		Target:     []string{elasticsearch.UpgradeStatusSucceeded, elasticsearch.UpgradeStatusFailed},
 		Refresh:    statusUpgradeStatus(conn, name),
 		Timeout:    timeout,
 		MinTimeout: domainUpgradeSuccessMinTimeout,
@@ -31,9 +31,11 @@ func waitUpgradeSucceeded(conn *elasticsearch.ElasticsearchService, name string,
 	outputRaw, err := stateConf.WaitForState()
 
 	if output, ok := outputRaw.(*elasticsearch.GetUpgradeStatusOutput); ok {
+		if *output.StepStatus == elasticsearch.UpgradeStatusFailed {
+			return output, fmt.Errorf("%s %s: %s", *output.UpgradeName, *output.StepStatus, *output.UpgradeStep)
+		}
 		return output, err
 	}
-
 	return nil, err
 }