MAINT: update calls to select

update to use new function signature

lib/workflows/list_all_openstack.py

@@ -30,7 +30,7 @@ def list_all_openstack(
     if not properties_to_select:
         query.select_all()
     else:
-        query.select(*properties_to_select)
+        query.select(properties_to_select)
 
     if sort_by:
         query.sort_by(*[(p, SortOrder.DESC) for p in sort_by])

lib/workflows/search_by_datetime.py

@@ -49,7 +49,7 @@ def search_by_datetime(
     if not properties_to_select:
         query.select_all()
     else:
-        query.select(*properties_to_select)
+        query.select(properties_to_select)
 
     query.where(
         preset=QueryPresetsDateTime.from_string(search_mode),

lib/workflows/search_by_property.py

@@ -42,7 +42,7 @@ def search_by_property(
     if not properties_to_select:
         query.select_all()
     else:
-        query.select(*properties_to_select)
+        query.select(properties_to_select)
 
     query.where(
         preset=QueryPresetsGeneric.from_string(search_mode),

lib/workflows/search_by_regex.py

@@ -34,7 +34,7 @@ def search_by_regex(
     if not properties_to_select:
         query.select_all()
     else:
-        query.select(*properties_to_select)
+        query.select(properties_to_select)
 
     query.where(
         preset=QueryPresetsString.MATCHES_REGEX,

lib/workflows/send_decom_flavor_email.py

@@ -88,9 +88,11 @@ def find_servers_with_decom_flavors(
         all_projects=not from_projects,
     )
     server_query.select(
-        ServerProperties.SERVER_ID,
-        ServerProperties.SERVER_NAME,
-        ServerProperties.ADDRESSES,
+        [
+            ServerProperties.SERVER_ID,
+            ServerProperties.SERVER_NAME,
+            ServerProperties.ADDRESSES,
+        ]
     )
 
     if not server_query.to_props():
@@ -160,7 +162,7 @@ def find_user_info(user_id, cloud_account, override_email_address):
     :param override_email_address: email address to return if no email address found via UserQuery
     """
     user_query = UserQuery()
-    user_query.select(UserProperties.USER_NAME, UserProperties.USER_EMAIL)
+    user_query.select([UserProperties.USER_NAME, UserProperties.USER_EMAIL])
     user_query.where(
         QueryPresetsGeneric.EQUAL_TO, UserProperties.USER_ID, value=user_id
     )

lib/workflows/send_decom_image_email.py

@@ -114,7 +114,7 @@ def find_servers_with_decom_images(
         all_projects=not from_projects,
     )
     image_query.sort_by(("id", "ascending"), ("name", "ascending"))
-    image_query.select("name")
+    image_query.select(["name"])
 
     if not image_query.to_props():
         raise RuntimeError(
@@ -129,7 +129,7 @@ def find_servers_with_decom_images(
         from_projects=from_projects or None,
         all_projects=not from_projects,
     )
-    server_query.select("id", "name", "addresses")
+    server_query.select(["id", "name", "addresses"])
 
     if not server_query.to_props():
         raise RuntimeError(
@@ -196,7 +196,7 @@ def find_user_info(user_id, cloud_account, override_email_address):
     :param override_email_address: email address to return if no email address found via UserQuery
     """
     user_query = UserQuery()
-    user_query.select("name", "email_address")
+    user_query.select(["name", "email_address"])
     user_query.where("equal_to", "id", value=user_id)
     user_query.run(cloud_account=cloud_account)
     res = user_query.to_props(flatten=True)

tests/lib/workflows/test_list_all_openstack.py

@@ -63,7 +63,7 @@ def test_list_all_openstack_all(mock_openstack_query, output_type):
 
     res = list_all_openstack(**params)
 
-    mock_query.select.assert_called_once_with(*params["properties_to_select"])
+    mock_query.select.assert_called_once_with(params["properties_to_select"])
     mock_query.sort_by.assert_called_once_with(
         *[(p, SortOrder.DESC) for p in params["sort_by"]]
     )

tests/lib/workflows/test_search_by_datetime.py

@@ -98,7 +98,7 @@ def test_search_by_datetime_all(mock_preset_enum, mock_openstack_query, output_t
     }
     res = search_by_datetime(**params)
 
-    mock_query.select.assert_called_once_with(*params["properties_to_select"])
+    mock_query.select.assert_called_once_with(params["properties_to_select"])
     mock_query.where.assert_called_once_with(
         preset=mock_preset_enum.from_string.return_value,
         prop=params["property_to_search_by"],

tests/lib/workflows/test_search_by_property.py

@@ -94,7 +94,7 @@ def test_search_by_property_all(mock_preset_enum, mock_openstack_query, output_t
     }
     res = search_by_property(**params)
 
-    mock_query.select.assert_called_once_with(*params["properties_to_select"])
+    mock_query.select.assert_called_once_with(params["properties_to_select"])
     mock_query.where.assert_called_once_with(
         preset=mock_preset_enum.from_string.return_value,
         prop=params["property_to_search_by"],

tests/lib/workflows/test_search_by_regex.py

@@ -74,7 +74,7 @@ def test_search_by_regex_all(mock_openstack_query, output_type):
     }
     res = search_by_regex(**params)
 
-    mock_query.select.assert_called_once_with(*params["properties_to_select"])
+    mock_query.select.assert_called_once_with(params["properties_to_select"])
     mock_query.where.assert_called_once_with(
         preset=QueryPresetsString.MATCHES_REGEX,
         prop=params["property_to_search_by"],

tests/lib/workflows/test_send_decom_flavor_email.py

@@ -92,7 +92,7 @@ def test_find_user_info_valid(mock_user_query):
     res = find_user_info(mock_user_id, mock_cloud_account, mock_override_email)
     mock_user_query.assert_called_once()
     mock_user_query.return_value.select.assert_called_once_with(
-        UserProperties.USER_NAME, UserProperties.USER_EMAIL
+        [UserProperties.USER_NAME, UserProperties.USER_EMAIL]
     )
     mock_user_query.return_value.where.assert_called_once_with(
         QueryPresetsGeneric.EQUAL_TO, UserProperties.USER_ID, value=mock_user_id
@@ -118,7 +118,7 @@ def test_find_user_info_invalid(mock_user_query):
     res = find_user_info(mock_user_id, mock_cloud_account, mock_override_email)
     mock_user_query.assert_called_once()
     mock_user_query.return_value.select.assert_called_once_with(
-        UserProperties.USER_NAME, UserProperties.USER_EMAIL
+        [UserProperties.USER_NAME, UserProperties.USER_EMAIL]
     )
     mock_user_query.return_value.where.assert_called_once_with(
         QueryPresetsGeneric.EQUAL_TO, UserProperties.USER_ID, value=mock_user_id
@@ -147,7 +147,7 @@ def test_find_user_info_no_email_address(mock_user_query):
     res = find_user_info(mock_user_id, mock_cloud_account, mock_override_email)
     mock_user_query.assert_called_once()
     mock_user_query.return_value.select.assert_called_once_with(
-        UserProperties.USER_NAME, UserProperties.USER_EMAIL
+        [UserProperties.USER_NAME, UserProperties.USER_EMAIL]
     )
     mock_user_query.return_value.where.assert_called_once_with(
         QueryPresetsGeneric.EQUAL_TO, UserProperties.USER_ID, value=mock_user_id
@@ -196,9 +196,11 @@ def test_find_users_with_decom_flavor_valid(mock_flavor_query):
         all_projects=False,
     )
     mock_server_query_obj.select.assert_called_once_with(
-        ServerProperties.SERVER_ID,
-        ServerProperties.SERVER_NAME,
-        ServerProperties.ADDRESSES,
+        [
+            ServerProperties.SERVER_ID,
+            ServerProperties.SERVER_NAME,
+            ServerProperties.ADDRESSES,
+        ]
     )
     mock_server_query_obj.to_props.assert_called_once()
 
@@ -267,9 +269,11 @@ def test_find_users_with_decom_flavor_no_servers_found(mock_flavor_query):
         all_projects=False,
     )
     mock_server_query_obj.select.assert_called_once_with(
-        ServerProperties.SERVER_ID,
-        ServerProperties.SERVER_NAME,
-        ServerProperties.ADDRESSES,
+        [
+            ServerProperties.SERVER_ID,
+            ServerProperties.SERVER_NAME,
+            ServerProperties.ADDRESSES,
+        ]
     )
     mock_server_query_obj.to_props.assert_called_once()
 

tests/lib/workflows/test_send_decom_image_email.py

@@ -112,7 +112,9 @@ def test_find_user_info_valid(mock_user_query):
     }
     res = find_user_info(mock_user_id, mock_cloud_account, mock_override_email)
     mock_user_query.assert_called_once()
-    mock_user_query.return_value.select.assert_called_once_with("name", "email_address")
+    mock_user_query.return_value.select.assert_called_once_with(
+        ["name", "email_address"]
+    )
     mock_user_query.return_value.where.assert_called_once_with(
         "equal_to", "id", value=mock_user_id
     )
@@ -136,7 +138,9 @@ def test_find_user_info_invalid(mock_user_query):
     mock_user_query.return_value.to_props.return_value = []
     res = find_user_info(mock_user_id, mock_cloud_account, mock_override_email)
     mock_user_query.assert_called_once()
-    mock_user_query.return_value.select.assert_called_once_with("name", "email_address")
+    mock_user_query.return_value.select.assert_called_once_with(
+        ["name", "email_address"]
+    )
     mock_user_query.return_value.where.assert_called_once_with(
         "equal_to", "id", value=mock_user_id
     )
@@ -163,7 +167,9 @@ def test_find_user_info_no_email_address(mock_user_query):
     }
     res = find_user_info(mock_user_id, mock_cloud_account, mock_override_email)
     mock_user_query.assert_called_once()
-    mock_user_query.return_value.select.assert_called_once_with("name", "email_address")
+    mock_user_query.return_value.select.assert_called_once_with(
+        ["name", "email_address"]
+    )
     mock_user_query.return_value.where.assert_called_once_with(
         "equal_to", "id", value=mock_user_id
     )
@@ -217,7 +223,7 @@ def test_find_servers_with_decom_images_valid(mock_list_to_regex, mock_image_que
         from_projects=["project1", "project2"],
         all_projects=False,
     )
-    mock_server_query_obj.select.assert_called_once_with("id", "name", "addresses")
+    mock_server_query_obj.select.assert_called_once_with(["id", "name", "addresses"])
     mock_server_query_obj.to_props.assert_called_once()
 
     mock_server_query_obj.append_from.assert_called_once_with(
@@ -304,7 +310,7 @@ def test_find_servers_with_decom_images_no_servers_found(
         from_projects=["project1", "project2"],
         all_projects=False,
     )
-    mock_server_query_obj.select.assert_called_once_with("id", "name", "addresses")
+    mock_server_query_obj.select.assert_called_once_with(["id", "name", "addresses"])
     mock_server_query_obj.to_props.assert_called_once()