Skip to content

Commit

Permalink
azurerm_api_management - Only set hostname_configuration properties…
Browse files Browse the repository at this point in the history
… if not empty (#6850)

When the fields are set to empty strings instead of null, the error message in #6621 is given. When set to null when empty strings, the update goes through.

Fixes #6621.
  • Loading branch information
sirlatrom committed May 13, 2020
1 parent 001fefb commit b5a336c
Showing 1 changed file with 21 additions and 10 deletions.
31 changes: 21 additions & 10 deletions azurerm/internal/services/apimanagement/api_management_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -747,17 +747,28 @@ func expandAzureRmApiManagementHostnameConfigurations(d *schema.ResourceData) *[
}

func expandApiManagementCommonHostnameConfiguration(input map[string]interface{}, hostnameType apimanagement.HostnameType) apimanagement.HostnameConfiguration {
encodedCertificate := input["certificate"].(string)
certificatePassword := input["certificate_password"].(string)
hostName := input["host_name"].(string)
keyVaultId := input["key_vault_id"].(string)

output := apimanagement.HostnameConfiguration{
EncodedCertificate: utils.String(encodedCertificate),
CertificatePassword: utils.String(certificatePassword),
HostName: utils.String(hostName),
KeyVaultID: utils.String(keyVaultId),
Type: hostnameType,
Type: hostnameType,
}
if v, ok := input["certificate"]; ok {
if v.(string) != "" {
output.EncodedCertificate = utils.String(v.(string))
}
}
if v, ok := input["certificate_password"]; ok {
if v.(string) != "" {
output.CertificatePassword = utils.String(v.(string))
}
}
if v, ok := input["host_name"]; ok {
if v.(string) != "" {
output.HostName = utils.String(v.(string))
}
}
if v, ok := input["key_vault_id"]; ok {
if v.(string) != "" {
output.KeyVaultID = utils.String(v.(string))
}
}

if v, ok := input["negotiate_client_certificate"]; ok {
Expand Down

0 comments on commit b5a336c

Please sign in to comment.