azurerm_cdn_endpoint - delivery_rule condition optional match_values

azurerm/internal/services/cdn/cdn_endpoint_resource_test.go

@@ -298,6 +298,21 @@ func TestAccCdnEndpoint_PremiumVerizon(t *testing.T) {
 	})
 }
 
+func TestAccCdnEndpoint_deliveryRuleOptionalMatchValue(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_cdn_endpoint", "test")
+	r := CdnEndpointResource{}
+
+	data.ResourceTest(t, r, []resource.TestStep{
+		{
+			Config: r.deliveryRuleOptionalMatchValue(data),
+			Check: resource.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep(),
+	})
+}
+
 func (r CdnEndpointResource) Exists(ctx context.Context, client *clients.Client, state *terraform.InstanceState) (*bool, error) {
 	id, err := parse.EndpointID(state.ID)
 	if err != nil {
@@ -1129,3 +1144,182 @@ resource "azurerm_cdn_endpoint" "test" {
 }
 `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger)
 }
+
+func (r CdnEndpointResource) deliveryRuleOptionalMatchValue(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+provider "azurerm" {
+  features {}
+}
+
+resource "azurerm_resource_group" "test" {
+  name     = "acctestRG-%d"
+  location = "%s"
+}
+
+resource "azurerm_cdn_profile" "test" {
+  name                = "acctestcdnprof%d"
+  location            = azurerm_resource_group.test.location
+  resource_group_name = azurerm_resource_group.test.name
+  sku                 = "Standard_Microsoft"
+}
+
+resource "azurerm_cdn_endpoint" "test" {
+  name                = "acctestcdnend%d"
+  profile_name        = azurerm_cdn_profile.test.name
+  location            = azurerm_resource_group.test.location
+  resource_group_name = azurerm_resource_group.test.name
+
+  origin_host_header = "www.contoso.com"
+
+  origin {
+    name       = "acceptanceTestCdnOrigin1"
+    host_name  = "www.contoso.com"
+    https_port = 443
+    http_port  = 80
+  }
+
+  delivery_rule {
+    name  = "cookieCondition"
+    order = 1
+
+    cookies_condition {
+      selector = "abc"
+      operator = "Any"
+    }
+
+    modify_response_header_action {
+      action = "Delete"
+      name   = "Content-Language"
+    }
+  }
+
+  delivery_rule {
+    name  = "postArg"
+    order = 2
+
+    post_arg_condition {
+      selector = "abc"
+      operator = "Any"
+    }
+
+    modify_response_header_action {
+      action = "Delete"
+      name   = "Content-Language"
+    }
+  }
+
+  delivery_rule {
+    name  = "queryString"
+    order = 3
+
+    query_string_condition {
+      operator = "Any"
+    }
+
+    modify_response_header_action {
+      action = "Delete"
+      name   = "Content-Language"
+    }
+  }
+
+  delivery_rule {
+    name  = "remoteAddress"
+    order = 4
+
+    remote_address_condition {
+      operator = "Any"
+    }
+
+    modify_response_header_action {
+      action = "Delete"
+      name   = "Content-Language"
+    }
+  }
+
+  delivery_rule {
+    name  = "requestBody"
+    order = 5
+
+    request_body_condition {
+      operator = "Any"
+    }
+
+    modify_response_header_action {
+      action = "Delete"
+      name   = "Content-Language"
+    }
+  }
+
+  delivery_rule {
+    name  = "requestHeader"
+    order = 6
+
+    request_header_condition {
+      selector = "abc"
+      operator = "Any"
+    }
+
+    modify_response_header_action {
+      action = "Delete"
+      name   = "Content-Language"
+    }
+  }
+
+  delivery_rule {
+    name  = "requestUri"
+    order = 7
+
+    request_uri_condition {
+      operator = "Any"
+    }
+
+    modify_response_header_action {
+      action = "Delete"
+      name   = "Content-Language"
+    }
+  }
+
+  delivery_rule {
+    name  = "uriFileExtension"
+    order = 8
+
+    url_file_extension_condition {
+      operator = "Any"
+    }
+
+    modify_response_header_action {
+      action = "Delete"
+      name   = "Content-Language"
+    }
+  }
+
+  delivery_rule {
+    name  = "uriFileName"
+    order = 9
+
+    url_file_name_condition {
+      operator = "Any"
+    }
+
+    modify_response_header_action {
+      action = "Delete"
+      name   = "Content-Language"
+    }
+  }
+
+  delivery_rule {
+    name  = "uriPath"
+    order = 10
+
+    url_path_condition {
+      operator = "Any"
+    }
+
+    modify_response_header_action {
+      action = "Delete"
+      name   = "Content-Language"
+    }
+  }
+}
+`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger)
+}

azurerm/internal/services/cdn/deliveryruleconditions/cookies.go

@@ -42,7 +42,7 @@ func Cookies() *schema.Resource {
 
 			"match_values": {
 				Type:     schema.TypeSet,
-				Required: true,
+				Optional: true,
 				MinItems: 1,
 				Elem: &schema.Schema{
 					Type:         schema.TypeString,

azurerm/internal/services/cdn/deliveryruleconditions/post_arg.go

@@ -42,7 +42,7 @@ func PostArg() *schema.Resource {
 
 			"match_values": {
 				Type:     schema.TypeSet,
-				Required: true,
+				Optional: true,
 				MinItems: 1,
 				Elem: &schema.Schema{
 					Type:         schema.TypeString,

azurerm/internal/services/cdn/deliveryruleconditions/query_string.go

@@ -36,7 +36,7 @@ func QueryString() *schema.Resource {
 
 			"match_values": {
 				Type:     schema.TypeSet,
-				Required: true,
+				Optional: true,
 				MinItems: 1,
 				Elem: &schema.Schema{
 					Type:         schema.TypeString,

azurerm/internal/services/cdn/deliveryruleconditions/remote_address.go

@@ -30,7 +30,7 @@ func RemoteAddress() *schema.Resource {
 
 			"match_values": {
 				Type:     schema.TypeSet,
-				Required: true,
+				Optional: true,
 				MinItems: 1,
 				Elem: &schema.Schema{
 					Type:         schema.TypeString,

azurerm/internal/services/cdn/deliveryruleconditions/request_body.go

@@ -36,7 +36,7 @@ func RequestBody() *schema.Resource {
 
 			"match_values": {
 				Type:     schema.TypeSet,
-				Required: true,
+				Optional: true,
 				MinItems: 1,
 				Elem: &schema.Schema{
 					Type:         schema.TypeString,

azurerm/internal/services/cdn/deliveryruleconditions/request_header.go

@@ -42,7 +42,7 @@ func RequestHeader() *schema.Resource {
 
 			"match_values": {
 				Type:     schema.TypeSet,
-				Required: true,
+				Optional: true,
 				MinItems: 1,
 				Elem: &schema.Schema{
 					Type:         schema.TypeString,

azurerm/internal/services/cdn/deliveryruleconditions/request_uri.go

@@ -36,7 +36,7 @@ func RequestURI() *schema.Resource {
 
 			"match_values": {
 				Type:     schema.TypeSet,
-				Required: true,
+				Optional: true,
 				MinItems: 1,
 				Elem: &schema.Schema{
 					Type:         schema.TypeString,

azurerm/internal/services/cdn/deliveryruleconditions/url_file_extension.go

@@ -36,7 +36,7 @@ func URLFileExtension() *schema.Resource {
 
 			"match_values": {
 				Type:     schema.TypeSet,
-				Required: true,
+				Optional: true,
 				MinItems: 1,
 				Elem: &schema.Schema{
 					Type:         schema.TypeString,

azurerm/internal/services/cdn/deliveryruleconditions/url_file_name.go

@@ -36,7 +36,7 @@ func URLFileName() *schema.Resource {
 
 			"match_values": {
 				Type:     schema.TypeSet,
-				Required: true,
+				Optional: true,
 				MinItems: 1,
 				Elem: &schema.Schema{
 					Type:         schema.TypeString,

azurerm/internal/services/cdn/deliveryruleconditions/url_path.go

@@ -36,7 +36,7 @@ func URLPath() *schema.Resource {
 
 			"match_values": {
 				Type:     schema.TypeSet,
-				Required: true,
+				Optional: true,
 				MinItems: 1,
 				Elem: &schema.Schema{
 					Type:         schema.TypeString,

website/docs/r/cdn_endpoint.html.markdown

@@ -234,7 +234,9 @@ A `cookies_condition` block supports the following:
 
 * `negate_condition` - (Optional) Defaults to `false`.
 
-* `match_values` - (Required) List of values for the cookie.
+* `match_values` - (Optional) List of values for the cookie. This is required if `operator` is not `Any`.
+
+
 
 * `transforms` - (Optional) Valid values are `Lowercase` and `Uppercase`.
 
@@ -268,7 +270,7 @@ A `post_arg_condition` block supports the following:
 
 * `negate_condition` - (Optional) Defaults to `false`.
 
-* `match_values` - (Required) List of string values.
+* `match_values` - (Optional) List of string values. This is required if `operator` is not `Any`.
 
 * `transforms` - (Optional) Valid values are `Lowercase` and `Uppercase`.
 
@@ -280,7 +282,7 @@ A `query_string_condition` block supports the following:
 
 * `negate_condition` - (Optional) Defaults to `false`.
 
-* `match_values` - (Required) List of string values.
+* `match_values` - (Optional) List of string values. This is required if `operator` is not `Any`.
 
 * `transforms` - (Optional) Valid values are `Lowercase` and `Uppercase`.
 
@@ -292,7 +294,7 @@ A `remote_address_condition` block supports the following:
 
 * `negate_condition` - (Optional) Defaults to `false`.
 
-* `match_values` - (Required) List of string values. For `GeoMatch` `operator` this should be a list of country codes (e.g. `US` or `DE`). List of IP address if `operator` equals to `IPMatch`.
+* `match_values` - (Optional) List of string values. For `GeoMatch` `operator` this should be a list of country codes (e.g. `US` or `DE`). List of IP address if `operator` equals to `IPMatch`. This is required if `operator` is not `Any`.
 
 ---
 
@@ -302,7 +304,7 @@ A `request_body_condition` block supports the following:
 
 * `negate_condition` - (Optional) Defaults to `false`.
 
-* `match_values` - (Required) List of string values.
+* `match_values` - (Optional) List of string values. This is required if `operator` is not `Any`.
 
 * `transforms` - (Optional) Valid values are `Lowercase` and `Uppercase`.
 
@@ -316,7 +318,7 @@ A `request_header_condition` block supports the following:
 
 * `negate_condition` - (Optional) Defaults to `false`.
 
-* `match_values` - (Required) List of header values.
+* `match_values` - (Optional) List of header values. This is required if `operator` is not `Any`.
 
 * `transforms` - (Optional) Valid values are `Lowercase` and `Uppercase`.
 
@@ -348,7 +350,7 @@ A `request_uri_condition` block supports the following:
 
 * `negate_condition` - (Optional) Defaults to `false`.
 
-* `match_values` - (Required) List of string values.
+* `match_values` - (Optional) List of string values. This is required if `operator` is not `Any`.
 
 * `transforms` - (Optional) Valid values are `Lowercase` and `Uppercase`.
 
@@ -360,7 +362,7 @@ A `url_file_extension_condition` block supports the following:
 
 * `negate_condition` - (Optional) Defaults to `false`.
 
-* `match_values` - (Required) List of string values.
+* `match_values` - (Optional) List of string values. This is required if `operator` is not `Any`.
 
 * `transforms` - (Optional) Valid values are `Lowercase` and `Uppercase`.
 
@@ -372,7 +374,7 @@ A `url_file_name_condition` block supports the following:
 
 * `negate_condition` - (Optional) Defaults to `false`.
 
-* `match_values` - (Required) List of string values.
+* `match_values` - (Optional) List of string values. This is required if `operator` is not `Any`.
 
 * `transforms` - (Optional) Valid values are `Lowercase` and `Uppercase`.
 
@@ -384,7 +386,7 @@ A `url_path_condition` block supports the following:
 
 * `negate_condition` - (Optional) Defaults to `false`.
 
-* `match_values` - (Required) List of string values.
+* `match_values` - (Optional) List of string values. This is required if `operator` is not `Any`.
 
 * `transforms` - (Optional) Valid values are `Lowercase` and `Uppercase`.