From fe160cdbc3fa66607919bf362bf4a8bbfde7fbf3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 13:33:13 +0000 Subject: [PATCH 1/2] deps: update Terraform azuread to v3 --- infra/azure-peerpods/.terraform.lock.hcl | 42 ++++++++++++++---------- infra/azure-peerpods/main.tf | 2 +- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/infra/azure-peerpods/.terraform.lock.hcl b/infra/azure-peerpods/.terraform.lock.hcl index ebe0b07e1..73169490c 100644 --- a/infra/azure-peerpods/.terraform.lock.hcl +++ b/infra/azure-peerpods/.terraform.lock.hcl @@ -2,26 +2,32 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/azuread" { - version = "2.53.1" - constraints = "2.53.1" + version = "3.0.1" + constraints = "3.0.1" hashes = [ - "h1:0z/718jtR2TJHQQMMqi4nvd6XFPV/iA1jb/5fyAcn5o=", - "h1:2rk36pu4YyhBVz/Mf4swYCQxaB31iPaXOiWNlqZMXbM=", - "h1:7ZNdNGnUB6N6Z6St3COzRXFaghMEyYkZt7WyOCRKOqo=", - "h1:EZNO8sEtUABuRxujQrDrW1z1QsG0dq6iLbzWtnG7Om4=", - "h1:GS/WN8VS6Wp9hvs46lgDsR4ERV8o3Sr+zatF/z2XohU=", - "zh:162916b037e5133f49298b0ffa3e7dcef7d76530a8ca738e7293373980f73c68", + "h1:PgLVIoF07OA8ygDHQFzzmA54U33VVCQvSpO/Q7ZVvU0=", + "h1:QQByHTlxBQg9GPOA/1cJi7di58CYCOYWP9vMZAjNOkA=", + "h1:YG/whP+QO8zeq5ulBW86qT0MzhZKaaAMg4fTLVf7DdY=", + "h1:b+o1KUHwfiqBuydREX7RfTXYIYsPYe+0x/0/EnIy6ZY=", + "h1:lAVL2Wfe+g1jyL8mpeS0iCcBo8dqEdMn+cvpaxrvuYw=", + "h1:m4wMAbvXC3VGsqhRPpWVRbFMXlJT6fjNrFs95ikMzec=", + "h1:oe88sDvu8LKNmurnCZATjrAR90RzzXGZFvizoNhqUsg=", + "h1:ry9Iv1J98D8QfK3+j7hSCN3FtRSk4Wvp4vzTgdWYclw=", + "h1:vayudRxajhsQvK9ROkZFXP/3dKOLvERUnBTrBQ9VtiA=", + "h1:w6keqjlCvUqpNGunfzvDHrnO1B+OrnnI9KNg/LQibQg=", + "h1:yc8irSM9QPwF2JHFY07/sETDIq2c4PA2gmieiYrdd4A=", + "zh:183d1e84298feb673fe7059d9941baee1c82b619f6757742bcc5b789f90dc6cf", "zh:1c3e89cf19118fc07d7b04257251fc9897e722c16e0a0df7b07fcd261f8c12e7", - "zh:492931cea4f30887ab5bca36a8556dfcb897288eddd44619c0217fc5da2d57e7", - "zh:4c895e450e18335ad8714cc6d3488fc1a78816ad2851a91b06cb2ef775dd7c66", - "zh:60d92fdaf7235574201f2d8f68f733ee00a822993b3fc95e6952e09e6ec76999", - "zh:67a169119efa41c1fb867ef1a8e79bf03472a2324384c36eb55370c817dcce42", - "zh:9dd4d5ed9233cf9329262200bc5a1aa60942b80dbc611e2ef4b09f47531b39b1", - "zh:a3c160e35b9e40fc1497b83c2f37a8e24565b05a1783c7733609f3695735c2a9", - "zh:a4a221da42b1f46e7c436c7145e5beaadfd9d03f3be6fd526d132c03f18a5979", - "zh:af0d3476a9702d2287e168e3baa670e64daab9c9b01c01e17025a5248f3e28e9", - "zh:e3579bff7894f3d36066b74ec324be6d28f56a42a387a2b8a0eabf33cbff86df", - "zh:f1749ee8ad972ae6424665aa9d2c0ece8c40c51d41ec2f38b863148cb437e865", + "zh:43c175d8fe55e2abaa4e6b715dccbef38028f0d99e10c478bde1f2e45b9c2751", + "zh:7164ddefa58fd95886beed0ebdedf7923fd6f6336a7ac64982ae342d3eba85a3", + "zh:82b74de05a260632dfe3818c79dacab2c7a31164cd31ae483cd0c1eeb5fa5c3d", + "zh:b306b796363ac9aa05da0ecbc59f684ba35aeaf7e8cb01181cce43cb4f383dc3", + "zh:b505ae5c04589cf156e7748587dff8262f0501bde050bd5250866b58bb60bc1f", + "zh:db3c617b24290386a01df989e173eb192b3edfb8fbce29f158ed4d0bb7840b78", + "zh:e6ebf29881b525a83c34dd74e6a58e595421888ed159ecfe452ea0d40fddd953", + "zh:e74b83a285a7973c1a0bd8b7aa5f5bf9fc6da4b2aef5b64b62cdfdf582b86a79", + "zh:e9f83cbf27fe16d9ecd82ec8fae7676985922db939d2a90b6c7e042d4be9a5e4", + "zh:f642ba7f8df413d5d0ce7229fae9cbb72dd8421282f2cb3168da537c2393e19e", ] } diff --git a/infra/azure-peerpods/main.tf b/infra/azure-peerpods/main.tf index 8bc917663..ef7c20e3e 100644 --- a/infra/azure-peerpods/main.tf +++ b/infra/azure-peerpods/main.tf @@ -6,7 +6,7 @@ terraform { } azuread = { source = "hashicorp/azuread" - version = "2.53.1" + version = "3.0.1" } local = { source = "hashicorp/local" From 7d3409ca5d269592875e5d34deff1436421715e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Wei=C3=9Fe?= Date: Wed, 2 Oct 2024 13:18:09 +0200 Subject: [PATCH 2/2] infra: update principal id references --- infra/azure-peerpods/main.tf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/infra/azure-peerpods/main.tf b/infra/azure-peerpods/main.tf index ef7c20e3e..e4a6c0fba 100644 --- a/infra/azure-peerpods/main.tf +++ b/infra/azure-peerpods/main.tf @@ -59,19 +59,19 @@ resource "azuread_service_principal" "sp" { resource "azurerm_role_assignment" "ra_vm_contributor" { scope = azurerm_resource_group.rg.id role_definition_name = "Virtual Machine Contributor" - principal_id = azuread_service_principal.sp.id + principal_id = azuread_service_principal.sp.object_id } resource "azurerm_role_assignment" "ra_reader" { scope = azurerm_resource_group.rg.id role_definition_name = "Reader" - principal_id = azuread_service_principal.sp.id + principal_id = azuread_service_principal.sp.object_id } resource "azurerm_role_assignment" "ra_network_contributor" { scope = azurerm_resource_group.rg.id role_definition_name = "Network Contributor" - principal_id = azuread_service_principal.sp.id + principal_id = azuread_service_principal.sp.object_id } resource "azuread_application_federated_identity_credential" "federated_credentials" { @@ -85,7 +85,7 @@ resource "azuread_application_federated_identity_credential" "federated_credenti resource "azurerm_role_assignment" "ra_image" { scope = data.azurerm_resource_group.rg_podvm_image.id role_definition_name = "Reader" - principal_id = azuread_service_principal.sp.id + principal_id = azuread_service_principal.sp.object_id } resource "azuread_application_password" "cred" {