Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4d9d6a2
Refactor virtual machines module
BorislavRaynov Feb 4, 2025
3018eca
Refactor storage accounts module
BorislavRaynov Feb 4, 2025
255cc62
Refactor role definitions module
BorislavRaynov Feb 4, 2025
a6a47f9
Refactor managed identities module
BorislavRaynov Feb 4, 2025
69731d1
Refcator role assignments module
BorislavRaynov Feb 4, 2025
5e558e6
Refactor managed disks module
BorislavRaynov Feb 4, 2025
84e4253
Refactor log log analytics workspaces module
BorislavRaynov Feb 4, 2025
0457cbd
Refactor log_analytics data export rules module
BorislavRaynov Feb 4, 2025
b73dda0
Refactor keyvaults module
BorislavRaynov Feb 4, 2025
5d1a9b6
Refactor variables
BorislavRaynov Feb 4, 2025
60a9c15
Refactor aks module
BorislavRaynov Feb 4, 2025
28002ed
Refactor networking module
BorislavRaynov Feb 4, 2025
5fa41e6
Refactor vng connection module
BorislavRaynov Feb 4, 2025
ffcc8de
Refactor global vars
BorislavRaynov Feb 4, 2025
dee3c5e
Add default value for bypass in kevault network rules
BorislavRaynov Feb 5, 2025
03f6781
Add private dns zones into storage account main module call
lyudmililchev92 Feb 5, 2025
99a50fc
fix ipsec_policy
lyudmililchev92 Feb 5, 2025
98ffc8b
fix pre commit
lyudmililchev92 Feb 5, 2025
3955c46
Merge branch 'devli' into TC-41
BorislavRaynov Feb 13, 2025
283f9a3
Move keyvault-key into keyvault
BorislavRaynov Feb 13, 2025
00cdb31
Merge branch 'devli' into TC-41
BorislavRaynov Mar 21, 2025
5af8f57
Add linux vm private key
BorislavRaynov Mar 21, 2025
65615ff
Remove "try" in admin ssh key.
BorislavRaynov Mar 24, 2025
787f49a
Add index of vm_key property
BorislavRaynov Mar 24, 2025
865e2be
Handle multiple admin_ssh_key blocks
BorislavRaynov Mar 24, 2025
a31fb08
Handle naming in secrets
BorislavRaynov Mar 24, 2025
c796358
Remove comments
BorislavRaynov Mar 24, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ locals {

key_vault_id = var.resources.keyvaults[var.settings.keyvault_ref].id

public_key = tls_private_key.main[var.settings.admin_ssh_key.public_key_ref].public_key_openssh
vm_keys = { for key, ssh_key in var.settings.admin_ssh_key :
key => tls_private_key.main[ssh_key.public_key_ref]
}
private_keys_pem = { for key, value in local.vm_keys : key => value.private_key_pem }
public_keys_openssh = { for key, value in local.vm_keys : key => value.public_key_openssh }

tags = merge(
var.global_settings.tags,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ resource "azurerm_linux_virtual_machine" "main" {
tags = local.tags

dynamic "admin_ssh_key" {
for_each = try(var.settings.admin_ssh_key[*], {})
for_each = try(var.settings.admin_ssh_key, {})
content {
username = try(admin_ssh_key.value.username, null)
public_key = try(admin_ssh_key.value.public_key, null)
username = admin_ssh_key.value.username
public_key = tls_private_key.main[admin_ssh_key.value.public_key_ref].public_key_openssh
}
}

Expand Down
14 changes: 11 additions & 3 deletions src/modules/virtual_machines/linux_virtual_machine/secrets.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
resource "azurerm_key_vault_secret" "main" {
name = "${var.settings.name}-ssh-private-key"
value = local.public_key
resource "azurerm_key_vault_secret" "private_keys" {
for_each = local.private_keys_pem
name = "${var.settings.name}-${replace(each.key, "_", "-")}-ssh-private-key"
value = each.value
key_vault_id = local.key_vault_id
}

resource "azurerm_key_vault_secret" "public_keys" {
for_each = local.public_keys_openssh
name = "${var.settings.name}-${replace(each.key, "_", "-")}-ssh-public-key"
value = each.value
key_vault_id = local.key_vault_id
}
Loading