removed duplicate entry from names_data.hcl and semgrep fix

Author: ab-cs13

internal/service/odb/cloud_exadata_infrastructure.go

@@ -93,7 +93,7 @@ func (r *resourceCloudExadataInfrastructure) Schema(ctx context.Context, req res
 				Computed:    true,
 				Description: "The amount of available storage, in gigabytes (GB), for the Exadata infrastructure",
 			},
-			"availability_zone": schema.StringAttribute{
+			names.AttrAvailabilityZone: schema.StringAttribute{
 				Optional: true,
 				Computed: true,
 				PlanModifiers: []planmodifier.String{
@@ -135,7 +135,7 @@ func (r *resourceCloudExadataInfrastructure) Schema(ctx context.Context, req res
 				Computed:    true,
 				Description: "The software version of the database servers (dom0) in the Exadata infrastructure",
 			},
-			"display_name": schema.StringAttribute{
+			names.AttrDisplayName: schema.StringAttribute{
 				Required: true,
 				PlanModifiers: []planmodifier.String{
 					stringplanmodifier.RequiresReplace(),
@@ -201,12 +201,12 @@ func (r *resourceCloudExadataInfrastructure) Schema(ctx context.Context, req res
 				},
 				Description: "The model name of the Exadata infrastructure. Changing this will force terraform to create new resource",
 			},
-			"status": schema.StringAttribute{
+			names.AttrStatus: schema.StringAttribute{
 				CustomType:  statusType,
 				Computed:    true,
 				Description: "The current status of the Exadata infrastructure",
 			},
-			"status_reason": schema.StringAttribute{
+			names.AttrStatusReason: schema.StringAttribute{
 				Computed:    true,
 				Description: "Additional information about the status of the Exadata infrastructure",
 			},
@@ -228,7 +228,7 @@ func (r *resourceCloudExadataInfrastructure) Schema(ctx context.Context, req res
 			"total_storage_size_in_gbs": schema.Int32Attribute{
 				Computed: true,
 			},
-			"created_at": schema.StringAttribute{
+			names.AttrCreatedAt: schema.StringAttribute{
 				Computed:    true,
 				CustomType:  timetypes.RFC3339Type{},
 				Description: "The time when the Exadata infrastructure was created.",
@@ -483,7 +483,7 @@ func (r *resourceCloudExadataInfrastructure) Delete(ctx context.Context, req res
 }
 
 func (r *resourceCloudExadataInfrastructure) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
-	resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp)
+	resource.ImportStatePassthroughID(ctx, path.Root(names.AttrID), req, resp)
 }
 
 func waitCloudExadataInfrastructureCreated(ctx context.Context, conn *odb.Client, id string, timeout time.Duration) (*odbtypes.CloudExadataInfrastructure, error) {

internal/service/odb/cloud_exadata_infrastructure_data_source.go

@@ -55,7 +55,7 @@ func (d *dataSourceCloudExadataInfrastructure) Schema(ctx context.Context, req d
 				Computed:    true,
 				Description: "The amount of available storage, in gigabytes (GB), for the Exadata infrastructure.",
 			},
-			"availability_zone": schema.StringAttribute{
+			names.AttrAvailabilityZone: schema.StringAttribute{
 				Computed:    true,
 				Description: "he name of the Availability Zone (AZ) where the Exadata infrastructure is located.",
 			},
@@ -92,7 +92,7 @@ func (d *dataSourceCloudExadataInfrastructure) Schema(ctx context.Context, req d
 				Computed:    true,
 				Description: "The version of the Exadata infrastructure.",
 			},
-			"display_name": schema.StringAttribute{
+			names.AttrDisplayName: schema.StringAttribute{
 				Computed:    true,
 				Description: "The display name of the Exadata infrastructure.",
 			},
@@ -152,12 +152,12 @@ func (d *dataSourceCloudExadataInfrastructure) Schema(ctx context.Context, req d
 				Computed:    true,
 				Description: "The model name of the Exadata infrastructure.",
 			},
-			"status": schema.StringAttribute{
+			names.AttrStatus: schema.StringAttribute{
 				CustomType:  statusType,
 				Computed:    true,
 				Description: "The status of the Exadata infrastructure.",
 			},
-			"status_reason": schema.StringAttribute{
+			names.AttrStatusReason: schema.StringAttribute{
 				Computed:    true,
 				Description: "Additional information about the status of the Exadata infrastructure.",
 			},
@@ -182,7 +182,7 @@ func (d *dataSourceCloudExadataInfrastructure) Schema(ctx context.Context, req d
 					"servers. An OCPU is a legacy physical measure of compute resources. OCPUs are\n" +
 					"based on the physical core of a processor with hyper-threading enabled.",
 			},
-			"created_at": schema.StringAttribute{
+			names.AttrCreatedAt: schema.StringAttribute{
 				Computed:    true,
 				CustomType:  timetypes.RFC3339Type{},
 				Description: "The time when the Exadata infrastructure was created.",

internal/service/odb/cloud_exadata_infrastructure_data_source_test.go

@@ -48,9 +48,9 @@ func TestAccODBCloudExadataInfrastructureDataSource_basic(t *testing.T) {
 			{
 				Config: exaInfraDataSourceTestEntity.basicExaInfraDataSource(displayNameSuffix),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttrPair(exaInfraResource, "id", exaInfraDataSource, "id"),
+					resource.TestCheckResourceAttrPair(exaInfraResource, names.AttrID, exaInfraDataSource, names.AttrID),
 					resource.TestCheckResourceAttr(exaInfraDataSource, "shape", "Exadata.X9M"),
-					resource.TestCheckResourceAttr(exaInfraDataSource, "status", "AVAILABLE"),
+					resource.TestCheckResourceAttr(exaInfraDataSource, names.AttrStatus, "AVAILABLE"),
 					resource.TestCheckResourceAttr(exaInfraDataSource, "storage_count", "3"),
 					resource.TestCheckResourceAttr(exaInfraDataSource, "compute_count", "2"),
 				),

internal/service/odb/cloud_exadata_infrastructure_test.go

@@ -122,7 +122,7 @@ func TestAccODBCloudExadataInfrastructureResource_tagging(t *testing.T) {
 				Config: exaInfraTestResource.exaDataInfraResourceBasicConfigWithTags(rName),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					exaInfraTestResource.testAccCheckCloudExadataInfrastructureExists(ctx, resourceName, &cloudExaDataInfrastructure1),
-					resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
+					resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"),
 					resource.TestCheckResourceAttr(resourceName, "tags.env", "dev"),
 				),
 			},
@@ -141,7 +141,7 @@ func TestAccODBCloudExadataInfrastructureResource_tagging(t *testing.T) {
 						}
 						return nil
 					}),
-					resource.TestCheckResourceAttr(resourceName, "tags.%", "0"),
+					resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"),
 				),
 			},
 			{

names/data/names_data.hcl

@@ -9520,31 +9520,4 @@ service "evs" {
   provider_package_correct = "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"
-  }
-  resource_prefix{
-    correct = "aws_odb_"
-  }
-  provider_package_correct = "odb"
-  doc_prefix = ["odb_"]
-  brand = "AWS"
 }