Skip to content

Commit 3689f2d

Browse files
authored
Deprecate vpn resources (#6317)
1 parent c0bb73e commit 3689f2d

File tree

6 files changed

+95
-70
lines changed

6 files changed

+95
-70
lines changed

ibm/service/power/resource_ibm_pi_ike_policy.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ func ResourceIBMPIIKEPolicy() *schema.Resource {
9595
Description: "IKE Policy ID",
9696
},
9797
},
98+
DeprecationMessage: "Resource ibm_pi_ike_policy is deprecated. VPN has reached end of life.",
9899
}
99100
}
100101

ibm/service/power/resource_ibm_pi_ipsec_policy.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ func ResourceIBMPIIPSecPolicy() *schema.Resource {
8585
Description: "IPSec policy ID",
8686
},
8787
},
88+
DeprecationMessage: "Resource ibm_pi_ipsec_policy is deprecated. VPN has reached end of life.",
8889
}
8990
}
9091

ibm/service/power/resource_ibm_pi_vpn_connection.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ func ResourceIBMPIVPNConnection() *schema.Resource {
111111
Description: "Dead Peer Detection",
112112
},
113113
},
114+
DeprecationMessage: "Resource ibm_pi_vpn_connection is deprecated. VPN has reached end of life.",
114115
}
115116
}
116117

website/docs/r/pi_vpn_connection.html.markdown

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,39 @@ description: |-
88
---
99

1010
# ibm_pi_vpn_connection
11+
12+
~> This resource is deprecated and will be removed in the next major version. This resource has reached end of life.
13+
1114
Update or delete a VPN connection. For more information, about IBM power virtual server cloud, see [getting started with IBM Power Systems Virtual Servers](https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-getting-started).
1215

1316
~> **Deprecated:**
1417
Create VPN connection is deprecated and no longer supported. Existing `pi_vpn_connection` will still have support for `update` and `delete`. See [a new method for creating a VPN connection](https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-VPN-connections)
1518

16-
## Example usage
19+
## Example Usage
20+
1721
The following example creates a VPN Connection.
1822

1923
```terraform
20-
resource "ibm_pi_vpn_connection" "example" {
21-
pi_cloud_instance_id = "<value of the cloud_instance_id>"
22-
pi_vpn_connection_name = "test"
23-
pi_ike_policy_id = ibm_pi_ike_policy.policy.policy_id
24-
pi_ipsec_policy_id = ibm_pi_ipsec_policy.policy.policy_id
25-
pi_vpn_connection_mode = "policy"
26-
pi_networks = [ibm_pi_network.private_network1.network_id]
27-
pi_peer_gateway_address = "1.22.124.1"
28-
pi_peer_subnets = ["107.0.0.0/24"]
29-
}
24+
resource "ibm_pi_vpn_connection" "example" {
25+
pi_cloud_instance_id = "<value of the cloud_instance_id>"
26+
pi_vpn_connection_name = "test"
27+
pi_ike_policy_id = ibm_pi_ike_policy.policy.policy_id
28+
pi_ipsec_policy_id = ibm_pi_ipsec_policy.policy.policy_id
29+
pi_vpn_connection_mode = "policy"
30+
pi_networks = [ibm_pi_network.private_network1.network_id]
31+
pi_peer_gateway_address = "1.22.124.1"
32+
pi_peer_subnets = ["107.0.0.0/24"]
33+
}
3034
```
3135

32-
**Note**
33-
* Please find [supported Regions](https://cloud.ibm.com/apidocs/power-cloud#endpoint) for endpoints.
34-
* If a Power cloud instance is provisioned at `lon04`, The provider level attributes should be as follows:
35-
* `region` - `lon`
36-
* `zone` - `lon04`
36+
### Notes
3737

38-
Example usage:
38+
- Please find [supported Regions](https://cloud.ibm.com/apidocs/power-cloud#endpoint) for endpoints.
39+
- If a Power cloud instance is provisioned at `lon04`, The provider level attributes should be as follows:
40+
- `region` - `lon`
41+
- `zone` - `lon04`
42+
43+
Example usage:
3944

4045
```terraform
4146
provider "ibm" {
@@ -48,12 +53,13 @@ The following example creates a VPN Connection.
4853

4954
ibm_pi_vpn_connection provides the following [timeouts](https://www.terraform.io/docs/language/resources/syntax.html) configuration options:
5055

51-
5256
- **update** - (Default 20 minutes) Used for updating VPN connection.
5357
- **delete** - (Default 20 minutes) Used for deleting VPN connection.
5458

55-
## Argument reference
56-
Review the argument references that you can specify for your resource.
59+
## Argument Reference
60+
61+
Review the argument references that you can specify for your resource.
62+
5763
- `pi_cloud_instance_id` - (Required, String) The GUID of the service instance associated with an account.
5864
- `pi_ike_policy_id` - (Required, String) Unique identifier of IKE Policy selected for this VPN Connection.
5965
- `pi_ipsec_policy_id`- (Required, String) Unique identifier of IPSec Policy selected for this VPN Connection.
@@ -63,7 +69,8 @@ Review the argument references that you can specify for your resource.
6369
- `pi_vpn_connection_mode` - (Required, String) Mode used by this VPN Connection, either `policy` or `route`.
6470
- `pi_vpn_connection_name` - (Required, String) Name of the VPN Connection.
6571

66-
## Attribute reference
72+
## Attribute Reference
73+
6774
In addition to all argument reference list, you can access the following attribute reference after your resource is created.
6875

6976
- `id` - (String) The unique identifier of the VPN Connection. The ID is composed of `<power_instance_id>/<vpn_connection_id>`.
@@ -78,13 +85,12 @@ In addition to all argument reference list, you can access the following attribu
7885
- `gateway_address` - (String) Public IP address of the VPN Gateway (vSRX) attached to this VPN Connection.
7986
- `local_gateway_address` - (String) Local Gateway address, only in `route` mode.
8087

81-
8288
## Import
8389

8490
The `ibm_pi_vpn_connection` resource can be imported by using `power_instance_id` and `vpn_connection_id`.
8591

86-
**Example**
92+
### Example
8793

88-
```
89-
$ terraform import ibm_pi_vpn_connection.example d7bec597-4726-451f-8a63-e62e6f19c32c/cea6651a-bc0a-4438-9f8a-a0770bbf451f
94+
```bash
95+
terraform import ibm_pi_vpn_connection.example d7bec597-4726-451f-8a63-e62e6f19c32c/cea6651a-bc0a-4438-9f8a-a0770bbf451f
9096
```

website/docs/r/pi_vpn_ike_policy.html.markdown

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,36 @@ description: |-
88
---
99

1010
# ibm_pi_ike_policy
11+
12+
~> This resource is deprecated and will be removed in the next major version. This resource has reached end of life.
13+
1114
Create, update, or delete a IKE Policy. For more information, about IBM power virtual server cloud, see [getting started with IBM Power Systems Virtual Servers](https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-getting-started).
1215

13-
## Example usage
16+
## Example Usage
17+
1418
The following example creates a IKE Policy.
1519

1620
```terraform
17-
resource "ibm_pi_ike_policy" "example" {
18-
pi_cloud_instance_id = "<value of the cloud_instance_id>"
19-
pi_policy_name = "test"
20-
pi_policy_dh_group = 1
21-
pi_policy_encryption = "aes-256-cbc"
22-
pi_policy_key_lifetime = 28800
23-
pi_policy_preshared_key = "sample"
24-
pi_policy_version = 1
25-
pi_policy_authentication = "sha1"
26-
}
21+
resource "ibm_pi_ike_policy" "example" {
22+
pi_cloud_instance_id = "<value of the cloud_instance_id>"
23+
pi_policy_name = "test"
24+
pi_policy_dh_group = 1
25+
pi_policy_encryption = "aes-256-cbc"
26+
pi_policy_key_lifetime = 28800
27+
pi_policy_preshared_key = "sample"
28+
pi_policy_version = 1
29+
pi_policy_authentication = "sha1"
30+
}
2731
```
2832

29-
**Note**
30-
* Please find [supported Regions](https://cloud.ibm.com/apidocs/power-cloud#endpoint) for endpoints.
31-
* If a Power cloud instance is provisioned at `lon04`, The provider level attributes should be as follows:
32-
* `region` - `lon`
33-
* `zone` - `lon04`
33+
### Notes
34+
35+
- Please find [supported Regions](https://cloud.ibm.com/apidocs/power-cloud#endpoint) for endpoints.
36+
- If a Power cloud instance is provisioned at `lon04`, The provider level attributes should be as follows:
37+
- `region` - `lon`
38+
- `zone` - `lon04`
3439

35-
Example usage:
40+
Example usage:
3641

3742
```terraform
3843
provider "ibm" {
@@ -49,8 +54,10 @@ ibm_pi_ike_policy provides the following [timeouts](https://www.terraform.io/doc
4954
- **update** - (Default 10 minutes) Used for updating IKE Policy.
5055
- **delete** - (Default 10 minutes) Used for deleting IKE Policy.
5156

52-
## Argument reference
53-
Review the argument references that you can specify for your resource.
57+
## Argument Reference
58+
59+
Review the argument references that you can specify for your resource.
60+
5461
- `pi_cloud_instance_id` - (Required, String) The GUID of the service instance associated with an account.
5562
- `pi_policy_authentication` - (Optional, String) Authentication for the IKE Policy. Supported values are `none`(Default), `sha-256`, `sha-384`, `sha1`.
5663
- `pi_policy_dh_group` - (Required, Integer) DH group of the IKE Policy. Supported values are `1`,`2`,`5`,`14`,`19`,`20`,`24`.
@@ -60,7 +67,8 @@ Review the argument references that you can specify for your resource.
6067
- `pi_policy_preshared_key` - (Required, String) Preshared key used in this IKE Policy (length of preshared key must be even).
6168
- `pi_policy_version` - (Required, Integer) Version of the IKE Policy. Supported values are `1`,`2`.
6269

63-
## Attribute reference
70+
## Attribute Reference
71+
6472
In addition to all argument reference list, you can access the following attribute reference after your resource is created.
6573

6674
- `id` - (String) The unique identifier of the IKE Policy. The ID is composed of `<power_instance_id>/<policy_id>`.
@@ -70,8 +78,8 @@ In addition to all argument reference list, you can access the following attribu
7078

7179
The `ibm_pi_ike_policy` resource can be imported by using `power_instance_id` and `policy_id`.
7280

73-
**Example**
81+
### Example
7482

75-
```
76-
$ terraform import ibm_pi_ike_policy.example d7bec597-4726-451f-8a63-e62e6f19c32c/cea6651a-bc0a-4438-9f8a-a0770bbf451f
83+
```bash
84+
terraform import ibm_pi_ike_policy.example d7bec597-4726-451f-8a63-e62e6f19c32c/cea6651a-bc0a-4438-9f8a-a0770bbf451f
7785
```

website/docs/r/pi_vpn_ipsec_policy.html.markdown

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,35 @@ description: |-
88
---
99

1010
# ibm_pi_ipsec_policy
11+
12+
~> This resource is deprecated and will be removed in the next major version. This resource has reached end of life.
13+
1114
Create, update, or delete a IPSec Policy. For more information, about IBM power virtual server cloud, see [getting started with IBM Power Systems Virtual Servers](https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-getting-started).
1215

13-
## Example usage
16+
## Example Usage
17+
1418
The following example creates a IPSec Policy.
1519

1620
```terraform
17-
resource "ibm_pi_ipsec_policy" "example" {
18-
pi_cloud_instance_id = "<value of the cloud_instance_id>"
19-
pi_policy_name = "test"
20-
pi_policy_dh_group = 1
21-
pi_policy_encryption = "aes-256-cbc"
22-
pi_policy_key_lifetime = 28800
23-
pi_policy_pfs = true
24-
pi_policy_authentication = "hmac-sha-256-128"
25-
}
21+
resource "ibm_pi_ipsec_policy" "example" {
22+
pi_cloud_instance_id = "<value of the cloud_instance_id>"
23+
pi_policy_name = "test"
24+
pi_policy_dh_group = 1
25+
pi_policy_encryption = "aes-256-cbc"
26+
pi_policy_key_lifetime = 28800
27+
pi_policy_pfs = true
28+
pi_policy_authentication = "hmac-sha-256-128"
29+
}
2630
```
2731

28-
**Note**
29-
* Please find [supported Regions](https://cloud.ibm.com/apidocs/power-cloud#endpoint) for endpoints.
30-
* If a Power cloud instance is provisioned at `lon04`, The provider level attributes should be as follows:
31-
* `region` - `lon`
32-
* `zone` - `lon04`
32+
### Notes
33+
34+
- Please find [supported Regions](https://cloud.ibm.com/apidocs/power-cloud#endpoint) for endpoints.
35+
- If a Power cloud instance is provisioned at `lon04`, The provider level attributes should be as follows:
36+
- `region` - `lon`
37+
- `zone` - `lon04`
3338

34-
Example usage:
39+
Example usage:
3540

3641
```terraform
3742
provider "ibm" {
@@ -48,8 +53,10 @@ ibm_pi_ipsec_policy provides the following [timeouts](https://www.terraform.io/d
4853
- **update** - (Default 10 minutes) Used for updating IPSec Policy.
4954
- **delete** - (Default 10 minutes) Used for deleting IPSec Policy.
5055

51-
## Argument reference
52-
Review the argument references that you can specify for your resource.
56+
## Argument Reference
57+
58+
Review the argument references that you can specify for your resource.
59+
5360
- `pi_cloud_instance_id` - (Required, String) The GUID of the service instance associated with an account.
5461
- `pi_policy_authentication` - (Optional, String) Authentication for the IPSec Policy. Supported values are `none`(Default), `hmac-sha-256-128`, `hmac-sha1-96`.
5562
- `pi_policy_dh_group` - (Required, Integer) DH group of the IPSec Policy. Supported values are `1`,`2`,`5`,`14`,`19`,`20`,`24`.
@@ -58,7 +65,8 @@ Review the argument references that you can specify for your resource.
5865
- `pi_policy_name` - (Required, String) Name of the IPSec Policy.
5966
- `pi_policy_pfs` - (Required, Boolean) Perfect Forward Secrecy.
6067

61-
## Attribute reference
68+
## Attribute Reference
69+
6270
In addition to all argument reference list, you can access the following attribute reference after your resource is created.
6371

6472
- `id` - (String) The unique identifier of the IPSec Policy. The ID is composed of `<power_instance_id>/<policy_id>`.
@@ -68,8 +76,8 @@ In addition to all argument reference list, you can access the following attribu
6876

6977
The `ibm_pi_ipsec_policy` resource can be imported by using `power_instance_id` and `policy_id`.
7078

71-
**Example**
79+
### Example
7280

73-
```
74-
$ terraform import ibm_pi_ipsec_policy.example d7bec597-4726-451f-8a63-e62e6f19c32c/ffag151a-bc0a-4438-9f8a-b0760bbf4u1u
81+
```bash
82+
terraform import ibm_pi_ipsec_policy.example d7bec597-4726-451f-8a63-e62e6f19c32c/ffag151a-bc0a-4438-9f8a-b0760bbf4u1u
7583
```

0 commit comments

Comments
 (0)