fixed integration(mock) tests

Author: dan-amzulescu

shells/generic_terraform_service/tests/.env.template.env

@@ -7,6 +7,10 @@ CS_USERNAME = ""
 CS_PASSWORD = ""
 
 CLP_RESOURSE = ""
+CLP_ATTRIBUTES = ""
+
+GITHUB_TOKEN_ENC = ""
+GITHUB_TOKEN_DEC = ""
 
 TFEXEC_VERSION = ""
 RESERVATION_DOMAIN = ""

shells/generic_terraform_service/tests/integration_tests/constants.py

@@ -1,6 +1,9 @@
+from cloudshell.api.cloudshell_api import ResourceAttribute
+
 SHELL_NAME = "Generic Terraform Service"
 UUID_ATTRIBUTE = f"{SHELL_NAME}.UUID"
 
+
 class ATTRIBUTE_NAMES:
     TF_OUTPUTS = "Terraform Outputs"
     TF_SENSIITVE_OUTPUTS = "Terraform Sensitive Outputs"

shells/generic_terraform_service/tests/integration_tests/helper_objects/integration_context.py

@@ -7,32 +7,30 @@
 from cloudshell.shell.core.driver_context import ResourceCommandContext
 
 from tests.integration_tests.helper_objects.env_vars import EnvVars
+from tests.integration_tests.helper_services.service_attributes_factory import ServiceAttributesFactory
 
 
 class IntegrationData(object):
-    def __init__(self, service_name: str, real_api: bool = True, mocked_attributes: list[AttributeValueInfo] = None):
+    def __init__(self, service_name: str, is_api_real: bool = True, mock_api: Mock = None):
         self._env_vars = EnvVars(service_name)
 
-        if real_api:
+        if is_api_real:
             self.api = CloudShellAPISession(
                 self._env_vars.cs_server,
                 self._env_vars.cs_user,
                 self._env_vars.cs_pass,
                 self._env_vars.cs_domain
             )
-            self._set_context(real_api)
-            self._logger = get_qs_logger(log_group=self.context.resource.name)
-            self.create_tf_shell()
 
         else:
-            self.api = Mock()
+            self.api = mock_api
             self.api.authentication.xmlrpc_token = Mock()
-            self._set_context(real_api)
-            self._logger = get_qs_logger(log_group=self.context.resource.name)
+        self._set_context(is_api_real)
+        self._logger = get_qs_logger(log_group=self.context.resource.name)
+        self.create_tf_shell()
 
-            self._set_context(real_api, mocked_attributes)
 
-    def _set_context(self, real_api: bool, mocked_attributes: list[AttributeValueInfo] = None):
+    def _set_context(self, is_api_real: bool):
         self.context = mock.create_autospec(ResourceCommandContext)
         self.context.connectivity = mock.MagicMock()
         self.context.connectivity.server_address = self._env_vars.cs_server
@@ -42,9 +40,10 @@ def _set_context(self, real_api: bool, mocked_attributes: list[AttributeValueInf
         self.context.resource.attributes = dict()
         self.context.resource.name = self._env_vars.sb_service_alias
         self.context.resource.model = 'Generic Terraform Service'
-        if real_api:
+        if is_api_real:
             self.set_context_resource_attributes_from_cs()
-
+        else:
+            self.context.resource.attributes = ServiceAttributesFactory.create_empty_attributes()
         self.context.reservation = mock.MagicMock()
         self.context.reservation.reservation_id = self._env_vars.cs_res_id
         self.context.reservation.domain = self._env_vars.cs_domain
@@ -64,3 +63,4 @@ def set_context_resource_attributes_from_cs(self, the_only_attribute_to_update:
     def create_tf_shell(self):
         self._config = TerraformShellConfig(write_sandbox_messages=True, update_live_status=True)
         self.tf_shell = TerraformShell(self.context, self._logger, self._config)
+

shells/generic_terraform_service/tests/integration_tests/helper_services/service_attributes_factory.py

@@ -1,18 +1,23 @@
+from cloudshell.api.cloudshell_api import NameValuePair
+
 from tests.integration_tests.constants import SHELL_NAME, ATTRIBUTE_NAMES
 
 
 class ServiceAttributesFactory:
-    def __init__(self):
-        self.attributes = {}
-        self.attributes[f"{SHELL_NAME}.{ATTRIBUTE_NAMES.REMOTE_STATE_PROVIDER}"] = ""
-        self.attributes[f"{SHELL_NAME}.{ATTRIBUTE_NAMES.BRANCH}"] = ""
-        self.attributes[f"{SHELL_NAME}.{ATTRIBUTE_NAMES.CUSTOM_TAGS}"] = ""
-        self.attributes[f"{SHELL_NAME}.{ATTRIBUTE_NAMES.APPLY_TAGS}"] = ""
-        self.attributes[f"{SHELL_NAME}.{ATTRIBUTE_NAMES.GITHUB_TERRAFORM_MODULE_URL}"] = ""
-        self.attributes[f"{SHELL_NAME}.{ATTRIBUTE_NAMES.TERRAFORM_VERSION}"] = ""
-        self.attributes[f"{SHELL_NAME}.{ATTRIBUTE_NAMES.GITHUB_TOKEN}"] = ""
-        self.attributes[f"{SHELL_NAME}.{ATTRIBUTE_NAMES.CLOUD_PROVIDER}"] = ""
-        self.attributes[f"{SHELL_NAME}.{ATTRIBUTE_NAMES.UUID}"] = ""
-        self.attributes[f"{SHELL_NAME}.{ATTRIBUTE_NAMES.TF_OUTPUTS}"] = ""
-        self.attributes[f"{SHELL_NAME}.{ATTRIBUTE_NAMES.TF_SENSIITVE_OUTPUTS}"] = ""
-        self.attributes[f"{SHELL_NAME}.{ATTRIBUTE_NAMES.TF_INPUTS}"] = ""
+    @staticmethod
+    def create_empty_attributes() -> list[dict]:
+        attributes = [
+            NameValuePair(Name=f"{SHELL_NAME}.{ATTRIBUTE_NAMES.REMOTE_STATE_PROVIDER}", Value=""),
+            NameValuePair(Name=f"{SHELL_NAME}.{ATTRIBUTE_NAMES.BRANCH}", Value=""),
+            NameValuePair(Name=f"{SHELL_NAME}.{ATTRIBUTE_NAMES.CUSTOM_TAGS}", Value=""),
+            NameValuePair(Name=f"{SHELL_NAME}.{ATTRIBUTE_NAMES.APPLY_TAGS}", Value=""),
+            NameValuePair(Name=f"{SHELL_NAME}.{ATTRIBUTE_NAMES.GITHUB_TERRAFORM_MODULE_URL}", Value=""),
+            NameValuePair(Name=f"{SHELL_NAME}.{ATTRIBUTE_NAMES.TERRAFORM_VERSION}", Value=""),
+            NameValuePair(Name=f"{SHELL_NAME}.{ATTRIBUTE_NAMES.GITHUB_TOKEN}", Value=""),
+            NameValuePair(Name=f"{SHELL_NAME}.{ATTRIBUTE_NAMES.CLOUD_PROVIDER}", Value=""),
+            NameValuePair(Name=f"{SHELL_NAME}.{ATTRIBUTE_NAMES.UUID}", Value=""),
+            NameValuePair(Name=f"{SHELL_NAME}.{ATTRIBUTE_NAMES.TF_OUTPUTS}", Value=""),
+            NameValuePair(Name=f"{SHELL_NAME}.{ATTRIBUTE_NAMES.TF_SENSIITVE_OUTPUTS}", Value=""),
+            NameValuePair(Name=f"{SHELL_NAME}.{ATTRIBUTE_NAMES.TF_INPUTS}", Value="")
+        ]
+        return attributes