Merge pull request #6550 from r0bnet/cdn-endpoint-origin-host-header-…

…required CDN Endpoint: make origin_host_header required
hashicorp · Apr 21, 2020 · aed9dcd · aed9dcd
2 parents a809b44 + 4c6552c
commit aed9dcd
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/azurerm/internal/services/cdn/resource_arm_cdn_endpoint.go b/azurerm/internal/services/cdn/resource_arm_cdn_endpoint.go
@@ -58,8 +58,7 @@ func resourceArmCdnEndpoint() *schema.Resource {
 
 			"origin_host_header": {
 				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
+				Required: true,
 			},
 
 			"is_http_allowed": {

diff --git a/azurerm/internal/services/cdn/tests/resource_arm_cdn_endpoint_test.go b/azurerm/internal/services/cdn/tests/resource_arm_cdn_endpoint_test.go
@@ -449,6 +449,8 @@ resource "azurerm_cdn_endpoint" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
 
+  origin_host_header = "www.example.com"
+
   origin {
     name       = "acceptanceTestCdnOrigin1"
     host_name  = "www.example.com"
@@ -470,6 +472,8 @@ resource "azurerm_cdn_endpoint" "import" {
   location            = azurerm_cdn_endpoint.test.location
   resource_group_name = azurerm_cdn_endpoint.test.resource_group_name
 
+  origin_host_header = "www.example.com"
+
   origin {
     name       = "acceptanceTestCdnOrigin1"
     host_name  = "www.example.com"
@@ -544,6 +548,8 @@ resource "azurerm_cdn_endpoint" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
 
+  origin_host_header = "www.example.com"
+
   origin {
     name       = "acceptanceTestCdnOrigin2"
     host_name  = "www.example.com"
@@ -583,6 +589,8 @@ resource "azurerm_cdn_endpoint" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
 
+  origin_host_header = "www.example.com"
+
   origin {
     name       = "acceptanceTestCdnOrigin2"
     host_name  = "www.example.com"
@@ -625,6 +633,8 @@ resource "azurerm_cdn_endpoint" "test" {
   origin_path         = "/origin-path"
   probe_path          = "/origin-path/probe"
 
+  origin_host_header = "www.example.com"
+
   origin {
     name       = "acceptanceTestCdnOrigin1"
     host_name  = "www.example.com"
@@ -674,6 +684,8 @@ resource "azurerm_cdn_endpoint" "test" {
   is_https_allowed    = true
   optimization_type   = "GeneralWebDelivery"
 
+  origin_host_header = "www.example.com"
+
   origin {
     name       = "acceptanceTestCdnOrigin1"
     host_name  = "www.example.com"
@@ -763,6 +775,8 @@ resource "azurerm_cdn_endpoint" "test" {
   is_http_allowed     = %s
   is_https_allowed    = %s
 
+  origin_host_header = "www.example.com"
+
   origin {
     name       = "acceptanceTestCdnOrigin1"
     host_name  = "www.example.com"

diff --git a/website/docs/r/cdn_endpoint.html.markdown b/website/docs/r/cdn_endpoint.html.markdown
@@ -31,6 +31,8 @@ resource "azurerm_cdn_endpoint" "example" {
   location            = azurerm_resource_group.example.location
   resource_group_name = azurerm_resource_group.example.name
 
+  origin_host_header = "www.example.com"
+
   origin {
     name      = "example"
     host_name = "www.example.com"
@@ -66,7 +68,7 @@ The following arguments are supported:
 
 * `origin` - (Required) The set of origins of the CDN endpoint. When multiple origins exist, the first origin will be used as primary and rest will be used as failover options. Each `origin` block supports fields documented below.
 
-* `origin_host_header` - (Optional) The host header CDN provider will send along with content requests to origins. Defaults to the host name of the origin.
+* `origin_host_header` - (Required) The host header CDN provider will send along with content requests to origins. Defaults to the host name of the origin.
 
 * `origin_path` - (Optional) The path used at for origin requests.