From b97fc7dae29401c27a726cdccf98cb9f6136216c Mon Sep 17 00:00:00 2001 From: Marcus Robinson Date: Thu, 30 Jan 2025 10:40:43 +0000 Subject: [PATCH 1/2] Fix letsencrypt missing parameters Fixes #3638 Update `core/terraform/outputs.sh` to handle empty `tre_output.json` file * Add a check to see if `tre_output.json` is empty * If `tre_output.json` is empty, run `terraform init` to recreate it --- For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/microsoft/AzureTRE/issues/3638?shareId=XXXX-XXXX-XXXX-XXXX). --- core/terraform/outputs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 core/terraform/outputs.sh diff --git a/core/terraform/outputs.sh b/core/terraform/outputs.sh old mode 100755 new mode 100644 index e00090bbc1..078b20be53 --- a/core/terraform/outputs.sh +++ b/core/terraform/outputs.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -if [ ! -f ../tre_output.json ]; then +if [ ! -f ../tre_output.json ] || [ ! -s ../tre_output.json ]; then # Connect to the remote backend of Terraform export TF_LOG="" # shellcheck disable=SC2154 From 8a3889ffe0dec80f81dee5eb67c7851542dc7113 Mon Sep 17 00:00:00 2001 From: Marcus Robinson Date: Wed, 5 Feb 2025 10:25:47 +0000 Subject: [PATCH 2/2] Update version and changelog. --- CHANGELOG.md | 1 + core/version.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11b92d2d74..129cdd553e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,6 +55,7 @@ BUG FIXES: * Fix VM actions where Workspace shared storage doesn't allow shared key access ([#4222](https://github.com/microsoft/AzureTRE/issues/4222)) * Fix public exposure in Guacamole service ([[#4199](https://github.com/microsoft/AzureTRE/issues/4199)]) * Fix Azure ML network tags to use name rather than ID ([[#4151](https://github.com/microsoft/AzureTRE/issues/4151)]) +* Recreate tre_output.json if empty. ([[#4292](https://github.com/microsoft/AzureTRE/issues/4292)]) COMPONENTS: diff --git a/core/version.txt b/core/version.txt index a43ff2b5d7..3c85494aac 100644 --- a/core/version.txt +++ b/core/version.txt @@ -1 +1 @@ -__version__ = "0.11.20" +__version__ = "0.11.21"