Skip to content

Commit 62a584a

Browse files
ab-cs13ab-cs13
committed
db_servers_list renamed to db_servers and db_nodes_list to db_nodes
1 parent d204eb7 commit 62a584a

13 files changed

+50
-50
lines changed

‎internal/service/odb/cloud_autonomous_vm_cluster_data_source_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func (autonomousVMClusterDSTest) avmcBasic() string {
109109
110110
%s
111111
112-
data "aws_odb_db_servers_list" "test" {
112+
data "aws_odb_db_servers" "test" {
113113
cloud_exadata_infrastructure_id = aws_odb_cloud_exadata_infrastructure.test.id
114114
}
115115
@@ -122,7 +122,7 @@ resource "aws_odb_cloud_autonomous_vm_cluster" "test" {
122122
total_container_databases = 1
123123
cpu_core_count_per_node = 40
124124
license_model = "LICENSE_INCLUDED"
125-
db_servers = [for db_server in data.aws_odb_db_servers_list.test.db_servers : db_server.id]
125+
db_servers = [for db_server in data.aws_odb_db_servers.test.db_servers : db_server.id]
126126
scan_listener_port_tls = 8561
127127
scan_listener_port_non_tls = 1024
128128
maintenance_window {

‎internal/service/odb/cloud_autonomous_vm_cluster_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ func (autonomousVMClusterResourceTest) avmcBasic() string {
279279
280280
%s
281281
282-
data "aws_odb_db_servers_list" "test" {
282+
data "aws_odb_db_servers" "test" {
283283
cloud_exadata_infrastructure_id = aws_odb_cloud_exadata_infrastructure.test.id
284284
}
285285
@@ -292,7 +292,7 @@ resource "aws_odb_cloud_autonomous_vm_cluster" "test" {
292292
total_container_databases = 1
293293
cpu_core_count_per_node = 40
294294
license_model = "LICENSE_INCLUDED"
295-
db_servers = [for db_server in data.aws_odb_db_servers_list.test.db_servers : db_server.id]
295+
db_servers = [for db_server in data.aws_odb_db_servers.test.db_servers : db_server.id]
296296
scan_listener_port_tls = 8561
297297
scan_listener_port_non_tls = 1024
298298
maintenance_window {
@@ -322,7 +322,7 @@ func (autonomousVMClusterResourceTest) avmcNoTagWithTag() (string, string) {
322322
323323
%s
324324
325-
data "aws_odb_db_servers_list" "test" {
325+
data "aws_odb_db_servers" "test" {
326326
cloud_exadata_infrastructure_id = aws_odb_cloud_exadata_infrastructure.test.id
327327
}
328328
@@ -335,7 +335,7 @@ resource "aws_odb_cloud_autonomous_vm_cluster" "test" {
335335
total_container_databases = 1
336336
cpu_core_count_per_node = 40
337337
license_model = "LICENSE_INCLUDED"
338-
db_servers = [for db_server in data.aws_odb_db_servers_list.test.db_servers : db_server.id]
338+
db_servers = [for db_server in data.aws_odb_db_servers.test.db_servers : db_server.id]
339339
scan_listener_port_tls = 8561
340340
scan_listener_port_non_tls = 1024
341341
maintenance_window {
@@ -353,7 +353,7 @@ resource "aws_odb_cloud_autonomous_vm_cluster" "test" {
353353
354354
%s
355355
356-
data "aws_odb_db_servers_list" "test" {
356+
data "aws_odb_db_servers" "test" {
357357
cloud_exadata_infrastructure_id = aws_odb_cloud_exadata_infrastructure.test.id
358358
}
359359
@@ -366,7 +366,7 @@ resource "aws_odb_cloud_autonomous_vm_cluster" "test" {
366366
total_container_databases = 1
367367
cpu_core_count_per_node = 40
368368
license_model = "LICENSE_INCLUDED"
369-
db_servers = [for db_server in data.aws_odb_db_servers_list.test.db_servers : db_server.id]
369+
db_servers = [for db_server in data.aws_odb_db_servers.test.db_servers : db_server.id]
370370
scan_listener_port_tls = 8561
371371
scan_listener_port_non_tls = 1024
372372
maintenance_window {
@@ -399,7 +399,7 @@ func (autonomousVMClusterResourceTest) avmcAllParamsConfig() string {
399399
400400
%s
401401
402-
data "aws_odb_db_servers_list" "test" {
402+
data "aws_odb_db_servers" "test" {
403403
cloud_exadata_infrastructure_id = aws_odb_cloud_exadata_infrastructure.test.id
404404
}
405405
@@ -414,7 +414,7 @@ resource "aws_odb_cloud_autonomous_vm_cluster" "test" {
414414
total_container_databases = 1
415415
cpu_core_count_per_node = 40
416416
license_model = "LICENSE_INCLUDED"
417-
db_servers = [for db_server in data.aws_odb_db_servers_list.test.db_servers : db_server.id]
417+
db_servers = [for db_server in data.aws_odb_db_servers.test.db_servers : db_server.id]
418418
scan_listener_port_tls = 8561
419419
scan_listener_port_non_tls = 1024
420420
maintenance_window {

‎internal/service/odb/cloud_vm_cluster_data_source_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" {
150150
}
151151
}
152152
153-
data "aws_odb_db_servers_list" "test" {
153+
data "aws_odb_db_servers" "test" {
154154
cloud_exadata_infrastructure_id = aws_odb_cloud_exadata_infrastructure.test.id
155155
}
156156
@@ -166,7 +166,7 @@ resource "aws_odb_cloud_vm_cluster" "test" {
166166
is_sparse_diskgroup_enabled = true
167167
license_model = "LICENSE_INCLUDED"
168168
data_storage_size_in_tbs = 20.0
169-
db_servers = [for db_server in data.aws_odb_db_servers_list.test.db_servers : db_server.id]
169+
db_servers = [for db_server in data.aws_odb_db_servers.test.db_servers : db_server.id]
170170
db_node_storage_size_in_gbs = 120.0
171171
memory_size_in_gbs = 60
172172
data_collection_options {

‎internal/service/odb/cloud_vm_cluster_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ func (cloudVmClusterResourceTest) testAccCloudVmClusterConfigBasic(vmClusterDisp
267267
268268
%s
269269
270-
data "aws_odb_db_servers_list" "test" {
270+
data "aws_odb_db_servers" "test" {
271271
cloud_exadata_infrastructure_id = aws_odb_cloud_exadata_infrastructure.test.id
272272
}
273273
@@ -283,7 +283,7 @@ resource "aws_odb_cloud_vm_cluster" "test" {
283283
is_sparse_diskgroup_enabled = true
284284
license_model = "LICENSE_INCLUDED"
285285
data_storage_size_in_tbs = 20.0
286-
db_servers = [for db_server in data.aws_odb_db_servers_list.test.db_servers : db_server.id]
286+
db_servers = [for db_server in data.aws_odb_db_servers.test.db_servers : db_server.id]
287287
db_node_storage_size_in_gbs = 120.0
288288
memory_size_in_gbs = 60
289289
data_collection_options {
@@ -309,7 +309,7 @@ func (cloudVmClusterResourceTest) cloudVmClusterWithAllParameters(vmClusterDispl
309309
%s
310310
311311
312-
data "aws_odb_db_servers_list" "test" {
312+
data "aws_odb_db_servers" "test" {
313313
cloud_exadata_infrastructure_id = aws_odb_cloud_exadata_infrastructure.test.id
314314
}
315315
@@ -325,7 +325,7 @@ resource "aws_odb_cloud_vm_cluster" "test" {
325325
is_sparse_diskgroup_enabled = true
326326
license_model = "LICENSE_INCLUDED"
327327
data_storage_size_in_tbs = 20.0
328-
db_servers = [for db_server in data.aws_odb_db_servers_list.test.db_servers : db_server.id]
328+
db_servers = [for db_server in data.aws_odb_db_servers.test.db_servers : db_server.id]
329329
db_node_storage_size_in_gbs = 120.0
330330
memory_size_in_gbs = 60
331331
cluster_name = "julia-13"
@@ -354,7 +354,7 @@ func (cloudVmClusterResourceTest) testAccCloudVmClusterConfigUpdatedTags(vmClust
354354
355355
%s
356356
357-
data "aws_odb_db_servers_list" "test" {
357+
data "aws_odb_db_servers" "test" {
358358
cloud_exadata_infrastructure_id = aws_odb_cloud_exadata_infrastructure.test.id
359359
}
360360
@@ -370,7 +370,7 @@ resource "aws_odb_cloud_vm_cluster" "test" {
370370
is_sparse_diskgroup_enabled = true
371371
license_model = "LICENSE_INCLUDED"
372372
data_storage_size_in_tbs = 20.0
373-
db_servers = [for db_server in data.aws_odb_db_servers_list.test.db_servers : db_server.id]
373+
db_servers = [for db_server in data.aws_odb_db_servers.test.db_servers : db_server.id]
374374
db_node_storage_size_in_gbs = 120.0
375375
memory_size_in_gbs = 60
376376
data_collection_options {

‎internal/service/odb/db_node_data_source_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,12 @@ func (testDbNodeDataSourceTest) dbNodeDataSourceBasicConfig(publicKey string) st
137137
return fmt.Sprintf(`
138138
%s
139139
140-
data "aws_odb_db_nodes_list" "test" {
140+
data "aws_odb_db_nodes" "test" {
141141
cloud_vm_cluster_id = aws_odb_cloud_vm_cluster.test.id
142142
}
143143
144144
data "aws_odb_db_node" "test" {
145-
id = data.aws_odb_db_nodes_list.test.db_nodes[0].id
145+
id = data.aws_odb_db_nodes.test.db_nodes[0].id
146146
cloud_vm_cluster_id = aws_odb_cloud_vm_cluster.test.id
147147
}
148148
@@ -179,7 +179,7 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" {
179179
}
180180
}
181181
182-
data "aws_odb_db_servers_list" "test" {
182+
data "aws_odb_db_servers" "test" {
183183
cloud_exadata_infrastructure_id = aws_odb_cloud_exadata_infrastructure.test.id
184184
}
185185
@@ -195,7 +195,7 @@ resource "aws_odb_cloud_vm_cluster" "test" {
195195
is_sparse_diskgroup_enabled = true
196196
license_model = "LICENSE_INCLUDED"
197197
data_storage_size_in_tbs = 20.0
198-
db_servers = [for db_server in data.aws_odb_db_servers_list.test.db_servers : db_server.id]
198+
db_servers = [for db_server in data.aws_odb_db_servers.test.db_servers : db_server.id]
199199
db_node_storage_size_in_gbs = 120.0
200200
memory_size_in_gbs = 60
201201
data_collection_options {

‎internal/service/odb/db_nodes_list_data_source.go‎ renamed to ‎internal/service/odb/db_nodes_data_source.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"github.com/hashicorp/terraform-provider-aws/names"
2020
)
2121

22-
// @FrameworkDataSource("aws_odb_db_nodes_list", name="Db Nodes List")
23-
func newDataSourceDBNodesList(context.Context) (datasource.DataSourceWithConfigure, error) {
22+
// @FrameworkDataSource("aws_odb_db_nodes", name="Db Nodes")
23+
func newDataSourceDBNodes(context.Context) (datasource.DataSourceWithConfigure, error) {
2424
return &dataSourceDbNodesList{}, nil
2525
}
2626

‎internal/service/odb/db_nodes_list_data_source_test.go‎ renamed to ‎internal/service/odb/db_nodes_data_source_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func TestAccODBDBNodesListDataSource_basic(t *testing.T) {
5050
return
5151
}
5252
var dbNodesList odb.ListDbNodesOutput
53-
dbNodesListsDataSourceName := "data.aws_odb_db_nodes_list.test"
53+
dbNodesListsDataSourceName := "data.aws_odb_db_nodes.test"
5454
vmClusterListsResourceName := "aws_odb_cloud_vm_cluster.test"
5555

5656
resource.ParallelTest(t, resource.TestCase{
@@ -65,7 +65,7 @@ func TestAccODBDBNodesListDataSource_basic(t *testing.T) {
6565
Config: dbNodesListDataSourceTestEntity.basicDBNodesListDataSource(publicKey),
6666
Check: resource.ComposeAggregateTestCheckFunc(
6767
dbNodesListDataSourceTestEntity.testAccCheckDBNodesListExists(ctx, vmClusterListsResourceName, &dbNodesList),
68-
resource.TestCheckResourceAttr(dbNodesListsDataSourceName, "aws_odb_db_nodes_list.db_nodes.#", strconv.Itoa(len(dbNodesList.DbNodes))),
68+
resource.TestCheckResourceAttr(dbNodesListsDataSourceName, "aws_odb_db_nodes.db_nodes.#", strconv.Itoa(len(dbNodesList.DbNodes))),
6969
),
7070
},
7171
},
@@ -143,7 +143,7 @@ func (dbNodesListDataSourceTest) basicDBNodesListDataSource(publicKey string) st
143143
144144
%s
145145
146-
data "aws_odb_db_nodes_list" "test" {
146+
data "aws_odb_db_nodes" "test" {
147147
cloud_vm_cluster_id = aws_odb_cloud_vm_cluster.test.id
148148
}
149149
`, vmCluster)
@@ -178,7 +178,7 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" {
178178
}
179179
}
180180
181-
data "aws_odb_db_servers_list" "test" {
181+
data "aws_odb_db_servers" "test" {
182182
cloud_exadata_infrastructure_id = aws_odb_cloud_exadata_infrastructure.test.id
183183
}
184184
@@ -194,7 +194,7 @@ resource "aws_odb_cloud_vm_cluster" "test" {
194194
is_sparse_diskgroup_enabled = true
195195
license_model = "LICENSE_INCLUDED"
196196
data_storage_size_in_tbs = 20.0
197-
db_servers = [for db_server in data.aws_odb_db_servers_list.test.db_servers : db_server.id]
197+
db_servers = [for db_server in data.aws_odb_db_servers.test.db_servers : db_server.id]
198198
db_node_storage_size_in_gbs = 120.0
199199
memory_size_in_gbs = 60
200200
data_collection_options {

‎internal/service/odb/db_server_data_source_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,12 @@ func (testDbServerDataSourceTest) basicDBServerDataSourceConfig() string {
138138
return fmt.Sprintf(`
139139
%s
140140
141-
data "aws_odb_db_servers_list" "test" {
141+
data "aws_odb_db_servers" "test" {
142142
cloud_exadata_infrastructure_id = aws_odb_cloud_exadata_infrastructure.test.id
143143
}
144144
145145
data "aws_odb_db_server" "test" {
146-
id = data.aws_odb_db_servers_list.test.db_servers[0].id
146+
id = data.aws_odb_db_servers.test.db_servers[0].id
147147
cloud_exadata_infrastructure_id = aws_odb_cloud_exadata_infrastructure.test.id
148148
}
149149
`, exaInfra)

‎internal/service/odb/db_servers_list_data_source.go‎ renamed to ‎internal/service/odb/db_servers_data_source.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"github.com/hashicorp/terraform-provider-aws/names"
2020
)
2121

22-
// @FrameworkDataSource("aws_odb_db_servers_list", name="Db Servers List")
23-
func newDataSourceDBServersList(context.Context) (datasource.DataSourceWithConfigure, error) {
22+
// @FrameworkDataSource("aws_odb_db_servers", name="Db Servers")
23+
func newDataSourceDBServers(context.Context) (datasource.DataSourceWithConfigure, error) {
2424
return &dataSourceDbServersList{}, nil
2525
}
2626

‎internal/service/odb/db_servers_list_data_source_test.go‎ renamed to ‎internal/service/odb/db_servers_data_source_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func TestAccODBDBServersListDataSource_basic(t *testing.T) {
4141
t.Skip("skipping long-running test in short mode")
4242
}
4343
var dbServersList odb.ListDbServersOutput
44-
dataSourceName := "data.aws_odb_db_servers_list.test"
44+
dataSourceName := "data.aws_odb_db_servers.test"
4545
exaInfraResourceName := "aws_odb_cloud_exadata_infrastructure.test"
4646
resource.ParallelTest(t, resource.TestCase{
4747
PreCheck: func() {
@@ -55,7 +55,7 @@ func TestAccODBDBServersListDataSource_basic(t *testing.T) {
5555
Config: dbServersListDataSourceTestEntity.testAccDBServersListDataSourceConfigBasic(),
5656
Check: resource.ComposeAggregateTestCheckFunc(
5757
dbServersListDataSourceTestEntity.testAccCheckDBServersListExists(ctx, exaInfraResourceName, &dbServersList),
58-
resource.TestCheckResourceAttr(dataSourceName, "aws_odb_db_servers_list.db_servers.#", strconv.Itoa(len(dbServersList.DbServers))),
58+
resource.TestCheckResourceAttr(dataSourceName, "aws_odb_db_servers.db_servers.#", strconv.Itoa(len(dbServersList.DbServers))),
5959
),
6060
},
6161
},
@@ -137,7 +137,7 @@ func (testDbServersListDataSource) testAccDBServersListDataSourceConfigBasic() s
137137
return fmt.Sprintf(`
138138
%s
139139
140-
data "aws_odb_db_servers_list" "test" {
140+
data "aws_odb_db_servers" "test" {
141141
cloud_exadata_infrastructure_id = aws_odb_cloud_exadata_infrastructure.test.id
142142
}
143143
`, exaInfra)

0 commit comments

Comments
 (0)