Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

azurerm_front_door - Add minimum_tls_version property #5539

Merged
merged 10 commits into from
Jan 31, 2020
Merged

azurerm_front_door - Add minimum_tls_version property #5539

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c887039
r/front_door - Add minimum_tls_version property
Jan 27, 2020
9d57aff
r/frontdoor Make default min TLS version 1.0 until v2.0
Jan 27, 2020
2d6abd1
r/frontdoor: Make minimum_tls_version computed
Jan 29, 2020
761add0
Revert azurerm_frontdoor 2.0 upgrade note
Jan 29, 2020
22f7fd9
r/frontdoor: Remove minimum_tls_version from docs
Jan 29, 2020
4179b67
Added test case for custom https
WodansSon Jan 29, 2020
a3b57de
Fixed test HCL formatting
WodansSon Jan 29, 2020
da20eed
Fixed test fmt lint issue
WodansSon Jan 30, 2020
b59ed71
Fix test lint error
WodansSon Jan 30, 2020
1512b04
Added minimum tls to documentation
WodansSon Jan 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion azurerm/internal/services/frontdoor/resource_arm_front_door.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,15 @@ func resourceArmFrontDoor() *schema.Resource {
}, false),
Default: string(frontdoor.CertificateSourceFrontDoor),
},
"minimum_tls_version": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.StringInSlice([]string{
string(frontdoor.OneFullStopTwo),
string(frontdoor.OneFullStopZero),
}, false),
Default: string(frontdoor.OneFullStopZero), // TODO: Update default to TLS 1.2 in version 2.0
},
"provisioning_state": {
Type: schema.TypeString,
Computed: true,
Expand Down Expand Up @@ -1265,6 +1274,8 @@ func flattenArmFrontDoorFrontendEndpoint(d *schema.ResourceData, input *[]frontd
chc["certificate_source"] = string(frontdoor.CertificateSourceFrontDoor)
}

chc["minimum_tls_version"] = string(customHTTPSConfiguration.MinimumTLSVersion)

if provisioningState := properties.CustomHTTPSProvisioningState; provisioningState != "" {
chc["provisioning_state"] = provisioningState
if provisioningState == frontdoor.CustomHTTPSProvisioningStateEnabled || provisioningState == frontdoor.CustomHTTPSProvisioningStateEnabling {
Expand Down Expand Up @@ -1502,8 +1513,11 @@ func makeCustomHttpsConfiguration(customHttpsConfiguration map[string]interface{
// https://github.com/Azure/azure-sdk-for-go/issues/6882
defaultProtocolType := "ServerNameIndication"

minTLSVersion := customHttpsConfiguration["minimum_tls_version"].(string)

customHTTPSConfigurationUpdate := frontdoor.CustomHTTPSConfiguration{
ProtocolType: &defaultProtocolType,
ProtocolType: &defaultProtocolType,
MinimumTLSVersion: frontdoor.MinimumTLSVersion(minTLSVersion),
}

if customHttpsConfiguration["certificate_source"].(string) == "AzureKeyVault" {
Expand Down
4 changes: 4 additions & 0 deletions website/docs/guides/2.0-upgrade-guide.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,10 @@ The deprecated `location` field will be removed, since this is no longer used.

The deprecated `internal_public_ip_address_id` field in the `ip_configuration` block will be removed. This field has been replaced by the `public_ip_address_id` field in the `ip_configuration` block.

### Resource: `azurerm_frontdoor`

The default value of the `minimum_tls_version` field in the `custom_https_configuration` block will be changed from `1.0` to `1.2` to align with [updates to the Azure platform defaults](https://docs.microsoft.com/en-us/azure/frontdoor/front-door-faq#what-tls-versions-are-supported-by-azure-front-door-service)

### Resource: `azurerm_iothub`

The deprecated `sku.tier` property will be remove.
Expand Down
2 changes: 2 additions & 0 deletions website/docs/r/front_door.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@ The `custom_https_configuration` block supports the following:

* `certificate_source` - (Optional) Certificate source to encrypted `HTTPS` traffic with. Allowed values are `FrontDoor` or `AzureKeyVault`. Defaults to `FrontDoor`.

* `minimum_tls_version` - (Optional) Minimum TLS version required for clients to connect. Allowed values are `1.0` or `1.2`. Defaults to `1.0`.

The following attributes are only valid if `certificate_source` is set to `AzureKeyVault`:

* `azure_key_vault_certificate_vault_id` - (Required) The ID of the Key Vault containing the SSL certificate.
Expand Down