Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ FEATURES:
ENHANCEMENTS:

BUG FIXES:
* Nexus might fail to deploy due to wrong identity used in key-vault extension ([#3492](https://github.com/microsoft/AzureTRE/issues/3492))

COMPONENTS:

Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ terraform-import:
terraform-destroy:
$(call target_title, "Destroying ${DIR} Service") \
&& . ${MAKEFILE_DIR}/devops/scripts/check_dependencies.sh env \
&& . ${MAKEFILE_DIR}/devops/scripts/load_and_validate_env.sh \
&& . ${MAKEFILE_DIR}/devops/scripts/load_env.sh ${DIR}/.env \
&& cd ${DIR}/terraform/ && ./destroy.sh

# This will validate all files, not only the changed ones as the CI version does.
Expand Down
4 changes: 3 additions & 1 deletion e2e_tests/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@
import config
from e2e_tests import cloud


LOGGER = logging.getLogger(__name__)
TIMEOUT = Timeout(10, read=30)

azlogger = logging.getLogger("azure")
azlogger.setLevel(logging.WARN)


class InstallFailedException(Exception):
pass
Expand Down
2 changes: 1 addition & 1 deletion templates/shared_services/sonatype-nexus-vm/porter.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
schemaVersion: 1.0.0
name: tre-shared-service-sonatype-nexus
version: 2.5.0
version: 2.5.2
description: "A Sonatype Nexus shared service"
dockerfile: Dockerfile.tmpl
registry: azuretre
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ resource "azurerm_key_vault_access_policy" "nexus_msi" {
tenant_id = azurerm_user_assigned_identity.nexus_msi.tenant_id
object_id = azurerm_user_assigned_identity.nexus_msi.principal_id

secret_permissions = ["Get", "Recover"]
secret_permissions = ["Get", "List"]
}

resource "azurerm_linux_virtual_machine" "nexus" {
Expand Down Expand Up @@ -217,5 +217,9 @@ resource "azurerm_virtual_machine_extension" "keyvault" {
data.azurerm_key_vault_certificate.nexus_cert.versionless_secret_id
]
}
"authenticationSettings" : {
"msiEndpoint" : "http://169.254.169.254/metadata/identity",
"msiClientId" : azurerm_user_assigned_identity.nexus_msi.client_id
}
})
Comment thread
tamirkamara marked this conversation as resolved.
}