Merge pull request #95 from minos-framework/issue-93-use-same-template-version-in-links

#93 - Do not let registry get overridden.

Author: albamig

.github/workflows/python-tests.yml

@@ -24,7 +24,7 @@ jobs:
                 run: make coverage
 
             -   name: Publish coverage
-                uses: codecov/codecov-action@v1.3.1
+                uses: codecov/codecov-action@v2
                 with:
                     token: ${{ secrets.CODECOV_TOKEN }}
                     files: ./coverage.xml

minos/cli/templating/processors.py

@@ -135,7 +135,7 @@ def answers(self) -> dict[str, Any]:
         :return: A mapping from question name to the answer value.
         """
         answers = self.context
-        answers |= self._previous_answers
+        answers |= self._previous_answers_without_template_registry
 
         answers = self.form.ask(context=answers, env=self.env)
         self._store_new_answers(answers)
@@ -154,6 +154,14 @@ def _previous_answers(self) -> dict[str, str]:
 
         return answers
 
+    @cached_property
+    def _previous_answers_without_template_registry(self):
+        previous_answers_without_registry = self._previous_answers.copy()
+        previous_answers_without_registry.pop("template_registry", None)
+        previous_answers_without_registry.pop("template_version", None)
+
+        return previous_answers_without_registry
+
     def _store_new_answers(self, answers) -> None:
         with self._answers_file_path.open("w") as file:
             yaml.dump(answers, file)

poetry.lock

@@ -45,9 +45,9 @@ coverage = "^5.5"
 flake8 = "^3.9.2"
 Sphinx = "^4.0.1"
 pre-commit = "^2.12.1"
-sphinx-autodoc-typehints = "^1.12.0"
+sphinx-autodoc-typehints = "^1.17.0"
 sphinxcontrib-apidoc = "^0.3.0"
-sphinx-rtd-theme = "^0.5.2"
+sphinx-rtd-theme = "^1.0.0"
 m2r2 = "^0.3.2"
 
 [build-system]

pyproject.toml

@@ -118,6 +118,40 @@ def test_answers_with_previous_answers(self):
                 answers = yaml.safe_load(file)
                 self.assertEqual(expected_answers, answers)
 
+    def test_answers_do_not_override_template_registry_and_version(self):
+        expected_answers = {
+            "foo": "foo_answer",
+            "template_registry": f"{TEMPLATE_URL}/{TEMPLATE_VERSION}",
+            "template_version": TEMPLATE_VERSION,
+        }
+        with TemporaryDirectory() as tmp_dir_name:
+            project_destination = Path(tmp_dir_name)
+            (project_destination / ".minos-project.yaml").touch()
+            minos_answers_file = project_destination / ".minos-answers.yml"
+            minos_answers_file.touch()
+
+            with minos_answers_file.open("w") as file:
+                answers_with_wrong_version = {
+                    "foo": "foo_answer",
+                    "template_registry": f"{TEMPLATE_URL}/wrong_version",
+                    "template_version": "wrong_version",
+                }
+                yaml.dump(
+                    answers_with_wrong_version, file,
+                )
+
+            microservice_destination = project_destination / "microservices" / "foo"
+            microservice_destination.mkdir(parents=True)
+
+            processor = TemplateProcessor.from_fetcher(self.fetcher, microservice_destination,)
+
+            with patch("minos.cli.Form.ask", return_value=expected_answers) as mock:
+                self.assertEqual(expected_answers, processor.answers)
+
+            self.assertEqual(
+                [call(context=processor.context | expected_answers, env=processor.env)], mock.call_args_list,
+            )
+
     def test_answers_without_previous_answers(self):
         with TemporaryDirectory() as tmp_dir_name:
             destination = Path(tmp_dir_name)