Merge branch 'main' into 529-feature-request-syntax-highlighting-of-c…

…ode-blocks
MatthewJohn · Jun 17, 2024 · 90aa335 · 90aa335
2 parents 66e21fd + 5071a40
commit 90aa335
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 8 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -211,7 +211,7 @@ build-pr-image:
   tags: [nomad]
 
   rules:
-    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH
+    - if: $CI_PIPELINE_SOURCE == 'push'
 
   # Use docker without docker-in-docker, as we're
   # passing through the docker socket
@@ -274,6 +274,22 @@ stop_review:
     - ./gitlab-terraform destroy
   allow_failure: true
 
+deploy_main_demo:
+  extends: deploy_review
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
+  environment:
+    name: main-demo
+    auto_stop_in: never
+    url: $DYNAMIC_ENVIRONMENT_URL
+    on_stop: stop_main_demo
+
+stop_main_demo:
+  extends: stop_review
+  environment:
+    name: main-demo
+    action: stop
+
 release:
   stage: deploy
   image: semantic-release:latest

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [3.6.2](https://gitlab.dockstudios.co.uk/pub/terrareg/compare/v3.6.1...v3.6.2) (2024-06-17)
+
+
+### Bug Fixes
+
+* Fix bug where HTML is only rendered in inputs/outputs when terraform compatibility is configured ([09b9e39](https://gitlab.dockstudios.co.uk/pub/terrareg/commit/09b9e3948dfdf0313cab2bf868c74922bfba09f4)), closes [#527](https://gitlab.dockstudios.co.uk/pub/terrareg/issues/527)
+
 ## [3.6.1](https://gitlab.dockstudios.co.uk/pub/terrareg/compare/v3.6.0...v3.6.1) (2024-06-14)
 
 

diff --git a/terrareg/static/js/terrareg/module_provider.js b/terrareg/static/js/terrareg/module_provider.js
@@ -223,14 +223,14 @@ async function getModuleDetails(module_id) {
         terraregModuleDetailsPromiseSingleton[module_id] = new Promise((resolve, reject) => {
             let terraformVersionConstraintQueryString = (
                 userPreferences['terraform-compatibility-version'] ?
-                `?target_terraform_version=${userPreferences['terraform-compatibility-version']}&output=html` :
+                `&target_terraform_version=${userPreferences['terraform-compatibility-version']}` :
                 ''
             );
 
             // Perform request to obtain module details
             $.ajax({
                 type: "GET",
-                url: `/v1/terrareg/modules/${module_id}${terraformVersionConstraintQueryString}`,
+                url: `/v1/terrareg/modules/${module_id}?output=html${terraformVersionConstraintQueryString}`,
                 success: function (data) {
                     resolve(data);
                 },

diff --git a/test/selenium/test_module_provider.py b/test/selenium/test_module_provider.py
@@ -899,10 +899,10 @@ def test_additional_links(self):
         (
             '/modules/moduledetails/fullypopulated/testprovider/1.5.0',
             [
-                ['name_of_application', 'Enter the application name\nThis should be a real name\n\nDouble line break', 'string', 'Required'],
-                ['string_with_default_value', 'Override the default string', 'string', '"this is the default"'],
-                ['example_boolean_input', 'Override the truthful boolean', 'bool', 'true'],
-                ['example_list_input', 'Override the stringy list', 'list', '["value 1","value 2"]']
+                ['name_of_application', '<p>Enter the application name\nThis should be a real name</p>\n<p>Double line break</p>', 'string', 'Required'],
+                ['string_with_default_value', '<p>Override the default string</p>', 'string', '"this is the default"'],
+                ['example_boolean_input', '<p>Override the truthful boolean</p>', 'bool', 'true'],
+                ['example_list_input', '<p>Override the stringy list</p>', 'list', '["value 1","value 2"]']
             ]
         ),
         # Module example
@@ -957,7 +957,7 @@ def test_inputs_tab(self, url, expected_inputs):
         (
             '/modules/moduledetails/fullypopulated/testprovider/1.5.0',
             [
-                ['generated_name', 'Name with randomness\nThis random will not change.\n\nDouble line break'],
+                ['generated_name', '<p>Name with randomness\nThis random will not change.</p>\n<p>Double line break</p>'],
                 ['no_desc_output', '']
             ]
         ),