From c6e785b21e917a3f9b25439032c451a7e03496bc Mon Sep 17 00:00:00 2001 From: SergiyDivnych <39331653+SergiyDivnych@users.noreply.github.com> Date: Thu, 9 Jun 2022 11:37:15 +0300 Subject: [PATCH 1/6] Fixing issue #17042 --- internal/services/appservice/windows_function_app_data_source.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/services/appservice/windows_function_app_data_source.go b/internal/services/appservice/windows_function_app_data_source.go index 3d36ab5085c8..a0cd4b904c1a 100644 --- a/internal/services/appservice/windows_function_app_data_source.go +++ b/internal/services/appservice/windows_function_app_data_source.go @@ -255,6 +255,7 @@ func (d WindowsFunctionAppDataSource) Read() sdk.ResourceFunc { functionApp.DailyMemoryTimeQuota = int(utils.NormaliseNilableInt32(props.DailyMemoryTimeQuota)) functionApp.Tags = tags.ToTypedObject(existing.Tags) functionApp.Kind = utils.NormalizeNilableString(existing.Kind) + functionApp.CustomDomainVerificationId = utils.NormalizeNilableString(props.CustomDomainVerificationId) appSettingsResp, err := client.ListApplicationSettings(ctx, id.ResourceGroup, id.SiteName) if err != nil { From cf153a3f6d1aba369015dc861b118cfd005e7a39 Mon Sep 17 00:00:00 2001 From: SergiyDivnych <39331653+SergiyDivnych@users.noreply.github.com> Date: Thu, 9 Jun 2022 11:37:56 +0300 Subject: [PATCH 2/6] Fixing issue #17042 --- internal/services/appservice/windows_function_app_resource.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/services/appservice/windows_function_app_resource.go b/internal/services/appservice/windows_function_app_resource.go index 0c7fa56d20c1..b4ed88e61416 100644 --- a/internal/services/appservice/windows_function_app_resource.go +++ b/internal/services/appservice/windows_function_app_resource.go @@ -589,6 +589,7 @@ func (r WindowsFunctionAppResource) Read() sdk.ResourceFunc { Tags: tags.ToTypedObject(functionApp.Tags), Kind: utils.NormalizeNilableString(functionApp.Kind), KeyVaultReferenceIdentityID: utils.NormalizeNilableString(props.KeyVaultReferenceIdentity), + CustomDomainVerificationId: utils.NormalizeNilableString(props.CustomDomainVerificationId), } configResp, err := client.GetConfiguration(ctx, id.ResourceGroup, id.SiteName) From 8b40d5346b43aebf406cf30effba2d41dea1d1ef Mon Sep 17 00:00:00 2001 From: SergiyDivnych <39331653+SergiyDivnych@users.noreply.github.com> Date: Thu, 9 Jun 2022 11:38:33 +0300 Subject: [PATCH 3/6] Fixing issue #17042 --- .../services/appservice/windows_function_app_slot_resource.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/services/appservice/windows_function_app_slot_resource.go b/internal/services/appservice/windows_function_app_slot_resource.go index ba5fe02e5a93..4fe00e0a065e 100644 --- a/internal/services/appservice/windows_function_app_slot_resource.go +++ b/internal/services/appservice/windows_function_app_slot_resource.go @@ -573,6 +573,7 @@ func (r WindowsFunctionAppSlotResource) Read() sdk.ResourceFunc { Tags: tags.ToTypedObject(functionAppSlot.Tags), Kind: utils.NormalizeNilableString(functionAppSlot.Kind), KeyVaultReferenceIdentityID: utils.NormalizeNilableString(props.KeyVaultReferenceIdentity), + CustomDomainVerificationId: utils.NormalizeNilableString(props.CustomDomainVerificationId), } configResp, err := client.GetConfigurationSlot(ctx, id.ResourceGroup, id.SiteName, id.SlotName) From 0d9c9a1eea8b09075bd54116dd3900f0691b4023 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Thu, 9 Jun 2022 14:35:57 -0700 Subject: [PATCH 4/6] Update windows_function_app_data_source.go --- .../services/appservice/windows_function_app_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/services/appservice/windows_function_app_data_source.go b/internal/services/appservice/windows_function_app_data_source.go index a0cd4b904c1a..b7d2a30cbbc5 100644 --- a/internal/services/appservice/windows_function_app_data_source.go +++ b/internal/services/appservice/windows_function_app_data_source.go @@ -255,7 +255,7 @@ func (d WindowsFunctionAppDataSource) Read() sdk.ResourceFunc { functionApp.DailyMemoryTimeQuota = int(utils.NormaliseNilableInt32(props.DailyMemoryTimeQuota)) functionApp.Tags = tags.ToTypedObject(existing.Tags) functionApp.Kind = utils.NormalizeNilableString(existing.Kind) - functionApp.CustomDomainVerificationId = utils.NormalizeNilableString(props.CustomDomainVerificationId) + functionApp.CustomDomainVerificationId = utils.NormalizeNilableString(props.CustomDomainVerificationID) appSettingsResp, err := client.ListApplicationSettings(ctx, id.ResourceGroup, id.SiteName) if err != nil { From 828f8ab3b5e104dc6ca04189a2f45ba6466ca6e9 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Thu, 9 Jun 2022 14:36:40 -0700 Subject: [PATCH 5/6] Update windows_function_app_slot_resource.go --- .../services/appservice/windows_function_app_slot_resource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/services/appservice/windows_function_app_slot_resource.go b/internal/services/appservice/windows_function_app_slot_resource.go index 4fe00e0a065e..2689679b5b5c 100644 --- a/internal/services/appservice/windows_function_app_slot_resource.go +++ b/internal/services/appservice/windows_function_app_slot_resource.go @@ -573,7 +573,7 @@ func (r WindowsFunctionAppSlotResource) Read() sdk.ResourceFunc { Tags: tags.ToTypedObject(functionAppSlot.Tags), Kind: utils.NormalizeNilableString(functionAppSlot.Kind), KeyVaultReferenceIdentityID: utils.NormalizeNilableString(props.KeyVaultReferenceIdentity), - CustomDomainVerificationId: utils.NormalizeNilableString(props.CustomDomainVerificationId), + CustomDomainVerificationId: utils.NormalizeNilableString(props.CustomDomainVerificationID), } configResp, err := client.GetConfigurationSlot(ctx, id.ResourceGroup, id.SiteName, id.SlotName) From b2276bb53a58b1f8180ead0990f5c65e62d903c6 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Thu, 9 Jun 2022 14:37:03 -0700 Subject: [PATCH 6/6] Update windows_function_app_resource.go --- internal/services/appservice/windows_function_app_resource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/services/appservice/windows_function_app_resource.go b/internal/services/appservice/windows_function_app_resource.go index b4ed88e61416..1efdffc725cc 100644 --- a/internal/services/appservice/windows_function_app_resource.go +++ b/internal/services/appservice/windows_function_app_resource.go @@ -589,7 +589,7 @@ func (r WindowsFunctionAppResource) Read() sdk.ResourceFunc { Tags: tags.ToTypedObject(functionApp.Tags), Kind: utils.NormalizeNilableString(functionApp.Kind), KeyVaultReferenceIdentityID: utils.NormalizeNilableString(props.KeyVaultReferenceIdentity), - CustomDomainVerificationId: utils.NormalizeNilableString(props.CustomDomainVerificationId), + CustomDomainVerificationId: utils.NormalizeNilableString(props.CustomDomainVerificationID), } configResp, err := client.GetConfiguration(ctx, id.ResourceGroup, id.SiteName)