Skip to content

Fix RedshiftCreateClusterOperator for single-node cluster type #23839

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

Merged
potiuk merged 1 commit into from
May 22, 2022
Merged

Fix RedshiftCreateClusterOperator for single-node cluster type #23839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions airflow/providers/amazon/aws/operators/redshift_cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ def execute(self, context: 'Context'):
params["DBName"] = self.db_name
if self.cluster_type:
params["ClusterType"] = self.cluster_type
if self.number_of_nodes:
params["NumberOfNodes"] = self.number_of_nodes
if self.cluster_type == "multi-node":
params["NumberOfNodes"] = self.number_of_nodes
if self.cluster_security_groups:
params["ClusterSecurityGroups"] = self.cluster_security_groups
if self.vpc_security_group_ids:
Expand Down
33 changes: 31 additions & 2 deletions tests/providers/amazon/aws/operators/test_redshift_cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def test_init(self):
assert redshift_operator.master_user_password == "Test123$"

@mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftHook.get_conn")
def test_create_cluster(self, mock_get_conn):
def test_create_single_node_cluster(self, mock_get_conn):
redshift_operator = RedshiftCreateClusterOperator(
task_id="task_test",
cluster_identifier="test-cluster",
Expand All @@ -54,7 +54,36 @@ def test_create_cluster(self, mock_get_conn):
params = {
"DBName": "dev",
"ClusterType": "single-node",
"NumberOfNodes": 1,
"AutomatedSnapshotRetentionPeriod": 1,
"ClusterVersion": "1.0",
"AllowVersionUpgrade": True,
"PubliclyAccessible": True,
"Port": 5439,
}
mock_get_conn.return_value.create_cluster.assert_called_once_with(
ClusterIdentifier='test-cluster',
NodeType="dc2.large",
MasterUsername="adminuser",
MasterUserPassword="Test123$",
**params,
)

@mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftHook.get_conn")
def test_create_multi_node_cluster(self, mock_get_conn):
redshift_operator = RedshiftCreateClusterOperator(
task_id="task_test",
cluster_identifier="test-cluster",
node_type="dc2.large",
number_of_nodes=3,
master_username="adminuser",
master_user_password="Test123$",
cluster_type="multi-node",
)
redshift_operator.execute(None)
params = {
"DBName": "dev",
"ClusterType": "multi-node",
"NumberOfNodes": 3,
"AutomatedSnapshotRetentionPeriod": 1,
"ClusterVersion": "1.0",
"AllowVersionUpgrade": True,
Expand Down