fixed linting issues for odb network.

Author: ab-cs13

examples/odb/odb_network.tf

@@ -1,7 +1,7 @@
 # Copyright © 2025, Oracle and/or its affiliates. All rights reserved.
 
 # odb network without managed service
-resource "aws_odb_network" "test" {
+resource "aws_odb_network" "test_1" {
   display_name         = "odb-my-net"
   availability_zone_id = "use1-az6"
   client_subnet_cidr   = "10.2.0.0/24"
@@ -14,7 +14,7 @@ resource "aws_odb_network" "test" {
 }
 
 # odb network with managed service
-resource "aws_odb_network" "test" {
+resource "aws_odb_network" "test_2" {
   display_name         = "odb-my-net"
   availability_zone_id = "use1-az6"
   client_subnet_cidr   = "10.2.0.0/24"

internal/service/odb/network.go

@@ -5,7 +5,6 @@ package odb
 import (
 	"context"
 	"errors"
-	"github.com/hashicorp/terraform-plugin-framework/path"
 	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -15,6 +14,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework-timetypes/timetypes"
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
@@ -56,7 +56,7 @@ type resourceNetwork struct {
 	framework.WithImportByID
 }
 
-var OdbNetwork = newResourceNetwork
+var OracleDBNetwork = newResourceNetwork
 var managedServiceTimeout = 15 * time.Minute
 
 func (r *resourceNetwork) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) {
@@ -68,7 +68,7 @@ func (r *resourceNetwork) Schema(ctx context.Context, req resource.SchemaRequest
 		Attributes: map[string]schema.Attribute{
 			names.AttrARN: framework.ARNAttributeComputedOnly(),
 			names.AttrID:  framework.IDAttribute(),
-			"display_name": schema.StringAttribute{
+			names.AttrDisplayName: schema.StringAttribute{
 				Required:    true,
 				Description: "The user-friendly name for the odb network. Changing this will force terraform to create a new resource.",
 				PlanModifiers: []planmodifier.String{
@@ -155,7 +155,7 @@ func (r *resourceNetwork) Schema(ctx context.Context, req resource.SchemaRequest
 				Description: "The DNS resolver endpoint in OCI for forwarding DNS queries for the ociPrivateZone domain.",
 				ElementType: types.ObjectType{
 					AttrTypes: map[string]attr.Type{
-						"domain_name":         types.StringType,
+						names.AttrDomainName:  types.StringType,
 						"oci_dns_listener_ip": types.StringType,
 					},
 				},
@@ -199,7 +199,7 @@ func (r *resourceNetwork) Schema(ctx context.Context, req resource.SchemaRequest
 				Computed:    true,
 				Description: "Additional information about the current status of the ODB network.",
 			},
-			"created_at": schema.StringAttribute{
+			names.AttrCreatedAt: schema.StringAttribute{
 				Computed:    true,
 				CustomType:  timetypes.RFC3339Type{},
 				Description: "The date and time when the ODB network was created.",
@@ -323,7 +323,7 @@ func (r *resourceNetwork) Read(ctx context.Context, req resource.ReadRequest, re
 		return
 	}
 
-	out, err := FindOdbNetworkResourceByID(ctx, conn, state.OdbNetworkId.ValueString())
+	out, err := FindOracleDBNetworkResourceByID(ctx, conn, state.OdbNetworkId.ValueString())
 	if tfresource.NotFound(err) {
 		resp.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err))
 		resp.State.RemoveResource(ctx)
@@ -520,7 +520,10 @@ func waitNetworkCreated(ctx context.Context, conn *odb.Client, id string, timeou
 }
 
 func waitForManagedService(ctx context.Context, targetStatus odbtypes.Access, conn *odb.Client, id string, timeout time.Duration, managedResourceStatus func(managedService *odbtypes.ManagedServices) odbtypes.ManagedResourceStatus) (*odbtypes.OdbNetwork, error) {
-	if targetStatus == odbtypes.AccessEnabled {
+
+	switch targetStatus {
+
+	case odbtypes.AccessEnabled:
 		stateConf := &retry.StateChangeConf{
 			Pending: enum.Slice(odbtypes.ManagedResourceStatusEnabling),
 			Target:  enum.Slice(odbtypes.ManagedResourceStatusEnabled),
@@ -533,7 +536,7 @@ func waitForManagedService(ctx context.Context, targetStatus odbtypes.Access, co
 			return out, err
 		}
 		return nil, err
-	} else if targetStatus == odbtypes.AccessDisabled {
+	case odbtypes.AccessDisabled:
 		stateConf := &retry.StateChangeConf{
 			Pending: enum.Slice(odbtypes.ManagedResourceStatusDisabling),
 			Target:  enum.Slice(odbtypes.ManagedResourceStatusDisabled),
@@ -545,16 +548,16 @@ func waitForManagedService(ctx context.Context, targetStatus odbtypes.Access, co
 		if out, ok := outputRaw.(*odbtypes.OdbNetwork); ok {
 			return out, err
 		}
-
 		return nil, err
-	}
 
-	return nil, errors.New("odb network invalid manged service status")
+	default:
+		return nil, errors.New("odb network invalid manged service status")
+	}
 }
 
 func statusManagedService(ctx context.Context, conn *odb.Client, id string, managedResourceStatus func(managedService *odbtypes.ManagedServices) odbtypes.ManagedResourceStatus) retry.StateRefreshFunc {
 	return func() (any, string, error) {
-		out, err := FindOdbNetworkResourceByID(ctx, conn, id)
+		out, err := FindOracleDBNetworkResourceByID(ctx, conn, id)
 
 		if err != nil {
 			return nil, "", err
@@ -602,7 +605,7 @@ func waitNetworkDeleted(ctx context.Context, conn *odb.Client, id string, timeou
 
 func statusNetwork(ctx context.Context, conn *odb.Client, id string) retry.StateRefreshFunc {
 	return func() (any, string, error) {
-		out, err := FindOdbNetworkResourceByID(ctx, conn, id)
+		out, err := FindOracleDBNetworkResourceByID(ctx, conn, id)
 		if tfresource.NotFound(err) {
 			return nil, "", nil
 		}
@@ -625,7 +628,7 @@ func mapManagedServiceStatusToAccessStatus(mangedStatus odbtypes.ManagedResource
 	return "", errors.New("can not convert managed status to access status")
 }
 
-func FindOdbNetworkResourceByID(ctx context.Context, conn *odb.Client, id string) (*odbtypes.OdbNetwork, error) {
+func FindOracleDBNetworkResourceByID(ctx context.Context, conn *odb.Client, id string) (*odbtypes.OdbNetwork, error) {
 	input := odb.GetOdbNetworkInput{
 		OdbNetworkId: aws.String(id),
 	}

internal/service/odb/network_data_source.go

@@ -4,6 +4,7 @@ package odb
 
 import (
 	"context"
+
 	"github.com/aws/aws-sdk-go-v2/service/odb"
 	odbtypes "github.com/aws/aws-sdk-go-v2/service/odb/types"
 	"github.com/hashicorp/terraform-plugin-framework-timetypes/timetypes"
@@ -41,15 +42,15 @@ func (d *dataSourceNetwork) Schema(ctx context.Context, req datasource.SchemaReq
 			names.AttrID: schema.StringAttribute{
 				Required: true,
 			},
-			"display_name": schema.StringAttribute{
+			names.AttrDisplayName: schema.StringAttribute{
 				Computed:    true,
 				Description: "Display name for the network resource.",
 			},
 			"availability_zone_id": schema.StringAttribute{
 				Computed:    true,
 				Description: "The AZ ID of the AZ where the ODB network is located.",
 			},
-			"availability_zone": schema.StringAttribute{
+			names.AttrAvailabilityZone: schema.StringAttribute{
 				Computed:    true,
 				Description: "The availability zone where the ODB network is located.",
 			},
@@ -99,16 +100,16 @@ func (d *dataSourceNetwork) Schema(ctx context.Context, req datasource.SchemaReq
 				Computed:    true,
 				Description: "The list of CIDR ranges from the peered VPC that are allowed access to the ODB network. Please refer odb network peering documentation.",
 			},
-			"status": schema.StringAttribute{
+			names.AttrStatus: schema.StringAttribute{
 				CustomType:  statusType,
 				Computed:    true,
 				Description: "The status of the network resource.",
 			},
-			"status_reason": schema.StringAttribute{
+			names.AttrStatusReason: schema.StringAttribute{
 				Computed:    true,
 				Description: "Additional information about the current status of the ODB network.",
 			},
-			"created_at": schema.StringAttribute{
+			names.AttrCreatedAt: schema.StringAttribute{
 				Computed:    true,
 				CustomType:  timetypes.RFC3339Type{},
 				Description: "The date and time when the ODB network was created.",

internal/service/odb/network_data_source_test.go

@@ -24,10 +24,10 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
-type odbNetworkDataSourceTest struct {
+type oracleDBNetworkDataSourceTest struct {
 }
 
-var odbNetworkDataSourceTestEntity = odbNetworkDataSourceTest{}
+var oracleDBNetworkDataSourceTestEntity = oracleDBNetworkDataSourceTest{}
 
 func TestAccODBNetworkDataSource_basic(t *testing.T) {
 	ctx := acctest.Context(t)
@@ -36,36 +36,36 @@ func TestAccODBNetworkDataSource_basic(t *testing.T) {
 	}
 	networkResource := "aws_odb_network.test_resource"
 	networkDataSource := "data.aws_odb_network.test"
-	rName := sdkacctest.RandomWithPrefix("tf-odb-net")
+	rName := sdkacctest.RandomWithPrefix("tf-ora-net")
 
-	resource.Test(t, resource.TestCase{
+	resource.ParallelTest(t, resource.TestCase{
 		PreCheck: func() {
 			acctest.PreCheck(ctx, t)
-			odbNetworkDataSourceTestEntity.testAccOdbNetworkDataSourcePreCheck(ctx, t)
+			oracleDBNetworkDataSourceTestEntity.testAccNetworkDataSourcePreCheck(ctx, t)
 		},
 		ErrorCheck:               acctest.ErrorCheck(t, names.ODBServiceID),
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
-		CheckDestroy:             odbNetworkDataSourceTestEntity.testAccCheckOdbNetworkDataSourceDestroyed(ctx),
+		CheckDestroy:             oracleDBNetworkDataSourceTestEntity.testAccCheckNetworkDataSourceDestroyed(ctx),
 		Steps: []resource.TestStep{
 			{
-				Config: odbNetworkDataSourceTestEntity.basicOdbNetworkDataSource(rName),
+				Config: oracleDBNetworkDataSourceTestEntity.basicNetworkDataSource(rName),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttrPair(networkResource, "id", networkDataSource, "id"),
+					resource.TestCheckResourceAttrPair(networkResource, names.AttrID, networkDataSource, names.AttrID),
 				),
 			},
 		},
 	})
 }
 
-func (odbNetworkDataSourceTest) testAccCheckOdbNetworkDataSourceDestroyed(ctx context.Context) resource.TestCheckFunc {
+func (oracleDBNetworkDataSourceTest) testAccCheckNetworkDataSourceDestroyed(ctx context.Context) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		conn := acctest.Provider.Meta().(*conns.AWSClient).ODBClient(ctx)
 
 		for _, rs := range s.RootModule().Resources {
 			if rs.Type != "aws_odb_network" {
 				continue
 			}
-			_, err := odbNetworkDataSourceTestEntity.findOdbNetwork(ctx, conn, rs.Primary.ID)
+			_, err := oracleDBNetworkDataSourceTestEntity.findNetwork(ctx, conn, rs.Primary.ID)
 			if tfresource.NotFound(err) {
 				return nil
 			}
@@ -80,7 +80,7 @@ func (odbNetworkDataSourceTest) testAccCheckOdbNetworkDataSourceDestroyed(ctx co
 	}
 }
 
-func (odbNetworkDataSourceTest) findOdbNetwork(ctx context.Context, conn *odb.Client, id string) (*odbtypes.OdbNetwork, error) {
+func (oracleDBNetworkDataSourceTest) findNetwork(ctx context.Context, conn *odb.Client, id string) (*odbtypes.OdbNetwork, error) {
 	input := odb.GetOdbNetworkInput{
 		OdbNetworkId: aws.String(id),
 	}
@@ -104,7 +104,7 @@ func (odbNetworkDataSourceTest) findOdbNetwork(ctx context.Context, conn *odb.Cl
 	return out.OdbNetwork, nil
 }
 
-func (odbNetworkDataSourceTest) basicOdbNetworkDataSource(rName string) string {
+func (oracleDBNetworkDataSourceTest) basicNetworkDataSource(rName string) string {
 	networkRes := fmt.Sprintf(`
 
 
@@ -131,13 +131,10 @@ data "aws_odb_network" "test" {
 `, rName)
 	return networkRes
 }
-func (odbNetworkDataSourceTest) testAccOdbNetworkDataSourcePreCheck(ctx context.Context, t *testing.T) {
+func (oracleDBNetworkDataSourceTest) testAccNetworkDataSourcePreCheck(ctx context.Context, t *testing.T) {
 	conn := acctest.Provider.Meta().(*conns.AWSClient).ODBClient(ctx)
-
-	input := &odb.ListOdbNetworksInput{}
-
-	_, err := conn.ListOdbNetworks(ctx, input)
-
+	input := odb.ListOdbNetworksInput{}
+	_, err := conn.ListOdbNetworks(ctx, &input)
 	if acctest.PreCheckSkipError(err) {
 		t.Skipf("skipping acceptance testing: %s", err)
 	}