From 25d3613b2d0c40b39cd0b285e11517bedd68eeb5 Mon Sep 17 00:00:00 2001 From: Damien Duportal Date: Sun, 29 Sep 2024 13:40:34 +0200 Subject: [PATCH] chore(terraform) fix deprecation with provider 3.x Signed-off-by: Damien Duportal --- .shared-tools | 2 +- cert.ci.jenkins.io.tf | 2 +- ci.jenkins.io.tf | 2 +- infra.ci.jenkins.io.tf | 12 ++++++------ packer-resources.tf | 4 ++-- publick8s.tf | 2 +- test.ci.jenkins.io.tf | 4 ++-- trusted.ci.jenkins.io.tf | 10 +++++----- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.shared-tools b/.shared-tools index 84dffd0b..66546b9f 160000 --- a/.shared-tools +++ b/.shared-tools @@ -1 +1 @@ -Subproject commit 84dffd0bb745cec165ea65ed7612b427f19f7316 +Subproject commit 66546b9f40fb06587df23222b498943808b66ddb diff --git a/cert.ci.jenkins.io.tf b/cert.ci.jenkins.io.tf index 057eac19..cf1f2636 100644 --- a/cert.ci.jenkins.io.tf +++ b/cert.ci.jenkins.io.tf @@ -25,7 +25,7 @@ module "cert_ci_jenkins_io" { } controller_service_principal_ids = [ - data.azuread_service_principal.terraform_production.id, + data.azuread_service_principal.terraform_production.object_id, ] controller_service_principal_end_date = "2024-11-06T00:00:00Z" controller_packer_rg_ids = [ diff --git a/ci.jenkins.io.tf b/ci.jenkins.io.tf index aa26f17f..940ed0bc 100644 --- a/ci.jenkins.io.tf +++ b/ci.jenkins.io.tf @@ -29,7 +29,7 @@ module "ci_jenkins_io_sponsorship" { privatevpn_subnet = data.azurerm_subnet.private_vnet_data_tier.address_prefixes } controller_service_principal_ids = [ - data.azuread_service_principal.terraform_production.id, + data.azuread_service_principal.terraform_production.object_id, ] controller_service_principal_end_date = "2024-10-19T00:00:00Z" controller_packer_rg_ids = [ diff --git a/infra.ci.jenkins.io.tf b/infra.ci.jenkins.io.tf index 17356fcd..df63da59 100644 --- a/infra.ci.jenkins.io.tf +++ b/infra.ci.jenkins.io.tf @@ -19,7 +19,7 @@ resource "azurerm_storage_account" "infra_ci_jenkins_io_agents" { resource "azuread_application" "infra_ci_jenkins_io" { display_name = "infra.ci.jenkins.io" owners = [ - data.azuread_service_principal.terraform_production.id, + data.azuread_service_principal.terraform_production.object_id, ] tags = [for key, value in local.default_tags : "${key}:${value}"] required_resource_access { @@ -38,7 +38,7 @@ resource "azuread_service_principal" "infra_ci_jenkins_io" { client_id = azuread_application.infra_ci_jenkins_io.client_id app_role_assignment_required = false owners = [ - data.azuread_service_principal.terraform_production.id, + data.azuread_service_principal.terraform_production.object_id, ] } resource "azuread_application_password" "infra_ci_jenkins_io" { @@ -73,7 +73,7 @@ module "infraci_contributorsjenkinsio_fileshare_serviceprincipal_writer" { source = "./.shared-tools/terraform/modules/azure-jenkinsinfra-fileshare-serviceprincipal-writer" service_fqdn = "infra-ci-jenkins-io-fileshare_serviceprincipal_writer" - active_directory_owners = [data.azuread_service_principal.terraform_production.id] + active_directory_owners = [data.azuread_service_principal.terraform_production.object_id] active_directory_url = "https://github.com/jenkins-infra/azure" service_principal_end_date = local.end_dates.infra_ci_jenkins_io.infraci_contributorsjenkinsio_fileshare_serviceprincipal_writer.end_date file_share_resource_manager_id = azurerm_storage_share.contributors_jenkins_io.resource_manager_id @@ -93,7 +93,7 @@ module "infraci_docsjenkinsio_fileshare_serviceprincipal_writer" { source = "./.shared-tools/terraform/modules/azure-jenkinsinfra-fileshare-serviceprincipal-writer" service_fqdn = "infra-ci-jenkins-io-fileshare_serviceprincipal_writer" - active_directory_owners = [data.azuread_service_principal.terraform_production.id] + active_directory_owners = [data.azuread_service_principal.terraform_production.object_id] active_directory_url = "https://github.com/jenkins-infra/azure" service_principal_end_date = local.end_dates.infra_ci_jenkins_io.infraci_docsjenkinsio_fileshare_serviceprincipal_writer.end_date file_share_resource_manager_id = azurerm_storage_share.docs_jenkins_io.resource_manager_id @@ -113,7 +113,7 @@ module "infraci_statsjenkinsio_fileshare_serviceprincipal_writer" { source = "./.shared-tools/terraform/modules/azure-jenkinsinfra-fileshare-serviceprincipal-writer" service_fqdn = "infra-ci-jenkins-io-fileshare_serviceprincipal_writer" - active_directory_owners = [data.azuread_service_principal.terraform_production.id] + active_directory_owners = [data.azuread_service_principal.terraform_production.object_id] active_directory_url = "https://github.com/jenkins-infra/azure" service_principal_end_date = local.end_dates.infra_ci_jenkins_io.infraci_statsjenkinsio_fileshare_serviceprincipal_writer.end_date file_share_resource_manager_id = azurerm_storage_share.stats_jenkins_io.resource_manager_id @@ -233,7 +233,7 @@ module "infraci_pluginsjenkinsio_fileshare_serviceprincipal_writer" { source = "./.shared-tools/terraform/modules/azure-jenkinsinfra-fileshare-serviceprincipal-writer" service_fqdn = "infraci-pluginsjenkinsio-fileshare_serviceprincipal_writer" - active_directory_owners = [data.azuread_service_principal.terraform_production.id] + active_directory_owners = [data.azuread_service_principal.terraform_production.object_id] active_directory_url = "https://github.com/jenkins-infra/azure" service_principal_end_date = local.end_dates.infra_ci_jenkins_io.infraci_pluginsjenkinsio_fileshare_serviceprincipal_writer.end_date file_share_resource_manager_id = azurerm_storage_share.plugins_jenkins_io.resource_manager_id diff --git a/packer-resources.tf b/packer-resources.tf index 1a3a3684..5671dec2 100644 --- a/packer-resources.tf +++ b/packer-resources.tf @@ -3,7 +3,7 @@ resource "azuread_application" "packer" { display_name = "packer" owners = [ - data.azuread_service_principal.terraform_production.id, # terraform-production Service Principal, used by the CI system + data.azuread_service_principal.terraform_production.object_id, # terraform-production Service Principal, used by the CI system ] tags = [for key, value in local.default_tags : "${key}:${value}"] required_resource_access { @@ -24,7 +24,7 @@ resource "azuread_service_principal" "packer" { client_id = azuread_application.packer.client_id app_role_assignment_required = false owners = [ - data.azuread_service_principal.terraform_production.id, # terraform-production Service Principal, used by the CI system + data.azuread_service_principal.terraform_production.object_id, # terraform-production Service Principal, used by the CI system ] } diff --git a/publick8s.tf b/publick8s.tf index 7df40a10..31fac3d5 100644 --- a/publick8s.tf +++ b/publick8s.tf @@ -357,7 +357,7 @@ module "cronjob_geoip_data_fileshare_serviceprincipal_writer" { source = "./.shared-tools/terraform/modules/azure-jenkinsinfra-fileshare-serviceprincipal-writer" service_fqdn = "${azurerm_resource_group.publick8s.name}-fileshare_serviceprincipal_writer-redirects" - active_directory_owners = [data.azuread_service_principal.terraform_production.id] + active_directory_owners = [data.azuread_service_principal.terraform_production.object_id] active_directory_url = "https://github.com/jenkins-infra/azure" service_principal_end_date = "2024-12-23T00:00:00Z" file_share_resource_manager_id = azurerm_storage_share.geoip_data.resource_manager_id diff --git a/test.ci.jenkins.io.tf b/test.ci.jenkins.io.tf index 0cab16cc..d3230967 100644 --- a/test.ci.jenkins.io.tf +++ b/test.ci.jenkins.io.tf @@ -31,7 +31,7 @@ data "azurerm_subnet" "test_azurevm_agents_agents_sponsorship" { #################################################################################### resource "azuread_application" "test_azurevm_agents_sponsorship" { display_name = "test.jay.onboarding" - owners = [data.azuread_service_principal.terraform_production.id] + owners = [data.azuread_service_principal.terraform_production.object_id] tags = [for key, value in local.default_tags : "${key}:${value}"] required_resource_access { resource_app_id = "00000003-0000-0000-c000-000000000000" # Microsoft Graph @@ -48,7 +48,7 @@ resource "azuread_application" "test_azurevm_agents_sponsorship" { resource "azuread_service_principal" "test_azurevm_agents_sponsorship" { client_id = azuread_application.test_azurevm_agents_sponsorship.client_id app_role_assignment_required = false - owners = [data.azuread_service_principal.terraform_production.id] + owners = [data.azuread_service_principal.terraform_production.object_id] } resource "azuread_application_password" "test_azurevm_agents_sponsorship" { application_id = azuread_application.test_azurevm_agents_sponsorship.id diff --git a/trusted.ci.jenkins.io.tf b/trusted.ci.jenkins.io.tf index 66bf7f83..6bc5eae8 100644 --- a/trusted.ci.jenkins.io.tf +++ b/trusted.ci.jenkins.io.tf @@ -41,7 +41,7 @@ module "trusted_ci_jenkins_io" { } controller_service_principal_ids = [ - data.azuread_service_principal.terraform_production.id, + data.azuread_service_principal.terraform_production.object_id, ] controller_service_principal_end_date = "2024-11-20T00:00:00Z" controller_packer_rg_ids = [ @@ -78,7 +78,7 @@ module "trustedci_updatesjenkinsio_content_fileshare_serviceprincipal_writer" { source = "./.shared-tools/terraform/modules/azure-jenkinsinfra-fileshare-serviceprincipal-writer" service_fqdn = "${module.trusted_ci_jenkins_io.service_fqdn}-fileshare_serviceprincipal_writer" - active_directory_owners = [data.azuread_service_principal.terraform_production.id] + active_directory_owners = [data.azuread_service_principal.terraform_production.object_id] active_directory_url = "https://github.com/jenkins-infra/azure" service_principal_end_date = "2024-12-18T00:00:00Z" file_share_resource_manager_id = azurerm_storage_share.updates_jenkins_io_content.resource_manager_id @@ -90,7 +90,7 @@ module "trustedci_updatesjenkinsio_redirects_fileshare_serviceprincipal_writer" source = "./.shared-tools/terraform/modules/azure-jenkinsinfra-fileshare-serviceprincipal-writer" service_fqdn = "${module.trusted_ci_jenkins_io.service_fqdn}-fileshare_serviceprincipal_writer-redirects" - active_directory_owners = [data.azuread_service_principal.terraform_production.id] + active_directory_owners = [data.azuread_service_principal.terraform_production.object_id] active_directory_url = "https://github.com/jenkins-infra/azure" service_principal_end_date = "2024-12-18T00:00:00Z" file_share_resource_manager_id = azurerm_storage_share.updates_jenkins_io_redirects.resource_manager_id @@ -103,7 +103,7 @@ module "trustedci_jenkinsio_fileshare_serviceprincipal_writer" { source = "./.shared-tools/terraform/modules/azure-jenkinsinfra-fileshare-serviceprincipal-writer" service_fqdn = "trustedci-jenkinsio-fileshare_serviceprincipal_writer" - active_directory_owners = [data.azuread_service_principal.terraform_production.id] + active_directory_owners = [data.azuread_service_principal.terraform_production.object_id] active_directory_url = "https://github.com/jenkins-infra/azure" service_principal_end_date = "2024-10-16T00:00:00Z" file_share_resource_manager_id = azurerm_storage_share.jenkins_io.resource_manager_id @@ -116,7 +116,7 @@ module "trustedci_javadocjenkinsio_fileshare_serviceprincipal_writer" { source = "./.shared-tools/terraform/modules/azure-jenkinsinfra-fileshare-serviceprincipal-writer" service_fqdn = "trustedci-javadocjenkinsio-fileshare_serviceprincipal_writer" - active_directory_owners = [data.azuread_service_principal.terraform_production.id] + active_directory_owners = [data.azuread_service_principal.terraform_production.object_id] active_directory_url = "https://github.com/jenkins-infra/azure" service_principal_end_date = "2024-10-16T00:00:00Z" file_share_resource_manager_id = azurerm_storage_share.javadoc_jenkins_io.resource_manager_id