review optional + computed in cdn (#26535)

hashicorp · Jul 5, 2024 · b7e25e9 · b7e25e9
1 parent cd0fcf9
commit b7e25e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/internal/services/cdn/cdn_endpoint_resource.go b/internal/services/cdn/cdn_endpoint_resource.go
@@ -14,6 +14,7 @@ import (
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/features"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/cdn/migration"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/cdn/parse"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tags"
@@ -119,7 +120,7 @@ func resourceCdnEndpoint() *pluginsdk.Resource {
 			"origin_path": {
 				Type:     pluginsdk.TypeString,
 				Optional: true,
-				Computed: true,
+				Computed: !features.FourPointOhBeta(),
 			},
 
 			"querystring_caching_behaviour": {
@@ -137,7 +138,7 @@ func resourceCdnEndpoint() *pluginsdk.Resource {
 			"content_types_to_compress": {
 				Type:     pluginsdk.TypeSet,
 				Optional: true,
-				Computed: true,
+				Computed: !features.FourPointOhBeta(),
 				Elem: &pluginsdk.Schema{
 					Type: pluginsdk.TypeString,
 				},
@@ -152,7 +153,7 @@ func resourceCdnEndpoint() *pluginsdk.Resource {
 			"probe_path": {
 				Type:     pluginsdk.TypeString,
 				Optional: true,
-				Computed: true,
+				Computed: !features.FourPointOhBeta(),
 			},
 
 			"geo_filter": {

diff --git a/internal/services/cdn/cdn_endpoint_resource_test.go b/internal/services/cdn/cdn_endpoint_resource_test.go
@@ -165,7 +165,7 @@ func TestAccCdnEndpoint_fullFields(t *testing.T) {
 				check.That(data.ResourceName).Key("origin_host_header").HasValue("www.contoso.com"),
 				check.That(data.ResourceName).Key("optimization_type").HasValue("GeneralWebDelivery"),
 				check.That(data.ResourceName).Key("querystring_caching_behaviour").HasValue("UseQueryString"),
-				check.That(data.ResourceName).Key("content_types_to_compress.#").HasValue("1"),
+				check.That(data.ResourceName).Key("content_types_to_compress.#").HasValue("3"),
 				check.That(data.ResourceName).Key("is_compression_enabled").HasValue("true"),
 				check.That(data.ResourceName).Key("geo_filter.#").HasValue("1"),
 				check.That(data.ResourceName).Key("tags.%").HasValue("1"),
@@ -723,7 +723,7 @@ resource "azurerm_cdn_endpoint" "test" {
   resource_group_name           = azurerm_resource_group.test.name
   is_http_allowed               = true
   is_https_allowed              = true
-  content_types_to_compress     = ["text/html"]
+  content_types_to_compress     = ["text/html", "image/gif", "text/css"]
   is_compression_enabled        = true
   querystring_caching_behaviour = "UseQueryString"
   origin_host_header            = "www.contoso.com"