From a45741a1a0e17b1f6431506886ad56cff1951655 Mon Sep 17 00:00:00 2001 From: Chris van Sluijsveld Date: Tue, 10 Jan 2023 13:16:55 +0100 Subject: [PATCH 1/2] Add support for cloud_displayname --- .../services/applications/migrations/application_resource.go | 2 ++ internal/services/applications/schema.go | 1 + 2 files changed, 3 insertions(+) diff --git a/internal/services/applications/migrations/application_resource.go b/internal/services/applications/migrations/application_resource.go index ed5257baf4..6ba31c7e62 100644 --- a/internal/services/applications/migrations/application_resource.go +++ b/internal/services/applications/migrations/application_resource.go @@ -331,6 +331,7 @@ func ResourceApplicationInstanceResourceV0() *schema.Resource { "netbios_domain_and_sam_account_name", "sam_account_name", "use_guid", + "cloud_displayname", }, false, ), @@ -377,6 +378,7 @@ func ResourceApplicationInstanceResourceV0() *schema.Resource { "netbios_domain_and_sam_account_name", "sam_account_name", "use_guid", + "cloud_displayname", }, false, ), diff --git a/internal/services/applications/schema.go b/internal/services/applications/schema.go index 83b9da3109..6c5732f710 100644 --- a/internal/services/applications/schema.go +++ b/internal/services/applications/schema.go @@ -51,6 +51,7 @@ func schemaOptionalClaims() *schema.Schema { "on_premise_security_identifier", "sam_account_name", "use_guid", + "cloud_displayname", }, false, ), From 9f0451d43478f59490b02b2845416a604975cde4 Mon Sep 17 00:00:00 2001 From: Chris van Sluijsveld Date: Tue, 10 Jan 2023 20:47:55 +0100 Subject: [PATCH 2/2] fix comments --- .../services/applications/migrations/application_resource.go | 2 -- internal/services/applications/schema.go | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/internal/services/applications/migrations/application_resource.go b/internal/services/applications/migrations/application_resource.go index 6ba31c7e62..ed5257baf4 100644 --- a/internal/services/applications/migrations/application_resource.go +++ b/internal/services/applications/migrations/application_resource.go @@ -331,7 +331,6 @@ func ResourceApplicationInstanceResourceV0() *schema.Resource { "netbios_domain_and_sam_account_name", "sam_account_name", "use_guid", - "cloud_displayname", }, false, ), @@ -378,7 +377,6 @@ func ResourceApplicationInstanceResourceV0() *schema.Resource { "netbios_domain_and_sam_account_name", "sam_account_name", "use_guid", - "cloud_displayname", }, false, ), diff --git a/internal/services/applications/schema.go b/internal/services/applications/schema.go index 6c5732f710..7a98dfde99 100644 --- a/internal/services/applications/schema.go +++ b/internal/services/applications/schema.go @@ -42,16 +42,16 @@ func schemaOptionalClaims() *schema.Schema { Type: schema.TypeString, ValidateFunc: validation.StringInSlice( []string{ + "cloud_displayname", "dns_domain_and_sam_account_name", "emit_as_roles", - "include_externally_authenticated_upn", "include_externally_authenticated_upn_without_hash", + "include_externally_authenticated_upn", "max_size_limit", "netbios_domain_and_sam_account_name", "on_premise_security_identifier", "sam_account_name", "use_guid", - "cloud_displayname", }, false, ),