diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index 0a655e9..1016720 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -2,60 +2,64 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/azuread" { - version = "2.18.0" - constraints = ">= 2.18.0" + version = "2.53.1" + constraints = ">= 2.53.0" hashes = [ - "h1:cpppwljjeyqTnwNlQGHK+o1Jb5Tf4UAnJiInNkN6P38=", - "zh:04b2b5e09dedd45316cd47d21d2ed7e3cd7a4e5f3c8b6e8fba0a10e7eb2a1ca9", - "zh:232440381b60d918e0da0ea8e8a2e8a78a4fe1ae785b3f829f2f965464ab79a2", - "zh:688111a9cb8d9ffec2ccabacb27456d275bf1d404dd5f85e681715abbdd64654", - "zh:7f37b7be7859170f077c58e74be42b5571e364c52aac0a2df3a6a14fbe48d3c5", - "zh:a385743bfae40f6a01bf6662a3c7a71035113c33965e0dbf421997a015734d08", - "zh:a97b7430647d7b449441e5515f11a4d123f6d6a383a8fbca5c0a4086be407358", - "zh:be6d40d1431e8e71a96cce2099a259ef5a8dfb0e849817875d9ee4bb8cf59d40", - "zh:db3b541d90881d620111fdae0efe90d1e0972fc80a2b4346d4af8d96e1fc1195", - "zh:e6d9e0481f2bdc16ee69aa00001d9713282daccfbc621e0143c53d9f6dbdb537", - "zh:ee5b724ca78301057059eff18062fa88d8b24ac7b39f52eb17b8609634427ce0", - "zh:fdb169f89551f97f6b0bf90d61d5fda166a25cce6867ec16f63c3bfb4d90a0a2", + "h1:7ZNdNGnUB6N6Z6St3COzRXFaghMEyYkZt7WyOCRKOqo=", + "zh:162916b037e5133f49298b0ffa3e7dcef7d76530a8ca738e7293373980f73c68", + "zh:1c3e89cf19118fc07d7b04257251fc9897e722c16e0a0df7b07fcd261f8c12e7", + "zh:492931cea4f30887ab5bca36a8556dfcb897288eddd44619c0217fc5da2d57e7", + "zh:4c895e450e18335ad8714cc6d3488fc1a78816ad2851a91b06cb2ef775dd7c66", + "zh:60d92fdaf7235574201f2d8f68f733ee00a822993b3fc95e6952e09e6ec76999", + "zh:67a169119efa41c1fb867ef1a8e79bf03472a2324384c36eb55370c817dcce42", + "zh:9dd4d5ed9233cf9329262200bc5a1aa60942b80dbc611e2ef4b09f47531b39b1", + "zh:a3c160e35b9e40fc1497b83c2f37a8e24565b05a1783c7733609f3695735c2a9", + "zh:a4a221da42b1f46e7c436c7145e5beaadfd9d03f3be6fd526d132c03f18a5979", + "zh:af0d3476a9702d2287e168e3baa670e64daab9c9b01c01e17025a5248f3e28e9", + "zh:e3579bff7894f3d36066b74ec324be6d28f56a42a387a2b8a0eabf33cbff86df", + "zh:f1749ee8ad972ae6424665aa9d2c0ece8c40c51d41ec2f38b863148cb437e865", ] } provider "registry.terraform.io/hashicorp/azurerm" { - version = "2.98.0" - constraints = ">= 2.98.0" + version = "4.0.1" + constraints = ">= 4.0.1" hashes = [ - "h1:8Sg08lYcJC12Y8EH5oFfgBhIR9OhZFKF633NjOMjilY=", - "zh:025f656a6d3ecc30f7cc2279bc41969789987b405e3fa8a7c1eb5f74e3ee1140", - "zh:23c54b330678a16378156193d709bbddce3ba76ee827fd65fb751ce90790af9e", - "zh:2d28d359ce6881918bd6c03701f6ec4fd90215abfce9b863cfd3172e28c1acb3", - "zh:31df88584d39cf876fa45ff6de92e67e03814a0985d34c7671bd6989cda22af8", - "zh:36019109790b9a905770355e5bbb57b291a9689a8b9beac5751dcbdb1282d035", - "zh:5fb4a277331c459db9e1b150d79b7c7157a176ceca871195e81225e949141b72", - "zh:7ec304afa1b60dc84257a54cea68e97f85df3feb405d25a9226a4f593ed00744", - "zh:bac469f104b8ad2c8b5ddc88ddae3b0bc27ae5f9c2ccf03f14a001a5c3ed6ae1", - "zh:d860b0ec60a978fe3f08d695326e9051a61cd3f60786fc618a61fbdb5d6a4f15", - "zh:ebcb2911ee27587f63df7eff3836c9a206181a931357c6b9a380124be4241597", - "zh:f37fae57bf7d05c30fda6e5414ad5a4aad1b34d41a5f2465a864736f92ded1ac", + "h1:LVQ97nZPNIi6mXGSj4s3h3z8sHi1cQXOxSsLsmtA9b0=", + "zh:0e78a9200eef138d08050aab99c4fb9ab99c7c5ccbdd410592db7acc5ed421fe", + "zh:443157ba089ef4002817c4f3b3610654588084c2d8c8cf00f1ddf708c7c73411", + "zh:563595dd72b894b2ef9825226c04689ea9967113568a06077960cd863b3afa36", + "zh:5bef3c6bc8306b607078a09c3ab1d2ee55435e0099eedca459aca6c259c29079", + "zh:5eb305ca10a14a5cf5308e7225779f9f4152d5a8dd842c901fa47fc93432b346", + "zh:6041a5272b293ae95b46a39ceced3f14bf267a379263c10d11301c50c2e740d0", + "zh:7b077b9358ef6878d0520febcf17ba651eda6636c66885c925ae27d20df6d575", + "zh:8a140a1f8eb35a5ab5b5d3d46759d45408ad14dc5ca3f7fc9af5dc5cf1bb2133", + "zh:9a9d707dbd3b111a28e914a277e1e1076221a41194f7eaa0389e0b4a9b4033e4", + "zh:e8c42fb6cde74ecae1fe0a5fd9bb4bd804a5441f8dfec9d3cb4966af2054ede4", + "zh:eb018fe31c8e6f3e495bd79c7b278aa7dc51b48453f6b83bdb0e7b13459b2aa0", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } provider "registry.terraform.io/integrations/github" { - version = "4.20.0" - constraints = ">= 4.20.0" + version = "6.2.3" + constraints = ">= 6.2.3" hashes = [ - "h1:ogDrOjYdyxOqIHEnyrf7jRgQCOVmE5dk3+u1MHylsVI=", - "zh:1501c3ccaf624cf6d9d311eb59f911fa0cf431d4728af3b103e01c0eb4201efb", - "zh:18eca616b2eb0868fd411835b5d04898ef7a82803ac900571bfc4bccdda1192e", - "zh:194a711aee04329bbfff57a7c882bca55e9d96fc665c4aefb0e73bd214587c35", - "zh:7f8e33504b148a0bd2653c570381a420fc60f441f73c8a37329c6f9874f086bc", - "zh:86a33d09438d32a2a888cad6ba4997fa0f8cf9ed8b286e1dc16923ce55e5b0de", - "zh:ba00fb5c62ed035fd4a39af1213059d3cef74fb2736dc3e0639a18bea43d0a2b", - "zh:c4210ca75475f67d2a4c21711176ca00622c18b8fbc34e03e7ebbb9b6f7f7e58", - "zh:cf4322242197ac2785246475d9152693c5602531ad564d492fe632f5e8c507f4", - "zh:d8f0fc65fea1eda41ba0f2431d06df0585b794686165aa1aa87a533023b90476", - "zh:ee7e0442fcfbc98fc71c0d8abe83b0c8794ab8f4b8d0384a1f9582c94f2bff71", - "zh:f40c44faa01d7f615a67711ebd01b8175ffc2121c35483905c1b1afedc1f1af5", - "zh:f4c2f8db3902803c2e06b3c36c58cb847f893e775e5855165300d8baa756199a", - "zh:fd329d9663e710ab6d35465c16a0a085463039740cb34458ee9f47b05402c736", + "h1:ZWIpZ9fENRI4AE501NfMzoMR0JwT7SHKZn8l67lF9es=", + "zh:05874671652a260b12d784cc46b0eea156f493a5f12e00368d1f6cb319156257", + "zh:0c7a3cae5a66e5c5efc3b25ba646a0d46bfe1fd3edba1f5a75f51aede85a9d1b", + "zh:174310010d08f13e36e53ff18e44a21dd040c89884ef190a192c6ce27926a912", + "zh:23d1d8731e518354ce6a83419f49101aece63882b0ca7c489f3c598cc6ea5d5e", + "zh:4e88953816daf11ab1681c32c7988d4e29476fc44f0959fe03173532cf5044de", + "zh:6fab07734ccf27f5afee4442abae2d33245eabf35519032ce1e2aad6961a640a", + "zh:7b2f324b918e161c892c29ee80d36c48ca8b891b8047e132fc701ca741e5ae72", + "zh:8ef4f0d691ade98082ef1f6b36e556468e5ab26e60021f0de0fb22e3acdfd990", + "zh:8f0f3e139faa8f2b9075bb9978dd683f4bab5ac91171bbb969addd04d7f0b90f", + "zh:97cb6d7fdf640237cc2f0ab830db8f878770968c59fd28298e9dddb8b9e6294d", + "zh:a17038d8747c6bb660e4c5981e8ffbbc33c66ba164868fd35d442e7f828a1e01", + "zh:aa9f4b7d947f7b11277b4e9ba7147f5594cf60a6589b7aac4344f73d1400d1c0", + "zh:c780b951e14d583ef6ffef9a934831b56ee157c50ed8e969c676a636810f7db1", + "zh:d8497bb2986fd76107b7208b33cc39281797164fdea09453e987b969a461befb", + "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", ] } diff --git a/packer.tf b/packer.tf index e5474fb..5a24ba6 100644 --- a/packer.tf +++ b/packer.tf @@ -4,17 +4,17 @@ terraform { required_providers { azuread = { source = "azuread" - version = ">= 2.18.0" + version = ">= 2.53.0" } azurerm = { source = "azurerm" - version = ">= 2.98.0" + version = ">= 4.0.1" } github = { source = "integrations/github" - version = ">= 4.20.0" + version = ">= 6.2.3" } } } @@ -48,7 +48,7 @@ resource "azuread_application" "packer" { } resource "azuread_service_principal" "packer" { - application_id = azuread_application.packer.application_id + client_id = azuread_application.packer.client_id } resource "azuread_service_principal_password" "packer" { @@ -93,7 +93,7 @@ resource "github_actions_secret" "github_actions_azure_credentials" { plaintext_value = jsonencode( { - clientId = azuread_application.packer.application_id + clientId = azuread_application.packer.client_id clientSecret = azuread_service_principal_password.packer.value subscriptionId = data.azurerm_subscription.subscription.subscription_id tenantId = data.azurerm_subscription.subscription.tenant_id @@ -106,7 +106,7 @@ resource "github_actions_secret" "github_actions_azure_credentials" { resource "github_actions_secret" "packer_client_id" { repository = data.github_repository.packer_windows_avd.name secret_name = "PACKER_CLIENT_ID" - plaintext_value = azuread_application.packer.application_id + plaintext_value = azuread_application.packer.client_id } resource "github_actions_secret" "packer_client_secret" { @@ -152,7 +152,7 @@ output "packer_build_resource_group" { } output "packer_client_id" { - value = azuread_application.packer.application_id + value = azuread_application.packer.client_id sensitive = true }