fixed linting issues of avmc

Author: ab-cs13

internal/service/odb/cloud_autonomous_vm_cluster.go

@@ -447,7 +447,6 @@ func (r *resourceCloudAutonomousVmCluster) Read(ctx context.Context, req resourc
 }
 
 func (r *resourceCloudAutonomousVmCluster) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
-
 	var plan, state cloudAutonomousVmClusterResourceModel
 	resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...)
 	resp.Diagnostics.Append(req.State.Get(ctx, &state)...)
@@ -474,7 +473,6 @@ func (r *resourceCloudAutonomousVmCluster) Update(ctx context.Context, req resou
 }
 
 func (r *resourceCloudAutonomousVmCluster) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) {
-
 	conn := r.Meta().ODBClient(ctx)
 
 	var state cloudAutonomousVmClusterResourceModel

internal/service/odb/cloud_autonomous_vm_cluster_data_source_test.go

@@ -8,17 +8,14 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/aws/aws-sdk-go-v2/aws"
 	"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-sdk/v2/helper/retry"
 	sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 	"github.com/hashicorp/terraform-provider-aws/internal/acctest"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/create"
-	"github.com/hashicorp/terraform-provider-aws/internal/errs"
 	tfodb "github.com/hashicorp/terraform-provider-aws/internal/service/odb"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"github.com/hashicorp/terraform-provider-aws/names"
@@ -63,50 +60,6 @@ func TestAccODBCloudAutonomousVmClusterDataSource_basic(t *testing.T) {
 		},
 	})
 }
-func (autonomousVMClusterDSTest) checkCloudAutonomousVmClusterExists(ctx context.Context, name string, cloudAutonomousVMCluster *odbtypes.CloudAutonomousVmCluster) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		rs, ok := s.RootModule().Resources[name]
-		if !ok {
-			return create.Error(names.ODB, create.ErrActionCheckingExistence, tfodb.ResNameCloudAutonomousVmCluster, name, errors.New("not found"))
-		}
-
-		if rs.Primary.ID == "" {
-			return create.Error(names.ODB, create.ErrActionCheckingExistence, tfodb.ResNameCloudAutonomousVmCluster, name, errors.New("not set"))
-		}
-
-		conn := acctest.Provider.Meta().(*conns.AWSClient).ODBClient(ctx)
-		resp, err := autonomousVMClusterDSTestEntity.findAVMC(ctx, conn, rs.Primary.ID)
-		if err != nil {
-			return create.Error(names.ODB, create.ErrActionCheckingExistence, tfodb.ResNameCloudAutonomousVmCluster, rs.Primary.ID, err)
-		}
-
-		*cloudAutonomousVMCluster = *resp
-
-		return nil
-	}
-}
-
-func (autonomousVMClusterDSTest) findAVMC(ctx context.Context, conn *odb.Client, id string) (*odbtypes.CloudAutonomousVmCluster, error) {
-	input := odb.GetCloudAutonomousVmClusterInput{
-		CloudAutonomousVmClusterId: aws.String(id),
-	}
-	out, err := conn.GetCloudAutonomousVmCluster(ctx, &input)
-	if err != nil {
-		if errs.IsA[*odbtypes.ResourceNotFoundException](err) {
-			return nil, &retry.NotFoundError{
-				LastError:   err,
-				LastRequest: &input,
-			}
-		}
-		return nil, err
-	}
-
-	if out == nil || out.CloudAutonomousVmCluster == nil {
-		return nil, tfresource.NewEmptyResultError(&input)
-	}
-
-	return out.CloudAutonomousVmCluster, nil
-}
 
 func (autonomousVMClusterDSTest) testAccCheckCloudAutonomousVmClusterDestroy(ctx context.Context) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
@@ -147,7 +100,6 @@ func (autonomousVMClusterDSTest) testAccPreCheck(ctx context.Context, t *testing
 }
 
 func (autonomousVMClusterDSTest) avmcBasic() string {
-
 	exaInfraDisplayName := sdkacctest.RandomWithPrefix(autonomousVMClusterDSTestEntity.exaInfraDisplayNamePrefix)
 	odbNetworkDisplayName := sdkacctest.RandomWithPrefix(autonomousVMClusterDSTestEntity.odbNetDisplayNamePrefix)
 	avmcDisplayName := sdkacctest.RandomWithPrefix(autonomousVMClusterDSTestEntity.autonomousVmClusterDisplayNamePrefix)

internal/service/odb/cloud_autonomous_vm_cluster_test.go

@@ -276,8 +276,8 @@ func (autonomousVMClusterResourceTest) avmcBasic() string {
 	odbNetworkDisplayName := sdkacctest.RandomWithPrefix(autonomousVMClusterDSTestEntity.odbNetDisplayNamePrefix)
 	avmcDisplayName := sdkacctest.RandomWithPrefix(autonomousVMClusterDSTestEntity.autonomousVmClusterDisplayNamePrefix)
 
-	exaInfraRes := autonomousVMClusterDSTestEntity.exaInfra(exaInfraDisplayName)
-	odbNetRes := autonomousVMClusterDSTestEntity.odbNet(odbNetworkDisplayName)
+	exaInfraRes := autonomousVMClusterResourceTestEntity.exaInfra(exaInfraDisplayName)
+	odbNetRes := autonomousVMClusterResourceTestEntity.odbNet(odbNetworkDisplayName)
 	res := fmt.Sprintf(`
 %s
 
@@ -320,8 +320,8 @@ func (autonomousVMClusterResourceTest) avmcNoTagWithTag() (string, string) {
 	odbNetworkDisplayName := sdkacctest.RandomWithPrefix(autonomousVMClusterDSTestEntity.odbNetDisplayNamePrefix)
 	avmcDisplayName := sdkacctest.RandomWithPrefix(autonomousVMClusterDSTestEntity.autonomousVmClusterDisplayNamePrefix)
 
-	exaInfraRes := autonomousVMClusterDSTestEntity.exaInfra(exaInfraDisplayName)
-	odbNetRes := autonomousVMClusterDSTestEntity.odbNet(odbNetworkDisplayName)
+	exaInfraRes := autonomousVMClusterResourceTestEntity.exaInfra(exaInfraDisplayName)
+	odbNetRes := autonomousVMClusterResourceTestEntity.odbNet(odbNetworkDisplayName)
 	noTag := fmt.Sprintf(`
 %s
 
@@ -401,8 +401,8 @@ func (autonomousVMClusterResourceTest) avmcAllParamsConfig() string {
 	odbNetworkDisplayName := sdkacctest.RandomWithPrefix(autonomousVMClusterDSTestEntity.odbNetDisplayNamePrefix)
 	avmcDisplayName := sdkacctest.RandomWithPrefix(autonomousVMClusterDSTestEntity.autonomousVmClusterDisplayNamePrefix)
 
-	exaInfraRes := autonomousVMClusterDSTestEntity.exaInfra(exaInfraDisplayName)
-	odbNetRes := autonomousVMClusterDSTestEntity.odbNet(odbNetworkDisplayName)
+	exaInfraRes := autonomousVMClusterResourceTestEntity.exaInfra(exaInfraDisplayName)
+	odbNetRes := autonomousVMClusterResourceTestEntity.odbNet(odbNetworkDisplayName)
 	res := fmt.Sprintf(`
 %s
 
@@ -488,16 +488,3 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" {
 
 	return resource
 }
-func (autonomousVMClusterResourceTest) odbNetwork(odbNetDisplayName string) string {
-	return fmt.Sprintf(`
-	resource "aws_odb_network" "test" {
-  		display_name          = %[1]q
-  		availability_zone_id = "use1-az6"
-  		client_subnet_cidr   = "10.2.0.0/24"
-  		backup_subnet_cidr   = "10.2.1.0/24"
-  		s3_access = "DISABLED"
-  		zero_etl_access = "DISABLED"
-	}
-`, odbNetDisplayName)
-
-}