Skip to content

Commit 98f66e7

Browse files
ab-cs13ab-cs13
committed
fixed linter check
1 parent 81dae9e commit 98f66e7

13 files changed

+65
-65
lines changed

‎internal/service/odb/db_node_data_source.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import (
2020
)
2121

2222
// @FrameworkDataSource("aws_odb_db_node", name="Db Node")
23-
func newDataSourceDbNode(context.Context) (datasource.DataSourceWithConfigure, error) {
23+
func newDataSourceDBNode(context.Context) (datasource.DataSourceWithConfigure, error) {
2424
return &dataSourceDbNode{}, nil
2525
}
2626

2727
const (
28-
DSNameDbNode = "Db Node Data Source"
28+
DSNameDBNode = "DB Node Data Source"
2929
)
3030

3131
type dataSourceDbNode struct {
@@ -167,7 +167,7 @@ func (d *dataSourceDbNode) Read(ctx context.Context, req datasource.ReadRequest,
167167
out, err := conn.GetDbNode(ctx, &input)
168168
if err != nil {
169169
resp.Diagnostics.AddError(
170-
create.ProblemStandardMessage(names.ODB, create.ErrActionReading, DSNameDbNode, data.DbNodeId.ValueString(), err),
170+
create.ProblemStandardMessage(names.ODB, create.ErrActionReading, DSNameDBNode, data.DbNodeId.ValueString(), err),
171171
err.Error(),
172172
)
173173
return

‎internal/service/odb/db_node_data_source_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ var dbNodeDataSourceTestEntity = testDbNodeDataSourceTest{
3838
}
3939

4040
// Acceptance test access AWS and cost money to run.
41-
func TestAccODBDbNodeDataSource_basic(t *testing.T) {
41+
func TestAccODBDBNodeDataSource_basic(t *testing.T) {
4242
ctx := acctest.Context(t)
4343
if testing.Short() {
4444
t.Skip("skipping long-running test in short mode")
@@ -51,23 +51,23 @@ func TestAccODBDbNodeDataSource_basic(t *testing.T) {
5151
},
5252
ErrorCheck: acctest.ErrorCheck(t, names.ODBServiceID),
5353
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
54-
CheckDestroy: dbNodeDataSourceTestEntity.testAccCheckDbNodeDestroyed(ctx),
54+
CheckDestroy: dbNodeDataSourceTestEntity.testAccCheckDBNodeDestroyed(ctx),
5555
Steps: []resource.TestStep{
5656
{
5757
Config: dbNodeDataSourceTestEntity.dbNodeDataSourceBasicConfig(),
5858
Check: resource.ComposeAggregateTestCheckFunc(
59-
dbNodeDataSourceTestEntity.testAccCheckDbNodeExists(ctx, dataSourceName, &dbNode),
59+
dbNodeDataSourceTestEntity.testAccCheckDBNodeExists(ctx, dataSourceName, &dbNode),
6060
),
6161
},
6262
},
6363
})
6464
}
6565

66-
func (testDbNodeDataSourceTest) testAccCheckDbNodeExists(ctx context.Context, name string, output *odb.GetDbNodeOutput) resource.TestCheckFunc {
66+
func (testDbNodeDataSourceTest) testAccCheckDBNodeExists(ctx context.Context, name string, output *odb.GetDbNodeOutput) resource.TestCheckFunc {
6767
return func(s *terraform.State) error {
6868
rs, ok := s.RootModule().Resources[name]
6969
if !ok {
70-
return create.Error(names.ODB, create.ErrActionCheckingExistence, tfodb.DSNameDbServer, name, errors.New("not found"))
70+
return create.Error(names.ODB, create.ErrActionCheckingExistence, tfodb.DSNameDBServer, name, errors.New("not found"))
7171
}
7272
conn := acctest.Provider.Meta().(*conns.AWSClient).ODBClient(ctx)
7373
var dbNodeId = rs.Primary.ID
@@ -79,14 +79,14 @@ func (testDbNodeDataSourceTest) testAccCheckDbNodeExists(ctx context.Context, na
7979
}
8080
resp, err := conn.GetDbNode(ctx, &input)
8181
if err != nil {
82-
return create.Error(names.ODB, create.ErrActionCheckingExistence, tfodb.DSNameDbNode, rs.Primary.ID, err)
82+
return create.Error(names.ODB, create.ErrActionCheckingExistence, tfodb.DSNameDBNode, rs.Primary.ID, err)
8383
}
8484
*output = *resp
8585
return nil
8686
}
8787
}
8888

89-
func (testDbNodeDataSourceTest) testAccCheckDbNodeDestroyed(ctx context.Context) resource.TestCheckFunc {
89+
func (testDbNodeDataSourceTest) testAccCheckDBNodeDestroyed(ctx context.Context) resource.TestCheckFunc {
9090
return func(s *terraform.State) error {
9191
conn := acctest.Provider.Meta().(*conns.AWSClient).ODBClient(ctx)
9292
for _, rs := range s.RootModule().Resources {
@@ -98,9 +98,9 @@ func (testDbNodeDataSourceTest) testAccCheckDbNodeDestroyed(ctx context.Context)
9898
return nil
9999
}
100100
if err != nil {
101-
return create.Error(names.ODB, create.ErrActionCheckingDestroyed, tfodb.DSNameDbServer, rs.Primary.ID, err)
101+
return create.Error(names.ODB, create.ErrActionCheckingDestroyed, tfodb.DSNameDBServer, rs.Primary.ID, err)
102102
}
103-
return create.Error(names.ODB, create.ErrActionCheckingDestroyed, tfodb.DSNameDbServer, rs.Primary.ID, errors.New("not destroyed"))
103+
return create.Error(names.ODB, create.ErrActionCheckingDestroyed, tfodb.DSNameDBServer, rs.Primary.ID, errors.New("not destroyed"))
104104
}
105105
return nil
106106
}

‎internal/service/odb/db_nodes_list_data_source.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import (
2020
)
2121

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

2727
const (
28-
DSNameDbNodesList = "Db Nodes List Data Source"
28+
DSNameDBNodesList = "DB Nodes List Data Source"
2929
)
3030

3131
type dataSourceDbNodesList struct {
@@ -64,7 +64,7 @@ func (d *dataSourceDbNodesList) Read(ctx context.Context, req datasource.ReadReq
6464
page, err := paginator.NextPage(ctx)
6565
if err != nil {
6666
resp.Diagnostics.AddError(
67-
create.ProblemStandardMessage(names.ODB, create.ErrActionReading, DSNameDbNodesList, data.CloudVmClusterId.ValueString(), err),
67+
create.ProblemStandardMessage(names.ODB, create.ErrActionReading, DSNameDBNodesList, data.CloudVmClusterId.ValueString(), err),
6868
err.Error(),
6969
)
7070
return

‎internal/service/odb/db_nodes_list_data_source_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ var dbNodesListDataSourceTestEntity = dbNodesListDataSourceTest{
3939
}
4040

4141
// Acceptance test access AWS and cost money to run.
42-
func TestAccODBDbNodesListDataSource_basic(t *testing.T) {
42+
func TestAccODBDBNodesListDataSource_basic(t *testing.T) {
4343
ctx := acctest.Context(t)
4444
if testing.Short() {
4545
t.Skip("skipping long-running test in short mode")
@@ -55,24 +55,24 @@ func TestAccODBDbNodesListDataSource_basic(t *testing.T) {
5555
},
5656
ErrorCheck: acctest.ErrorCheck(t, names.ODBServiceID),
5757
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
58-
CheckDestroy: dbNodesListDataSourceTestEntity.testAccCheckDbNodesDestroyed(ctx),
58+
CheckDestroy: dbNodesListDataSourceTestEntity.testAccCheckDBNodesDestroyed(ctx),
5959
Steps: []resource.TestStep{
6060
{
61-
Config: dbNodesListDataSourceTestEntity.basicDbNodesListDataSource(),
61+
Config: dbNodesListDataSourceTestEntity.basicDBNodesListDataSource(),
6262
Check: resource.ComposeAggregateTestCheckFunc(
63-
dbNodesListDataSourceTestEntity.testAccCheckDbNodesListExists(ctx, vmClusterListsResourceName, &dbNodesList),
63+
dbNodesListDataSourceTestEntity.testAccCheckDBNodesListExists(ctx, vmClusterListsResourceName, &dbNodesList),
6464
resource.TestCheckResourceAttr(dbNodesListsDataSourceName, "aws_odb_db_nodes_list.db_nodes.#", strconv.Itoa(len(dbNodesList.DbNodes))),
6565
),
6666
},
6767
},
6868
})
6969
}
7070

71-
func (dbNodesListDataSourceTest) testAccCheckDbNodesListExists(ctx context.Context, name string, output *odb.ListDbNodesOutput) resource.TestCheckFunc {
71+
func (dbNodesListDataSourceTest) testAccCheckDBNodesListExists(ctx context.Context, name string, output *odb.ListDbNodesOutput) resource.TestCheckFunc {
7272
return func(s *terraform.State) error {
7373
rs, ok := s.RootModule().Resources[name]
7474
if !ok {
75-
return create.Error(names.ODB, create.ErrActionCheckingExistence, tfodb.DSNameDbNodesList, name, errors.New("not found"))
75+
return create.Error(names.ODB, create.ErrActionCheckingExistence, tfodb.DSNameDBNodesList, name, errors.New("not found"))
7676
}
7777
conn := acctest.Provider.Meta().(*conns.AWSClient).ODBClient(ctx)
7878
var vmClusterId = &rs.Primary.ID
@@ -93,7 +93,7 @@ func (dbNodesListDataSourceTest) testAccCheckDbNodesListExists(ctx context.Conte
9393
}
9494
}
9595

96-
func (dbNodesListDataSourceTest) testAccCheckDbNodesDestroyed(ctx context.Context) resource.TestCheckFunc {
96+
func (dbNodesListDataSourceTest) testAccCheckDBNodesDestroyed(ctx context.Context) resource.TestCheckFunc {
9797
return func(s *terraform.State) error {
9898
conn := acctest.Provider.Meta().(*conns.AWSClient).ODBClient(ctx)
9999
for _, rs := range s.RootModule().Resources {
@@ -105,9 +105,9 @@ func (dbNodesListDataSourceTest) testAccCheckDbNodesDestroyed(ctx context.Contex
105105
return nil
106106
}
107107
if err != nil {
108-
return create.Error(names.ODB, create.ErrActionCheckingDestroyed, tfodb.DSNameDbServersList, rs.Primary.ID, err)
108+
return create.Error(names.ODB, create.ErrActionCheckingDestroyed, tfodb.DSNameDBServersList, rs.Primary.ID, err)
109109
}
110-
return create.Error(names.ODB, create.ErrActionCheckingDestroyed, tfodb.DSNameDbServersList, rs.Primary.ID, errors.New("not destroyed"))
110+
return create.Error(names.ODB, create.ErrActionCheckingDestroyed, tfodb.DSNameDBServersList, rs.Primary.ID, errors.New("not destroyed"))
111111
}
112112
return nil
113113
}
@@ -133,7 +133,7 @@ func (dbNodesListDataSourceTest) findVmCluster(ctx context.Context, conn *odb.Cl
133133
return output.CloudVmCluster, nil
134134
}
135135

136-
func (dbNodesListDataSourceTest) basicDbNodesListDataSource() string {
136+
func (dbNodesListDataSourceTest) basicDBNodesListDataSource() string {
137137
vmCluster := dbNodesListDataSourceTestEntity.vmClusterBasic()
138138
return fmt.Sprintf(`
139139

‎internal/service/odb/db_server_data_source.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import (
2020
)
2121

2222
// @FrameworkDataSource("aws_odb_db_server", name="Db Server")
23-
func newDataSourceDbServer(context.Context) (datasource.DataSourceWithConfigure, error) {
23+
func newDataSourceDBServer(context.Context) (datasource.DataSourceWithConfigure, error) {
2424
return &dataSourceDbServer{}, nil
2525
}
2626

2727
const (
28-
DSNameDbServer = "Db Server Data Source"
28+
DSNameDBServer = "DB Server Data Source"
2929
)
3030

3131
type dataSourceDbServer struct {
@@ -149,7 +149,7 @@ func (d *dataSourceDbServer) Read(ctx context.Context, req datasource.ReadReques
149149
out, err := conn.GetDbServer(ctx, &input)
150150
if err != nil {
151151
resp.Diagnostics.AddError(
152-
create.ProblemStandardMessage(names.ODB, create.ErrActionReading, DSNameDbServer, data.DbServerID.ValueString(), err),
152+
create.ProblemStandardMessage(names.ODB, create.ErrActionReading, DSNameDBServer, data.DbServerID.ValueString(), err),
153153
err.Error(),
154154
)
155155
return

‎internal/service/odb/db_server_data_source_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ var dbServerDataSourceTestEntity = testDbServerDataSourceTest{
3434
}
3535

3636
// Acceptance test access AWS and cost money to run.
37-
func TestAccODBDbServerDataSource(t *testing.T) {
37+
func TestAccODBDBServerDataSource(t *testing.T) {
3838
ctx := acctest.Context(t)
3939
if testing.Short() {
4040
t.Skip("skipping long-running test in short mode")
@@ -48,38 +48,38 @@ func TestAccODBDbServerDataSource(t *testing.T) {
4848
},
4949
ErrorCheck: acctest.ErrorCheck(t, names.ODBServiceID),
5050
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
51-
CheckDestroy: dbServerDataSourceTestEntity.testAccCheckDbServersDestroyed(ctx),
51+
CheckDestroy: dbServerDataSourceTestEntity.testAccCheckDBServersDestroyed(ctx),
5252
Steps: []resource.TestStep{
5353
{
54-
Config: dbServerDataSourceTestEntity.basicDbServerDataSourceConfig(),
54+
Config: dbServerDataSourceTestEntity.basicDBServerDataSourceConfig(),
5555
Check: resource.ComposeAggregateTestCheckFunc(
56-
dbServerDataSourceTestEntity.testAccCheckDbServerExists(ctx, dataSourceName, &dbServer),
56+
dbServerDataSourceTestEntity.testAccCheckDBServerExists(ctx, dataSourceName, &dbServer),
5757
),
5858
},
5959
},
6060
})
6161
}
6262

63-
func (testDbServerDataSourceTest) testAccCheckDbServerExists(ctx context.Context, name string, output *odb.GetDbServerOutput) resource.TestCheckFunc {
63+
func (testDbServerDataSourceTest) testAccCheckDBServerExists(ctx context.Context, name string, output *odb.GetDbServerOutput) resource.TestCheckFunc {
6464
return func(s *terraform.State) error {
6565
rs, ok := s.RootModule().Resources[name]
6666
if !ok {
67-
return create.Error(names.ODB, create.ErrActionCheckingExistence, tfodb.DSNameDbServer, name, errors.New("not found"))
67+
return create.Error(names.ODB, create.ErrActionCheckingExistence, tfodb.DSNameDBServer, name, errors.New("not found"))
6868
}
6969
conn := acctest.Provider.Meta().(*conns.AWSClient).ODBClient(ctx)
7070
var dbServerId = rs.Primary.ID
7171
var attributes = rs.Primary.Attributes
7272
exaId := attributes["exadata_infrastructure_id"]
73-
resp, err := dbServerDataSourceTestEntity.findDbServer(ctx, conn, &dbServerId, &exaId)
73+
resp, err := dbServerDataSourceTestEntity.findDBServer(ctx, conn, &dbServerId, &exaId)
7474
if err != nil {
75-
return create.Error(names.ODB, create.ErrActionCheckingExistence, tfodb.DSNameDbServer, rs.Primary.ID, err)
75+
return create.Error(names.ODB, create.ErrActionCheckingExistence, tfodb.DSNameDBServer, rs.Primary.ID, err)
7676
}
7777
*output = *resp
7878
return nil
7979
}
8080
}
8181

82-
func (testDbServerDataSourceTest) testAccCheckDbServersDestroyed(ctx context.Context) resource.TestCheckFunc {
82+
func (testDbServerDataSourceTest) testAccCheckDBServersDestroyed(ctx context.Context) resource.TestCheckFunc {
8383
return func(s *terraform.State) error {
8484
conn := acctest.Provider.Meta().(*conns.AWSClient).ODBClient(ctx)
8585
for _, rs := range s.RootModule().Resources {
@@ -91,9 +91,9 @@ func (testDbServerDataSourceTest) testAccCheckDbServersDestroyed(ctx context.Con
9191
return nil
9292
}
9393
if err != nil {
94-
return create.Error(names.ODB, create.ErrActionCheckingDestroyed, tfodb.DSNameDbServer, rs.Primary.ID, err)
94+
return create.Error(names.ODB, create.ErrActionCheckingDestroyed, tfodb.DSNameDBServer, rs.Primary.ID, err)
9595
}
96-
return create.Error(names.ODB, create.ErrActionCheckingDestroyed, tfodb.DSNameDbServer, rs.Primary.ID, errors.New("not destroyed"))
96+
return create.Error(names.ODB, create.ErrActionCheckingDestroyed, tfodb.DSNameDBServer, rs.Primary.ID, errors.New("not destroyed"))
9797
}
9898
return nil
9999
}
@@ -119,7 +119,7 @@ func (testDbServerDataSourceTest) findExaInfra(ctx context.Context, conn *odb.Cl
119119
return nil
120120
}
121121

122-
func (testDbServerDataSourceTest) findDbServer(ctx context.Context, conn *odb.Client, dbServerId *string, exaInfraId *string) (*odb.GetDbServerOutput, error) {
122+
func (testDbServerDataSourceTest) findDBServer(ctx context.Context, conn *odb.Client, dbServerId *string, exaInfraId *string) (*odb.GetDbServerOutput, error) {
123123
inputWithExaId := odb.GetDbServerInput{
124124
DbServerId: dbServerId,
125125
CloudExadataInfrastructureId: exaInfraId,
@@ -131,7 +131,7 @@ func (testDbServerDataSourceTest) findDbServer(ctx context.Context, conn *odb.Cl
131131
return output, nil
132132
}
133133

134-
func (testDbServerDataSourceTest) basicDbServerDataSourceConfig() string {
134+
func (testDbServerDataSourceTest) basicDBServerDataSourceConfig() string {
135135
exaInfraDisplayName := sdkacctest.RandomWithPrefix(dbServersListDataSourceTestEntity.displayNamePrefix)
136136
exaInfra := dbServerDataSourceTestEntity.exaInfra(exaInfraDisplayName)
137137

‎internal/service/odb/db_servers_list_data_source.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import (
2020
)
2121

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

2727
const (
28-
DSNameDbServersList = "Db Servers List Data Source"
28+
DSNameDBServersList = "DB Servers List Data Source"
2929
)
3030

3131
type dataSourceDbServersList struct {
@@ -66,7 +66,7 @@ func (d *dataSourceDbServersList) Read(ctx context.Context, req datasource.ReadR
6666
page, err := paginator.NextPage(ctx)
6767
if err != nil {
6868
resp.Diagnostics.AddError(
69-
create.ProblemStandardMessage(names.ODB, create.ErrActionReading, DSNameDbServersList, "", err),
69+
create.ProblemStandardMessage(names.ODB, create.ErrActionReading, DSNameDBServersList, "", err),
7070
err.Error(),
7171
)
7272
}

0 commit comments

Comments
 (0)