Skip to content

Commit

Permalink
Fix lint issues (terraform formatting)
Browse files Browse the repository at this point in the history
  • Loading branch information
jonnyry committed Nov 4, 2024
1 parent 84b599b commit d5332c9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion core/terraform/appgateway/certificate.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
resource "azurerm_role_assignment" "keyvault_appgw_role" {
scope = var.keyvault_id
role_definition_name = "Key Vault Secrets User"
principal_id = azurerm_user_assigned_identity.agw_id.principal_id // id-agw-<TRE_ID>
principal_id = azurerm_user_assigned_identity.agw_id.principal_id // id-agw-<TRE_ID>
}

resource "azurerm_key_vault_certificate" "tlscert" {
Expand Down
4 changes: 2 additions & 2 deletions core/terraform/keyvault.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ resource "azurerm_key_vault" "kv" {
resource "azurerm_role_assignment" "keyvault_deployer_role" {
scope = azurerm_key_vault.kv.id
role_definition_name = "Key Vault Administrator"
principal_id = data.azurerm_client_config.current.object_id // deployer - either CICD service principal or local user
principal_id = data.azurerm_client_config.current.object_id // deployer - either CICD service principal or local user
}

resource "azurerm_role_assignment" "keyvault_apiidentity_role" {
scope = azurerm_key_vault.kv.id
role_definition_name = "Key Vault Secrets User"
principal_id = azurerm_user_assigned_identity.id.principal_id // id-api-<TRE_ID>
principal_id = azurerm_user_assigned_identity.id.principal_id // id-api-<TRE_ID>
}

data "azurerm_private_dns_zone" "vaultcore" {
Expand Down
2 changes: 1 addition & 1 deletion core/terraform/resource_processor/vmss_porter/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ resource "azurerm_role_assignment" "subscription_contributor" {
resource "azurerm_role_assignment" "keyvault_vmss_role" {
scope = var.key_vault_id
role_definition_name = "Key Vault Administrator"
principal_id = azurerm_user_assigned_identity.vmss_msi.principal_id // id-vmss-<TRE_ID>
principal_id = azurerm_user_assigned_identity.vmss_msi.principal_id // id-vmss-<TRE_ID>
}

module "terraform_azurerm_environment_configuration" {
Expand Down
14 changes: 7 additions & 7 deletions templates/workspaces/base/terraform/keyvault.tf
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
data "azurerm_client_config" "current" {}

resource "azurerm_key_vault" "kv" {
name = local.keyvault_name
location = azurerm_resource_group.ws.location
resource_group_name = azurerm_resource_group.ws.name
sku_name = "standard"
name = local.keyvault_name
location = azurerm_resource_group.ws.location
resource_group_name = azurerm_resource_group.ws.name
sku_name = "standard"
enable_rbac_authorization = true
purge_protection_enabled = true
tenant_id = data.azurerm_client_config.current.tenant_id
tags = local.tre_workspace_tags
purge_protection_enabled = true
tenant_id = data.azurerm_client_config.current.tenant_id
tags = local.tre_workspace_tags

network_acls {
bypass = "AzureServices"
Expand Down

0 comments on commit d5332c9

Please sign in to comment.