Skip to content

Commit

Permalink
fix: Change deprecated application_id attribute to client_id
Browse files Browse the repository at this point in the history
  • Loading branch information
janvanicek committed Sep 26, 2024
1 parent 2f117f6 commit 15d0ec6
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions provisioning/ci/azure.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ resource "azuread_application" "job_runner" {
}

resource "azuread_service_principal" "job_runner" {
application_id = azuread_application.job_runner.application_id
owners = [data.azuread_client_config.current.object_id]
client_id = azuread_application.job_runner.client_id
owners = [data.azuread_client_config.current.object_id]
}

resource "azuread_service_principal_password" "job_runner" {
Expand All @@ -47,8 +47,8 @@ output "az_tenant_id" {
value = local.az_tenant_id
}

output "az_application_id" {
value = azuread_application.job_runner.application_id
output "az_client_id" {
value = azuread_application.job_runner.client_id
}

output "az_application_secret" {
Expand Down
2 changes: 1 addition & 1 deletion provisioning/ci/env-scripts/extract-variables-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ echo ''

output_var 'AZURE_KEY_VAULT_URL' $(terraform_output 'az_key_vault_url')
output_var 'TEST_AZURE_TENANT_ID' $(terraform_output 'az_tenant_id')
output_var 'TEST_AZURE_CLIENT_ID' $(terraform_output 'az_application_id')
output_var 'TEST_AZURE_CLIENT_ID' $(terraform_output 'az_client_id')
output_var 'TEST_AZURE_CLIENT_SECRET' $(terraform_output 'az_application_secret')
echo ''

Expand Down
8 changes: 4 additions & 4 deletions provisioning/local/azure.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ resource "azuread_application" "job_runner" {
}

resource "azuread_service_principal" "job_runner" {
application_id = azuread_application.job_runner.application_id
owners = [data.azuread_client_config.current.object_id]
client_id = azuread_application.job_runner.client_id
owners = [data.azuread_client_config.current.object_id]
}

resource "azuread_service_principal_password" "job_runner" {
Expand All @@ -47,8 +47,8 @@ output "az_tenant_id" {
value = local.az_tenant_id
}

output "az_application_id" {
value = azuread_application.job_runner.application_id
output "az_client_id" {
value = azuread_application.job_runner.client_id
}

output "az_application_secret" {
Expand Down
2 changes: 1 addition & 1 deletion provisioning/local/env-scripts/extract-variables-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ echo ''

output_var 'AZURE_KEY_VAULT_URL' $(terraform_output 'az_key_vault_url')
output_var 'TEST_AZURE_TENANT_ID' $(terraform_output 'az_tenant_id')
output_var 'TEST_AZURE_CLIENT_ID' $(terraform_output 'az_application_id')
output_var 'TEST_AZURE_CLIENT_ID' $(terraform_output 'az_client_id')
output_var 'TEST_AZURE_CLIENT_SECRET' $(terraform_output 'az_application_secret')
echo ''

Expand Down

0 comments on commit 15d0ec6

Please sign in to comment.