rebase with latest. refactored code according to feedback for exadata-infra PR.

Author: ab-cs13

internal/service/odb/cloud_autonomous_vm_cluster.go

@@ -6,21 +6,21 @@ import (
 	"context"
 	"errors"
 	"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"
-	"testing"
-
-	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
-	"github.com/hashicorp/terraform-provider-aws/internal/acctest"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 

internal/service/odb/cloud_autonomous_vm_cluster_data_source.go

@@ -6,26 +6,23 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/aws/aws-sdk-go-v2/service/odb"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
-	"github.com/hashicorp/terraform-provider-aws/internal/errs"
-	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"strings"
 	"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/names"
-
-	odbtypes "github.com/aws/aws-sdk-go-v2/service/odb/types"
-
+	"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"
 )
 
 type autonomousVMClusterResourceTest struct {

internal/service/odb/cloud_autonomous_vm_cluster_data_source_test.go

@@ -9521,32 +9521,3 @@ service "evs" {
   doc_prefix               = ["evs_"]
   brand                    = "Amazon"
 }
-service "odb" {
-  sdk {
-    id = "ODB"
-    arn_namespace = "odb"
-  }
-  names {
-    provider_name_upper = "ODB"
-    human_friendly = "Oracle Database@AWS"
-  }
-  endpoint_info {
-    endpoint_api_call = "ListGiVersions"
-    endpoint_region_overrides = {
-      "aws" = "us-east-1"
-    }
-  }
-  go_packages {
-    v1_package = ""
-    v2_package = "odb"
-  }
-  client{
-    skip_client_generate = true
-  }
-  resource_prefix{
-    correct = "aws_odb_"
-  }
-  provider_package_correct = "odb"
-  doc_prefix = ["odb_"]
-  brand = "AWS"
-}