From b5bda2c527e8cc55e8e23195e4e166e5767f943e Mon Sep 17 00:00:00 2001 From: Lars Waage <46653859+larwaa@users.noreply.github.com> Date: Wed, 9 Oct 2024 19:12:27 +0200 Subject: [PATCH] chore: bump tf providers (#959) --- infrastructure/modules/vnet/providers.tf | 2 +- .../environments/dev/.terraform.lock.hcl | 84 ++++++++++ .../server/environments/dev/github.tf | 11 -- .../server/environments/dev/main.tf | 14 +- .../server/environments/dev/terraform.tfvars | 60 ++++++- .../server/environments/dev/variables.tf | 16 ++ .../production/.terraform.lock.hcl | 118 +++++++------- .../server/environments/production/main.tf | 6 +- .../shared_resources/.terraform.lock.hcl | 149 +++++++++--------- infrastructure/shared_resources/main.tf | 8 +- 10 files changed, 303 insertions(+), 165 deletions(-) create mode 100644 infrastructure/server/environments/dev/.terraform.lock.hcl diff --git a/infrastructure/modules/vnet/providers.tf b/infrastructure/modules/vnet/providers.tf index 8a863dad..12ccf34f 100644 --- a/infrastructure/modules/vnet/providers.tf +++ b/infrastructure/modules/vnet/providers.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = ">= 3.50.0" + version = "~> 4.4.0" } } } diff --git a/infrastructure/server/environments/dev/.terraform.lock.hcl b/infrastructure/server/environments/dev/.terraform.lock.hcl new file mode 100644 index 00000000..a6d83a30 --- /dev/null +++ b/infrastructure/server/environments/dev/.terraform.lock.hcl @@ -0,0 +1,84 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/azurerm" { + version = "4.4.0" + constraints = "~> 4.4.0" + hashes = [ + "h1:M9kwRlP7zg89AVw7e/5ddhUZ+4FesIUkKJVwD5D0d1M=", + "zh:04890898b58f2c25c8a1e17fec67c442ef2476dfc119642d001741f6d2e8bc42", + "zh:0b99e793c5d56529df51de06ed53599a5c2715cfa09bf4ed59997ed7dbf8b6bc", + "zh:11c3cf86dcf07077f8f3b040afa69205609b1333204cec2ee8779df1223aa4cd", + "zh:12dbc644830aa9e04a332882269ace24f7365e53d0a32a9d193442e61b22bb5a", + "zh:2656f4742245d51a07ae0c7221c5de33b027fce99fe1c37295c9d67d6107db27", + "zh:48bd6c8f32d7849e291ff47e5790f26046a3bc35b9f10219425784804b86f1ab", + "zh:55334716561e630462a719318a172c047ca51c1ebc0d5fa878a0ee2446d7beb9", + "zh:656c7aa2f4b39aa6e8d7d2ae5afb77fae07b795fa7f1b212eaccea90ef71ebbe", + "zh:777c0e7280d9202e7cc5c580bfb538ae34e644777111e05b9553b5e3c1e8f397", + "zh:81fc7b48b8cb87eb27f70da457d3df8eb4a067f9e4d36cf947a2eeca0b7f96f1", + "zh:98e3bfca410207f61c7eb89e670c18b24d77cad82dd104af8d7a68885e2586cb", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} + +provider "registry.terraform.io/hashicorp/random" { + version = "3.6.3" + hashes = [ + "h1:zG9uFP8l9u+yGZZvi5Te7PV62j50azpgwPunq2vTm1E=", + "zh:04ceb65210251339f07cd4611885d242cd4d0c7306e86dda9785396807c00451", + "zh:448f56199f3e99ff75d5c0afacae867ee795e4dfda6cb5f8e3b2a72ec3583dd8", + "zh:4b4c11ccfba7319e901df2dac836b1ae8f12185e37249e8d870ee10bb87a13fe", + "zh:4fa45c44c0de582c2edb8a2e054f55124520c16a39b2dfc0355929063b6395b1", + "zh:588508280501a06259e023b0695f6a18149a3816d259655c424d068982cbdd36", + "zh:737c4d99a87d2a4d1ac0a54a73d2cb62974ccb2edbd234f333abd079a32ebc9e", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:a357ab512e5ebc6d1fda1382503109766e21bbfdfaa9ccda43d313c122069b30", + "zh:c51bfb15e7d52cc1a2eaec2a903ac2aff15d162c172b1b4c17675190e8147615", + "zh:e0951ee6fa9df90433728b96381fb867e3db98f66f735e0c3e24f8f16903f0ad", + "zh:e3cdcb4e73740621dabd82ee6a37d6cfce7fee2a03d8074df65086760f5cf556", + "zh:eff58323099f1bd9a0bec7cb04f717e7f1b2774c7d612bf7581797e1622613a0", + ] +} + +provider "registry.terraform.io/hashicorp/time" { + version = "0.12.1" + constraints = "~> 0.12.1" + hashes = [ + "h1:JzYsPugN8Fb7C4NlfLoFu7BBPuRVT2/fCOdCaxshveI=", + "zh:090023137df8effe8804e81c65f636dadf8f9d35b79c3afff282d39367ba44b2", + "zh:26f1e458358ba55f6558613f1427dcfa6ae2be5119b722d0b3adb27cd001efea", + "zh:272ccc73a03384b72b964918c7afeb22c2e6be22460d92b150aaf28f29a7d511", + "zh:438b8c74f5ed62fe921bd1078abe628a6675e44912933100ea4fa26863e340e9", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:85c8bd8eefc4afc33445de2ee7fbf33a7807bc34eb3734b8eefa4e98e4cddf38", + "zh:98bbe309c9ff5b2352de6a047e0ec6c7e3764b4ed3dfd370839c4be2fbfff869", + "zh:9c7bf8c56da1b124e0e2f3210a1915e778bab2be924481af684695b52672891e", + "zh:d2200f7f6ab8ecb8373cda796b864ad4867f5c255cff9d3b032f666e4c78f625", + "zh:d8c7926feaddfdc08d5ebb41b03445166df8c125417b28d64712dccd9feef136", + "zh:e2412a192fc340c61b373d6c20c9d805d7d3dee6c720c34db23c2a8ff0abd71b", + "zh:e6ac6bba391afe728a099df344dbd6481425b06d61697522017b8f7a59957d44", + ] +} + +provider "registry.terraform.io/integrations/github" { + version = "6.3.0" + constraints = "~> 6.3.0" + hashes = [ + "h1:AG//wDT67eInhTk+SQdDz5o8R8YIIBrZGz7C9TXKDOw=", + "zh:04fe3b820fe8c247b98b9d6810b8bb84d3e8ac08054faf450c42489815ef4bfa", + "zh:24096b2d16208d1411a58bdb8df8cd9f0558fb9054ffeb95c4e7e90a9a34f976", + "zh:2b27332adf8d08fbdc08b5f55e87691bce02c311219e6deb39c08753bd93db6d", + "zh:335dd6c2d50fcdce2ef0cc194465fdf9df1f5fdecc805804c78df30a4eb2e11e", + "zh:383a6879565969dbdf5405b651cd870c09c615dbd3df2554e5574d39d161c98c", + "zh:4903038a6bc605f372e1569695db4a2e2862e1fc6cf4faf9e13c5f8f4fa2ed94", + "zh:4cc4dffbee8b28102d38abe855b7440d4f4226261b43fda2ec289b48c3de1537", + "zh:57c30c6fe0b64fa86906700ceb1691562b62f2b1ef0404952aeb4092acb6acb3", + "zh:7bf518396fb00e4f55c406f2ffb5583b43278682a92f0864a0c47e3a74627bbb", + "zh:93c2c5cb90f74ad3c0874b7f7d8a866f28a852f0eda736c6aef8ce65d4061f4d", + "zh:9562a82a6193a2db110fb34d1aceeedb27c0a640058dce9c31b37b17eeb5f4e7", + "zh:ac97f2d111703a219f27fcbf5e89460ea98f9168badcc0913c8b214a37f76814", + "zh:c882af4d33b761ec198cedac212ab1c114d97540119dc97daca38021ab3edd0a", + "zh:c9ffd0a37f07a93af02a1caa90bfbea27a952d3e5badf4aab866ec71cdb184a3", + "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", + ] +} diff --git a/infrastructure/server/environments/dev/github.tf b/infrastructure/server/environments/dev/github.tf index 85f963f4..1d4bde3d 100644 --- a/infrastructure/server/environments/dev/github.tf +++ b/infrastructure/server/environments/dev/github.tf @@ -8,14 +8,3 @@ resource "github_repository_environment" "this" { repository = local.repository_name } -resource "github_actions_environment_variable" "this" { - for_each = { - "azure_client_id" = module.server.managed_identity.client_id, - "azure_tenant_id" = module.server.managed_identity.tenant_id, - "azure_subscription_id" = data.azurerm_client_config.current.subscription_id, - } - repository = local.repository_name - variable_name = upper(each.key) - environment = github_repository_environment.this.environment - value = each.value -} diff --git a/infrastructure/server/environments/dev/main.tf b/infrastructure/server/environments/dev/main.tf index 72e68779..d04ec721 100644 --- a/infrastructure/server/environments/dev/main.tf +++ b/infrastructure/server/environments/dev/main.tf @@ -2,15 +2,15 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 3.54.0" + version = "~> 4.4.0" } github = { source = "integrations/github" - version = "~> 5.24.0" + version = "~> 6.3.0" } time = { source = "hashicorp/time" - version = "~> 0.9.0" + version = "~> 0.12.1" } } backend "azurerm" { @@ -48,9 +48,15 @@ module "server" { source = "../../../modules/server" suffix = random_string.resource_code.result - environment_variables = var.environment_variables + environment_variables = concat(var.environment_variables, [{ + name = "SENTRY_RELEASE", + value = var.git_sha + }]) + docker_registry_password = var.docker_registry_password environment = var.environment + image_tag = var.image_tag + blob_storage = var.blob_storage postgres = { sku_name = "B_Standard_B1ms" diff --git a/infrastructure/server/environments/dev/terraform.tfvars b/infrastructure/server/environments/dev/terraform.tfvars index 7b5b63b9..9b856fce 100644 --- a/infrastructure/server/environments/dev/terraform.tfvars +++ b/infrastructure/server/environments/dev/terraform.tfvars @@ -1,7 +1,17 @@ +/* +--- IMPORTANT --- +This file MUST NOT contain any secrets. +It is checked into version control and is therefore public. + +Secrets should be stored in the Azure Key Vault and inject into the containers at runtime. +See `infrastucture/modules/server/server_app.tf` and `infrastucture/modules/server/secrets.tf` +on how to do this. +*/ + environment_variables = [ { name = "CORS_ORIGINS" - value = "https://indokntnu.no" + value = "https://client.canary.indokntnu.no" }, { name = "CORS_CREDENTIALS" @@ -9,7 +19,7 @@ environment_variables = [ }, { name = "NODE_ENV" - value = "development" + value = "production" }, { name = "NO_REPLY_EMAIL" @@ -20,12 +30,12 @@ environment_variables = [ value = 4000 }, { - name = "FEIDE_CLIENT_ID" - value = "fcaa9e30-a6d3-4809-8fea-cdd7b3de1c98" + name = "SERVER_URL" + value = "https://canary.indokntnu.no" }, { - name = "FEIDE_REDIRECT_URI" - value = "https://indokntnu.no/api/auth/feide/callback" + name = "FEIDE_CLIENT_ID" + value = "fcaa9e30-a6d3-4809-8fea-cdd7b3de1c98" }, { name = "FEIDE_BASE_URL" @@ -37,12 +47,16 @@ environment_variables = [ }, { name = "SESSION_COOKIE_DOMAIN" - value = "yellowflower-e949ae00.norwayeast.azurecontainerapps.io" + value = "indokntnu.no" }, { name = "SESSION_COOKIE_HTTP_ONLY" value = "true" }, + { + name = "SESSION_COOKIE_SAME_SITE" + value = "lax" + }, { name = "SESSION_COOKIE_SECURE" value = "true" @@ -50,8 +64,40 @@ environment_variables = [ { name = "SENTRY_DSN" value = "https://3e8801d618184101b5d2c6b7b4da6f0b@o514678.ingest.sentry.io/6553834" + }, + { + name = "TRUST_PROXY" + value = "true" + }, + { + name = "RATE_LIMIT_MAX", + value = 1000 + }, + { + name = "REDIRECT_ORIGINS", + value = "https://client.canary.indokntnu.no,https://canary.indokntnu.no,https://indokntnu.no,https://indøkntnu.no" + }, + { + name = "FEIDE_GROUPS_API", + value = "https://groups-api.dataporten.no/groups/me/groups" + }, + { + name = "VIPPS_TEST_MODE", + value = "true" + }, + { + name = "CONTACT_EMAIL", + value = "kontakt@rubberdok.no" + }, + { + name = "CLIENT_URL", + value = "https://client.canary.indokntnu.no" } ] +blob_storage = { + allowed_origins = ["https://client.canary.indokntnu.no", "https://canary.indokntnu.no", "https://*.indokntnu.no", "canary.indokntnu.no", "client.canary.indokntnu.no"] +} + environment = "development" diff --git a/infrastructure/server/environments/dev/variables.tf b/infrastructure/server/environments/dev/variables.tf index e80afe0c..6399c883 100644 --- a/infrastructure/server/environments/dev/variables.tf +++ b/infrastructure/server/environments/dev/variables.tf @@ -24,3 +24,19 @@ variable "docker_registry_password" { variable "environment" { type = string } + +variable "git_sha" { + type = string + default = null +} + +variable "image_tag" { + type = string + default = "ghcr.io/rubberdok/server:latest" +} + +variable "blob_storage" { + type = object({ + allowed_origins = list(string) + }) +} \ No newline at end of file diff --git a/infrastructure/server/environments/production/.terraform.lock.hcl b/infrastructure/server/environments/production/.terraform.lock.hcl index d500aba3..a6d83a30 100644 --- a/infrastructure/server/environments/production/.terraform.lock.hcl +++ b/infrastructure/server/environments/production/.terraform.lock.hcl @@ -2,83 +2,83 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.85.0" - constraints = ">= 3.50.0, ~> 3.85.0" + version = "4.4.0" + constraints = "~> 4.4.0" hashes = [ - "h1:BX6+m8KJATrpqlwBSyA63Fmwjvgwcs/v1qwB7B5GLCU=", - "zh:1ae6c0d82b5801641a17094b84f2ec1dcac699c1c4e40669a267511061414a34", - "zh:259e9386a43aabecb1205b0ceea2d205223637c09b66d806a89fed04f3343253", - "zh:4d940f9c14fece4f1d9219ac9d104202e5561bddc5024e5ac97f3f93eea20110", - "zh:530bca70b950e835f63c796c694106d701e5de0e2cf096fa35f08afd5c254594", - "zh:69e6b7f44ffbe0383b6485bb9db26781eb7869503889303e202967900a6b35ed", - "zh:8528e7d054254daae06eeb2bf343d566d3908a024fdfb5e515fbdbe0669c15eb", - "zh:98d66edfa89ed9a431ca37be384e5dfe7fa20bdc732c6e7d30f3f922ca3b29dc", - "zh:b8d37cedeffeb6bd37d4ec79fc2da19ed6b57d1ac08d835395dfa4fb3cfdf447", - "zh:bbc94e89cd6c0d59c2e5ed0bce852cac8435b6dc2e979691ee84af4c8b2c9bb8", - "zh:ceb4c624e8bb56bbcfe53e3c4ed4b4d27c3a5b62e5f4890b32c98b60b83c7827", - "zh:f08c5bf19eb25f668633964c6bfa823aa0ead785824082533c4a6cff3959e3d0", + "h1:M9kwRlP7zg89AVw7e/5ddhUZ+4FesIUkKJVwD5D0d1M=", + "zh:04890898b58f2c25c8a1e17fec67c442ef2476dfc119642d001741f6d2e8bc42", + "zh:0b99e793c5d56529df51de06ed53599a5c2715cfa09bf4ed59997ed7dbf8b6bc", + "zh:11c3cf86dcf07077f8f3b040afa69205609b1333204cec2ee8779df1223aa4cd", + "zh:12dbc644830aa9e04a332882269ace24f7365e53d0a32a9d193442e61b22bb5a", + "zh:2656f4742245d51a07ae0c7221c5de33b027fce99fe1c37295c9d67d6107db27", + "zh:48bd6c8f32d7849e291ff47e5790f26046a3bc35b9f10219425784804b86f1ab", + "zh:55334716561e630462a719318a172c047ca51c1ebc0d5fa878a0ee2446d7beb9", + "zh:656c7aa2f4b39aa6e8d7d2ae5afb77fae07b795fa7f1b212eaccea90ef71ebbe", + "zh:777c0e7280d9202e7cc5c580bfb538ae34e644777111e05b9553b5e3c1e8f397", + "zh:81fc7b48b8cb87eb27f70da457d3df8eb4a067f9e4d36cf947a2eeca0b7f96f1", + "zh:98e3bfca410207f61c7eb89e670c18b24d77cad82dd104af8d7a68885e2586cb", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } provider "registry.terraform.io/hashicorp/random" { - version = "3.6.0" + version = "3.6.3" hashes = [ - "h1:I8MBeauYA8J8yheLJ8oSMWqB0kovn16dF/wKZ1QTdkk=", - "zh:03360ed3ecd31e8c5dac9c95fe0858be50f3e9a0d0c654b5e504109c2159287d", - "zh:1c67ac51254ba2a2bb53a25e8ae7e4d076103483f55f39b426ec55e47d1fe211", - "zh:24a17bba7f6d679538ff51b3a2f378cedadede97af8a1db7dad4fd8d6d50f829", - "zh:30ffb297ffd1633175d6545d37c2217e2cef9545a6e03946e514c59c0859b77d", - "zh:454ce4b3dbc73e6775f2f6605d45cee6e16c3872a2e66a2c97993d6e5cbd7055", + "h1:zG9uFP8l9u+yGZZvi5Te7PV62j50azpgwPunq2vTm1E=", + "zh:04ceb65210251339f07cd4611885d242cd4d0c7306e86dda9785396807c00451", + "zh:448f56199f3e99ff75d5c0afacae867ee795e4dfda6cb5f8e3b2a72ec3583dd8", + "zh:4b4c11ccfba7319e901df2dac836b1ae8f12185e37249e8d870ee10bb87a13fe", + "zh:4fa45c44c0de582c2edb8a2e054f55124520c16a39b2dfc0355929063b6395b1", + "zh:588508280501a06259e023b0695f6a18149a3816d259655c424d068982cbdd36", + "zh:737c4d99a87d2a4d1ac0a54a73d2cb62974ccb2edbd234f333abd079a32ebc9e", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:91df0a9fab329aff2ff4cf26797592eb7a3a90b4a0c04d64ce186654e0cc6e17", - "zh:aa57384b85622a9f7bfb5d4512ca88e61f22a9cea9f30febaa4c98c68ff0dc21", - "zh:c4a3e329ba786ffb6f2b694e1fd41d413a7010f3a53c20b432325a94fa71e839", - "zh:e2699bc9116447f96c53d55f2a00570f982e6f9935038c3810603572693712d0", - "zh:e747c0fd5d7684e5bfad8aa0ca441903f15ae7a98a737ff6aca24ba223207e2c", - "zh:f1ca75f417ce490368f047b63ec09fd003711ae48487fba90b4aba2ccf71920e", + "zh:a357ab512e5ebc6d1fda1382503109766e21bbfdfaa9ccda43d313c122069b30", + "zh:c51bfb15e7d52cc1a2eaec2a903ac2aff15d162c172b1b4c17675190e8147615", + "zh:e0951ee6fa9df90433728b96381fb867e3db98f66f735e0c3e24f8f16903f0ad", + "zh:e3cdcb4e73740621dabd82ee6a37d6cfce7fee2a03d8074df65086760f5cf556", + "zh:eff58323099f1bd9a0bec7cb04f717e7f1b2774c7d612bf7581797e1622613a0", ] } provider "registry.terraform.io/hashicorp/time" { - version = "0.9.2" - constraints = "~> 0.9.0" + version = "0.12.1" + constraints = "~> 0.12.1" hashes = [ - "h1:M93amXwO9KelOaPiyXGak1aiIyf6pYo+FDr6pigIb6M=", - "zh:140ca678c8f2e0c73fcbda470531db01ca5d3b22cf6ddcc96e65fc28d179d81e", - "zh:1a85697ab9995e7a5af34d6f971939e748486c1818ce8c7f98e27b47a45db43b", - "zh:3cbe245e318fa6ae905367ffe4980a1dbcd8bde630c4911f34ac297e6f8080cb", - "zh:3eb83fd3857ebdc1e40c0dc6dcc5c161c122560765115b31360a0722158d9b8b", - "zh:4d7611ddc90c7fc458a8255c1ad87286512a497f6c842786cda1b93f18ca463e", + "h1:JzYsPugN8Fb7C4NlfLoFu7BBPuRVT2/fCOdCaxshveI=", + "zh:090023137df8effe8804e81c65f636dadf8f9d35b79c3afff282d39367ba44b2", + "zh:26f1e458358ba55f6558613f1427dcfa6ae2be5119b722d0b3adb27cd001efea", + "zh:272ccc73a03384b72b964918c7afeb22c2e6be22460d92b150aaf28f29a7d511", + "zh:438b8c74f5ed62fe921bd1078abe628a6675e44912933100ea4fa26863e340e9", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:7e8d3fd420d9b41a95f95a023c830f9e53feee54d47d640679b3b5bfbb757422", - "zh:90e63a84dda94619199f541e48388e8d1306fc9857b10c75dfee901ec9e4d94b", - "zh:cc52109be89301a1309d21704599ecd70e50c339087f7577da865588655f240d", - "zh:d5ee0e0abbfe75a9f33ada420b8bb8f4a3a0f97ebc25c1e55aa80a9c12f70519", - "zh:e15abaa2dc6751918802dc283e7348d0c99944fcf581a96e481a5afc3c13ebae", - "zh:f5c6b98cb1b40728150415b2b8a1e8075d5704c5cf6fc0b95b6b2dbaf560427a", + "zh:85c8bd8eefc4afc33445de2ee7fbf33a7807bc34eb3734b8eefa4e98e4cddf38", + "zh:98bbe309c9ff5b2352de6a047e0ec6c7e3764b4ed3dfd370839c4be2fbfff869", + "zh:9c7bf8c56da1b124e0e2f3210a1915e778bab2be924481af684695b52672891e", + "zh:d2200f7f6ab8ecb8373cda796b864ad4867f5c255cff9d3b032f666e4c78f625", + "zh:d8c7926feaddfdc08d5ebb41b03445166df8c125417b28d64712dccd9feef136", + "zh:e2412a192fc340c61b373d6c20c9d805d7d3dee6c720c34db23c2a8ff0abd71b", + "zh:e6ac6bba391afe728a099df344dbd6481425b06d61697522017b8f7a59957d44", ] } provider "registry.terraform.io/integrations/github" { - version = "5.24.0" - constraints = "~> 5.24.0" + version = "6.3.0" + constraints = "~> 6.3.0" hashes = [ - "h1:hzDve3dXttwoWSxyODTF2m7TKuXJRjJPFvldkO51UKc=", - "h1:lSIRHgnQhJjy19dhUjp86F68CMyME7IQXSDrzCuyLvM=", - "zh:01c544600c48a7ba5822c8ddf717eeb580360c3b033268bf905c5489fb4bb337", - "zh:14f6ceae2234d75a539df7ce3223b77eddce48f848ffbffd87b5a81027afadf8", - "zh:18effbc9957a804a439ad742c3475510ab8349548255e6f5096160154aac23dc", - "zh:1f75ce3ff800d61d148f3a95d802ecf45f9386d6e2ebfe58c224914377a95741", - "zh:2a333220d04ab2e3278a252cea84ca34f7e84b7362bb285673a4d132c037b238", - "zh:4fb2a338d84d656ba890469246973faaa70b6c559c61f12c19f50fe99b7749f7", - "zh:5b2bb8281e2237e2b682833ac1d19f002ac9a4c036ff32c3ba0c8e62fe3e4292", - "zh:7748493f26f1a99df13c7e3ba8d82d9cf200c168314ce3467c32214180118df2", - "zh:91ebc65f4236c5810a70718751381e2909a68e573e264a36369658b95477e542", - "zh:d1d476f935b95ecafa8b6579eaeabe44964f14ac16a9e1b58fe28797a4d10d2b", - "zh:d38045d07fccd87a64fe480e750d1e004ff6ae8aedb89fd3310ba13e9b5ee6bf", - "zh:d46edbdaf3f5b5e34c831bf7a4ad11c267ec4d079ca9f907d8f97f33073a40eb", - "zh:eda90ef78f94728d3ce81e8b479cbf23fc247b5764b496d32c54d249ca537270", - "zh:f7d551125d7fa99572960877e2f3edc796dc3b04c9024e5c7e7ed5a764a8d4d8", + "h1:AG//wDT67eInhTk+SQdDz5o8R8YIIBrZGz7C9TXKDOw=", + "zh:04fe3b820fe8c247b98b9d6810b8bb84d3e8ac08054faf450c42489815ef4bfa", + "zh:24096b2d16208d1411a58bdb8df8cd9f0558fb9054ffeb95c4e7e90a9a34f976", + "zh:2b27332adf8d08fbdc08b5f55e87691bce02c311219e6deb39c08753bd93db6d", + "zh:335dd6c2d50fcdce2ef0cc194465fdf9df1f5fdecc805804c78df30a4eb2e11e", + "zh:383a6879565969dbdf5405b651cd870c09c615dbd3df2554e5574d39d161c98c", + "zh:4903038a6bc605f372e1569695db4a2e2862e1fc6cf4faf9e13c5f8f4fa2ed94", + "zh:4cc4dffbee8b28102d38abe855b7440d4f4226261b43fda2ec289b48c3de1537", + "zh:57c30c6fe0b64fa86906700ceb1691562b62f2b1ef0404952aeb4092acb6acb3", + "zh:7bf518396fb00e4f55c406f2ffb5583b43278682a92f0864a0c47e3a74627bbb", + "zh:93c2c5cb90f74ad3c0874b7f7d8a866f28a852f0eda736c6aef8ce65d4061f4d", + "zh:9562a82a6193a2db110fb34d1aceeedb27c0a640058dce9c31b37b17eeb5f4e7", + "zh:ac97f2d111703a219f27fcbf5e89460ea98f9168badcc0913c8b214a37f76814", + "zh:c882af4d33b761ec198cedac212ab1c114d97540119dc97daca38021ab3edd0a", + "zh:c9ffd0a37f07a93af02a1caa90bfbea27a952d3e5badf4aab866ec71cdb184a3", + "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", ] } diff --git a/infrastructure/server/environments/production/main.tf b/infrastructure/server/environments/production/main.tf index 624aa161..d04ec721 100644 --- a/infrastructure/server/environments/production/main.tf +++ b/infrastructure/server/environments/production/main.tf @@ -2,15 +2,15 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 3.85.0" + version = "~> 4.4.0" } github = { source = "integrations/github" - version = "~> 5.24.0" + version = "~> 6.3.0" } time = { source = "hashicorp/time" - version = "~> 0.9.0" + version = "~> 0.12.1" } } backend "azurerm" { diff --git a/infrastructure/shared_resources/.terraform.lock.hcl b/infrastructure/shared_resources/.terraform.lock.hcl index b061a63b..f6c0f0f8 100644 --- a/infrastructure/shared_resources/.terraform.lock.hcl +++ b/infrastructure/shared_resources/.terraform.lock.hcl @@ -2,106 +2,103 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/azuread" { - version = "2.45.0" - constraints = "~> 2.45.0" + version = "3.0.2" + constraints = "~> 3.0.2" hashes = [ - "h1:/uvs5iEiakqbl4PEGzNob8Rqbnw7YaeXfjnTMfJJK2w=", - "zh:08d80f6ab1d8bcb02976a5fde0b108fc008093a7a6f1b5d083d5cf1e01dc0b86", + "h1:yQqvUtgtrYKGpIygdM8P6N+pvMWJJWIsVdPow29VE20=", + "zh:16e724b80a9004c7978c30f69a73c98ff63eb8a03937dd44c2a8f0ea0438b7a3", "zh:1c3e89cf19118fc07d7b04257251fc9897e722c16e0a0df7b07fcd261f8c12e7", - "zh:2571a343d8e1af699c1e1d815a5654ad98665427c6f3912b41557ff775a73c75", - "zh:2a20afb34eaca73c2206250abbb40997498a1a9aca34e8d6524370fbf6278f82", - "zh:3044cb26396399f0082ee06a8f788c6260ab12e752f64c0d7921e7d4e39c14b8", - "zh:311fcfdee359129748caaae5b204113a3e3b7e1fc00704c21300461114eb2075", - "zh:a3af689267be6f7ebfd9726aa2bfd4faabb9efbcab9da24949ae5fec87d18d23", - "zh:adbe97fd77ef94c5f1fc8b10e7dc87048035dc39ff7ea81042350fc311034850", - "zh:c6ce4f348596515d1748c047b51462cb40802b57316b13f8fb4760ef1c5e775c", - "zh:d0b8854b5097ffd6f6d6a14544f74745b23ba949472351e585c57402f5ca28ae", - "zh:ebdf01510f10e468aaa6c8f5fd9fc50b7232acbbe5fcbc50e8bea2de5d964d3e", - "zh:f3a55da36dcfd0bf34f785ce3c47dbe8538408c1aaf729604a6ef841fc8ce6f4", + "zh:2bbbf13713ca4767267b889471c9fc14a56a8fdf5d1013da3ca78667e3caec64", + "zh:409ccb05431d643a079da082d89db2d95d6afed4769997ac537c8b7de3bff867", + "zh:53e4bca0f5d015380f7f524f36344afe6211ccaf614bfc69af73ca64a9f47d6c", + "zh:5780be2c1981d090604d7fa4cef675462f17f40e7f3dc501a031488e87a35b8f", + "zh:850e61a1b3e64c752c418526ccf48653514c861b36f5feb631619f906f7e99a0", + "zh:8c3565bfcea006a734149cc080452a9daf7d2a9d5362eb7e0a088b6c0d7f0f03", + "zh:908b9e6ad49d5d21173ecefc7924902047611be93bbf8e7d021aa9563358396f", + "zh:a2a79765c029bc58966eff61cb6e9b0ee14d2ac52b0a22fc7dfa35c9a49af669", + "zh:c7f56cbe8743e9ba81fce871bc97d9c07abe86770d9ee7ffefbf3882a61ba89a", + "zh:d4dba80e33421b30d81c62611fb7fc62ad39afecc6484436e635913cd8553e67", ] } provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.60.0" - constraints = "~> 3.60.0" + version = "4.4.0" + constraints = "~> 4.4.0" hashes = [ - "h1:Mlg5trMUHikAaWEBj0vTEjvhKHy3yKPxYOt8cSB/H9A=", - "h1:PSnlROxXF/xClkInoi5vLHOvkiIfDM9XgfqwRTs5ixU=", - "zh:0ee99a2a59b8ec8db077ccbed88739e2c84e5c1dceae166171602e2001e08128", - "zh:194636208067e5c24d077aa74e1405a757e70dff35a7618d768a748710be1eba", - "zh:1a69482589e31834b38226762263bd0b8fc9f86b16403705d2e4d161e6f209e6", - "zh:23fa6b45f2bb19c3218c1b47528e538456444c86b3bb542df02a4ba3b788e662", - "zh:715b62b26ee81b07845613e32dc72899c694af91cbc1756b32783cab89836ffe", - "zh:8bc1f72454e465c7ac8aaa87bf09dcb5c560fc8d2d976cb11b7f206ff4f2e0d0", - "zh:8d4be7c813f3859b78caefcd11e88e9631155986b846bab94a98eadbc25d817e", - "zh:aaf63f83ae41f4a3cb6f18d2d5fc403fa2047d5ad74ee2c4aa24db91a3ef851c", - "zh:cb444a37d09683340d38629bfb33c925865eebe2ff1ca3f1d0ae470f6a82ab6b", - "zh:ed2dae0151e1591799061711e9b63fee283f3e6f47829b2521baab5e04ab5b5e", - "zh:f05e8e85a8f61ed1a7d3929fce1a529a9a2aebb2d59704994d4c9e80626aef5d", + "h1:M9kwRlP7zg89AVw7e/5ddhUZ+4FesIUkKJVwD5D0d1M=", + "zh:04890898b58f2c25c8a1e17fec67c442ef2476dfc119642d001741f6d2e8bc42", + "zh:0b99e793c5d56529df51de06ed53599a5c2715cfa09bf4ed59997ed7dbf8b6bc", + "zh:11c3cf86dcf07077f8f3b040afa69205609b1333204cec2ee8779df1223aa4cd", + "zh:12dbc644830aa9e04a332882269ace24f7365e53d0a32a9d193442e61b22bb5a", + "zh:2656f4742245d51a07ae0c7221c5de33b027fce99fe1c37295c9d67d6107db27", + "zh:48bd6c8f32d7849e291ff47e5790f26046a3bc35b9f10219425784804b86f1ab", + "zh:55334716561e630462a719318a172c047ca51c1ebc0d5fa878a0ee2446d7beb9", + "zh:656c7aa2f4b39aa6e8d7d2ae5afb77fae07b795fa7f1b212eaccea90ef71ebbe", + "zh:777c0e7280d9202e7cc5c580bfb538ae34e644777111e05b9553b5e3c1e8f397", + "zh:81fc7b48b8cb87eb27f70da457d3df8eb4a067f9e4d36cf947a2eeca0b7f96f1", + "zh:98e3bfca410207f61c7eb89e670c18b24d77cad82dd104af8d7a68885e2586cb", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } provider "registry.terraform.io/hashicorp/random" { - version = "3.5.1" + version = "3.6.3" hashes = [ - "h1:IL9mSatmwov+e0+++YX2V6uel+dV6bn+fC/cnGDK3Ck=", - "h1:sZ7MTSD4FLekNN2wSNFGpM+5slfvpm5A/NLVZiB7CO0=", - "zh:04e3fbd610cb52c1017d282531364b9c53ef72b6bc533acb2a90671957324a64", - "zh:119197103301ebaf7efb91df8f0b6e0dd31e6ff943d231af35ee1831c599188d", - "zh:4d2b219d09abf3b1bb4df93d399ed156cadd61f44ad3baf5cf2954df2fba0831", - "zh:6130bdde527587bbe2dcaa7150363e96dbc5250ea20154176d82bc69df5d4ce3", - "zh:6cc326cd4000f724d3086ee05587e7710f032f94fc9af35e96a386a1c6f2214f", + "h1:zG9uFP8l9u+yGZZvi5Te7PV62j50azpgwPunq2vTm1E=", + "zh:04ceb65210251339f07cd4611885d242cd4d0c7306e86dda9785396807c00451", + "zh:448f56199f3e99ff75d5c0afacae867ee795e4dfda6cb5f8e3b2a72ec3583dd8", + "zh:4b4c11ccfba7319e901df2dac836b1ae8f12185e37249e8d870ee10bb87a13fe", + "zh:4fa45c44c0de582c2edb8a2e054f55124520c16a39b2dfc0355929063b6395b1", + "zh:588508280501a06259e023b0695f6a18149a3816d259655c424d068982cbdd36", + "zh:737c4d99a87d2a4d1ac0a54a73d2cb62974ccb2edbd234f333abd079a32ebc9e", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:b6d88e1d28cf2dfa24e9fdcc3efc77adcdc1c3c3b5c7ce503a423efbdd6de57b", - "zh:ba74c592622ecbcef9dc2a4d81ed321c4e44cddf7da799faa324da9bf52a22b2", - "zh:c7c5cde98fe4ef1143bd1b3ec5dc04baf0d4cc3ca2c5c7d40d17c0e9b2076865", - "zh:dac4bad52c940cd0dfc27893507c1e92393846b024c5a9db159a93c534a3da03", - "zh:de8febe2a2acd9ac454b844a4106ed295ae9520ef54dc8ed2faf29f12716b602", - "zh:eab0d0495e7e711cca367f7d4df6e322e6c562fc52151ec931176115b83ed014", + "zh:a357ab512e5ebc6d1fda1382503109766e21bbfdfaa9ccda43d313c122069b30", + "zh:c51bfb15e7d52cc1a2eaec2a903ac2aff15d162c172b1b4c17675190e8147615", + "zh:e0951ee6fa9df90433728b96381fb867e3db98f66f735e0c3e24f8f16903f0ad", + "zh:e3cdcb4e73740621dabd82ee6a37d6cfce7fee2a03d8074df65086760f5cf556", + "zh:eff58323099f1bd9a0bec7cb04f717e7f1b2774c7d612bf7581797e1622613a0", ] } provider "registry.terraform.io/hashicorp/time" { - version = "0.9.1" - constraints = "~> 0.9.0" + version = "0.12.1" + constraints = "~> 0.12.1" hashes = [ - "h1:UHcDnIYFZ00uoou0TwPGMwOrE8gTkoRephIvdwDAK70=", - "h1:VxyoYYOCaJGDmLz4TruZQTSfQhvwEcMxvcKclWdnpbs=", - "zh:00a1476ecf18c735cc08e27bfa835c33f8ac8fa6fa746b01cd3bcbad8ca84f7f", - "zh:3007f8fc4a4f8614c43e8ef1d4b0c773a5de1dcac50e701d8abc9fdc8fcb6bf5", - "zh:5f79d0730fdec8cb148b277de3f00485eff3e9cf1ff47fb715b1c969e5bbd9d4", + "h1:JzYsPugN8Fb7C4NlfLoFu7BBPuRVT2/fCOdCaxshveI=", + "zh:090023137df8effe8804e81c65f636dadf8f9d35b79c3afff282d39367ba44b2", + "zh:26f1e458358ba55f6558613f1427dcfa6ae2be5119b722d0b3adb27cd001efea", + "zh:272ccc73a03384b72b964918c7afeb22c2e6be22460d92b150aaf28f29a7d511", + "zh:438b8c74f5ed62fe921bd1078abe628a6675e44912933100ea4fa26863e340e9", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:8c8094689a2bed4bb597d24a418bbbf846e15507f08be447d0a5acea67c2265a", - "zh:a6d9206e95d5681229429b406bc7a9ba4b2d9b67470bda7df88fa161508ace57", - "zh:aa299ec058f23ebe68976c7581017de50da6204883950de228ed9246f309e7f1", - "zh:b129f00f45fba1991db0aa954a6ba48d90f64a738629119bfb8e9a844b66e80b", - "zh:ef6cecf5f50cda971c1b215847938ced4cb4a30a18095509c068643b14030b00", - "zh:f1f46a4f6c65886d2dd27b66d92632232adc64f92145bf8403fe64d5ffa5caea", - "zh:f79d6155cda7d559c60d74883a24879a01c4d5f6fd7e8d1e3250f3cd215fb904", - "zh:fd59fa73074805c3575f08cd627eef7acda14ab6dac2c135a66e7a38d262201c", + "zh:85c8bd8eefc4afc33445de2ee7fbf33a7807bc34eb3734b8eefa4e98e4cddf38", + "zh:98bbe309c9ff5b2352de6a047e0ec6c7e3764b4ed3dfd370839c4be2fbfff869", + "zh:9c7bf8c56da1b124e0e2f3210a1915e778bab2be924481af684695b52672891e", + "zh:d2200f7f6ab8ecb8373cda796b864ad4867f5c255cff9d3b032f666e4c78f625", + "zh:d8c7926feaddfdc08d5ebb41b03445166df8c125417b28d64712dccd9feef136", + "zh:e2412a192fc340c61b373d6c20c9d805d7d3dee6c720c34db23c2a8ff0abd71b", + "zh:e6ac6bba391afe728a099df344dbd6481425b06d61697522017b8f7a59957d44", ] } provider "registry.terraform.io/integrations/github" { - version = "5.26.0" - constraints = "~> 5.26.0" + version = "6.3.0" + constraints = "~> 6.3.0" hashes = [ - "h1:67ff42LPoQR56CovBPWqChNa6o8offxInvJo8gO7/is=", - "h1:LTSeUuYyaR/Y85nbCTrBa62jTJWC3bCQ6MLzGU1aQGw=", - "zh:09236b5396ec086b3d6c06cfe4160185ef0364d2f99deea00576d3ad5864db49", - "zh:1335b570cc3ddade75bac3fe691f26d159b5d2cfc1a96a23bdef6a6dbf86b090", - "zh:157659e5f0d43109d0ac523c3e3abdd35463fef089dab72ecb291314a26e7731", - "zh:235aab664e2633ad597a0add45547591bc265610b80c554903b76f6094b5ffc9", - "zh:4a40582adf31bacddd37ed24d6224adc859bdddf9d8b9800a3da33897d23fe40", - "zh:4b0ae10366e57e40221a83135d5a918d8e0bc99fcc94ee4ceb045257ac8e5871", - "zh:5b7046eb963572ac7f2c1e2f3fb831645206c931c94fa465e24975c5f6c2441a", - "zh:5f362404ecbbde9fd087e0fdf766a619319b666dd4118116b946fd32b11bb62c", - "zh:75ffafe88fa3ae1117c57aca8237ca44ef871956484b7924d0114907a2303e15", - "zh:99ae45c65008d545f79cdecd18c17fc2a58e6f392691afd7ce9cbdda2cd63622", - "zh:bd1ac24942aba812866f1240bf5a0c2ec075dae7c564146bcbf29bac4eaaf4d1", - "zh:d5ccd9e2dc2ef2d13ffd884343b7a3972ee5ba3986f72d65c577c32fc460af34", - "zh:ef87cd75e01df472a44922a8a4ff03d7d759fa5d2aebe61f9b2f05c796734d1b", - "zh:ff3d11577c594d244015d5a708b7cb2c91058c3ad075c3e78c6f8b9fb07e8244", + "h1:AG//wDT67eInhTk+SQdDz5o8R8YIIBrZGz7C9TXKDOw=", + "zh:04fe3b820fe8c247b98b9d6810b8bb84d3e8ac08054faf450c42489815ef4bfa", + "zh:24096b2d16208d1411a58bdb8df8cd9f0558fb9054ffeb95c4e7e90a9a34f976", + "zh:2b27332adf8d08fbdc08b5f55e87691bce02c311219e6deb39c08753bd93db6d", + "zh:335dd6c2d50fcdce2ef0cc194465fdf9df1f5fdecc805804c78df30a4eb2e11e", + "zh:383a6879565969dbdf5405b651cd870c09c615dbd3df2554e5574d39d161c98c", + "zh:4903038a6bc605f372e1569695db4a2e2862e1fc6cf4faf9e13c5f8f4fa2ed94", + "zh:4cc4dffbee8b28102d38abe855b7440d4f4226261b43fda2ec289b48c3de1537", + "zh:57c30c6fe0b64fa86906700ceb1691562b62f2b1ef0404952aeb4092acb6acb3", + "zh:7bf518396fb00e4f55c406f2ffb5583b43278682a92f0864a0c47e3a74627bbb", + "zh:93c2c5cb90f74ad3c0874b7f7d8a866f28a852f0eda736c6aef8ce65d4061f4d", + "zh:9562a82a6193a2db110fb34d1aceeedb27c0a640058dce9c31b37b17eeb5f4e7", + "zh:ac97f2d111703a219f27fcbf5e89460ea98f9168badcc0913c8b214a37f76814", + "zh:c882af4d33b761ec198cedac212ab1c114d97540119dc97daca38021ab3edd0a", + "zh:c9ffd0a37f07a93af02a1caa90bfbea27a952d3e5badf4aab866ec71cdb184a3", + "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", ] } diff --git a/infrastructure/shared_resources/main.tf b/infrastructure/shared_resources/main.tf index ab645068..fd6c5ece 100644 --- a/infrastructure/shared_resources/main.tf +++ b/infrastructure/shared_resources/main.tf @@ -2,19 +2,19 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 3.60.0" + version = "~> 4.4.0" } azuread = { source = "hashicorp/azuread" - version = "~> 2.45.0" + version = "~> 3.0.2" } github = { source = "integrations/github" - version = "~> 5.26.0" + version = "~> 6.3.0" } time = { source = "hashicorp/time" - version = "~> 0.9.0" + version = "~> 0.12.1" } } backend "azurerm" {