Skip to content

Commit

Permalink
Merge pull request #13672 from terraform-providers/ap_unparam_linting…
Browse files Browse the repository at this point in the history 
…_expandPolicyAttributes

tech-debt/structure: remove always nil error param from expandPolicyAttributes func
  • Loading branch information
@anGie44
anGie44 authored Jun 12, 2020
2 parents a56cfac + fd9ffd1 commit a1022e4
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 65 deletions.
6 changes: 1 addition & 5 deletions aws/resource_aws_lb_ssl_negotiation_policy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,8 @@ func resourceAwsLBSSLNegotiationPolicyCreate(d *schema.ResourceData, meta interf

// Check for Policy Attributes
if v, ok := d.GetOk("attribute"); ok {
var err error
// Expand the "attribute" set to aws-sdk-go compat []*elb.PolicyAttribute
lbspOpts.PolicyAttributes, err = expandPolicyAttributes(v.(*schema.Set).List())
if err != nil {
return err
}
lbspOpts.PolicyAttributes = expandPolicyAttributes(v.(*schema.Set).List())
}

log.Printf("[DEBUG] Load Balancer Policy opts: %#v", lbspOpts)
Expand Down
4 changes: 2 additions & 2 deletions aws/structure.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2123,7 +2123,7 @@ func flattenApiGatewayThrottleSettings(settings *apigateway.ThrottleSettings) []

// Takes the result of flatmap.Expand for an array of policy attributes and
// returns ELB API compatible objects
func expandPolicyAttributes(configured []interface{}) ([]*elb.PolicyAttribute, error) {
func expandPolicyAttributes(configured []interface{}) []*elb.PolicyAttribute {
attributes := make([]*elb.PolicyAttribute, 0, len(configured))

// Loop over our configured attributes and create
Expand All @@ -2140,7 +2140,7 @@ func expandPolicyAttributes(configured []interface{}) ([]*elb.PolicyAttribute, e

}

return attributes, nil
return attributes
}

// Flattens an array of PolicyAttributes into a []interface{}
Expand Down
107 changes: 49 additions & 58 deletions aws/structure_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,49 +172,49 @@ func TestExpandIPPerms(t *testing.T) {
exp := expected[0]
perm := perms[0]

if *exp.FromPort != *perm.FromPort {
if aws.Int64Value(exp.FromPort) != aws.Int64Value(perm.FromPort) {
t.Fatalf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n",
*perm.FromPort,
*exp.FromPort)
aws.Int64Value(perm.FromPort),
aws.Int64Value(exp.FromPort))
}

if *exp.IpRanges[0].CidrIp != *perm.IpRanges[0].CidrIp {
if aws.StringValue(exp.IpRanges[0].CidrIp) != aws.StringValue(perm.IpRanges[0].CidrIp) {
t.Fatalf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n",
*perm.IpRanges[0].CidrIp,
*exp.IpRanges[0].CidrIp)
aws.StringValue(perm.IpRanges[0].CidrIp),
aws.StringValue(exp.IpRanges[0].CidrIp))
}

if *exp.UserIdGroupPairs[0].UserId != *perm.UserIdGroupPairs[0].UserId {
if aws.StringValue(exp.UserIdGroupPairs[0].UserId) != aws.StringValue(perm.UserIdGroupPairs[0].UserId) {
t.Fatalf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n",
*perm.UserIdGroupPairs[0].UserId,
*exp.UserIdGroupPairs[0].UserId)
aws.StringValue(perm.UserIdGroupPairs[0].UserId),
aws.StringValue(exp.UserIdGroupPairs[0].UserId))
}

if *exp.UserIdGroupPairs[0].GroupId != *perm.UserIdGroupPairs[0].GroupId {
if aws.StringValue(exp.UserIdGroupPairs[0].GroupId) != aws.StringValue(perm.UserIdGroupPairs[0].GroupId) {
t.Fatalf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n",
*perm.UserIdGroupPairs[0].GroupId,
*exp.UserIdGroupPairs[0].GroupId)
aws.StringValue(perm.UserIdGroupPairs[0].GroupId),
aws.StringValue(exp.UserIdGroupPairs[0].GroupId))
}

if *exp.UserIdGroupPairs[1].GroupId != *perm.UserIdGroupPairs[1].GroupId {
if aws.StringValue(exp.UserIdGroupPairs[1].GroupId) != aws.StringValue(perm.UserIdGroupPairs[1].GroupId) {
t.Fatalf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n",
*perm.UserIdGroupPairs[1].GroupId,
*exp.UserIdGroupPairs[1].GroupId)
aws.StringValue(perm.UserIdGroupPairs[1].GroupId),
aws.StringValue(exp.UserIdGroupPairs[1].GroupId))
}

exp = expected[1]
perm = perms[1]

if *exp.UserIdGroupPairs[0].GroupId != *perm.UserIdGroupPairs[0].GroupId {
if aws.StringValue(exp.UserIdGroupPairs[0].GroupId) != aws.StringValue(perm.UserIdGroupPairs[0].GroupId) {
t.Fatalf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n",
*perm.UserIdGroupPairs[0].GroupId,
*exp.UserIdGroupPairs[0].GroupId)
aws.StringValue(perm.UserIdGroupPairs[0].GroupId),
aws.StringValue(exp.UserIdGroupPairs[0].GroupId))
}
}

Expand Down Expand Up @@ -264,25 +264,25 @@ func TestExpandIPPerms_NegOneProtocol(t *testing.T) {
exp := expected[0]
perm := perms[0]

if *exp.FromPort != *perm.FromPort {
if aws.Int64Value(exp.FromPort) != aws.Int64Value(perm.FromPort) {
t.Fatalf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n",
*perm.FromPort,
*exp.FromPort)
aws.Int64Value(perm.FromPort),
aws.Int64Value(exp.FromPort))
}

if *exp.IpRanges[0].CidrIp != *perm.IpRanges[0].CidrIp {
if aws.StringValue(exp.IpRanges[0].CidrIp) != aws.StringValue(perm.IpRanges[0].CidrIp) {
t.Fatalf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n",
*perm.IpRanges[0].CidrIp,
*exp.IpRanges[0].CidrIp)
aws.StringValue(perm.IpRanges[0].CidrIp),
aws.StringValue(exp.IpRanges[0].CidrIp))
}

if *exp.UserIdGroupPairs[0].UserId != *perm.UserIdGroupPairs[0].UserId {
if aws.StringValue(exp.UserIdGroupPairs[0].UserId) != aws.StringValue(perm.UserIdGroupPairs[0].UserId) {
t.Fatalf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n",
*perm.UserIdGroupPairs[0].UserId,
*exp.UserIdGroupPairs[0].UserId)
aws.StringValue(perm.UserIdGroupPairs[0].UserId),
aws.StringValue(exp.UserIdGroupPairs[0].UserId))
}

// Now test the error case. This *should* error when either from_port
Expand Down Expand Up @@ -369,42 +369,42 @@ func TestExpandIPPerms_nonVPC(t *testing.T) {
exp := expected[0]
perm := perms[0]

if *exp.FromPort != *perm.FromPort {
if aws.Int64Value(exp.FromPort) != aws.Int64Value(perm.FromPort) {
t.Fatalf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n",
*perm.FromPort,
*exp.FromPort)
aws.Int64Value(perm.FromPort),
aws.Int64Value(exp.FromPort))
}

if *exp.IpRanges[0].CidrIp != *perm.IpRanges[0].CidrIp {
if aws.StringValue(exp.IpRanges[0].CidrIp) != aws.StringValue(perm.IpRanges[0].CidrIp) {
t.Fatalf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n",
*perm.IpRanges[0].CidrIp,
*exp.IpRanges[0].CidrIp)
aws.StringValue(perm.IpRanges[0].CidrIp),
aws.StringValue(exp.IpRanges[0].CidrIp))
}

if *exp.UserIdGroupPairs[0].GroupName != *perm.UserIdGroupPairs[0].GroupName {
if aws.StringValue(exp.UserIdGroupPairs[0].GroupName) != aws.StringValue(perm.UserIdGroupPairs[0].GroupName) {
t.Fatalf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n",
*perm.UserIdGroupPairs[0].GroupName,
*exp.UserIdGroupPairs[0].GroupName)
aws.StringValue(perm.UserIdGroupPairs[0].GroupName),
aws.StringValue(exp.UserIdGroupPairs[0].GroupName))
}

if *exp.UserIdGroupPairs[1].GroupName != *perm.UserIdGroupPairs[1].GroupName {
if aws.StringValue(exp.UserIdGroupPairs[1].GroupName) != aws.StringValue(perm.UserIdGroupPairs[1].GroupName) {
t.Fatalf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n",
*perm.UserIdGroupPairs[1].GroupName,
*exp.UserIdGroupPairs[1].GroupName)
aws.StringValue(perm.UserIdGroupPairs[1].GroupName),
aws.StringValue(exp.UserIdGroupPairs[1].GroupName))
}

exp = expected[1]
perm = perms[1]

if *exp.UserIdGroupPairs[0].GroupName != *perm.UserIdGroupPairs[0].GroupName {
if aws.StringValue(exp.UserIdGroupPairs[0].GroupName) != aws.StringValue(perm.UserIdGroupPairs[0].GroupName) {
t.Fatalf(
"Got:\n\n%#v\n\nExpected:\n\n%#v\n",
*perm.UserIdGroupPairs[0].GroupName,
*exp.UserIdGroupPairs[0].GroupName)
aws.StringValue(perm.UserIdGroupPairs[0].GroupName),
aws.StringValue(exp.UserIdGroupPairs[0].GroupName))
}
}

Expand Down Expand Up @@ -824,12 +824,12 @@ func TestExpandPrivateIPAddresses(t *testing.T) {
t.Fatalf("expected result had %d elements, but got %d", 2, len(result))
}

if *result[0].PrivateIpAddress != "192.168.0.1" || !*result[0].Primary {
t.Fatalf("expected ip to be 192.168.0.1 and Primary, but got %v, %t", *result[0].PrivateIpAddress, *result[0].Primary)
if aws.StringValue(result[0].PrivateIpAddress) != "192.168.0.1" || !aws.BoolValue(result[0].Primary) {
t.Fatalf("expected ip to be 192.168.0.1 and Primary, but got %v, %t", aws.StringValue(result[0].PrivateIpAddress), aws.BoolValue(result[0].Primary))
}

if *result[1].PrivateIpAddress != "192.168.0.2" || *result[1].Primary {
t.Fatalf("expected ip to be 192.168.0.2 and not Primary, but got %v, %t", *result[1].PrivateIpAddress, *result[1].Primary)
if aws.StringValue(result[1].PrivateIpAddress) != "192.168.0.2" || aws.BoolValue(result[1].Primary) {
t.Fatalf("expected ip to be 192.168.0.2 and not Primary, but got %v, %t", aws.StringValue(result[1].PrivateIpAddress), aws.BoolValue(result[1].Primary))
}
}

Expand Down Expand Up @@ -1153,10 +1153,7 @@ func TestExpandPolicyAttributes(t *testing.T) {
"value": "true",
},
}
attributes, err := expandPolicyAttributes(expanded)
if err != nil {
t.Fatalf("bad: %#v", err)
}
attributes := expandPolicyAttributes(expanded)

if len(attributes) != 3 {
t.Fatalf("expected number of attributes to be 3, but got %d", len(attributes))
Expand All @@ -1182,10 +1179,7 @@ func TestExpandPolicyAttributes_invalid(t *testing.T) {
"value": "true",
},
}
attributes, err := expandPolicyAttributes(expanded)
if err != nil {
t.Fatalf("bad: %#v", err)
}
attributes := expandPolicyAttributes(expanded)

expected := &elb.PolicyAttribute{
AttributeName: aws.String("Protocol-TLSv1.2"),
Expand All @@ -1203,10 +1197,7 @@ func TestExpandPolicyAttributes_invalid(t *testing.T) {
func TestExpandPolicyAttributes_empty(t *testing.T) {
var expanded []interface{}

attributes, err := expandPolicyAttributes(expanded)
if err != nil {
t.Fatalf("bad: %#v", err)
}
attributes := expandPolicyAttributes(expanded)

if len(attributes) != 0 {
t.Fatalf("expected number of attributes to be 0, but got %d", len(attributes))
Expand Down

0 comments on commit a1022e4

Please sign in to comment.