Fixed issue with list command in offline mode

Fixed GH issue "Uninformative error message when configured domain is incorrect #254"
Fixed GH issue "'Error' word repeats twice #251"

Author: Alexey Bogoslovskyi

HISTORY.rst

@@ -1,6 +1,12 @@
 =======
 History
 =======
+1.2.21 (2022-03-31)
+-------------------
+
+* Fixed issue with list command in offline mode
+* Fixed GH issue "Uninformative error message when configured domain is incorrect #254"
+* Fixed GH issue "'Error' word repeats twice #251"
 
 1.2.20 (2021-08-19)
 -------------------

shellfoundry/bootstrap.py

@@ -50,7 +50,7 @@ def version():
 )
 @click.option("--all", "default_view", flag_value=NO_FILTER, help="Show all templates")
 @shellfoundry_version_check(abort_if_major=True)
-def list(default_view):
+def list(default_view):  # noqa: A001
     """Lists the available shell templates."""
     ListCommandExecutor(default_view).list()
 

shellfoundry/utilities/cloudshell_api/client_wrapper.py

@@ -54,8 +54,11 @@ def _create_client(self):
             return client
         except (HTTPError, Exception) as e:
             if hasattr(e, "code") and e.code == 401:
+                if hasattr(e, "msg") and e.msg:
+                    msg = e.msg
+                else:
+                    msg = "Please verify the credentials in the config"
                 raise FatalError(
-                    "Login to CloudShell failed. "
-                    "Please verify the credentials in the config"
+                    "Login to CloudShell failed. {}".format(msg)
                 )
             raise FatalError(self.ConnectionFailureMessage)

shellfoundry/utilities/cookiecutter_integration.py

@@ -53,7 +53,11 @@ def compile_template(
                 output_dir=output_dir,
             )
         except OutputDirExistsException as err:
-            raise ClickException(str(err))
+            if str(err).startswith("Error: "):
+                msg = str(err)[6:].strip()
+            else:
+                msg = str(err)
+            raise ClickException(msg)
 
     @staticmethod
     def _remove_template_info_file(shell_path):

shellfoundry/utilities/template_retriever.py

@@ -94,11 +94,20 @@ def _get_local_templates(self, template_location):
                 for filename in filenames:
                     if filename == TEMPLATE_INFO_FILE:
                         full_path = os.path.join(root, filename)
-                        standard_version = self._get_standard_version_from_template(
-                            root
-                        )
+
                         with open(full_path, mode="r", encoding="utf8") as f:
                             templ_data = json.load(f)
+
+                        if GEN_TWO in templ_data.get("template_name", "Undefined"):
+                            standard_version = self._get_standard_version_from_template(
+                                root
+                            )
+                        else:
+                            standard_version = templ_data.get(
+                                "version",
+                                templ_data.get("shell_version", "0.0.1")
+                            )
+
                         templ_info.append(
                             {
                                 "name": templ_data.get("template_name", "Undefined"),

tests/test_utilities/test_cloudshell_api/test_client_wrapper.py

@@ -58,7 +58,8 @@ def test_client_wrapper_raises_an_error_when_create_client_fails_after_retries_h
         self, api_mock
     ):
         # Arrange
-        error = HTTPError("url", 401, "not found", None, None)
+        error_msg = "not found"
+        error = HTTPError("url", 401, error_msg, None, None)
         api_mock.side_effect = [error, error]
 
         # Act
@@ -68,7 +69,7 @@ def test_client_wrapper_raises_an_error_when_create_client_fails_after_retries_h
         # Assert
         self.assertEqual(
             context.exception.message,
-            u"Login to CloudShell failed. Please verify the credentials in the config",
+            u"Login to CloudShell failed. {}".format(error_msg),
         )
 
     @patch(

version.txt

@@ -1 +1 @@
-1.2.20
+1.2.21