Skip to content

Commit 9c1664a

Browse files
committed
changing backendset resource name in the docs to mantain consistency
1 parent 465dea1 commit 9c1664a

File tree

5 files changed

+22
-18
lines changed

5 files changed

+22
-18
lines changed

docs/examples/load_balancer/lb_full/lb_full.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ resource "oci_load_balancer" "lb1" {
196196
display_name = "lb1"
197197
}
198198

199-
resource "oci_load_balancer_backendset" "lb-bes1" {
199+
resource "oci_load_balancer_backend_set" "lb-bes1" {
200200
name = "lb-bes1"
201201
load_balancer_id = "${oci_load_balancer.lb1.id}"
202202
policy = "ROUND_ROBIN"
@@ -223,7 +223,7 @@ resource "oci_load_balancer_path_route_set" "test_path_route_set" {
223223
name = "pr-set1"
224224
path_routes {
225225
#Required
226-
backend_set_name = "${oci_load_balancer_backendset.lb-bes1.name}"
226+
backend_set_name = "${oci_load_balancer_backend_set.lb-bes1.name}"
227227
path = "/example/video/123"
228228
path_match_type {
229229
#Required
@@ -236,7 +236,7 @@ resource "oci_load_balancer_path_route_set" "test_path_route_set" {
236236
resource "oci_load_balancer_listener" "lb-listener1" {
237237
load_balancer_id = "${oci_load_balancer.lb1.id}"
238238
name = "http"
239-
default_backend_set_name = "${oci_load_balancer_backendset.lb-bes1.id}"
239+
default_backend_set_name = "${oci_load_balancer_backend_set.lb-bes1.id}"
240240
port = 80
241241
protocol = "HTTP"
242242
connection_configuration {
@@ -247,7 +247,7 @@ resource "oci_load_balancer_listener" "lb-listener1" {
247247
resource "oci_load_balancer_listener" "lb-listener2" {
248248
load_balancer_id = "${oci_load_balancer.lb1.id}"
249249
name = "https"
250-
default_backend_set_name = "${oci_load_balancer_backendset.lb-bes1.id}"
250+
default_backend_set_name = "${oci_load_balancer_backend_set.lb-bes1.id}"
251251
port = 443
252252
protocol = "HTTP"
253253

@@ -259,7 +259,7 @@ resource "oci_load_balancer_listener" "lb-listener2" {
259259

260260
resource "oci_load_balancer_backend" "lb-be1" {
261261
load_balancer_id = "${oci_load_balancer.lb1.id}"
262-
backendset_name = "${oci_load_balancer_backendset.lb-bes1.id}"
262+
backendset_name = "${oci_load_balancer_backend_set.lb-bes1.id}"
263263
ip_address = "${oci_core_instance.instance1.private_ip}"
264264
port = 80
265265
backup = false
@@ -270,7 +270,7 @@ resource "oci_load_balancer_backend" "lb-be1" {
270270

271271
resource "oci_load_balancer_backend" "lb-be2" {
272272
load_balancer_id = "${oci_load_balancer.lb1.id}"
273-
backendset_name = "${oci_load_balancer_backendset.lb-bes1.id}"
273+
backendset_name = "${oci_load_balancer_backend_set.lb-bes1.id}"
274274
ip_address = "${oci_core_instance.instance2.private_ip}"
275275
port = 80
276276
backup = false

docs/examples/load_balancer/lb_private/lb_private.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ resource "oci_load_balancer" "lb1" {
6262
is_private = true
6363
}
6464

65-
resource "oci_load_balancer_backendset" "lb-bes1" {
65+
resource "oci_load_balancer_backend_set" "lb-bes1" {
6666
name = "lb-bes1"
6767
load_balancer_id = "${oci_load_balancer.lb1.id}"
6868
policy = "ROUND_ROBIN"

docs/load_balancer/backend_sets.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# oci_load_balancer_backendset
1+
# oci_load_balancer_backend_set
2+
`oci_load_balancer_backendset` is the old name for `oci_load_balancer_backend_set`. Both names are supported but `oci_load_balancer_backend_set` is used in the docs.
23

34
## BackendSet Resource
45

@@ -90,7 +91,7 @@ Any change to a property that does not support update will force the destruction
9091
### Example Usage
9192

9293
```
93-
resource "oci_load_balancer_backendset" "test_backend_set" {
94+
resource "oci_load_balancer_backend_set" "test_backend_set" {
9495
#Required
9596
health_checker {
9697
#Required
@@ -127,7 +128,8 @@ resource "oci_load_balancer_backendset" "test_backend_set" {
127128
}
128129
```
129130

130-
# oci_load_balancer_backendsets
131+
# oci_load_balancer_backend_sets
132+
`oci_load_balancer_backendsets` is the old name for `oci_load_balancer_backend_sets`. Both names are supported but `oci_load_balancer_backend_sets` is used in the docs.
131133

132134
## BackendSet DataSource
133135

@@ -147,7 +149,7 @@ The following attributes are exported:
147149
### Example Usage
148150

149151
```
150-
data "oci_load_balancer_backendsets" "test_backend_sets" {
152+
data "oci_load_balancer_backend_sets" "test_backend_sets" {
151153
#Required
152154
load_balancer_id = "${oci_load_balancer_load_balancer.test_load_balancer.id}"
153155
}

provider/load_balancer_backend_set_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
const (
1414
BackendSetRequiredOnlyResource = BackendSetResourceDependencies + `
15-
resource "oci_load_balancer_backendset" "test_backend_set" {
15+
resource "oci_load_balancer_backend_set" "test_backend_set" {
1616
#Required
1717
health_checker {
1818
#Required
@@ -26,7 +26,7 @@ resource "oci_load_balancer_backendset" "test_backend_set" {
2626
`
2727

2828
BackendSetResourceConfig = BackendSetResourceDependencies + `
29-
resource "oci_load_balancer_backendset" "test_backend_set" {
29+
resource "oci_load_balancer_backend_set" "test_backend_set" {
3030
#Required
3131
health_checker {
3232
#Required
@@ -93,8 +93,8 @@ func TestLoadBalancerBackendSetResource_basic(t *testing.T) {
9393
compartmentId2 := getRequiredEnvSetting("compartment_id_for_update")
9494
compartmentIdVariableStr2 := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId2)
9595

96-
resourceName := "oci_load_balancer_backendset.test_backend_set"
97-
datasourceName := "data.oci_load_balancer_backendsets.test_backend_sets"
96+
resourceName := "oci_load_balancer_backend_set.test_backend_set"
97+
datasourceName := "data.oci_load_balancer_backend_sets.test_backend_sets"
9898

9999
var resId, resId2 string
100100

@@ -276,13 +276,13 @@ variable "backend_set_ssl_configuration_certificate_name" { default = "certifica
276276
variable "backend_set_ssl_configuration_verify_depth" { default = 11 }
277277
variable "backend_set_ssl_configuration_verify_peer_certificate" { default = true }
278278
279-
data "oci_load_balancer_backendsets" "test_backend_sets" {
279+
data "oci_load_balancer_backend_sets" "test_backend_sets" {
280280
#Required
281281
load_balancer_id = "${oci_load_balancer_load_balancer.test_load_balancer.id}"
282282
283283
filter {
284284
name = "id"
285-
values = ["${oci_load_balancer_backendset.test_backend_set.id}"]
285+
values = ["${oci_load_balancer_backend_set.test_backend_set.id}"]
286286
}
287287
}
288288
` + compartmentIdVariableStr2 + BackendSetResourceConfig,
@@ -320,7 +320,7 @@ func TestLoadBalancerBackendSetResource_forcenew(t *testing.T) {
320320
compartmentId := getRequiredEnvSetting("compartment_id_for_create")
321321
compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
322322

323-
resourceName := "oci_load_balancer_backendset.test_backend_set"
323+
resourceName := "oci_load_balancer_backend_set.test_backend_set"
324324

325325
var resId, resId2 string
326326

provider/provider.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ func dataSourcesMap() map[string]*schema.Resource {
190190
"oci_identity_user_group_memberships": UserGroupMembershipsDataSource(),
191191
"oci_identity_users": UsersDataSource(),
192192
"oci_load_balancer_backends": BackendsDataSource(),
193+
"oci_load_balancer_backend_sets": BackendSetsDataSource(),
193194
"oci_load_balancer_backendsets": BackendSetsDataSource(),
194195
"oci_load_balancer_certificates": CertificatesDataSource(),
195196
"oci_load_balancer_policies": LoadBalancerPoliciesDataSource(),
@@ -245,6 +246,7 @@ func resourcesMap() map[string]*schema.Resource {
245246
"oci_load_balancer": LoadBalancerResource(),
246247
"oci_load_balancer_load_balancer": LoadBalancerResource(),
247248
"oci_load_balancer_backend": BackendResource(),
249+
"oci_load_balancer_backend_set": BackendSetResource(),
248250
"oci_load_balancer_backendset": BackendSetResource(),
249251
"oci_load_balancer_certificate": CertificateResource(),
250252
"oci_load_balancer_listener": ListenerResource(),

0 commit comments

Comments
 (0)