Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

correct service principal ID attribute from object_id to id for proper resource referencing #6

Merged
merged 8 commits into from
Nov 11, 2024
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.4 |
| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | >= 2.47.0 |
| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | >= 3.0.2 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >= 3.107.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_azuread"></a> [azuread](#provider\_azuread) | >= 2.47.0 |
| <a name="provider_azuread"></a> [azuread](#provider\_azuread) | >= 3.0.2 |
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | >= 3.107.0 |

## Modules
Expand Down
2 changes: 1 addition & 1 deletion cluster_integration.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ resource "azuread_service_principal" "truefoundry_platform_features_service_prin

resource "azuread_service_principal_password" "truefoundry_platform_features_service_principal_password" {
count = var.platform_feature_enabled ? var.feature_cluster_integration_enabled ? 1 : 0 : 0
service_principal_id = azuread_service_principal.truefoundry_platform_features_service_principal[0].object_id
service_principal_id = azuread_service_principal.truefoundry_platform_features_service_principal[0].id
dunefro marked this conversation as resolved.
Show resolved Hide resolved
display_name = local.service_principal_password
end_date = var.cluster_integration_service_principal_password_expiry_end_date
}
Expand Down
13 changes: 6 additions & 7 deletions container.tf
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
resource "azurerm_storage_account" "truefoundry_platform_storage_account" {
count = var.platform_feature_enabled ? var.feature_blob_storage_enabled ? 1 : 0 : 0
name = local.storage_account_name
resource_group_name = var.resource_group_name
location = var.location
account_tier = var.blob_storage_account_account_tier
account_replication_type = var.blob_storage_account_replication_type

count = var.platform_feature_enabled ? var.feature_blob_storage_enabled ? 1 : 0 : 0
name = local.storage_account_name
resource_group_name = var.resource_group_name
location = var.location
account_tier = var.blob_storage_account_account_tier
account_replication_type = var.blob_storage_account_replication_type
enable_https_traffic_only = true
access_tier = "Hot"
min_tls_version = "TLS1_2"
Expand Down
2 changes: 1 addition & 1 deletion versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
}
azuread = {
source = "hashicorp/azuread"
version = ">= 2.47.0"
version = ">= 3.0.2"
}
}
}