Client config objectid (#24)

* Terraform 1.2.1 * Update providers * Switch to azuread_client_config, mitigating hashicorp/terraform-provider-azurerm#16982
geekzter · May 28, 2022 · 9a2f052 · 9a2f052
1 parent 19570b1
commit 9a2f052
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 70 deletions.
diff --git a/terraform/.terraform-version b/terraform/.terraform-version
@@ -1 +1 @@
-1.1.7
+1.2.1
diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl
diff --git a/terraform/main.tf b/terraform/main.tf
@@ -29,7 +29,7 @@ locals {
   workspace_moniker            = terraform.workspace == "default" ? "" : terraform.workspace
 }
 
-# Usage: https://www.terraform.io/docs/providers/azurerm/d/client_config.html
+data azuread_client_config current {}
 data azurerm_client_config current {}
 data azurerm_subscription primary {}
 
@@ -47,7 +47,7 @@ resource azurerm_resource_group rg {
     environment                = local.environment
     provisioner                = "terraform"
     provisioner-client-id      = data.azurerm_client_config.current.client_id
-    provisioner-object-id      = data.azurerm_client_config.current.object_id
+    provisioner-object-id      = data.azuread_client_config.current.object_id
     repository                 = "azure-aks"
     runid                      = var.run_id
     shutdown                   = "true"

diff --git a/terraform/modules.tf b/terraform/modules.tf
@@ -29,7 +29,7 @@ module aks {
 
   admin_username               = "aksadmin"
   application_gateway_subnet_id= module.network.application_gateway_subnet_id
-  client_object_id             = data.azurerm_client_config.current.object_id
+  client_object_id             = data.azuread_client_config.current.object_id
   dns_prefix                   = "ew-aks"
   dns_host_suffix              = var.dns_host_suffix
   location                     = var.location