Merge pull request #50 from QualiSystemsLab/feature/dan-mocktests_fix

Update int_test_mock_tf_execute_destroy.py

Author: alexazarh

shells/generic_terraform_service/tests/integration_tests/int_test_mock_tf_execute_destroy.py

@@ -23,10 +23,10 @@ def setUp(self, patched_api) -> None:
 
         self._mocked_tf_working_dir = ''
         self._prepare_mock_services()
-        self._prepare_integration_data()
 
         self.mock_api.GetReservationDetails.return_value.ReservationDescription.Services = [self._service1,
                                                                                             self._service2]
+        self._prepare_integration_data()
 
     def _prepare_integration_data(self):
         self.integration_data1 = IntegrationData(self._service1.Alias, False, self.mock_api)
@@ -62,6 +62,11 @@ def run_destroy(self, pre_destroy_function: Callable, integration_data: Integrat
         self.pre_destroy_prep(pre_destroy_function, integration_data)
         integration_data.tf_shell.destroy_terraform()
 
+    def run_execute_and_destroy(self, pre_exec_function: Callable, pre_destroy_function: Callable,
+                                integration_data: IntegrationData):
+        self.run_execute(pre_exec_function, integration_data)
+        self.run_destroy(pre_destroy_function, integration_data)
+
     '''------------------------------ Test Cases ---------------------------------'''
 
     @patch('cloudshell.iac.terraform.services.tf_proc_exec.TfProcExec.can_destroy_run')
@@ -122,6 +127,9 @@ def pre_exec_azure_vault(self, integration_data: IntegrationData):
             os.environ.get("CLP_RESOURSE"),
             integration_data
         )
+        self._prepare_service1_before_execute(integration_data)
+
+    def _prepare_service1_before_execute(self, integration_data):
         service1 = Mock()
         service1.Alias = integration_data.context.resource.name
         service1.Attributes = integration_data.context.resource.attributes
@@ -144,6 +152,7 @@ def pre_exec_azure_mssql(self, integration_data: IntegrationData):
             os.environ.get(""),
             integration_data
         )
+        self._prepare_service1_before_execute(integration_data)
 
     def pre_exec_azure_vault_with_remote_access_key_based(self, integration_data: IntegrationData):
         self.pre_exec_azure_vault(integration_data)