Merge pull request #13665 from terraform-providers/ap_unparam_linting…

…_expandredshiftparameters tech-debt/structure: remove always nil error param from expandRedshiftParameters func
hashicorp · Jun 12, 2020 · 684e66e · 684e66e
2 parents 747c204 + 3837c3f
commit 684e66e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/aws/resource_aws_redshift_parameter_group.go b/aws/resource_aws_redshift_parameter_group.go
@@ -101,11 +101,7 @@ func resourceAwsRedshiftParameterGroupCreate(d *schema.ResourceData, meta interf
 	d.SetId(*createOpts.ParameterGroupName)
 
 	if v := d.Get("parameter").(*schema.Set); v.Len() > 0 {
-		parameters, err := expandRedshiftParameters(v.List())
-
-		if err != nil {
-			return fmt.Errorf("error expanding parameter: %s", err)
-		}
+		parameters := expandRedshiftParameters(v.List())
 
 		modifyOpts := redshift.ModifyClusterParameterGroupInput{
 			ParameterGroupName: aws.String(d.Id()),
@@ -134,7 +130,7 @@ func resourceAwsRedshiftParameterGroupRead(d *schema.ResourceData, meta interfac
 	}
 
 	if len(describeResp.ParameterGroups) != 1 ||
-		*describeResp.ParameterGroups[0].ParameterGroupName != d.Id() {
+		aws.StringValue(describeResp.ParameterGroups[0].ParameterGroupName) != d.Id() {
 		d.SetId("")
 		return fmt.Errorf("Unable to find Parameter Group: %#v", describeResp.ParameterGroups)
 	}
@@ -186,10 +182,7 @@ func resourceAwsRedshiftParameterGroupUpdate(d *schema.ResourceData, meta interf
 		ns := n.(*schema.Set)
 
 		// Expand the "parameter" set to aws-sdk-go compat []redshift.Parameter
-		parameters, err := expandRedshiftParameters(ns.Difference(os).List())
-		if err != nil {
-			return err
-		}
+		parameters := expandRedshiftParameters(ns.Difference(os).List())
 
 		if len(parameters) > 0 {
 			modifyOpts := redshift.ModifyClusterParameterGroupInput{
@@ -198,7 +191,7 @@ func resourceAwsRedshiftParameterGroupUpdate(d *schema.ResourceData, meta interf
 			}
 
 			log.Printf("[DEBUG] Modify Redshift Parameter Group: %s", modifyOpts)
-			_, err = conn.ModifyClusterParameterGroup(&modifyOpts)
+			_, err := conn.ModifyClusterParameterGroup(&modifyOpts)
 			if err != nil {
 				return fmt.Errorf("Error modifying Redshift Parameter Group: %s", err)
 			}

diff --git a/aws/structure.go b/aws/structure.go
@@ -345,7 +345,7 @@ func expandParameters(configured []interface{}) []*rds.Parameter {
 	return parameters
 }
 
-func expandRedshiftParameters(configured []interface{}) ([]*redshift.Parameter, error) {
+func expandRedshiftParameters(configured []interface{}) []*redshift.Parameter {
 	var parameters []*redshift.Parameter
 
 	// Loop over our configured parameters and create
@@ -365,7 +365,7 @@ func expandRedshiftParameters(configured []interface{}) ([]*redshift.Parameter,
 		parameters = append(parameters, p)
 	}
 
-	return parameters, nil
+	return parameters
 }
 
 // Takes the result of flatmap.Expand for an array of parameters and

diff --git a/aws/structure_test.go b/aws/structure_test.go
@@ -589,10 +589,7 @@ func TestExpandRedshiftParameters(t *testing.T) {
 			"value": "utf8",
 		},
 	}
-	parameters, err := expandRedshiftParameters(expanded)
-	if err != nil {
-		t.Fatalf("bad: %#v", err)
-	}
+	parameters := expandRedshiftParameters(expanded)
 
 	expected := &redshift.Parameter{
 		ParameterName:  aws.String("character_set_client"),