Merge pull request #6 from EncoreTechnologies/hotfix/fix-ci-errors

hotfix/fix-ci-errors

Author: nzlosh

CHANGES.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## v1.0.1
+
+* Updated files to work with latest CI updates
+
 ## v1.0.0
 
 * Drop Python 2.7 support

etc/action_generate.py

@@ -95,7 +95,7 @@ def __init__(self, cli_args, **kwargs):
     def load_template_params(self):
         params_yaml_str = self.jinja_render_file(ACTION_TEMPLATE_PATH,
                                                  {'operation_camel_case': ''})
-        params_dict = yaml.load(params_yaml_str)
+        params_dict = yaml.safe_load(params_yaml_str)
         params = params_dict['parameters'].keys()
         return params
 

pack.yaml

@@ -6,7 +6,7 @@ keywords:
     - AlgoSec
     - Firewall
     - Networking
-version: 1.0.0
+version: 1.0.1
 python_versions:
     - "3"
 author: Encore Technologies

tests/test_action_lib_run_login.py

@@ -45,7 +45,7 @@ def test_run_fireflow(self, mock__pre_exec):
             password=context['connection']['password'],
             domain=None)
 
-        self.assertEquals(result, {'session_id': expected_session})
+        self.assertEqual(result, {'session_id': expected_session})
 
     @mock.patch("lib.run_operation.RunOperation._pre_exec")
     def test_run_afa(self, mock__pre_exec):
@@ -75,4 +75,4 @@ def test_run_afa(self, mock__pre_exec):
             Password=context['connection']['password'],
             Domain=None)
 
-        self.assertEquals(result, {'session_id': expected_session})
+        self.assertEqual(result, {'session_id': expected_session})

tests/test_action_lib_run_operation.py

@@ -38,12 +38,12 @@ def test__sanitize_operation_args(self):
         action.client = zeep.Client(wsdl="./etc/fireflow_wsdl_2018_06_13.xml")
         test_operation = 'createTicket'
         test_dict = {'ffws_header': {"version": "1.0", "opaque": ""},
-                    'session_id': 'test',
-                    'ticket': "test"}
+                     'session_id': 'test',
+                     'ticket': "test"}
 
         expected_dict = {'FFWSHeader': {"version": "1.0", "opaque": ""},
-                        'sessionId': 'test',
-                        'ticket': "test"}
+                         'sessionId': 'test',
+                         'ticket': "test"}
         result = action._sanitize_operation_args(test_operation, test_dict)
         self.assertEqual(result, expected_dict)
 
@@ -181,7 +181,7 @@ def test_build_wsdl_url(self):
                                connection['server'],
                                connection['wsdl_endpoint']))
         wsdl_url = action.build_wsdl_url(connection)
-        self.assertEquals(wsdl_url, expected_url)
+        self.assertEqual(wsdl_url, expected_url)
 
     def test_build_wsdl_url_port(self):
         action = self.get_action_instance({})
@@ -195,7 +195,7 @@ def test_build_wsdl_url_port(self):
                                connection['port'],
                                connection['wsdl_endpoint']))
         wsdl_url = action.build_wsdl_url(connection)
-        self.assertEquals(wsdl_url, expected_url)
+        self.assertEqual(wsdl_url, expected_url)
 
     def test_build_wsdl_url_missing_server(self):
         action = self.get_action_instance({})
@@ -213,7 +213,7 @@ def test_login(self):
         connection_name = 'full'
         connection = self.config_good['algosec'][connection_name]
         context = {'connection': connection,
-                  'kwargs_dict': kwargs_dict}
+                   'kwargs_dict': kwargs_dict}
 
         expected_session = "expected_session"
 
@@ -230,7 +230,7 @@ def test_login(self):
             password=context['connection']['password'],
             domain=None)
 
-        self.assertEquals(result, expected_session)
+        self.assertEqual(result, expected_session)
 
     @mock.patch('lib.run_operation.zeep.Client')
     def test__pre_exec_kwargs(self, mock_client):
@@ -264,8 +264,8 @@ def test__pre_exec_kwargs(self, mock_client):
 
         result_context, result_client = action._pre_exec(**kwargs_dict_copy)
         mock_client.assert_called_with(wsdl=wsdl_url)
-        self.assertEquals(result_client, mock_client.return_value.service)
-        self.assertEquals(result_context, expected_context)
+        self.assertEqual(result_client, mock_client.return_value.service)
+        self.assertEqual(result_context, expected_context)
 
     @mock.patch('lib.run_operation.zeep.Client')
     def test__pre_exec_config(self, mock_client):
@@ -297,8 +297,8 @@ def test__pre_exec_config(self, mock_client):
 
         result_context, result_client = action._pre_exec(**kwargs_dict_copy)
         mock_client.assert_called_with(wsdl=wsdl_url)
-        self.assertEquals(result_client, mock_client.return_value.service)
-        self.assertEquals(result_context, expected_context)
+        self.assertEqual(result_client, mock_client.return_value.service)
+        self.assertEqual(result_context, expected_context)
 
     @mock.patch('lib.run_operation.RunOperation._sanitize_operation_args')
     def test__exec_session(self, mock__sanitize_operation_args):
@@ -330,7 +330,7 @@ def test__exec_session(self, mock__sanitize_operation_args):
         self.assertFalse(mock_client.service.Login.called)
         mock_client.service.__getitem__.assert_called_with(context['operation'])
         mock_operation.assert_called_with(**expected_args)
-        self.assertEquals(result, expected_result)
+        self.assertEqual(result, expected_result)
 
     @mock.patch('lib.run_operation.RunOperation._sanitize_operation_args')
     def test__exec_login(self, mock__sanitize_operation_args):
@@ -367,7 +367,7 @@ def test__exec_login(self, mock__sanitize_operation_args):
             domain=None)
         mock_client.service.__getitem__.assert_called_with(context['operation'])
         mock_operation.assert_called_with(**expected_args)
-        self.assertEquals(result, expected_result)
+        self.assertEqual(result, expected_result)
 
     def test__exec_login_bad_connection(self):
         action = self.get_action_instance(self.config_blank)
@@ -387,17 +387,17 @@ def test__post_exec(self):
         action = self.get_action_instance(self.config_blank)
         client = zeep.Client(wsdl="./etc/fireflow_wsdl_2018_06_13.xml")
         expected = {"customFieldData": {"name": "abc123",
-                               "displayName": "new_field",
-                               "type": None,
-                               "maxValues": None,
-                               "category": None,
-                               "defaultValue": None,
-                               "validation": None}}
+                                        "displayName": "new_field",
+                                        "type": None,
+                                        "maxValues": None,
+                                        "category": None,
+                                        "defaultValue": None,
+                                        "validation": None}}
         type_class = client.get_type('ns0:customFieldData')
         obj = type_class(name=expected['customFieldData']['name'],
-                        displayName=expected['customFieldData']['displayName'])
+                         displayName=expected['customFieldData']['displayName'])
         result = action._post_exec(obj)
-        self.assertEquals(result, expected['customFieldData'])
+        self.assertEqual(result, expected['customFieldData'])
 
     @mock.patch("lib.run_operation.RunOperation._post_exec")
     @mock.patch("lib.run_operation.RunOperation._exec")
@@ -420,4 +420,4 @@ def test_run(self, mock__pre_exec, mock__exec, mock__post_exec):
         mock__pre_exec.assert_called_with(**kwargs_dict)
         mock__exec.assert_called_with(context, client)
         mock__post_exec.assert_called_with(exec_result)
-        self.assertEquals(result, post_exec_result)
+        self.assertEqual(result, post_exec_result)