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

Update IKEPolicy and IPSecPolicy encryption/authentication #3530

Merged
merged 1 commit into from Jan 31, 2022
Merged

Update IKEPolicy and IPSecPolicy encryption/authentication #3530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions ibm/service/power/resource_ibm_pi_ike_policy.go
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@ func ResourceIBMPIIKEPolicy() *schema.Resource {
helpers.PIVPNPolicyEncryption: {
Type: schema.TypeString,
Required: true,
ValidateFunc: validate.ValidateAllowedStringValues([]string{"3des-cbc", "aes-128-cbc", "aes-128-gcm", "aes-192-cbc", "aes-256-cbc", "aes-256-gcm", "des-cbc"}),
ValidateFunc: validate.ValidateAllowedStringValues([]string{"aes-256-cbc", "aes-192-cbc", "aes-128-cbc", "aes-256-gcm", "aes-128-gcm", "3des-cbc"}),
Description: "Encryption of the IKE Policy",
},
helpers.PIVPNPolicyKeyLifetime: {
Expand All @@ -84,7 +84,7 @@ func ResourceIBMPIIKEPolicy() *schema.Resource {
Type: schema.TypeString,
Optional: true,
Default: "none",
ValidateFunc: validate.ValidateAllowedStringValues([]string{"none", "sha-256", "sha-384", "sha1"}),
ValidateFunc: validate.ValidateAllowedStringValues([]string{"sha-256", "sha-384", "sha1", "none"}),
Description: "Authentication for the IKE Policy",
},

Expand Down
2 changes: 1 addition & 1 deletion ibm/service/power/resource_ibm_pi_ipsec_policy.go
View file
Open in desktop
Expand Up @@ -54,7 +54,7 @@ func ResourceIBMPIIPSecPolicy() *schema.Resource {
helpers.PIVPNPolicyEncryption: {
Type: schema.TypeString,
Required: true,
ValidateFunc: validate.ValidateAllowedStringValues([]string{"3des-cbc", "aes-128-cbc", "aes-128-gcm", "aes-192-cbc", "aes-256-cbc", "aes-256-gcm", "des-cbc"}),
ValidateFunc: validate.ValidateAllowedStringValues([]string{"aes-256-cbc", "aes-192-cbc", "aes-128-cbc", "aes-256-gcm", "aes-128-gcm", "3des-cbc"}),
Description: "Encryption of the IPSec Policy",
},
helpers.PIVPNPolicyKeyLifetime: {
Expand Down
8 changes: 4 additions & 4 deletions website/docs/r/pi_vpn_ike_policy.html.markdown
View file
Open in desktop
Expand Up @@ -18,8 +18,8 @@ The following example creates a IKE Policy.
pi_cloud_instance_id = "<value of the cloud_instance_id>"
pi_policy_name = "test"
pi_policy_dh_group = 1
pi_policy_encryption = "3des-cbc"
pi_policy_key_lifetime = 180
pi_policy_encryption = "aes-256-cbc"
pi_policy_key_lifetime = 28800
pi_policy_preshared_key = "sample"
pi_policy_version = 1
pi_policy_authentication = "sha1"
Expand Down Expand Up @@ -52,9 +52,9 @@ ibm_pi_ike_policy provides the following [timeouts](https://www.terraform.io/doc
## Argument reference
Review the argument references that you can specify for your resource.
- `pi_cloud_instance_id` - (Required, String) The GUID of the service instance associated with an account.
- `pi_policy_authentication` - (Optional, String) Authentication for the IKE Policy. Supported values are `none`(Default), `sha-256`, `sha-384`, and `sha1`.
- `pi_policy_authentication` - (Optional, String) Authentication for the IKE Policy. Supported values are `none`(Default), `sha-256`, `sha-384`, `sha1`.
- `pi_policy_dh_group` - (Required, Integer) DH group of the IKE Policy. Supported values are `1`,`2`,`5`,`14`,`19`,`20`,`24`.
- `pi_policy_encryption`- (Required, String) Encryption of the IKE Policy. Supported values are `3des-cbc`,`aes-128-cbc`,`aes-128-gcm`,`aes-192-cbc`,`aes-256-cbc`,`aes-256-gcm`,`des-cbc`.
- `pi_policy_encryption`- (Required, String) Encryption of the IKE Policy. Supported values are `aes-256-cbc`, `aes-192-cbc`, `aes-128-cbc`, `aes-256-gcm`, `aes-128-gcm`, `3des-cbc`.
- `pi_policy_key_lifetime` - (Required, Integer) Policy key lifetime. Supported values: `180` ≤ value ≤ `86400`.
- `pi_policy_name` - (Required, String) Name of the IKE Policy.
- `pi_policy_preshared_key` - (Required, String) Preshared key used in this IKE Policy (length of preshared key must be even).
Expand Down
8 changes: 4 additions & 4 deletions website/docs/r/pi_vpn_ipsec_policy.html.markdown
View file
Open in desktop
Expand Up @@ -18,8 +18,8 @@ The following example creates a IPSec Policy.
pi_cloud_instance_id = "<value of the cloud_instance_id>"
pi_policy_name = "test"
pi_policy_dh_group = 1
pi_policy_encryption = "3des-cbc"
pi_policy_key_lifetime = 180
pi_policy_encryption = "aes-256-cbc"
pi_policy_key_lifetime = 28800
pi_policy_pfs = true
pi_policy_authentication = "hmac-sha-256-128"
}
Expand Down Expand Up @@ -51,9 +51,9 @@ ibm_pi_ipsec_policy provides the following [timeouts](https://www.terraform.io/d
## Argument reference
Review the argument references that you can specify for your resource.
- `pi_cloud_instance_id` - (Required, String) The GUID of the service instance associated with an account.
- `pi_policy_authentication` - (Optional, String) Authentication for the IPSec Policy. Supported values are `none`(Default), `hmac-sha-256-128` and `hmac-sha1-96`.
- `pi_policy_authentication` - (Optional, String) Authentication for the IPSec Policy. Supported values are `none`(Default), `hmac-sha-256-128`, `hmac-sha1-96`.
- `pi_policy_dh_group` - (Required, Integer) DH group of the IPSec Policy. Supported values are `1`,`2`,`5`,`14`,`19`,`20`,`24`.
- `pi_policy_encryption`- (Required, String) Encryption of the IPSec Policy. Supported values are `3des-cbc`,`aes-128-cbc`,`aes-128-gcm`,`aes-192-cbc`,`aes-256-cbc`,`aes-256-gcm`,`des-cbc`.
- `pi_policy_encryption`- (Required, String) Encryption of the IPSec Policy. Supported values are `aes-256-cbc`, `aes-192-cbc`, `aes-128-cbc`, `aes-256-gcm`, `aes-128-gcm`, `3des-cbc`.
- `pi_policy_key_lifetime` - (Required, Integer) Policy key lifetime. Supported values: `180` ≤ value ≤ `86400`.
- `pi_policy_name` - (Required, String) Name of the IPSec Policy.
- `pi_policy_pfs` - (Required, Boolean) Perfect Forward Secrecy.
Expand Down