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

Author: ab-cs13

examples/odb/db_system_shapes_list_data_source.tf

@@ -4,11 +4,7 @@ package odb
 
 import (
 	"context"
-	"fmt"
-	"github.com/hashicorp/terraform-plugin-framework/attr"
-
 	"github.com/aws/aws-sdk-go-v2/service/odb"
-
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/types"
@@ -38,51 +34,19 @@ func (d *dataSourceDbSystemShapesList) Schema(ctx context.Context, req datasourc
 		Attributes: map[string]schema.Attribute{
 			"availability_zone_id": schema.StringAttribute{
 				Optional:    true,
-				Description: "The physical ID of the AZ, for example, use1-az4. This ID persists across accounts",
+				Description: "The physical ID of the AZ, for example, use1-az4. This ID persists across accounts.",
 			},
 			"db_system_shapes": schema.ListAttribute{
 				Computed:   true,
 				CustomType: fwtypes.NewListNestedObjectTypeOf[dbSystemShapeDataSourceModel](ctx),
-				Description: fmt.Sprint("The list of shapes and their properties.\n\n" +
-					"(structure)\n" +
-					"Information about a hardware system model (shape) that's\n " +
-					"available for an Exadata infrastructure. The shape determines\n" +
-					"resources, such as CPU cores, memory, and storage, to allocate to\n " +
-					"the Exadata infrastructure.\n"),
-				ElementType: types.ObjectType{
-
-					AttrTypes: map[string]attr.Type{
-						"available_core_count":                     types.Int32Type,
-						"available_core_count_per_node":            types.Int32Type,
-						"available_data_storage_in_tbs":            types.Int32Type,
-						"available_data_storage_per_server_in_tbs": types.Int32Type,
-						"available_db_node_per_node_in_gbs":        types.Int32Type,
-						"available_db_node_storage_in_gbs":         types.Int32Type,
-						"available_memory_in_gbs":                  types.Int32Type,
-						"available_memory_per_node_in_gbs":         types.Int32Type,
-						"core_count_increment":                     types.Int32Type,
-						"max_storage_count":                        types.Int32Type,
-						"maximum_node_count":                       types.Int32Type,
-						"min_core_count_per_node":                  types.Int32Type,
-						"min_data_storage_in_tbs":                  types.Int32Type,
-						"min_db_node_storage_per_node_in_gbs":      types.Int32Type,
-						"min_memory_per_node_in_gbs":               types.Int32Type,
-						"min_storage_count":                        types.Int32Type,
-						"minimum_core_count":                       types.Int32Type,
-						"minimum_node_count":                       types.Int32Type,
-						"name":                                     types.StringType,
-						"runtime_minimum_core_count":               types.Int32Type,
-						"shape_family":                             types.StringType,
-						"shape_type":                               types.StringType,
-					},
-				},
+				Description: "The list of shapes and their properties. Information about a hardware system model (shape) that's available for an Exadata infrastructure." +
+					"The shape determines resources, such as CPU cores, memory, and storage, to allocate to the Exadata infrastructure.",
 			},
 		},
 	}
 }
 
 func (d *dataSourceDbSystemShapesList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
-
 	conn := d.Meta().ODBClient(ctx)
 
 	var data dbSystemShapesListDataSourceModel

examples/odb/gi_versions_list_data_source.tf

@@ -4,7 +4,6 @@ package odb_test
 
 import (
 	"fmt"
-
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -17,9 +16,7 @@ func TestAccODBDbSystemShapesListDataSource_basic(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping long-running test in short mode")
 	}
-
 	dataSourceName := "data.aws_odb_db_system_shapes_list.test"
-
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck: func() {
 			acctest.PreCheck(ctx, t)

internal/service/odb/db_system_shapes_list_data_source.go

@@ -4,10 +4,7 @@ package odb
 
 import (
 	"context"
-	"fmt"
-
 	"github.com/aws/aws-sdk-go-v2/service/odb"
-
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/types"
@@ -39,38 +36,22 @@ func (d *dataSourceGiVersionsList) Schema(ctx context.Context, req datasource.Sc
 				Optional:    true,
 				Description: "The system shape.",
 			},
-		},
-		Blocks: map[string]schema.Block{
-			"gi_versions": schema.ListNestedBlock{
-				Description: fmt.Sprint(" (structure)\n " +
-					"Information about a specific version of Oracle Grid\n" +
-					"Infrastructure (GI) software that can be installed on a VM\n " +
-					"cluster.\n\n " +
-					"version -> (string)\n " +
-					"The GI software version."),
-				CustomType: fwtypes.NewListNestedObjectTypeOf[giVersionSummaryModel](ctx),
-				NestedObject: schema.NestedBlockObject{
-					Attributes: map[string]schema.Attribute{
-						"version": schema.StringAttribute{
-							Computed: true,
-						},
-					},
-				},
+			"gi_versions": schema.ListAttribute{
+				Computed:    true,
+				CustomType:  fwtypes.NewListNestedObjectTypeOf[giVersionSummaryModel](ctx),
+				Description: "Information about a specific version of Oracle Grid Infrastructure (GI) software that can be installed on a VM cluster.",
 			},
 		},
 	}
 }
 
 func (d *dataSourceGiVersionsList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
-
 	conn := d.Meta().ODBClient(ctx)
-
 	var data giVersionDataSourceModel
 	resp.Diagnostics.Append(req.Config.Get(ctx, &data)...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
-
 	var input odb.ListGiVersionsInput
 	if !data.Shape.IsNull() {
 		input.Shape = data.Shape.ValueStringPointer()
@@ -83,12 +64,10 @@ func (d *dataSourceGiVersionsList) Read(ctx context.Context, req datasource.Read
 		)
 		return
 	}
-
 	resp.Diagnostics.Append(flex.Flatten(ctx, out, &data)...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
-
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }
 

internal/service/odb/db_system_shapes_list_data_source_test.go

@@ -4,10 +4,11 @@ package odb_test
 
 import (
 	"fmt"
+	"testing"
+
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-provider-aws/internal/acctest"
 	"github.com/hashicorp/terraform-provider-aws/names"
-	"testing"
 )
 
 func TestAccGiVersionsListDataSource_basicX9M(t *testing.T) {
@@ -26,24 +27,21 @@ func TestAccGiVersionsListDataSource_basicX9M(t *testing.T) {
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccGiVersionsListeConfig_basic("Exadata.X9M"),
+				Config: testAccGiVersionsListConfigBasic("Exadata.X9M"),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(dataSourceName, "gi_versions.#", "2"),
 				),
 			},
 		},
 	})
-
 }
 
 func TestAccGiVersionsListDataSource_basicX11M(t *testing.T) {
 	ctx := acctest.Context(t)
-
 	if testing.Short() {
 		t.Skip("skipping long-running test in short mode")
 	}
 	dataSourceName := "data.aws_odb_gi_versions_list.test"
-
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
 			acctest.PreCheck(ctx, t)
@@ -52,7 +50,7 @@ func TestAccGiVersionsListDataSource_basicX11M(t *testing.T) {
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccGiVersionsListeConfig_basic("Exadata.X11M"),
+				Config: testAccGiVersionsListConfigBasic("Exadata.X11M"),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(dataSourceName, "gi_versions.#", "2"),
 				),
@@ -61,11 +59,12 @@ func TestAccGiVersionsListDataSource_basicX11M(t *testing.T) {
 	})
 }
 
-func testAccGiVersionsListeConfig_basic(shape string) string {
+func testAccGiVersionsListConfigBasic(shape string) string {
 	return fmt.Sprintf(`
 
+
 data "aws_odb_gi_versions_list" "test" {
-  shape             = %[1]q
+  shape = %[1]q
 }
 `, shape)
 }

internal/service/odb/gi_versions_list_data_source.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"
-}

internal/service/odb/gi_versions_list_data_source_test.go

@@ -0,0 +1,36 @@
+---
+subcategory: "Oracle Database@AWS"
+layout: "AWS: aws_odb_db_system_shapes_list"
+page_title: "AWS: aws_odb_db_system_shapes_list"
+description: |-
+  Terraform data source to retrieve available system shapes Oracle Database@AWS.
+---
+
+# Data Source: aws_odb_db_system_shapes_list
+
+Terraform data source to retrieve available system shapes Oracle Database@AWS.
+
+You can find out more about Oracle Database@AWS from [User Guide](https://docs.aws.amazon.com/odb/latest/UserGuide/what-is-odb.html).
+
+## Example Usage
+
+### Basic Usage
+
+```terraform
+data "aws_odb_db_system_shapes_list" "example" {
+
+}
+```
+
+## Argument Reference
+
+The following arguments are optional:
+
+* `availability_zone_id` - (Optional) The physical ID of the AZ, for example, use1-az4. This ID persists across accounts.
+* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference).
+
+## Attribute Reference
+
+This data source exports the following attributes in addition to the arguments above:
+
+* `db_system_shapes` - IThe list of shapes and their properties. Information about a hardware system model (shape) that's available for an Exadata infrastructure. The shape determines resources, such as CPU cores, memory, and storage, to allocate to the Exadata infrastructure.