Skip to content

Commit f30805f

Browse files
committed
d/aws_iam_roles: Use 'inttypes.IsZero'.
1 parent daeaf7e commit f30805f

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

internal/service/iam/roles_data_source.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package iam
55

66
import (
77
"context"
8-
"reflect"
98

109
"github.com/YakDriver/regexache"
1110
"github.com/aws/aws-sdk-go-v2/aws"
@@ -16,6 +15,7 @@ import (
1615
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
1716
"github.com/hashicorp/terraform-provider-aws/internal/conns"
1817
"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
18+
inttypes "github.com/hashicorp/terraform-provider-aws/internal/types"
1919
"github.com/hashicorp/terraform-provider-aws/names"
2020
)
2121

@@ -68,7 +68,7 @@ func dataSourceRolesRead(ctx context.Context, d *schema.ResourceData, meta any)
6868
}
6969

7070
for _, role := range page.Roles {
71-
if reflect.ValueOf(role).IsZero() {
71+
if p := &role; inttypes.IsZero(p) {
7272
continue
7373
}
7474

@@ -89,13 +89,8 @@ func dataSourceRolesRead(ctx context.Context, d *schema.ResourceData, meta any)
8989
nms = append(nms, aws.ToString(r.RoleName))
9090
}
9191

92-
if err := d.Set(names.AttrARNs, arns); err != nil {
93-
return sdkdiag.AppendErrorf(diags, "setting arns: %s", err)
94-
}
95-
96-
if err := d.Set(names.AttrNames, nms); err != nil {
97-
return sdkdiag.AppendErrorf(diags, "setting names: %s", err)
98-
}
92+
d.Set(names.AttrARNs, arns)
93+
d.Set(names.AttrNames, nms)
9994

10095
return diags
10196
}

internal/service/iam/roles_data_source_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ resource "aws_iam_role" "test" {
143143
{
144144
"Action": "sts:AssumeRole",
145145
"Principal": {
146-
"Service": data.aws_service_principal.ec2.name
146+
"Service": "${data.aws_service_principal.ec2.name}"
147147
},
148148
"Effect": "Allow",
149149
"Sid": ""
@@ -179,7 +179,7 @@ resource "aws_iam_role" "test" {
179179
{
180180
"Action": "sts:AssumeRole",
181181
"Principal": {
182-
"Service": data.aws_service_principal.ec2.name
182+
"Service": "${data.aws_service_principal.ec2.name}"
183183
},
184184
"Effect": "Allow",
185185
"Sid": ""
@@ -220,7 +220,7 @@ resource "aws_iam_role" "test" {
220220
{
221221
"Action": "sts:AssumeRole",
222222
"Principal": {
223-
"Service": data.aws_service_principal.ec2.name
223+
"Service": "${data.aws_service_principal.ec2.name}"
224224
},
225225
"Effect": "Allow",
226226
"Sid": ""

0 commit comments

Comments
 (0)