Skip to content

Commit d14b5fe

Browse files
committed
semgrep
1 parent 5c4ec27 commit d14b5fe

File tree

2 files changed

+24
-23
lines changed

2 files changed

+24
-23
lines changed

internal/service/datazone/environment.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,7 @@ type environmentResourceModel struct {
515515
UserParameters fwtypes.ListNestedObjectValueOf[resourceUserParametersData] `tfsdk:"user_parameters"`
516516
}
517517

518+
// nosemgrep:ci.semgrep.framework.manual-flattener-functions
518519
func flattenEnvironment(ctx context.Context, apiObject *datazone.GetEnvironmentOutput, model *environmentResourceModel, diags *diag.Diagnostics) {
519520
diags.Append(fwflex.Flatten(ctx, apiObject, model, fwflex.WithIgnoredFieldNamesAppend("UserParameters"))...)
520521

internal/service/datazone/environment_test.go

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ func testAccDataZoneEnvironment_basic(t *testing.T) {
7171
acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreatedAt),
7272
resource.TestCheckResourceAttrSet(resourceName, "created_by"),
7373
resource.TestCheckNoResourceAttr(resourceName, names.AttrDescription),
74-
resource.TestCheckResourceAttrPair(resourceName, "domain_identifier", "aws_datazone_domain.test", "id"),
75-
resource.TestCheckResourceAttrPair(resourceName, "profile_identifier", "aws_datazone_environment_profile.test", "id"),
74+
resource.TestCheckResourceAttrPair(resourceName, "domain_identifier", "aws_datazone_domain.test", names.AttrID),
75+
resource.TestCheckResourceAttrPair(resourceName, "profile_identifier", "aws_datazone_environment_profile.test", names.AttrID),
7676
resource.TestCheckResourceAttrSet(resourceName, names.AttrID),
7777
resource.TestCheckResourceAttr(resourceName, names.AttrName, rName),
78-
resource.TestCheckResourceAttrPair(resourceName, "project_identifier", "aws_datazone_project.test", "id"),
78+
resource.TestCheckResourceAttrPair(resourceName, "project_identifier", "aws_datazone_project.test", names.AttrID),
7979
resource.TestCheckResourceAttr(resourceName, "provider_environment", "Amazon DataZone"),
8080
),
8181
ConfigStateChecks: []statecheck.StateCheck{
@@ -225,16 +225,16 @@ func testAccDataZoneEnvironment_userParameters_Environment(t *testing.T) {
225225
ConfigStateChecks: []statecheck.StateCheck{
226226
statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("user_parameters"), knownvalue.ListExact([]knownvalue.Check{
227227
knownvalue.ObjectExact(map[string]knownvalue.Check{
228-
"name": knownvalue.StringExact("consumerGlueDbName"),
229-
"value": knownvalue.StringExact(parameterPrefix + "-consumer"),
228+
names.AttrName: knownvalue.StringExact("consumerGlueDbName"),
229+
names.AttrValue: knownvalue.StringExact(parameterPrefix + "-consumer"),
230230
}),
231231
knownvalue.ObjectExact(map[string]knownvalue.Check{
232-
"name": knownvalue.StringExact("producerGlueDbName"),
233-
"value": knownvalue.StringExact(parameterPrefix + "-producer"),
232+
names.AttrName: knownvalue.StringExact("producerGlueDbName"),
233+
names.AttrValue: knownvalue.StringExact(parameterPrefix + "-producer"),
234234
}),
235235
knownvalue.ObjectExact(map[string]knownvalue.Check{
236-
"name": knownvalue.StringExact("workgroupName"),
237-
"value": knownvalue.StringExact(parameterPrefix + "-workgroup"),
236+
names.AttrName: knownvalue.StringExact("workgroupName"),
237+
names.AttrValue: knownvalue.StringExact(parameterPrefix + "-workgroup"),
238238
}),
239239
})),
240240
},
@@ -253,16 +253,16 @@ func testAccDataZoneEnvironment_userParameters_Environment(t *testing.T) {
253253
ConfigStateChecks: []statecheck.StateCheck{
254254
statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("user_parameters"), knownvalue.ListExact([]knownvalue.Check{
255255
knownvalue.ObjectExact(map[string]knownvalue.Check{
256-
"name": knownvalue.StringExact("consumerGlueDbName"),
257-
"value": knownvalue.StringExact(parameterPrefixUpdated + "-consumer"),
256+
names.AttrName: knownvalue.StringExact("consumerGlueDbName"),
257+
names.AttrValue: knownvalue.StringExact(parameterPrefixUpdated + "-consumer"),
258258
}),
259259
knownvalue.ObjectExact(map[string]knownvalue.Check{
260-
"name": knownvalue.StringExact("producerGlueDbName"),
261-
"value": knownvalue.StringExact(parameterPrefixUpdated + "-producer"),
260+
names.AttrName: knownvalue.StringExact("producerGlueDbName"),
261+
names.AttrValue: knownvalue.StringExact(parameterPrefixUpdated + "-producer"),
262262
}),
263263
knownvalue.ObjectExact(map[string]knownvalue.Check{
264-
"name": knownvalue.StringExact("workgroupName"),
265-
"value": knownvalue.StringExact(parameterPrefixUpdated + "-workgroup"),
264+
names.AttrName: knownvalue.StringExact("workgroupName"),
265+
names.AttrValue: knownvalue.StringExact(parameterPrefixUpdated + "-workgroup"),
266266
}),
267267
})),
268268
},
@@ -306,8 +306,8 @@ func testAccDataZoneEnvironment_userParameters_Inherited(t *testing.T) {
306306
ConfigStateChecks: []statecheck.StateCheck{
307307
statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("user_parameters"), knownvalue.ListExact([]knownvalue.Check{
308308
knownvalue.ObjectExact(map[string]knownvalue.Check{
309-
"name": knownvalue.StringExact("workgroupName"),
310-
"value": knownvalue.StringExact(rName + "-workgroup"),
309+
names.AttrName: knownvalue.StringExact("workgroupName"),
310+
names.AttrValue: knownvalue.StringExact(rName + "-workgroup"),
311311
}),
312312
})),
313313
},
@@ -358,16 +358,16 @@ func testAccDataZoneEnvironment_userParameters_Override(t *testing.T) {
358358
ConfigStateChecks: []statecheck.StateCheck{
359359
statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("user_parameters"), knownvalue.ListExact([]knownvalue.Check{
360360
knownvalue.ObjectExact(map[string]knownvalue.Check{
361-
"name": knownvalue.StringExact("consumerGlueDbName"),
362-
"value": knownvalue.StringExact(rName + "-consumer"),
361+
names.AttrName: knownvalue.StringExact("consumerGlueDbName"),
362+
names.AttrValue: knownvalue.StringExact(rName + "-consumer"),
363363
}),
364364
knownvalue.ObjectExact(map[string]knownvalue.Check{
365-
"name": knownvalue.StringExact("producerGlueDbName"),
366-
"value": knownvalue.StringExact(rName + "-producer"),
365+
names.AttrName: knownvalue.StringExact("producerGlueDbName"),
366+
names.AttrValue: knownvalue.StringExact(rName + "-producer"),
367367
}),
368368
knownvalue.ObjectExact(map[string]knownvalue.Check{
369-
"name": knownvalue.StringExact("workgroupName"),
370-
"value": knownvalue.StringExact(rName + "-workgroup"),
369+
names.AttrName: knownvalue.StringExact("workgroupName"),
370+
names.AttrValue: knownvalue.StringExact(rName + "-workgroup"),
371371
}),
372372
})),
373373
},

0 commit comments

Comments
 (0)