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

Jump to bottom

azurerm_application_gateway - key_vault_secret_id, force_firewall_policy_association #14413

Merged
merged 13 commits into from
Dec 17, 2021
Merged

azurerm_application_gateway - key_vault_secret_id, force_firewall_policy_association #14413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
552d2e9
azurerm_application_gateway - support enableFips and forceFirewallPol…
Nov 30, 2021
a287e74
update code
Nov 30, 2021
762806b
update code
Nov 30, 2021
9928a9a
update code
Dec 1, 2021
1a62f61
update code
Dec 1, 2021
d18341f
update code
Dec 2, 2021
fb06e0f
update code
Dec 2, 2021
0b275f4
update code
Dec 3, 2021
01ce778
update code
Dec 3, 2021
9c25337
remove unused code
Dec 17, 2021
2b90951
update code
Dec 17, 2021
48929b0
update code
Dec 17, 2021
2524abc
update code
Dec 17, 2021
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
44 changes: 32 additions & 12 deletions internal/services/network/application_gateway_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,17 +885,16 @@ func resourceApplicationGateway() *pluginsdk.Resource {

"data": {
Type: pluginsdk.TypeString,
Required: true,
Optional: true,
ValidateFunc: validation.StringIsNotEmpty,
Sensitive: true,
},

// TODO required soft delete on the keyvault
/*"key_vault_secret_id": {
"key_vault_secret_id": {
Type: pluginsdk.TypeString,
Optional: true,
ValidateFunc: azure.ValidateKeyVaultChildId,
},*/
ValidateFunc: keyVaultValidate.NestedItemIdWithOptionalVersion,
},

"id": {
Type: pluginsdk.TypeString,
Expand All @@ -913,6 +912,11 @@ func resourceApplicationGateway() *pluginsdk.Resource {
Optional: true,
},

"force_firewall_policy_association": {
Type: pluginsdk.TypeBool,
Optional: true,
},

"probe": {
Type: pluginsdk.TypeList,
Optional: true,
Expand Down Expand Up @@ -1546,7 +1550,10 @@ func resourceApplicationGatewayCreateUpdate(d *pluginsdk.ResourceData, meta inte
t := d.Get("tags").(map[string]interface{})

// Gateway ID is needed to link sub-resources together in expand functions
trustedRootCertificates := expandApplicationGatewayTrustedRootCertificates(d.Get("trusted_root_certificate").([]interface{}))
trustedRootCertificates, err := expandApplicationGatewayTrustedRootCertificates(d.Get("trusted_root_certificate").([]interface{}))
if err != nil {
return fmt.Errorf("expanding `trusted_root_certificate`: %+v", err)
}

requestRoutingRules, err := expandApplicationGatewayRequestRoutingRules(d, id.ID())
if err != nil {
Expand Down Expand Up @@ -1619,6 +1626,10 @@ func resourceApplicationGatewayCreateUpdate(d *pluginsdk.ResourceData, meta inte
},
}

if v, ok := d.GetOk("force_firewall_policy_association"); ok {
gateway.ApplicationGatewayPropertiesFormat.ForceFirewallPolicyAssociation = utils.Bool(v.(bool))
}

if _, ok := d.GetOk("identity"); ok {
gateway.Identity = expandAzureRmApplicationGatewayIdentity(d)
}
Expand Down Expand Up @@ -1767,6 +1778,7 @@ func resourceApplicationGatewayRead(d *pluginsdk.ResourceData, meta interface{})
}

d.Set("enable_http2", props.EnableHTTP2)
d.Set("force_firewall_policy_association", props.ForceFirewallPolicyAssociation)

httpListeners, err := flattenApplicationGatewayHTTPListeners(props.HTTPListeners)
if err != nil {
Expand Down Expand Up @@ -1968,28 +1980,36 @@ func expandApplicationGatewayAuthenticationCertificates(certs []interface{}) *[]
return &results
}

func expandApplicationGatewayTrustedRootCertificates(certs []interface{}) *[]network.ApplicationGatewayTrustedRootCertificate {
func expandApplicationGatewayTrustedRootCertificates(certs []interface{}) (*[]network.ApplicationGatewayTrustedRootCertificate, error) {
results := make([]network.ApplicationGatewayTrustedRootCertificate, 0)

for _, raw := range certs {
v := raw.(map[string]interface{})

name := v["name"].(string)
data := v["data"].(string)
kvsid := v["key_vault_secret_id"].(string)

output := network.ApplicationGatewayTrustedRootCertificate{
Name: utils.String(name),
ApplicationGatewayTrustedRootCertificatePropertiesFormat: &network.ApplicationGatewayTrustedRootCertificatePropertiesFormat{},
}

if data != "" {
switch {
case data != "" && kvsid != "":
return nil, fmt.Errorf("only one of `key_vault_secret_id` or `data` must be specified for the `trusted_root_certificate` block %q", name)
case data != "":
output.ApplicationGatewayTrustedRootCertificatePropertiesFormat.Data = utils.String(utils.Base64EncodeIfNot(data))
case kvsid != "":
output.ApplicationGatewayTrustedRootCertificatePropertiesFormat.KeyVaultSecretID = utils.String(kvsid)
default:
return nil, fmt.Errorf("either `key_vault_secret_id` or `data` must be specified for the `trusted_root_certificate` block %q", name)
}

results = append(results, output)
}

return &results
return &results, nil
}

func flattenApplicationGatewayAuthenticationCertificates(certs *[]network.ApplicationGatewayAuthenticationCertificate, d *pluginsdk.ResourceData) []interface{} {
Expand Down Expand Up @@ -2051,13 +2071,13 @@ func flattenApplicationGatewayTrustedRootCertificates(certs *[]network.Applicati
output["id"] = *v
}

/*kvsid := ""
kvsid := ""
if props := cert.ApplicationGatewayTrustedRootCertificatePropertiesFormat; props != nil {
if v := props.KeyVaultSecretID; v != nil {
kvsid = *v
output["key_vault_secret_id"] = *v
}
}*/
}
output["key_vault_secret_id"] = kvsid

if v := cert.Name; v != nil {
output["name"] = *v
Expand Down
Loading