From e93cd9e1a5019fac84eb139d088b8fe5184cf145 Mon Sep 17 00:00:00 2001
From: Tom Bamford <tom@bamford.io>
Date: Fri, 12 Jun 2020 23:14:03 +0100
Subject: [PATCH] Update acceptance test configs to use Terraform 0.12
 expressions

---
 azuread/data_group_test.go                    |  8 +++----
 azuread/data_groups_test.go                   |  4 ++--
 azuread/data_service_principal_test.go        |  6 ++---
 azuread/data_user_test.go                     |  6 ++---
 azuread/data_users_test.go                    |  6 ++---
 .../resource_application_certificate_test.go  | 16 +++++++-------
 azuread/resource_application_password_test.go | 18 +++++++--------
 azuread/resource_group_member_test.go         | 22 +++++++++----------
 ...urce_service_principal_certificate_test.go | 18 +++++++--------
 ...esource_service_principal_password_test.go | 18 +++++++--------
 azuread/resource_service_principal_test.go    |  4 ++--
 11 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/azuread/data_group_test.go b/azuread/data_group_test.go
index 0bf4933bb9..420fe9c06b 100644
--- a/azuread/data_group_test.go
+++ b/azuread/data_group_test.go
@@ -99,7 +99,7 @@ func testAccDataSourceAzureADGroup_name(id int) string {
 %s
 
 data "azuread_group" "test" {
-  name = "${azuread_group.test.name}"
+  name = azuread_group.test.name
 }
 `, testAccAzureADGroup_basic(id))
 }
@@ -109,7 +109,7 @@ func testAccDataSourceAzureADGroup_objectId(id int) string {
 %s
 
 data "azuread_group" "test" {
-  object_id = "${azuread_group.test.object_id}"
+  object_id = azuread_group.test.object_id
 }
 `, testAccAzureADGroup_basic(id))
 }
@@ -119,7 +119,7 @@ func testAccDataSourceAzureADGroup_members(id int, password string) string {
 %s
 
 data "azuread_group" "test" {
-  object_id = "${azuread_group.test.object_id}"
+  object_id = azuread_group.test.object_id
 }
 `, testAccAzureADGroupWithThreeMembers(id, password))
 }
@@ -129,7 +129,7 @@ func testAccDataSourceAzureADGroup_owners(id int, password string) string {
 %s
 
 data "azuread_group" "test" {
-  object_id = "${azuread_group.test.object_id}"
+  object_id = azuread_group.test.object_id
 }
 `, testAccAzureADGroupWithThreeOwners(id, password))
 }
diff --git a/azuread/data_groups_test.go b/azuread/data_groups_test.go
index ce428c7a61..81d1788d1f 100644
--- a/azuread/data_groups_test.go
+++ b/azuread/data_groups_test.go
@@ -84,7 +84,7 @@ func testAccAzureADGroupsDataSource_byDisplayNames(id int) string {
 %s
 
 data "azuread_groups" "test" {
-  names = ["${azuread_group.testA.name}", "${azuread_group.testB.name}"]
+  names = [azuread_group.testA.name, azuread_group.testB.name]
 }
 `, testAccAzureADGroup_multiple(id))
 }
@@ -94,7 +94,7 @@ func testAccAzureADGroupsDataSource_byObjectIds(id int) string {
 %s
 
 data "azuread_groups" "test" {
-  object_ids = ["${azuread_group.testA.object_id}", "${azuread_group.testB.object_id}"]
+  object_ids = [azuread_group.testA.object_id, azuread_group.testB.object_id]
 }
 `, testAccAzureADGroup_multiple(id))
 }
diff --git a/azuread/data_service_principal_test.go b/azuread/data_service_principal_test.go
index 78296f907c..8afbb71029 100644
--- a/azuread/data_service_principal_test.go
+++ b/azuread/data_service_principal_test.go
@@ -83,7 +83,7 @@ func testAccAzureADServicePrincipalDataSource_byApplicationId(id string) string
 %s
 
 data "azuread_service_principal" "test" {
-  application_id = "${azuread_service_principal.test.application_id}"
+  application_id = azuread_service_principal.test.application_id
 }
 `, template)
 }
@@ -94,7 +94,7 @@ func testAccAzureADServicePrincipalDataSource_byDisplayName(id string) string {
 %s
 
 data "azuread_service_principal" "test" {
-  display_name = "${azuread_service_principal.test.display_name}"
+  display_name = azuread_service_principal.test.display_name
 }
 `, template)
 }
@@ -105,7 +105,7 @@ func testAccAzureADServicePrincipalDataSource_byObjectId(id string) string {
 %s
 
 data "azuread_service_principal" "test" {
-  object_id = "${azuread_service_principal.test.object_id}"
+  object_id = azuread_service_principal.test.object_id
 }
 `, template)
 }
diff --git a/azuread/data_user_test.go b/azuread/data_user_test.go
index 5d665f2677..a3303444af 100644
--- a/azuread/data_user_test.go
+++ b/azuread/data_user_test.go
@@ -81,7 +81,7 @@ func testAccAzureADUserDataSource_byUserPrincipalName(id int, password string) s
 %s
 
 data "azuread_user" "test" {
-  user_principal_name = "${azuread_user.test.user_principal_name}"
+  user_principal_name = azuread_user.test.user_principal_name
 }
 `, testAccADUser_basic(id, password))
 }
@@ -91,7 +91,7 @@ func testAccAzureADUserDataSource_byObjectId(id int, password string) string {
 %s
 
 data "azuread_user" "test" {
-  object_id = "${azuread_user.test.object_id}"
+  object_id = azuread_user.test.object_id
 }
 `, testAccADUser_basic(id, password))
 }
@@ -101,7 +101,7 @@ func testAccAzureADUserDataSource_byMailNickname(id int, password string) string
 %s
 
 data "azuread_user" "test" {
-  mail_nickname = "${azuread_user.test.mail_nickname}"
+  mail_nickname = azuread_user.test.mail_nickname
 }
 `, testAccADUser_basic(id, password))
 }
diff --git a/azuread/data_users_test.go b/azuread/data_users_test.go
index bf891c4c92..aa476f2392 100644
--- a/azuread/data_users_test.go
+++ b/azuread/data_users_test.go
@@ -95,7 +95,7 @@ func testAccAzureADUsersDataSource_byUserPrincipalNames(id int, password string)
 %s
 
 data "azuread_users" "test" {
-  user_principal_names = ["${azuread_user.testA.user_principal_name}", "${azuread_user.testB.user_principal_name}"]
+  user_principal_names = [azuread_user.testA.user_principal_name, azuread_user.testB.user_principal_name]
 }
 `, testAccADUser_threeUsersABC(id, password))
 }
@@ -105,7 +105,7 @@ func testAccAzureADUsersDataSource_byObjectIds(id int, password string) string {
 %s
 
 data "azuread_users" "test" {
-  object_ids = ["${azuread_user.testA.object_id}", "${azuread_user.testB.object_id}"]
+  object_ids = [azuread_user.testA.object_id, azuread_user.testB.object_id]
 }
 `, testAccADUser_threeUsersABC(id, password))
 }
@@ -115,7 +115,7 @@ func testAccAzureADUsersDataSource_byMailNicknames(id int, password string) stri
 %s
 
 data "azuread_users" "test" {
-  mail_nicknames = ["${azuread_user.testA.mail_nickname}", "${azuread_user.testB.mail_nickname}"]
+  mail_nicknames = [azuread_user.testA.mail_nickname, azuread_user.testB.mail_nickname]
 }
 `, testAccADUser_threeUsersABC(id, password))
 }
diff --git a/azuread/resource_application_certificate_test.go b/azuread/resource_application_certificate_test.go
index 81e724bd7a..74c049f7e2 100644
--- a/azuread/resource_application_certificate_test.go
+++ b/azuread/resource_application_certificate_test.go
@@ -236,7 +236,7 @@ func testAccADObjectCertificateApplication_basic(ri int, keyType, endDate, value
 %s
 
 resource "azuread_application_certificate" "test" {
-  application_object_id = "${azuread_application.test.id}"
+  application_object_id = azuread_application.test.id
   type                  = "%s"
   end_date              = "%s"
   value                 = <<EOT
@@ -251,7 +251,7 @@ func testAccADApplicationCertificate_complete(ri int, keyId, keyType, startDate,
 %s
 
 resource "azuread_application_certificate" "test" {
-  application_object_id = "${azuread_application.test.id}"
+  application_object_id = azuread_application.test.id
   key_id                = "%s"
   type                  = "%s"
   start_date            = "%s"
@@ -268,7 +268,7 @@ func testAccADApplicationCertificate_relativeEndDate(ri int, keyType, value stri
 %s
 
 resource "azuread_application_certificate" "test" {
-  application_object_id = "${azuread_application.test.id}"
+  application_object_id = azuread_application.test.id
   end_date_relative     = "4320h"
   type                  = "%s"
   value                 = <<EOT
@@ -284,11 +284,11 @@ func testAccADApplicationCertificate_requiresImport(ri int, keyType, endDate, va
 %s
 
 resource "azuread_application_certificate" "import" {
-  application_object_id = "${azuread_application_certificate.test.application_object_id}"
-  key_id                = "${azuread_application_certificate.test.key_id}"
-  type                  = "${azuread_application_certificate.test.type}"
-  end_date              = "${azuread_application_certificate.test.end_date}"
-  value                 = "${azuread_application_certificate.test.value}"
+  application_object_id = azuread_application_certificate.test.application_object_id
+  key_id                = azuread_application_certificate.test.key_id
+  type                  = azuread_application_certificate.test.type
+  end_date              = azuread_application_certificate.test.end_date
+  value                 = azuread_application_certificate.test.value
 }
 `, template)
 }
diff --git a/azuread/resource_application_password_test.go b/azuread/resource_application_password_test.go
index ad31c77664..464a80caa9 100644
--- a/azuread/resource_application_password_test.go
+++ b/azuread/resource_application_password_test.go
@@ -268,7 +268,7 @@ func testAccADObjectPasswordApplication_basic(applicationId, value string) strin
 %s
 
 resource "azuread_application_password" "test" {
-  application_object_id = "${azuread_application.test.id}"
+  application_object_id = azuread_application.test.id
   value                 = "%s"
   end_date              = "2099-01-01T01:02:03Z"
 }
@@ -280,7 +280,7 @@ func testAccADObjectPasswordApplication_basicOld(applicationId, value string) st
 %s
 
 resource "azuread_application_password" "test" {
-  application_id = "${azuread_application.test.id}"
+  application_id = azuread_application.test.id
   value          = "%s"
   end_date       = "2099-01-01T01:02:03Z"
 }
@@ -293,10 +293,10 @@ func testAccADApplicationPassword_requiresImport(applicationId, value string) st
 %s
 
 resource "azuread_application_password" "import" {
-  application_object_id = "${azuread_application_password.test.application_object_id}"
-  key_id                = "${azuread_application_password.test.key_id}"
-  value                 = "${azuread_application_password.test.value}"
-  end_date              = "${azuread_application_password.test.end_date}"
+  application_object_id = azuread_application_password.test.application_object_id
+  key_id                = azuread_application_password.test.key_id
+  value                 = azuread_application_password.test.value
+  end_date              = azuread_application_password.test.end_date
 }
 `, template)
 }
@@ -306,7 +306,7 @@ func testAccADApplicationPassword_customKeyId(applicationId, keyId, value string
 %s
 
 resource "azuread_application_password" "test" {
-  application_object_id = "${azuread_application.test.id}"
+  application_object_id = azuread_application.test.id
   key_id                = "%s"
   value                 = "%s"
   end_date              = "2099-01-01T01:02:03Z"
@@ -319,7 +319,7 @@ func testAccADApplicationPassword_description(applicationId, value string) strin
 %s
 
 resource "azuread_application_password" "test" {
-  application_object_id = "${azuread_application.test.id}"
+  application_object_id = azuread_application.test.id
   description           = "terraform"
   value                 = "%s"
   end_date              = "2099-01-01T01:02:03Z"
@@ -332,7 +332,7 @@ func testAccADApplicationPassword_relativeEndDate(applicationId, value string) s
 %s
 
 resource "azuread_application_password" "test" {
-  application_object_id = "${azuread_application.test.id}"
+  application_object_id = azuread_application.test.id
   value                 = "%s"
   end_date_relative     = "8760h"
 }
diff --git a/azuread/resource_group_member_test.go b/azuread/resource_group_member_test.go
index 897b8735bc..676cdfde9c 100644
--- a/azuread/resource_group_member_test.go
+++ b/azuread/resource_group_member_test.go
@@ -200,8 +200,8 @@ resource "azuread_group" "test" {
 }
 
 resource "azuread_group_member" "testA" {
-  group_object_id  = "${azuread_group.test.object_id}"
-  member_object_id = "${azuread_user.testA.object_id}"
+  group_object_id  = azuread_group.test.object_id
+  member_object_id = azuread_user.testA.object_id
 }
 
 `, testAccADUser_threeUsersABC(id, password), id)
@@ -216,13 +216,13 @@ resource "azuread_group" "test" {
 }
 
 resource "azuread_group_member" "testA" {
-  group_object_id  = "${azuread_group.test.object_id}"
-  member_object_id = "${azuread_user.testA.object_id}"
+  group_object_id  = azuread_group.test.object_id
+  member_object_id = azuread_user.testA.object_id
 }
 
 resource "azuread_group_member" "testB" {
-  group_object_id  = "${azuread_group.test.object_id}"
-  member_object_id = "${azuread_user.testB.object_id}"
+  group_object_id  = azuread_group.test.object_id
+  member_object_id = azuread_user.testB.object_id
 }
 
 `, testAccADUser_threeUsersABC(id, password), id)
@@ -240,8 +240,8 @@ resource "azuread_group" "member" {
 }
 
 resource "azuread_group_member" "test" {
-  group_object_id  = "${azuread_group.test.object_id}"
-  member_object_id = "${azuread_group.member.object_id}"
+  group_object_id  = azuread_group.test.object_id
+  member_object_id = azuread_group.member.object_id
 }
 
 `, id)
@@ -255,7 +255,7 @@ resource "azuread_application" "test" {
 }
 
 resource "azuread_service_principal" "test" {
-  application_id = "${azuread_application.test.application_id}"
+  application_id = azuread_application.test.application_id
 }
 
 resource "azuread_group" "test" {
@@ -263,8 +263,8 @@ resource "azuread_group" "test" {
 }
 
 resource "azuread_group_member" "test" {
-  group_object_id  = "${azuread_group.test.object_id}"
-  member_object_id = "${azuread_service_principal.test.object_id}"
+  group_object_id  = azuread_group.test.object_id
+  member_object_id = azuread_service_principal.test.object_id
 }
 
 `, id)
diff --git a/azuread/resource_service_principal_certificate_test.go b/azuread/resource_service_principal_certificate_test.go
index a95420d103..ff763d1a7f 100644
--- a/azuread/resource_service_principal_certificate_test.go
+++ b/azuread/resource_service_principal_certificate_test.go
@@ -230,7 +230,7 @@ resource "azuread_application" "test" {
 }
 
 resource "azuread_service_principal" "test" {
-  application_id = "${azuread_application.test.application_id}"
+  application_id = azuread_application.test.application_id
 }
 `, ri)
 }
@@ -240,7 +240,7 @@ func testAccADObjectCertificateServicePrincipal_basic(ri int, keyType, endDate,
 %s
 
 resource "azuread_service_principal_certificate" "test" {
-  service_principal_id = "${azuread_service_principal.test.id}"
+  service_principal_id = azuread_service_principal.test.id
   type                 = "%s"
   end_date             = "%s"
   value                = <<EOT
@@ -255,7 +255,7 @@ func testAccADServicePrincipalCertificate_complete(ri int, keyId, keyType, start
 %s
 
 resource "azuread_service_principal_certificate" "test" {
-  service_principal_id = "${azuread_service_principal.test.id}"
+  service_principal_id = azuread_service_principal.test.id
   key_id               = "%s"
   type                 = "%s"
   start_date           = "%s"
@@ -272,7 +272,7 @@ func testAccADServicePrincipalCertificate_relativeEndDate(ri int, keyType, value
 %s
 
 resource "azuread_service_principal_certificate" "test" {
-  service_principal_id = "${azuread_service_principal.test.id}"
+  service_principal_id = azuread_service_principal.test.id
   end_date_relative    = "4320h"
   type                 = "%s"
   value                = <<EOT
@@ -288,11 +288,11 @@ func testAccADServicePrincipalCertificate_requiresImport(ri int, keyType, endDat
 %s
 
 resource "azuread_service_principal_certificate" "import" {
-  service_principal_id = "${azuread_service_principal_certificate.test.service_principal_id}"
-  key_id               = "${azuread_service_principal_certificate.test.key_id}"
-  type                 = "${azuread_service_principal_certificate.test.type}"
-  end_date             = "${azuread_service_principal_certificate.test.end_date}"
-  value                = "${azuread_service_principal_certificate.test.value}"
+  service_principal_id = azuread_service_principal_certificate.test.service_principal_id
+  key_id               = azuread_service_principal_certificate.test.key_id
+  type                 = azuread_service_principal_certificate.test.type
+  end_date             = azuread_service_principal_certificate.test.end_date
+  value                = azuread_service_principal_certificate.test.value
 }
 `, template)
 }
diff --git a/azuread/resource_service_principal_password_test.go b/azuread/resource_service_principal_password_test.go
index 0d1282fdb0..ccede79216 100644
--- a/azuread/resource_service_principal_password_test.go
+++ b/azuread/resource_service_principal_password_test.go
@@ -235,7 +235,7 @@ resource "azuread_application" "test" {
 }
 
 resource "azuread_service_principal" "test" {
-  application_id = "${azuread_application.test.application_id}"
+  application_id = azuread_application.test.application_id
 }
 `, applicationId)
 }
@@ -245,7 +245,7 @@ func testAccADServicePrincipalPassword_basic(applicationId, value string) string
 %s
 
 resource "azuread_service_principal_password" "test" {
-  service_principal_id = "${azuread_service_principal.test.id}"
+  service_principal_id = azuread_service_principal.test.id
   value                = "%s"
   end_date             = "2099-01-01T01:02:03Z"
 }
@@ -258,10 +258,10 @@ func testAccADServicePrincipalPassword_requiresImport(applicationId, value strin
 %s
 
 resource "azuread_service_principal_password" "import" {
-  key_id               = "${azuread_service_principal_password.test.key_id}"
-  service_principal_id = "${azuread_service_principal_password.test.service_principal_id}"
-  value                = "${azuread_service_principal_password.test.value}"
-  end_date             = "${azuread_service_principal_password.test.end_date}"
+  key_id               = azuread_service_principal_password.test.key_id
+  service_principal_id = azuread_service_principal_password.test.service_principal_id
+  value                = azuread_service_principal_password.test.value
+  end_date             = azuread_service_principal_password.test.end_date
 }
 `, template)
 }
@@ -271,7 +271,7 @@ func testAccADServicePrincipalPassword_customKeyId(applicationId, keyId, value s
 %s
 
 resource "azuread_service_principal_password" "test" {
-  service_principal_id = "${azuread_service_principal.test.id}"
+  service_principal_id = azuread_service_principal.test.id
   key_id               = "%s"
   value                = "%s"
   end_date             = "2099-01-01T01:02:03Z"
@@ -284,7 +284,7 @@ func testAccADServicePrincipalPassword_description(applicationId, value string)
 %s
 
 resource "azuread_service_principal_password" "test" {
-  service_principal_id = "${azuread_service_principal.test.id}"
+  service_principal_id = azuread_service_principal.test.id
   description          = "terraform"
   value                = "%s"
   end_date             = "2099-01-01T01:02:03Z"
@@ -297,7 +297,7 @@ func testAccADServicePrincipalPassword_relativeEndDate(applicationId, value stri
 %s
 
 resource "azuread_service_principal_password" "test" {
-  service_principal_id = "${azuread_service_principal.test.id}"
+  service_principal_id = azuread_service_principal.test.id
   value                = "%s"
   end_date_relative    = "8760h"
 }
diff --git a/azuread/resource_service_principal_test.go b/azuread/resource_service_principal_test.go
index 49e5ba8a6f..0d20889e6f 100644
--- a/azuread/resource_service_principal_test.go
+++ b/azuread/resource_service_principal_test.go
@@ -167,7 +167,7 @@ resource "azuread_application" "test" {
 }
 
 resource "azuread_service_principal" "test" {
-  application_id = "${azuread_application.test.application_id}"
+  application_id = azuread_application.test.application_id
 }
 `, id)
 }
@@ -179,7 +179,7 @@ resource "azuread_application" "test" {
 }
 
 resource "azuread_service_principal" "test" {
-  application_id               = "${azuread_application.test.application_id}"
+  application_id               = azuread_application.test.application_id
   app_role_assignment_required = true
 
   tags = ["test", "multiple", "CapitalS"]