Skip to content

Commit c3643f9

Browse files
committed
semgrep-fix code suggestion addressed.
1 parent 674ad7c commit c3643f9

File tree

3 files changed

+18
-14
lines changed

3 files changed

+18
-14
lines changed

internal/service/odb/cloud_exadata_infrastructure.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ var ResourceCloudExadataInfrastructure = newResourceCloudExadataInfrastructure
5757
type resourceCloudExadataInfrastructure struct {
5858
framework.ResourceWithModel[cloudExadataInfrastructureResourceModel]
5959
framework.WithTimeouts
60+
framework.WithImportByID
6061
}
6162

6263
func (r *resourceCloudExadataInfrastructure) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) {
@@ -482,10 +483,6 @@ func (r *resourceCloudExadataInfrastructure) Delete(ctx context.Context, req res
482483
}
483484
}
484485

485-
func (r *resourceCloudExadataInfrastructure) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
486-
resource.ImportStatePassthroughID(ctx, path.Root(names.AttrID), req, resp)
487-
}
488-
489486
func waitCloudExadataInfrastructureCreated(ctx context.Context, conn *odb.Client, id string, timeout time.Duration) (*odbtypes.CloudExadataInfrastructure, error) {
490487
stateConf := &retry.StateChangeConf{
491488
Pending: enum.Slice(odbtypes.ResourceStatusProvisioning),

internal/service/odb/cloud_exadata_infrastructure_data_source_test.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ func TestAccODBCloudExadataInfrastructureDataSource_basic(t *testing.T) {
3636
exaInfraResource := "aws_odb_cloud_exadata_infrastructure.test"
3737
exaInfraDataSource := "data.aws_odb_cloud_exadata_infrastructure.test"
3838
displayNameSuffix := sdkacctest.RandomWithPrefix(exaInfraDataSourceTestEntity.displayNamePrefix)
39+
domain := acctest.RandomDomainName()
40+
emailAddress1 := acctest.RandomEmailAddress(domain)
41+
emailAddress2 := acctest.RandomEmailAddress(domain)
3942

4043
resource.Test(t, resource.TestCase{
4144
PreCheck: func() {
@@ -46,7 +49,7 @@ func TestAccODBCloudExadataInfrastructureDataSource_basic(t *testing.T) {
4649
CheckDestroy: exaInfraDataSourceTestEntity.testAccCheckCloudExadataInfrastructureDestroy(ctx),
4750
Steps: []resource.TestStep{
4851
{
49-
Config: exaInfraDataSourceTestEntity.basicExaInfraDataSource(displayNameSuffix),
52+
Config: exaInfraDataSourceTestEntity.basicExaInfraDataSource(displayNameSuffix, emailAddress1, emailAddress2),
5053
Check: resource.ComposeAggregateTestCheckFunc(
5154
resource.TestCheckResourceAttrPair(exaInfraResource, names.AttrID, exaInfraDataSource, names.AttrID),
5255
resource.TestCheckResourceAttr(exaInfraDataSource, "shape", "Exadata.X9M"),
@@ -82,7 +85,7 @@ func (cloudExaDataInfraDataSourceTest) testAccCheckCloudExadataInfrastructureDes
8285
}
8386
}
8487

85-
func (cloudExaDataInfraDataSourceTest) basicExaInfraDataSource(displayNameSuffix string) string {
88+
func (cloudExaDataInfraDataSourceTest) basicExaInfraDataSource(displayNameSuffix, emailAddress1, emailAddress2 string) string {
8689
testData := fmt.Sprintf(`
8790
8891
@@ -94,7 +97,7 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" {
9497
storage_count = 3
9598
compute_count = 2
9699
availability_zone_id = "use1-az6"
97-
customer_contacts_to_send_to_oci = [{ email = "[email protected]" }, { email = "[email protected]" }]
100+
customer_contacts_to_send_to_oci = [{ email = %[2]q }, { email = %[3]q }]
98101
maintenance_window {
99102
custom_action_timeout_in_mins = 16
100103
is_custom_action_timeout_enabled = true
@@ -106,6 +109,6 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" {
106109
data "aws_odb_cloud_exadata_infrastructure" "test" {
107110
id = aws_odb_cloud_exadata_infrastructure.test.id
108111
}
109-
`, displayNameSuffix)
112+
`, displayNameSuffix, emailAddress1, emailAddress2)
110113
return testData
111114
}

internal/service/odb/cloud_exadata_infrastructure_test.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ func TestAccODBCloudExadataInfrastructureResource_withAllParameters(t *testing.T
7575
var cloudExaDataInfrastructure odbtypes.CloudExadataInfrastructure
7676
resourceName := "aws_odb_cloud_exadata_infrastructure.test"
7777
rName := sdkacctest.RandomWithPrefix(exaInfraTestResource.displayNamePrefix)
78+
domain := acctest.RandomDomainName()
79+
emailAddress1 := acctest.RandomEmailAddress(domain)
80+
emailAddress2 := acctest.RandomEmailAddress(domain)
7881
resource.ParallelTest(t, resource.TestCase{
7982
PreCheck: func() {
8083
acctest.PreCheck(ctx, t)
@@ -85,7 +88,7 @@ func TestAccODBCloudExadataInfrastructureResource_withAllParameters(t *testing.T
8588
CheckDestroy: exaInfraTestResource.testAccCheckCloudExaDataInfraDestroyed(ctx),
8689
Steps: []resource.TestStep{
8790
{
88-
Config: exaInfraTestResource.exaDataInfraResourceWithAllConfig(rName),
91+
Config: exaInfraTestResource.exaDataInfraResourceWithAllConfig(rName, emailAddress1, emailAddress2),
8992
Check: resource.ComposeAggregateTestCheckFunc(
9093
exaInfraTestResource.testAccCheckCloudExadataInfrastructureExists(ctx, resourceName, &cloudExaDataInfrastructure),
9194
),
@@ -337,9 +340,9 @@ func (cloudExaDataInfraResourceTest) testAccCheckCloudExadataInfrastructureExist
337340
func (cloudExaDataInfraResourceTest) testAccPreCheck(ctx context.Context, t *testing.T) {
338341
conn := acctest.Provider.Meta().(*conns.AWSClient).ODBClient(ctx)
339342

340-
input := &odb.ListCloudExadataInfrastructuresInput{}
343+
input := odb.ListCloudExadataInfrastructuresInput{}
341344

342-
_, err := conn.ListCloudExadataInfrastructures(ctx, input)
345+
_, err := conn.ListCloudExadataInfrastructures(ctx, &input)
343346

344347
if acctest.PreCheckSkipError(err) {
345348
t.Skipf("skipping acceptance testing: %s", err)
@@ -349,7 +352,8 @@ func (cloudExaDataInfraResourceTest) testAccPreCheck(ctx context.Context, t *tes
349352
}
350353
}
351354

352-
func (cloudExaDataInfraResourceTest) exaDataInfraResourceWithAllConfig(randomId string) string {
355+
func (cloudExaDataInfraResourceTest) exaDataInfraResourceWithAllConfig(randomId, emailAddress1, emailAddress2 string) string {
356+
353357
exaDataInfra := fmt.Sprintf(`
354358
355359
@@ -359,7 +363,7 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" {
359363
storage_count = 3
360364
compute_count = 2
361365
availability_zone_id = "use1-az6"
362-
customer_contacts_to_send_to_oci = [{ email = "[email protected]" }, { email = "[email protected]" }]
366+
customer_contacts_to_send_to_oci = [{ email =%[2]q }, { email = %[3]q }]
363367
database_server_type = "X11M"
364368
storage_server_type = "X11M-HC"
365369
maintenance_window {
@@ -378,7 +382,7 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" {
378382
}
379383
380384
}
381-
`, randomId)
385+
`, randomId, emailAddress1, emailAddress2)
382386
return exaDataInfra
383387
}
384388
func (cloudExaDataInfraResourceTest) exaDataInfraResourceBasicConfig(displayName string) string {

0 commit comments

Comments
 (0)