From 49a4c3b7fe3e1361187f3cf434875dcd8c350ab3 Mon Sep 17 00:00:00 2001 From: Jim Enright Date: Thu, 9 Jan 2025 18:55:08 +0000 Subject: [PATCH] Resolve PR feedback Signed-off-by: Jim Enright --- plugins/modules/dw_data_visualization.py | 10 +++++----- plugins/modules/dw_virtual_warehouse.py | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/plugins/modules/dw_data_visualization.py b/plugins/modules/dw_data_visualization.py index b15f32b..ccf5b3e 100644 --- a/plugins/modules/dw_data_visualization.py +++ b/plugins/modules/dw_data_visualization.py @@ -90,11 +90,11 @@ image_version: description: Version of the Cloudera Data Visualization. type: str - template_name: + resource_template: description: The name of the available resource template to use for the Cloudera Data Visualization. type: str aliases: - - resource_template + - template_name wait: description: - Flag to enable internal polling to wait for the Data Visualization Instance to achieve the declared state. @@ -194,7 +194,7 @@ def __init__(self, module): self.name = self._get_param("name") self.config = self._get_param("config") self.state = self._get_param("state") - self.template_name = self._get_param("template_name") + self.resource_template = self._get_param("resource_template") self.image_version = self._get_param("image_version") self.wait = self._get_param("wait") self.delay = self._get_param("delay") @@ -329,7 +329,7 @@ def process(self): cluster_id=self.cluster["id"], name=self.name, config=self.config, - resource_template=self.template_name, + resource_template=self.resource_template, image_version=self.image_version, ) if self.wait: @@ -358,7 +358,7 @@ def main(): id=dict(type="str"), name=dict(type="str"), config=dict(type="dict"), - template_name=dict(type="str", aliases=["resource_template"]), + resource_template=dict(type="str", aliases=["template_name"]), image_version=dict(type="str"), state=dict(type="str", choices=["present", "absent"], default="present"), wait=dict(type="bool", default=True), diff --git a/plugins/modules/dw_virtual_warehouse.py b/plugins/modules/dw_virtual_warehouse.py index fa8d231..9517dad 100644 --- a/plugins/modules/dw_virtual_warehouse.py +++ b/plugins/modules/dw_virtual_warehouse.py @@ -70,9 +70,9 @@ - The name of the Virtual Warehouse. - Required if C(state=present) type: str - template: + tshirt_size: description: - - The name of deployment T-shirt size to use. + - The name of deployment T-shirt size, i.e. the deployment template, to use. - This will determine the number of nodes. type: str choices: @@ -81,7 +81,7 @@ - medium - large aliases: - - tshirt_size + - template autoscaling: description: - Auto-scaling configuration for a Virtual Warehouse @@ -287,7 +287,7 @@ cluster_id: example-cluster-id name: example-virtual-warehouse type: hive - template: xsmall + tshirt_size: xsmall autoscaling: min_nodes: 3 max_nodes: 19 @@ -301,7 +301,7 @@ cluster_id: example-cluster-id name: example-virtual-warehouse type: "hive" - template: "xsmall" + tshirt_size: "xsmall" enable_sso: true ldap_groups: ['group1','group2','group3'] common_configs: @@ -403,7 +403,7 @@ def __init__(self, module): self.dbc_id = self._get_param("catalog_id") self.type = self._get_param("type") self.name = self._get_param("name") - self.template = self._get_param("template") + self.tshirt_size = self._get_param("tshirt_size") self.common_configs = self._get_param("common_configs") self.application_configs = self._get_param("application_configs") self.ldap_groups = self._get_param("ldap_groups") @@ -550,7 +550,7 @@ def process(self): dbc_id=self.dbc_id, vw_type=self.type, name=self.name, - tshirt_size=self.template, + tshirt_size=self.tshirt_size, autoscaling_min_cluster=self.autoscaling_min_nodes, autoscaling_max_cluster=self.autoscaling_max_nodes, autoscaling_auto_suspend_timeout_seconds=self.autoscaling_auto_suspend_timeout_seconds, @@ -604,10 +604,10 @@ def main(): catalog_id=dict(type="str", aliases=["dbc_id"]), type=dict(type="str"), name=dict(type="str"), - template=dict( + tshirt_size=dict( type="str", choices=["xsmall", "small", "medium", "large"], - aliases=["tshirt_size"], + aliases=["template"], ), autoscaling=dict( type="dict",