From ca4d50289aeb24dbd7535725d2592fbe902808f5 Mon Sep 17 00:00:00 2001
From: Tatsuro Shibamura <me@shibayan.jp>
Date: Wed, 21 Jun 2023 11:50:30 +0900
Subject: [PATCH] Fixed error while deleting `cdn_frontdoor_origin_path`
 property (#22209)

---
 internal/services/cdn/azuresdkhacks/cdn_frontdoor_route.go | 7 ++++---
 internal/services/cdn/cdn_frontdoor_route_resource.go      | 5 ++++-
 internal/services/cdn/cdn_frontdoor_route_resource_test.go | 1 +
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/internal/services/cdn/azuresdkhacks/cdn_frontdoor_route.go b/internal/services/cdn/azuresdkhacks/cdn_frontdoor_route.go
index ec721cc2225c..e862d8184b5f 100644
--- a/internal/services/cdn/azuresdkhacks/cdn_frontdoor_route.go
+++ b/internal/services/cdn/azuresdkhacks/cdn_frontdoor_route.go
@@ -137,9 +137,10 @@ func (rupp RouteUpdatePropertiesParameters) MarshalJSON() ([]byte, error) {
 	if rupp.OriginGroup != nil {
 		objectMap["originGroup"] = rupp.OriginGroup
 	}
-	if rupp.OriginPath != nil {
-		objectMap["originPath"] = rupp.OriginPath
-	}
+
+	// OriginPath must be set to nil to be removed
+	objectMap["originPath"] = rupp.OriginPath
+
 	if rupp.RuleSets != nil {
 		objectMap["ruleSets"] = rupp.RuleSets
 	}
diff --git a/internal/services/cdn/cdn_frontdoor_route_resource.go b/internal/services/cdn/cdn_frontdoor_route_resource.go
index 17b3909e089e..361cbbc54ce6 100644
--- a/internal/services/cdn/cdn_frontdoor_route_resource.go
+++ b/internal/services/cdn/cdn_frontdoor_route_resource.go
@@ -488,7 +488,10 @@ func resourceCdnFrontDoorRouteUpdate(d *pluginsdk.ResourceData, meta interface{}
 	}
 
 	if d.HasChange("cdn_frontdoor_origin_path") {
-		updateProps.OriginPath = utils.String(d.Get("cdn_frontdoor_origin_path").(string))
+		originPath := d.Get("cdn_frontdoor_origin_path").(string)
+		if originPath != "" {
+			updateProps.OriginPath = utils.String(originPath)
+		}
 	}
 
 	if d.HasChange("patterns_to_match") {
diff --git a/internal/services/cdn/cdn_frontdoor_route_resource_test.go b/internal/services/cdn/cdn_frontdoor_route_resource_test.go
index c897a4444d13..db01cbd1a127 100644
--- a/internal/services/cdn/cdn_frontdoor_route_resource_test.go
+++ b/internal/services/cdn/cdn_frontdoor_route_resource_test.go
@@ -197,6 +197,7 @@ resource "azurerm_cdn_frontdoor_route" "test" {
   cdn_frontdoor_origin_group_id = azurerm_cdn_frontdoor_origin_group.test.id
   cdn_frontdoor_origin_ids      = [azurerm_cdn_frontdoor_origin.test.id]
   cdn_frontdoor_rule_set_ids    = [azurerm_cdn_frontdoor_rule_set.test.id]
+  cdn_frontdoor_origin_path     = "/example"
 
   enabled                = true
   forwarding_protocol    = "HttpsOnly"