Adds retries to enabling and disabling the redshift cluster's logging…

…. Solves issue - hashicorp#21815

internal/service/redshift/cluster.go

@@ -802,9 +802,16 @@ func resourceClusterUpdate(d *schema.ResourceData, meta interface{}) error {
 			}
 		} else {
 			log.Printf("[INFO] Disabling Logging for Redshift Cluster %q", d.Id())
-			_, err := conn.DisableLogging(&redshift.DisableLoggingInput{
-				ClusterIdentifier: aws.String(d.Id()),
-			})
+			_, err := tfresource.RetryWhenAWSErrCodeEquals(
+				5*time.Minute,
+				func() (interface{}, error) {
+					return conn.DisableLogging(&redshift.DisableLoggingInput{
+						ClusterIdentifier: aws.String(d.Id()),
+					})
+				},
+				redshift.ErrCodeInvalidClusterStateFault,
+			)
+
 			if err != nil {
 				return err
 			}
@@ -830,9 +837,18 @@ func enableRedshiftClusterLogging(d *schema.ResourceData, conn *redshift.Redshif
 		params.S3KeyPrefix = aws.String(v.(string))
 	}
 
-	if _, err := conn.EnableLogging(params); err != nil {
+	_, err := tfresource.RetryWhenAWSErrCodeEquals(
+		5*time.Minute,
+		func() (interface{}, error) {
+			return conn.EnableLogging(params)
+		},
+		redshift.ErrCodeInvalidClusterStateFault,
+	)
+
+	if err != nil {
 		return fmt.Errorf("error enabling Redshift Cluster (%s) logging: %s", d.Id(), err)
 	}
+
 	return nil
 }