diff --git a/.changelog/30679.txt b/.changelog/30679.txt new file mode 100644 index 000000000000..30301e5e7c79 --- /dev/null +++ b/.changelog/30679.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_rds_cluster: Prevent `db_instance_parameter_group_name` from causing errors on minor upgrades +``` \ No newline at end of file diff --git a/internal/service/rds/certificate_data_source.go b/internal/service/rds/certificate_data_source.go index 0abf32f1d4e5..0a3cb0c08970 100644 --- a/internal/service/rds/certificate_data_source.go +++ b/internal/service/rds/certificate_data_source.go @@ -85,7 +85,6 @@ func dataSourceCertificateRead(ctx context.Context, d *schema.ResourceData, meta } return !lastPage }) - if err != nil { return sdkdiag.AppendErrorf(diags, "reading RDS Certificates: %s", err) } diff --git a/internal/service/rds/cluster.go b/internal/service/rds/cluster.go index cfb9a9bd74c7..4426d6cce4b2 100644 --- a/internal/service/rds/cluster.go +++ b/internal/service/rds/cluster.go @@ -632,7 +632,6 @@ func resourceClusterCreate(ctx context.Context, d *schema.ResourceData, meta int return conn.RestoreDBClusterFromSnapshotWithContext(ctx, input) }, errCodeInvalidParameterValue, "IAM role ARN value is invalid or does not include the required permissions") - if err != nil { return sdkdiag.AppendErrorf(diags, "creating RDS Cluster (restore from snapshot) (%s): %s", identifier, err) } @@ -757,7 +756,6 @@ func resourceClusterCreate(ctx context.Context, d *schema.ResourceData, meta int return false, err }, ) - if err != nil { return sdkdiag.AppendErrorf(diags, "creating RDS Cluster (restore from S3) (%s): %s", identifier, err) } @@ -869,7 +867,6 @@ func resourceClusterCreate(ctx context.Context, d *schema.ResourceData, meta int log.Printf("[DEBUG] Creating RDS Cluster: %s", input) _, err := conn.RestoreDBClusterToPointInTimeWithContext(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "creating RDS Cluster (restore to point-in-time) (%s): %s", identifier, err) } @@ -1016,7 +1013,6 @@ func resourceClusterCreate(ctx context.Context, d *schema.ResourceData, meta int return conn.CreateDBClusterWithContext(ctx, input) }, errCodeInvalidParameterValue, "IAM role ARN value is invalid or does not include the required permissions") - if err != nil { return sdkdiag.AppendErrorf(diags, "creating RDS Cluster (%s): %s", identifier, err) } @@ -1221,6 +1217,8 @@ func resourceClusterUpdate(ctx context.Context, d *schema.ResourceData, meta int // DB instance parameter group name is not currently returned from the // DescribeDBClusters API. This means there is no drift detection, so when // set, the configured attribute should always be sent on modify. + // Except, this causes an error on a minor version upgrade, so it is + // removed during update retry, if necessary. if v, ok := d.GetOk("db_instance_parameter_group_name"); ok || d.HasChange("db_instance_parameter_group_name") { input.DBInstanceParameterGroupName = aws.String(v.(string)) } @@ -1334,10 +1332,14 @@ func resourceClusterUpdate(ctx context.Context, d *schema.ResourceData, meta int return true, err } + if tfawserr.ErrMessageContains(err, errCodeInvalidParameterCombination, "db-instance-parameter-group-name can only be specified for a major") { + input.DBInstanceParameterGroupName = nil + return true, err + } + return false, err }, ) - if err != nil { return sdkdiag.AppendErrorf(diags, "updating RDS Cluster (%s): %s", d.Id(), err) } @@ -1464,7 +1466,6 @@ func resourceClusterDelete(ctx context.Context, d *schema.ResourceData, meta int return false, err }, ) - if err != nil { return false, fmt.Errorf("modifying RDS Cluster (%s) DeletionProtection=false: %s", d.Id(), err) } @@ -1519,7 +1520,6 @@ func addIAMRoleToCluster(ctx context.Context, conn *rds.RDS, clusterID, roleARN } _, err := conn.AddRoleToDBClusterWithContext(ctx, input) - if err != nil { return fmt.Errorf("adding IAM Role (%s) to RDS Cluster (%s): %s", roleARN, clusterID, err) } @@ -1534,7 +1534,6 @@ func removeIAMRoleFromCluster(ctx context.Context, conn *rds.RDS, clusterID, rol } _, err := conn.RemoveRoleFromDBClusterWithContext(ctx, input) - if err != nil { return fmt.Errorf("removing IAM Role (%s) from RDS Cluster (%s): %s", roleARN, clusterID, err) } diff --git a/internal/service/rds/cluster_activity_stream.go b/internal/service/rds/cluster_activity_stream.go index 7652fd82a674..7205e4ea0b3f 100644 --- a/internal/service/rds/cluster_activity_stream.go +++ b/internal/service/rds/cluster_activity_stream.go @@ -72,7 +72,6 @@ func resourceClusterActivityStreamCreate(ctx context.Context, d *schema.Resource } _, err := conn.StartActivityStreamWithContext(ctx, input) - if err != nil { return diag.Errorf("creating RDS Cluster Activity Stream (%s): %s", arn, err) } @@ -117,7 +116,6 @@ func resourceClusterActivityStreamDelete(ctx context.Context, d *schema.Resource ApplyImmediately: aws.Bool(true), ResourceArn: aws.String(d.Id()), }) - if err != nil { return diag.Errorf("stopping RDS Cluster Activity Stream (%s): %s", d.Id(), err) } @@ -131,7 +129,6 @@ func resourceClusterActivityStreamDelete(ctx context.Context, d *schema.Resource func FindDBClusterWithActivityStream(ctx context.Context, conn *rds.RDS, arn string) (*rds.DBCluster, error) { output, err := FindDBClusterByID(ctx, conn, arn) - if err != nil { return nil, err } diff --git a/internal/service/rds/cluster_activity_stream_test.go b/internal/service/rds/cluster_activity_stream_test.go index 810996ac4b86..111acf23b975 100644 --- a/internal/service/rds/cluster_activity_stream_test.go +++ b/internal/service/rds/cluster_activity_stream_test.go @@ -90,7 +90,6 @@ func testAccCheckClusterActivityStreamExists(ctx context.Context, n string, v *r conn := acctest.Provider.Meta().(*conns.AWSClient).RDSConn() output, err := tfrds.FindDBClusterWithActivityStream(ctx, conn, rs.Primary.ID) - if err != nil { return err } diff --git a/internal/service/rds/cluster_data_source.go b/internal/service/rds/cluster_data_source.go index 133b8bd7163c..e41ad86df862 100644 --- a/internal/service/rds/cluster_data_source.go +++ b/internal/service/rds/cluster_data_source.go @@ -170,7 +170,6 @@ func dataSourceClusterRead(ctx context.Context, d *schema.ResourceData, meta int dbClusterID := d.Get("cluster_identifier").(string) dbc, err := FindDBClusterByID(ctx, conn, dbClusterID) - if err != nil { return sdkdiag.AppendErrorf(diags, "reading RDS Cluster (%s): %s", dbClusterID, err) } @@ -231,7 +230,6 @@ func dataSourceClusterRead(ctx context.Context, d *schema.ResourceData, meta int d.Set("vpc_security_group_ids", securityGroupIDs) tags, err := ListTags(ctx, conn, clusterARN) - if err != nil { return sdkdiag.AppendErrorf(diags, "listing tags for RDS Cluster (%s): %s", d.Id(), err) } diff --git a/internal/service/rds/cluster_endpoint.go b/internal/service/rds/cluster_endpoint.go index e3c8e97f3555..7af21c0580d6 100644 --- a/internal/service/rds/cluster_endpoint.go +++ b/internal/service/rds/cluster_endpoint.go @@ -106,7 +106,6 @@ func resourceClusterEndpointCreate(ctx context.Context, d *schema.ResourceData, } _, err := conn.CreateDBClusterEndpointWithContext(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "creating RDS Cluster Endpoint (%s): %s", endpointID, err) } @@ -174,7 +173,6 @@ func resourceClusterEndpointUpdate(ctx context.Context, d *schema.ResourceData, } _, err := conn.ModifyDBClusterEndpointWithContext(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "modifying RDS Cluster Endpoint (%s): %s", d.Id(), err) } @@ -191,7 +189,6 @@ func resourceClusterEndpointDelete(ctx context.Context, d *schema.ResourceData, _, err := conn.DeleteDBClusterEndpointWithContext(ctx, &rds.DeleteDBClusterEndpointInput{ DBClusterEndpointIdentifier: aws.String(d.Id()), }) - if err != nil { return sdkdiag.AppendErrorf(diags, "deleting RDS Cluster Endpoint (%s): %s", d.Id(), err) } @@ -209,7 +206,6 @@ func FindDBClusterEndpointByID(ctx context.Context, conn *rds.RDS, id string) (* } output, err := conn.DescribeDBClusterEndpointsWithContext(ctx, input) - if err != nil { return nil, err } diff --git a/internal/service/rds/cluster_endpoint_test.go b/internal/service/rds/cluster_endpoint_test.go index 9447061c2b52..5bac22afe53f 100644 --- a/internal/service/rds/cluster_endpoint_test.go +++ b/internal/service/rds/cluster_endpoint_test.go @@ -187,7 +187,6 @@ func testAccCheckClusterEndpointExists(ctx context.Context, n string, v *rds.DBC conn := acctest.Provider.Meta().(*conns.AWSClient).RDSConn() output, err := tfrds.FindDBClusterEndpointByID(ctx, conn, rs.Primary.ID) - if err != nil { return err } diff --git a/internal/service/rds/cluster_instance.go b/internal/service/rds/cluster_instance.go index 73693baf33a7..4db8568f8f82 100644 --- a/internal/service/rds/cluster_instance.go +++ b/internal/service/rds/cluster_instance.go @@ -301,7 +301,6 @@ func resourceClusterInstanceCreate(ctx context.Context, d *schema.ResourceData, return conn.CreateDBInstanceWithContext(ctx, input) }, errCodeInvalidParameterValue, "IAM role ARN value is invalid or does not include the required permissions") - if err != nil { return sdkdiag.AppendErrorf(diags, "creating RDS Cluster (%s) Instance (%s): %s", clusterID, identifier, err) } @@ -365,7 +364,6 @@ func resourceClusterInstanceRead(ctx context.Context, d *schema.ResourceData, me } dbc, err := FindDBClusterByID(ctx, conn, dbClusterID) - if err != nil { return sdkdiag.AppendErrorf(diags, "reading RDS Cluster (%s): %s", dbClusterID, err) } @@ -490,7 +488,6 @@ func resourceClusterInstanceUpdate(ctx context.Context, d *schema.ResourceData, return conn.ModifyDBInstanceWithContext(ctx, input) }, errCodeInvalidParameterValue, "IAM role ARN value is invalid or does not include the required permissions") - if err != nil { return sdkdiag.AppendErrorf(diags, "updating RDS Cluster Instance (%s): %s", d.Id(), err) } diff --git a/internal/service/rds/cluster_instance_test.go b/internal/service/rds/cluster_instance_test.go index 4783e83312b2..83458b96fe94 100644 --- a/internal/service/rds/cluster_instance_test.go +++ b/internal/service/rds/cluster_instance_test.go @@ -1137,7 +1137,6 @@ func testAccCheckClusterInstanceExists(ctx context.Context, n string, v *rds.DBI conn := acctest.Provider.Meta().(*conns.AWSClient).RDSConn() output, err := tfrds.FindDBInstanceByID(ctx, conn, rs.Primary.ID) - if err != nil { return err } diff --git a/internal/service/rds/cluster_parameter_group.go b/internal/service/rds/cluster_parameter_group.go index e9c23866efd2..e89d23b3c95e 100644 --- a/internal/service/rds/cluster_parameter_group.go +++ b/internal/service/rds/cluster_parameter_group.go @@ -113,7 +113,6 @@ func resourceClusterParameterGroupCreate(ctx context.Context, d *schema.Resource } output, err := conn.CreateDBClusterParameterGroupWithContext(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "creating DB Cluster Parameter Group (%s): %s", groupName, err) } @@ -249,7 +248,6 @@ func resourceClusterParameterGroupUpdate(ctx context.Context, d *schema.Resource } _, err := conn.ModifyDBClusterParameterGroupWithContext(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "modifying DB Cluster Parameter Group (%s): %s", d.Id(), err) } diff --git a/internal/service/rds/cluster_parameter_group_test.go b/internal/service/rds/cluster_parameter_group_test.go index aa4bf870a23c..108cdc29e386 100644 --- a/internal/service/rds/cluster_parameter_group_test.go +++ b/internal/service/rds/cluster_parameter_group_test.go @@ -596,7 +596,6 @@ func testAccCheckClusterParameterGroupExists(ctx context.Context, n string, v *r conn := acctest.Provider.Meta().(*conns.AWSClient).RDSConn() output, err := tfrds.FindDBClusterParameterGroupByName(ctx, conn, rs.Primary.ID) - if err != nil { return err } diff --git a/internal/service/rds/cluster_role_association.go b/internal/service/rds/cluster_role_association.go index 8787a0e66a6c..b86c5073a5b5 100644 --- a/internal/service/rds/cluster_role_association.go +++ b/internal/service/rds/cluster_role_association.go @@ -94,7 +94,6 @@ func resourceClusterRoleAssociationRead(ctx context.Context, d *schema.ResourceD conn := meta.(*conns.AWSClient).RDSConn() dbClusterID, roleARN, err := ClusterRoleAssociationParseResourceID(d.Id()) - if err != nil { return sdkdiag.AppendErrorf(diags, "parsing RDS DB Cluster IAM Role Association ID: %s", err) } @@ -123,7 +122,6 @@ func resourceClusterRoleAssociationDelete(ctx context.Context, d *schema.Resourc conn := meta.(*conns.AWSClient).RDSConn() dbClusterID, roleARN, err := ClusterRoleAssociationParseResourceID(d.Id()) - if err != nil { return sdkdiag.AppendErrorf(diags, "parsing RDS DB Cluster IAM Role Association ID: %s", err) } diff --git a/internal/service/rds/cluster_role_association_test.go b/internal/service/rds/cluster_role_association_test.go index bdfac984c5b3..77c874fb21f6 100644 --- a/internal/service/rds/cluster_role_association_test.go +++ b/internal/service/rds/cluster_role_association_test.go @@ -131,7 +131,6 @@ func testAccCheckClusterRoleAssociationExists(ctx context.Context, resourceName } dbClusterID, roleARN, err := tfrds.ClusterRoleAssociationParseResourceID(rs.Primary.ID) - if err != nil { return err } @@ -139,7 +138,6 @@ func testAccCheckClusterRoleAssociationExists(ctx context.Context, resourceName conn := acctest.Provider.Meta().(*conns.AWSClient).RDSConn() role, err := tfrds.FindDBClusterRoleByDBClusterIDAndRoleARN(ctx, conn, dbClusterID, roleARN) - if err != nil { return err } @@ -160,7 +158,6 @@ func testAccCheckClusterRoleAssociationDestroy(ctx context.Context) resource.Tes } dbClusterID, roleARN, err := tfrds.ClusterRoleAssociationParseResourceID(rs.Primary.ID) - if err != nil { return err } diff --git a/internal/service/rds/cluster_snapshot_data_source.go b/internal/service/rds/cluster_snapshot_data_source.go index bf4cc800b726..444807b565b2 100644 --- a/internal/service/rds/cluster_snapshot_data_source.go +++ b/internal/service/rds/cluster_snapshot_data_source.go @@ -22,7 +22,7 @@ func DataSourceClusterSnapshot() *schema.Resource { ReadWithoutTimeout: dataSourceClusterSnapshotRead, Schema: map[string]*schema.Schema{ - //selection criteria + // selection criteria "db_cluster_identifier": { Type: schema.TypeString, Optional: true, @@ -55,7 +55,7 @@ func DataSourceClusterSnapshot() *schema.Resource { Default: false, }, - //Computed values returned + // Computed values returned "allocated_storage": { Type: schema.TypeInt, Computed: true, @@ -186,7 +186,6 @@ func dataSourceClusterSnapshotRead(ctx context.Context, d *schema.ResourceData, d.Set("vpc_id", snapshot.VpcId) tags, err := ListTags(ctx, conn, d.Get("db_cluster_snapshot_arn").(string)) - if err != nil { return sdkdiag.AppendErrorf(diags, "listing tags for RDS DB Cluster Snapshot (%s): %s", d.Get("db_cluster_snapshot_arn").(string), err) } diff --git a/internal/service/rds/cluster_test.go b/internal/service/rds/cluster_test.go index 8e658e595de9..d314f02d251e 100644 --- a/internal/service/rds/cluster_test.go +++ b/internal/service/rds/cluster_test.go @@ -460,6 +460,49 @@ func TestAccRDSCluster_onlyMajorVersion(t *testing.T) { }) } +// https://github.com/hashicorp/terraform-provider-aws/issues/30605 +func TestAccRDSCluster_minorVersion(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbCluster1, dbCluster2 rds.DBCluster + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_rds_cluster.test" + // If these hardcoded versions become a maintenance burden, use DescribeDBEngineVersions + // either by having a new data source created or implementing the testing similar + // to TestAccDMSReplicationInstance_engineVersion + engine := "aurora-postgresql" + engineVersion1 := "14.6" + engineVersion2 := "14.7" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, rds.EndpointsID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccClusterConfig_minorVersion(rName, engine, engineVersion1, "aurora-postgresql14"), + Check: resource.ComposeTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &dbCluster1), + resource.TestCheckResourceAttr(resourceName, "engine", engine), + resource.TestCheckResourceAttr(resourceName, "engine_version", engineVersion1), + ), + }, + { + Config: testAccClusterConfig_minorVersion(rName, engine, engineVersion2, "aurora-postgresql14"), + Check: resource.ComposeTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &dbCluster2), + resource.TestCheckResourceAttr(resourceName, "engine", engine), + resource.TestCheckResourceAttr(resourceName, "engine_version", engineVersion2), + ), + }, + }, + }) +} + func TestAccRDSCluster_availabilityZones(t *testing.T) { ctx := acctest.Context(t) var dbCluster rds.DBCluster @@ -1513,6 +1556,7 @@ func TestAccRDSCluster_ManagedMasterPassword_managed(t *testing.T) { }, }) } + func TestAccRDSCluster_ManagedMasterPassword_managedSpecificKMSKey(t *testing.T) { ctx := acctest.Context(t) var dbCluster rds.DBCluster @@ -2113,6 +2157,9 @@ func TestAccRDSCluster_SnapshotIdentifier_preferredMaintenanceWindow(t *testing. var dbCluster, sourceDbCluster rds.DBCluster var dbClusterSnapshot rds.DBClusterSnapshot + // This config is version agnostic. Use it as a model for fixing version errors + // in other tests. + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) sourceDbResourceName := "aws_rds_cluster.source" snapshotResourceName := "aws_db_cluster_snapshot.test" @@ -2384,7 +2431,6 @@ func testAccCheckClusterDestroyWithFinalSnapshot(ctx context.Context) resource.T finalSnapshotID := rs.Primary.Attributes["final_snapshot_identifier"] _, err := tfrds.FindDBClusterSnapshotByID(ctx, conn, finalSnapshotID) - if err != nil { return err } @@ -2432,7 +2478,6 @@ func testAccCheckClusterExistsWithProvider(ctx context.Context, n string, v *rds conn := providerF().Meta().(*conns.AWSClient).RDSConn() output, err := tfrds.FindDBClusterByID(ctx, conn, rs.Primary.ID) - if err != nil { return err } @@ -2697,6 +2742,51 @@ resource "aws_rds_cluster_instance" "test" { `, allowMajorVersionUpgrade, rName, engine, engineVersion) } +func testAccClusterConfig_minorVersion(rName, engine, engineVersion, family string) string { + return fmt.Sprintf(` +resource "aws_db_parameter_group" "test" { + name = %[1]q + family = %[4]q + + parameter { + name = "application_name" + value = %[1]q + } +} + +resource "aws_rds_cluster" "test" { + cluster_identifier = %[1]q + engine = %[2]q + engine_version = %[3]q + db_instance_parameter_group_name = aws_db_parameter_group.test.id + master_username = "tfacctest" + master_password = %[1]q + skip_final_snapshot = true +} + +data "aws_rds_orderable_db_instance" "test" { + engine = aws_rds_cluster.test.engine + engine_version = aws_rds_cluster.test.engine_version + preferred_instance_classes = ["db.t3.medium", "db.r5.large", "db.r6g.large"] +} + +# Upgrading requires a healthy primary instance +resource "aws_rds_cluster_instance" "test" { + apply_immediately = true + cluster_identifier = aws_rds_cluster.test.id + db_parameter_group_name = aws_db_parameter_group.test.name + engine = data.aws_rds_orderable_db_instance.test.engine + engine_version = data.aws_rds_orderable_db_instance.test.engine_version + identifier = %[1]q + instance_class = data.aws_rds_orderable_db_instance.test.instance_class + + lifecycle { + ignore_changes = [engine_version] + } +} +`, rName, engine, engineVersion, family) +} + func testAccClusterConfig_availabilityZones(rName string) string { return acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptIn(), fmt.Sprintf(` resource "aws_rds_cluster" "test" { @@ -4229,13 +4319,19 @@ resource "aws_rds_cluster" "test" { } func testAccClusterConfig_SnapshotID_preferredMaintenanceWindow(rName, preferredMaintenanceWindow string) string { + // This config will never need the version updated. Use as a model for changing the other + // tests. return fmt.Sprintf(` +data "aws_rds_engine_version" "test" { + engine = "aurora-mysql" +} + resource "aws_rds_cluster" "source" { cluster_identifier = "%[1]s-source" - engine = "aurora-mysql" master_password = "barbarbarbar" master_username = "foo" skip_final_snapshot = true + engine = data.aws_rds_engine_version.test.engine } resource "aws_db_cluster_snapshot" "test" { @@ -4245,10 +4341,10 @@ resource "aws_db_cluster_snapshot" "test" { resource "aws_rds_cluster" "test" { cluster_identifier = %[1]q - engine = "aurora-mysql" preferred_maintenance_window = %[2]q skip_final_snapshot = true snapshot_identifier = aws_db_cluster_snapshot.test.id + engine = data.aws_rds_engine_version.test.engine } `, rName, preferredMaintenanceWindow) } diff --git a/internal/service/rds/clusters_data_source.go b/internal/service/rds/clusters_data_source.go index d0af81fe9a49..62952371a674 100644 --- a/internal/service/rds/clusters_data_source.go +++ b/internal/service/rds/clusters_data_source.go @@ -66,7 +66,6 @@ func dataSourceClustersRead(ctx context.Context, d *schema.ResourceData, meta in return !lastPage }) - if err != nil { return create.DiagError(names.RDS, create.ErrActionReading, DSNameClusters, "", err) } diff --git a/internal/service/rds/engine_version_data_source.go b/internal/service/rds/engine_version_data_source.go index 1bc93b2762e7..b566f27499bc 100644 --- a/internal/service/rds/engine_version_data_source.go +++ b/internal/service/rds/engine_version_data_source.go @@ -190,7 +190,6 @@ func dataSourceEngineVersionRead(ctx context.Context, d *schema.ResourceData, me } return !lastPage }) - if err != nil { return sdkdiag.AppendErrorf(diags, "reading RDS engine versions: %s", err) } diff --git a/internal/service/rds/event_categories_data_source.go b/internal/service/rds/event_categories_data_source.go index ac3c5c1aac46..86936911f2ab 100644 --- a/internal/service/rds/event_categories_data_source.go +++ b/internal/service/rds/event_categories_data_source.go @@ -43,7 +43,6 @@ func dataSourceEventCategoriesRead(ctx context.Context, d *schema.ResourceData, } output, err := findEventCategoriesMaps(ctx, conn, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "reading RDS Event Categories: %s", err) } @@ -64,7 +63,6 @@ func findEventCategoriesMaps(ctx context.Context, conn *rds.RDS, input *rds.Desc var output []*rds.EventCategoriesMap page, err := conn.DescribeEventCategoriesWithContext(ctx, input) - if err != nil { return nil, err } diff --git a/internal/service/rds/event_subscription.go b/internal/service/rds/event_subscription.go index 2e91b39ac554..09ce6dfccc10 100644 --- a/internal/service/rds/event_subscription.go +++ b/internal/service/rds/event_subscription.go @@ -124,7 +124,6 @@ func resourceEventSubscriptionCreate(ctx context.Context, d *schema.ResourceData log.Printf("[DEBUG] Creating RDS Event Subscription: %s", input) output, err := conn.CreateEventSubscriptionWithContext(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "creating RDS Event Subscription (%s): %s", name, err) } @@ -194,7 +193,6 @@ func resourceEventSubscriptionUpdate(ctx context.Context, d *schema.ResourceData log.Printf("[DEBUG] Updating RDS Event Subscription: %s", input) _, err := conn.ModifyEventSubscriptionWithContext(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "updating RDS Event Subscription (%s): %s", d.Id(), err) } @@ -217,7 +215,6 @@ func resourceEventSubscriptionUpdate(ctx context.Context, d *schema.ResourceData SourceIdentifier: aws.String(del), SubscriptionName: aws.String(d.Id()), }) - if err != nil { return sdkdiag.AppendErrorf(diags, "removing RDS Event Subscription (%s) source ID (%s): %s", d.Id(), del, err) } @@ -229,7 +226,6 @@ func resourceEventSubscriptionUpdate(ctx context.Context, d *schema.ResourceData SourceIdentifier: aws.String(add), SubscriptionName: aws.String(d.Id()), }) - if err != nil { return sdkdiag.AppendErrorf(diags, "adding RDS Event Subscription (%s) source ID (%s): %s", d.Id(), add, err) } diff --git a/internal/service/rds/event_subscription_test.go b/internal/service/rds/event_subscription_test.go index 86591781517d..5d79b854b4e7 100644 --- a/internal/service/rds/event_subscription_test.go +++ b/internal/service/rds/event_subscription_test.go @@ -312,7 +312,6 @@ func testAccCheckEventSubscriptionExists(ctx context.Context, n string, v *rds.E conn := acctest.Provider.Meta().(*conns.AWSClient).RDSConn() output, err := tfrds.FindEventSubscriptionByID(ctx, conn, rs.Primary.ID) - if err != nil { return err } diff --git a/internal/service/rds/find.go b/internal/service/rds/find.go index 1d70c16c23ec..f5c5545cf138 100644 --- a/internal/service/rds/find.go +++ b/internal/service/rds/find.go @@ -68,7 +68,6 @@ func FindDBProxyEndpoint(ctx context.Context, conn *rds.RDS, id string) (*rds.DB func FindDBClusterRoleByDBClusterIDAndRoleARN(ctx context.Context, conn *rds.RDS, dbClusterID, roleARN string) (*rds.DBClusterRole, error) { dbCluster, err := FindDBClusterByID(ctx, conn, dbClusterID) - if err != nil { return nil, err } @@ -275,7 +274,6 @@ func FindDBInstanceAutomatedBackupByARN(ctx context.Context, conn *rds.RDS, arn } output, err := findDBInstanceAutomatedBackup(ctx, conn, input) - if err != nil { return nil, err } @@ -300,7 +298,6 @@ func FindDBInstanceAutomatedBackupByARN(ctx context.Context, conn *rds.RDS, arn func findDBInstanceAutomatedBackup(ctx context.Context, conn *rds.RDS, input *rds.DescribeDBInstanceAutomatedBackupsInput) (*rds.DBInstanceAutomatedBackup, error) { output, err := findDBInstanceAutomatedBackups(ctx, conn, input) - if err != nil { return nil, err } @@ -350,7 +347,6 @@ func findDBInstanceAutomatedBackups(ctx context.Context, conn *rds.RDS, input *r func FindGlobalClusterByDBClusterARN(ctx context.Context, conn *rds.RDS, dbClusterARN string) (*rds.GlobalCluster, error) { input := &rds.DescribeGlobalClustersInput{} globalClusters, err := findGlobalClusters(ctx, conn, input) - if err != nil { return nil, err } @@ -372,7 +368,6 @@ func FindGlobalClusterByID(ctx context.Context, conn *rds.RDS, id string) (*rds. } output, err := findGlobalCluster(ctx, conn, input) - if err != nil { return nil, err } @@ -389,7 +384,6 @@ func FindGlobalClusterByID(ctx context.Context, conn *rds.RDS, id string) (*rds. func findGlobalCluster(ctx context.Context, conn *rds.RDS, input *rds.DescribeGlobalClustersInput) (*rds.GlobalCluster, error) { output, err := findGlobalClusters(ctx, conn, input) - if err != nil { return nil, err } diff --git a/internal/service/rds/global_cluster.go b/internal/service/rds/global_cluster.go index 1335c9cf6d4f..490571e84361 100644 --- a/internal/service/rds/global_cluster.go +++ b/internal/service/rds/global_cluster.go @@ -331,7 +331,6 @@ func resourceGlobalClusterDelete(ctx context.Context, d *schema.ResourceData, me } _, err := conn.RemoveFromGlobalClusterWithContext(ctx, input) - if err != nil { if !tfawserr.ErrMessageContains(err, "InvalidParameterValue", "is not found in global cluster") { return sdkdiag.AppendErrorf(diags, "removing RDS DB Cluster (%s) from Global Cluster (%s): %s", writerARN, d.Id(), err) @@ -592,7 +591,6 @@ func globalClusterUpgradeMajorEngineVersion(ctx context.Context, meta interface{ err := retry.RetryContext(ctx, timeout, func() *retry.RetryError { _, err := conn.ModifyGlobalClusterWithContext(ctx, input) - if err != nil { if tfawserr.ErrCodeEquals(err, rds.ErrCodeGlobalClusterNotFoundFault) { return retry.NonRetryableError(err) @@ -617,7 +615,6 @@ func globalClusterUpgradeMajorEngineVersion(ctx context.Context, meta interface{ } globalCluster, err := DescribeGlobalCluster(ctx, conn, clusterID) - if err != nil { return fmt.Errorf("while upgrading major version of RDS Global Cluster (%s): %w", clusterID, err) } @@ -630,7 +627,6 @@ func globalClusterUpgradeMajorEngineVersion(ctx context.Context, meta interface{ } dbi, clusterRegion, err := ClusterIDRegionFromARN(arnID) - if err != nil { return fmt.Errorf("while upgrading RDS Global Cluster Cluster minor engine version: %w", err) } @@ -655,7 +651,6 @@ func globalClusterUpgradeMajorEngineVersion(ctx context.Context, meta interface{ func ClusterIDRegionFromARN(arnID string) (string, string, error) { parsedARN, err := arn.Parse(arnID) - if err != nil { return "", "", fmt.Errorf("could not parse ARN (%s): %w", arnID, err) } @@ -696,7 +691,6 @@ func globalClusterUpgradeMinorEngineVersion(ctx context.Context, meta interface{ arnID := clusterMember["db_cluster_arn"].(string) dbi, clusterRegion, err := ClusterIDRegionFromARN(arnID) - if err != nil { return fmt.Errorf("while upgrading RDS Global Cluster Cluster minor engine version: %w", err) } @@ -721,7 +715,6 @@ func globalClusterUpgradeMinorEngineVersion(ctx context.Context, meta interface{ err = retry.RetryContext(ctx, timeout, func() *retry.RetryError { _, err := useConn.ModifyDBClusterWithContext(ctx, modInput) - if err != nil { if tfawserr.ErrMessageContains(err, "InvalidParameterValue", "IAM role ARN value is invalid or does not include the required permissions") { return retry.RetryableError(err) @@ -742,7 +735,6 @@ func globalClusterUpgradeMinorEngineVersion(ctx context.Context, meta interface{ if tfresource.TimedOut(err) { _, err := useConn.ModifyDBClusterWithContext(ctx, modInput) - if err != nil { return err } diff --git a/internal/service/rds/global_cluster_test.go b/internal/service/rds/global_cluster_test.go index 987a5ba9c483..f4b5c8ddb360 100644 --- a/internal/service/rds/global_cluster_test.go +++ b/internal/service/rds/global_cluster_test.go @@ -298,14 +298,14 @@ func TestAccRDSGlobalCluster_EngineVersion_updateMinor(t *testing.T) { CheckDestroy: testAccCheckGlobalClusterDestroy(ctx), Steps: []resource.TestStep{ { - //Config: testAccGlobalClusterConfig_primaryEngineVersion(rName, "aurora", "5.6.mysql_aurora.1.22.2"), + // Config: testAccGlobalClusterConfig_primaryEngineVersion(rName, "aurora", "5.6.mysql_aurora.1.22.2"), Config: testAccGlobalClusterConfig_primaryEngineVersion(rName, "aurora-postgresql", "13.4"), Check: resource.ComposeTestCheckFunc( testAccCheckGlobalClusterExists(ctx, resourceName, &globalCluster1), ), }, { - //Config: testAccGlobalClusterConfig_primaryEngineVersion(rName, "aurora", "5.6.mysql_aurora.1.23.2"), + // Config: testAccGlobalClusterConfig_primaryEngineVersion(rName, "aurora", "5.6.mysql_aurora.1.23.2"), Config: testAccGlobalClusterConfig_primaryEngineVersion(rName, "aurora-postgresql", "13.5"), Check: resource.ComposeTestCheckFunc( testAccCheckGlobalClusterExists(ctx, resourceName, &globalCluster2), @@ -622,7 +622,6 @@ func testAccCheckGlobalClusterExists(ctx context.Context, resourceName string, g conn := acctest.Provider.Meta().(*conns.AWSClient).RDSConn() cluster, err := tfrds.DescribeGlobalCluster(ctx, conn, rs.Primary.ID) - if err != nil { return err } @@ -680,7 +679,6 @@ func testAccCheckGlobalClusterDisappears(ctx context.Context, globalCluster *rds } _, err := conn.DeleteGlobalClusterWithContext(ctx, input) - if err != nil { return err } diff --git a/internal/service/rds/instance.go b/internal/service/rds/instance.go index 7d75b1ad277e..fe4eb211150b 100644 --- a/internal/service/rds/instance.go +++ b/internal/service/rds/instance.go @@ -75,13 +75,11 @@ func ResourceInstance() *schema.Resource { mas := d.Get("max_allocated_storage").(int) newInt, err := strconv.Atoi(new) - if err != nil { return false } oldInt, err := strconv.Atoi(old) - if err != nil { return false } @@ -771,7 +769,6 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, meta in return conn.CreateDBInstanceReadReplicaWithContext(ctx, input) }, errCodeInvalidParameterValue, "ENHANCED_MONITORING") - if err != nil { return sdkdiag.AppendErrorf(diags, "creating RDS DB Instance (read replica) (%s): %s", identifier, err) } @@ -1008,7 +1005,6 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, meta in return false, err }, ) - if err != nil { return sdkdiag.AppendErrorf(diags, "creating RDS DB Instance (restore from S3) (%s): %s", identifier, err) } @@ -1377,7 +1373,6 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, meta in return false, err }, ) - if err != nil { return sdkdiag.AppendErrorf(diags, "creating RDS DB Instance (restore to point-in-time) (%s): %s", identifier, err) } @@ -1568,7 +1563,6 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, meta in return false, err }, ) - if err != nil { return sdkdiag.AppendErrorf(diags, "creating RDS DB Instance (%s): %s", identifier, err) } @@ -1592,7 +1586,6 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, meta in modifyDbInstanceInput.DBInstanceIdentifier = aws.String(d.Id()) _, err := conn.ModifyDBInstanceWithContext(ctx, modifyDbInstanceInput) - if err != nil { return sdkdiag.AppendErrorf(diags, "updating RDS DB Instance (%s): %s", d.Id(), err) } @@ -1606,7 +1599,6 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, meta in _, err := conn.RebootDBInstanceWithContext(ctx, &rds.RebootDBInstanceInput{ DBInstanceIdentifier: aws.String(d.Id()), }) - if err != nil { return sdkdiag.AppendErrorf(diags, "rebooting RDS DB Instance (%s): %s", d.Id(), err) } @@ -2198,7 +2190,6 @@ func dbInstanceModify(ctx context.Context, conn *rds_sdkv2.Client, input *rds_sd return false, err }, ) - if err != nil { return err } diff --git a/internal/service/rds/instance_automated_backups_replication.go b/internal/service/rds/instance_automated_backups_replication.go index 109c11e9b6a9..5bf78f21f544 100644 --- a/internal/service/rds/instance_automated_backups_replication.go +++ b/internal/service/rds/instance_automated_backups_replication.go @@ -86,7 +86,6 @@ func resourceInstanceAutomatedBackupsReplicationCreate(ctx context.Context, d *s log.Printf("[DEBUG] Starting RDS instance automated backups replication: %s", input) output, err := conn.StartDBInstanceAutomatedBackupsReplicationWithContext(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "starting RDS instance automated backups replication: %s", err) } @@ -140,7 +139,6 @@ func resourceInstanceAutomatedBackupsReplicationDelete(ctx context.Context, d *s dbInstanceID := aws.StringValue(backup.DBInstanceIdentifier) sourceDatabaseARN, err := arn.Parse(aws.StringValue(backup.DBInstanceArn)) - if err != nil { return sdkdiag.AppendErrorf(diags, "deleting RDS DB Instance Automated Backup (%s): %s", d.Id(), err) } diff --git a/internal/service/rds/instance_data_source.go b/internal/service/rds/instance_data_source.go index a8b2a74c3bd9..e54ac9e9952c 100644 --- a/internal/service/rds/instance_data_source.go +++ b/internal/service/rds/instance_data_source.go @@ -217,7 +217,6 @@ func dataSourceInstanceRead(ctx context.Context, d *schema.ResourceData, meta in ignoreTagsConfig := meta.(*conns.AWSClient).IgnoreTagsConfig v, err := findDBInstanceByIDSDKv1(ctx, conn, d.Get("db_instance_identifier").(string)) - if err != nil { return diag.FromErr(tfresource.SingularDataSourceFindError("RDS DB Instance", err)) } @@ -299,7 +298,6 @@ func dataSourceInstanceRead(ctx context.Context, d *schema.ResourceData, meta in } tags, err := ListTags(ctx, conn, d.Get("db_instance_arn").(string)) - if err != nil { return sdkdiag.AppendErrorf(diags, "listing tags for RDS DB Instance (%s): %s", d.Get("db_instance_arn").(string), err) } diff --git a/internal/service/rds/instance_data_source_test.go b/internal/service/rds/instance_data_source_test.go index ea8f03a1a4d9..f3ec5cc46e72 100644 --- a/internal/service/rds/instance_data_source_test.go +++ b/internal/service/rds/instance_data_source_test.go @@ -53,6 +53,7 @@ func TestAccRDSInstanceDataSource_basic(t *testing.T) { }, }) } + func TestAccRDSInstanceDataSource_ManagedMasterPassword_managed(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { diff --git a/internal/service/rds/instance_migrate_test.go b/internal/service/rds/instance_migrate_test.go index 8fa155654a5a..50f534d154ac 100644 --- a/internal/service/rds/instance_migrate_test.go +++ b/internal/service/rds/instance_migrate_test.go @@ -52,7 +52,6 @@ func TestInstanceStateUpgradeV0(t *testing.T) { t.Parallel() got, err := tfrds.InstanceStateUpgradeV0(ctx, testCase.InputState, nil) - if err != nil { t.Fatalf("error migrating state: %s", err) } diff --git a/internal/service/rds/instance_role_association.go b/internal/service/rds/instance_role_association.go index 30765b113c69..fc2679f42d6c 100644 --- a/internal/service/rds/instance_role_association.go +++ b/internal/service/rds/instance_role_association.go @@ -107,7 +107,6 @@ func resourceInstanceRoleAssociationRead(ctx context.Context, d *schema.Resource conn := meta.(*conns.AWSClient).RDSConn() dbInstanceIdentifier, roleArn, err := InstanceRoleAssociationDecodeID(d.Id()) - if err != nil { return sdkdiag.AppendErrorf(diags, "reading resource ID: %s", err) } @@ -136,7 +135,6 @@ func resourceInstanceRoleAssociationDelete(ctx context.Context, d *schema.Resour conn := meta.(*conns.AWSClient).RDSConn() dbInstanceIdentifier, roleArn, err := InstanceRoleAssociationDecodeID(d.Id()) - if err != nil { return sdkdiag.AppendErrorf(diags, "reading resource ID: %s", err) } diff --git a/internal/service/rds/instance_role_association_test.go b/internal/service/rds/instance_role_association_test.go index 98325eeecb29..ff68d5f86247 100644 --- a/internal/service/rds/instance_role_association_test.go +++ b/internal/service/rds/instance_role_association_test.go @@ -92,7 +92,6 @@ func testAccCheckInstanceRoleAssociationExists(ctx context.Context, resourceName } dbInstanceIdentifier, roleArn, err := tfrds.InstanceRoleAssociationDecodeID(rs.Primary.ID) - if err != nil { return fmt.Errorf("error reading resource ID: %s", err) } @@ -127,7 +126,6 @@ func testAccCheckInstanceRoleAssociationDestroy(ctx context.Context) resource.Te } dbInstanceIdentifier, roleArn, err := tfrds.InstanceRoleAssociationDecodeID(rs.Primary.ID) - if err != nil { return fmt.Errorf("error reading resource ID: %s", err) } @@ -158,7 +156,6 @@ func testAccCheckInstanceRoleAssociationDisappears(ctx context.Context, dbInstan } _, err := conn.RemoveRoleFromDBInstanceWithContext(ctx, input) - if err != nil { return err } diff --git a/internal/service/rds/instance_test.go b/internal/service/rds/instance_test.go index 3c75fc79d4a3..c412c69f6c6e 100644 --- a/internal/service/rds/instance_test.go +++ b/internal/service/rds/instance_test.go @@ -999,6 +999,7 @@ func TestAccRDSInstance_password(t *testing.T) { }, }) } + func TestAccRDSInstance_ManagedMasterPassword_managed(t *testing.T) { ctx := acctest.Context(t) var v rds.DBInstance @@ -5523,13 +5524,11 @@ func testAccCheckInstanceDestroyWithFinalSnapshot(ctx context.Context) resource. finalSnapshotID := rs.Primary.Attributes["final_snapshot_identifier"] output, err := tfrds.FindDBSnapshotByID(ctx, conn, finalSnapshotID) - if err != nil { return err } tags, err := tfrds.ListTags(ctx, conn, aws.StringValue(output.DBSnapshotArn)) - if err != nil { return err } @@ -5643,7 +5642,6 @@ func testAccCheckInstanceExists(ctx context.Context, n string, v *rds.DBInstance conn := acctest.Provider.Meta().(*conns.AWSClient).RDSConn() output, err := tfrds.FindDBInstanceByID(ctx, conn, rs.Primary.ID) - if err != nil { return err } @@ -7868,7 +7866,7 @@ resource "aws_db_instance" "test" { // When testing needs to distinguish a second region and second account in the same region // e.g. cross-region functionality with RAM shared subnets func testAccAlternateAccountAndAlternateRegionProviderConfig() string { - //lintignore:AT004 + // lintignore:AT004 return fmt.Sprintf(` provider "awsalternateaccountalternateregion" { access_key = %[1]q diff --git a/internal/service/rds/instances_data_source.go b/internal/service/rds/instances_data_source.go index 3dbad6089fc0..be84332bb17f 100644 --- a/internal/service/rds/instances_data_source.go +++ b/internal/service/rds/instances_data_source.go @@ -66,7 +66,6 @@ func dataSourceInstancesRead(ctx context.Context, d *schema.ResourceData, meta i return !lastPage }) - if err != nil { return create.DiagError(names.RDS, create.ErrActionReading, DSNameInstances, "", err) } diff --git a/internal/service/rds/option_group_test.go b/internal/service/rds/option_group_test.go index ae9a109223ac..bb1960807c35 100644 --- a/internal/service/rds/option_group_test.go +++ b/internal/service/rds/option_group_test.go @@ -578,7 +578,6 @@ func testAccCheckOptionGroupExists(ctx context.Context, n string, v *rds.OptionG } resp, err := conn.DescribeOptionGroupsWithContext(ctx, &opts) - if err != nil { return err } diff --git a/internal/service/rds/orderable_instance_data_source.go b/internal/service/rds/orderable_instance_data_source.go index 75b6677097ff..81026f4e269f 100644 --- a/internal/service/rds/orderable_instance_data_source.go +++ b/internal/service/rds/orderable_instance_data_source.go @@ -279,7 +279,6 @@ func dataSourceOrderableInstanceRead(ctx context.Context, d *schema.ResourceData } return !lastPage }) - if err != nil { return sdkdiag.AppendErrorf(diags, "reading RDS Orderable DB Instance Options: %s", err) } diff --git a/internal/service/rds/parameter_group.go b/internal/service/rds/parameter_group.go index bce7c305189b..08f4ea20932c 100644 --- a/internal/service/rds/parameter_group.go +++ b/internal/service/rds/parameter_group.go @@ -114,7 +114,6 @@ func resourceParameterGroupCreate(ctx context.Context, d *schema.ResourceData, m } output, err := conn.CreateDBParameterGroupWithContext(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "creatingDB Parameter Group (%s): %s", name, err) } @@ -224,14 +223,13 @@ func resourceParameterGroupRead(ctx context.Context, d *schema.ResourceData, met } tags, err := ListTags(ctx, conn, arn) - if err != nil { return sdkdiag.AppendErrorf(diags, "listing tags for RDS DB Parameter Group (%s): %s", arn, err) } tags = tags.IgnoreAWS().IgnoreConfig(ignoreTagsConfig) - //lintignore:AWSR002 + // lintignore:AWSR002 if err := d.Set("tags", tags.RemoveDefaultConfig(defaultTagsConfig).Map()); err != nil { return sdkdiag.AppendErrorf(diags, "setting tags: %s", err) } @@ -279,7 +277,6 @@ func resourceParameterGroupUpdate(ctx context.Context, d *schema.ResourceData, m } _, err := conn.ModifyDBParameterGroupWithContext(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "modifying DB Parameter Group (%s): %s", d.Id(), err) } @@ -321,7 +318,6 @@ func resourceParameterGroupUpdate(ctx context.Context, d *schema.ResourceData, m } _, err := conn.ResetDBParameterGroupWithContext(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "resetting DB Parameter Group (%s): %s", d.Id(), err) } diff --git a/internal/service/rds/parameter_group_test.go b/internal/service/rds/parameter_group_test.go index f5b58dcd442b..8cc66ea3f1a6 100644 --- a/internal/service/rds/parameter_group_test.go +++ b/internal/service/rds/parameter_group_test.go @@ -1048,7 +1048,6 @@ func testAccCheckParameterGroupExists(ctx context.Context, n string, v *rds.DBPa conn := acctest.Provider.Meta().(*conns.AWSClient).RDSConn() output, err := tfrds.FindDBParameterGroupByName(ctx, conn, rs.Primary.ID) - if err != nil { return err } diff --git a/internal/service/rds/proxy.go b/internal/service/rds/proxy.go index e20a69d69c86..adcc75551f8b 100644 --- a/internal/service/rds/proxy.go +++ b/internal/service/rds/proxy.go @@ -165,7 +165,6 @@ func resourceProxyCreate(ctx context.Context, d *schema.ResourceData, meta inter } output, err := conn.CreateDBProxyWithContext(ctx, &input) - if err != nil { return sdkdiag.AppendErrorf(diags, "creating RDS DB Proxy: %s", err) } @@ -234,7 +233,6 @@ func resourceProxyUpdate(ctx context.Context, d *schema.ResourceData, meta inter } _, err := conn.ModifyDBProxyWithContext(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "updating RDS DB Proxy (%s): %s", d.Id(), err) } diff --git a/internal/service/rds/proxy_data_source.go b/internal/service/rds/proxy_data_source.go index 69a136061073..8d55e461a95b 100644 --- a/internal/service/rds/proxy_data_source.go +++ b/internal/service/rds/proxy_data_source.go @@ -103,7 +103,6 @@ func dataSourceProxyRead(ctx context.Context, d *schema.ResourceData, meta inter name := d.Get("name").(string) dbProxy, err := FindDBProxyByName(ctx, conn, name) - if err != nil { return sdkdiag.AppendErrorf(diags, "reading RDS DB Proxy (%s): %s", name, err) } diff --git a/internal/service/rds/proxy_default_target_group.go b/internal/service/rds/proxy_default_target_group.go index 6cebc74234f7..5da1257d401d 100644 --- a/internal/service/rds/proxy_default_target_group.go +++ b/internal/service/rds/proxy_default_target_group.go @@ -101,7 +101,6 @@ func resourceProxyDefaultTargetGroupRead(ctx context.Context, d *schema.Resource conn := meta.(*conns.AWSClient).RDSConn() tg, err := resourceProxyDefaultTargetGroupGet(ctx, conn, d.Id()) - if err != nil { if tfawserr.ErrCodeEquals(err, rds.ErrCodeDBProxyNotFoundFault) { log.Printf("[WARN] DB Proxy (%s) not found, removing from state", d.Id()) @@ -215,7 +214,6 @@ func resourceProxyDefaultTargetGroupGet(ctx context.Context, conn *rds.RDS, prox } return !lastPage }) - if err != nil { return nil, err } @@ -227,7 +225,6 @@ func resourceProxyDefaultTargetGroupGet(ctx context.Context, conn *rds.RDS, prox func resourceProxyDefaultTargetGroupRefreshFunc(ctx context.Context, conn *rds.RDS, proxyName string) retry.StateRefreshFunc { return func() (interface{}, string, error) { tg, err := resourceProxyDefaultTargetGroupGet(ctx, conn, proxyName) - if err != nil { if tfawserr.ErrCodeEquals(err, rds.ErrCodeDBProxyNotFoundFault) { return 42, "", nil diff --git a/internal/service/rds/proxy_default_target_group_test.go b/internal/service/rds/proxy_default_target_group_test.go index a828b687a9a2..a7196a1c78f2 100644 --- a/internal/service/rds/proxy_default_target_group_test.go +++ b/internal/service/rds/proxy_default_target_group_test.go @@ -374,7 +374,6 @@ func testAccCheckProxyTargetGroupExists(ctx context.Context, n string, v *rds.DB } resp, err := conn.DescribeDBProxyTargetGroupsWithContext(ctx, &opts) - if err != nil { return err } diff --git a/internal/service/rds/proxy_endpoint.go b/internal/service/rds/proxy_endpoint.go index 07d913ade0f7..adf0c1811533 100644 --- a/internal/service/rds/proxy_endpoint.go +++ b/internal/service/rds/proxy_endpoint.go @@ -111,7 +111,6 @@ func resourceProxyEndpointCreate(ctx context.Context, d *schema.ResourceData, me } _, err := conn.CreateDBProxyEndpointWithContext(ctx, &input) - if err != nil { return sdkdiag.AppendErrorf(diags, "Creating RDS DB Proxy Endpoint (%s/%s): %s", dbProxyName, dbProxyEndpointName, err) } @@ -205,7 +204,6 @@ func resourceProxyEndpointDelete(ctx context.Context, d *schema.ResourceData, me log.Printf("[DEBUG] Delete DB Proxy Endpoint: %#v", params) _, err := conn.DeleteDBProxyEndpointWithContext(ctx, ¶ms) - if err != nil { if tfawserr.ErrCodeEquals(err, rds.ErrCodeDBProxyNotFoundFault) || tfawserr.ErrCodeEquals(err, rds.ErrCodeDBProxyEndpointNotFoundFault) { return diags diff --git a/internal/service/rds/proxy_endpoint_test.go b/internal/service/rds/proxy_endpoint_test.go index cde63a8c68f3..9db7d544e040 100644 --- a/internal/service/rds/proxy_endpoint_test.go +++ b/internal/service/rds/proxy_endpoint_test.go @@ -294,7 +294,6 @@ func testAccCheckProxyEndpointExists(ctx context.Context, n string, v *rds.DBPro conn := acctest.Provider.Meta().(*conns.AWSClient).RDSConn() dbProxyEndpoint, err := tfrds.FindDBProxyEndpoint(ctx, conn, rs.Primary.ID) - if err != nil { return err } diff --git a/internal/service/rds/proxy_target.go b/internal/service/rds/proxy_target.go index f79c2930254c..24a3d4e004c9 100644 --- a/internal/service/rds/proxy_target.go +++ b/internal/service/rds/proxy_target.go @@ -113,7 +113,6 @@ func resourceProxyTargetCreate(ctx context.Context, d *schema.ResourceData, meta return conn.RegisterDBProxyTargetsWithContext(ctx, input) }, rds.ErrCodeInvalidDBInstanceStateFault, "CREATING") - if err != nil { return sdkdiag.AppendErrorf(diags, "registering RDS DB Proxy (%s/%s) Target: %s", dbProxyName, targetGroupName, err) } diff --git a/internal/service/rds/proxy_target_test.go b/internal/service/rds/proxy_target_test.go index 2cd9265e85a8..63f3953ea805 100644 --- a/internal/service/rds/proxy_target_test.go +++ b/internal/service/rds/proxy_target_test.go @@ -127,7 +127,6 @@ func testAccCheckProxyTargetDestroy(ctx context.Context) resource.TestCheckFunc } dbProxyName, targetGroupName, targetType, rdsResourceId, err := tfrds.ProxyTargetParseID(rs.Primary.ID) - if err != nil { return err } @@ -173,13 +172,11 @@ func testAccCheckProxyTargetExists(ctx context.Context, n string, v *rds.DBProxy conn := acctest.Provider.Meta().(*conns.AWSClient).RDSConn() dbProxyName, targetGroupName, targetType, rdsResourceId, err := tfrds.ProxyTargetParseID(rs.Primary.ID) - if err != nil { return err } dbProxyTarget, err := tfrds.FindDBProxyTarget(ctx, conn, dbProxyName, targetGroupName, targetType, rdsResourceId) - if err != nil { return err } diff --git a/internal/service/rds/proxy_test.go b/internal/service/rds/proxy_test.go index 4b0080bca4ff..04fcfae78af7 100644 --- a/internal/service/rds/proxy_test.go +++ b/internal/service/rds/proxy_test.go @@ -573,7 +573,6 @@ func testAccCheckProxyExists(ctx context.Context, n string, v *rds.DBProxy) reso conn := acctest.Provider.Meta().(*conns.AWSClient).RDSConn() output, err := tfrds.FindDBProxyByName(ctx, conn, rs.Primary.ID) - if err != nil { return err } diff --git a/internal/service/rds/reserved_instance_offering_data_source.go b/internal/service/rds/reserved_instance_offering_data_source.go index 3698f209862a..0cc292f74380 100644 --- a/internal/service/rds/reserved_instance_offering_data_source.go +++ b/internal/service/rds/reserved_instance_offering_data_source.go @@ -76,7 +76,6 @@ func dataSourceReservedOfferingRead(ctx context.Context, d *schema.ResourceData, } resp, err := conn.DescribeReservedDBInstancesOfferingsWithContext(ctx, input) - if err != nil { return create.DiagError(names.RDS, create.ErrActionReading, ResNameReservedInstanceOffering, "unknown", err) } diff --git a/internal/service/rds/reserved_instance_test.go b/internal/service/rds/reserved_instance_test.go index 9e90ba05ec0b..65e07403b0d9 100644 --- a/internal/service/rds/reserved_instance_test.go +++ b/internal/service/rds/reserved_instance_test.go @@ -76,7 +76,6 @@ func testAccReservedInstanceExists(ctx context.Context, n string, reservation *r } resp, err := tfrds.FindReservedDBInstanceByID(ctx, conn, rs.Primary.ID) - if err != nil { return err } diff --git a/internal/service/rds/security_group.go b/internal/service/rds/security_group.go index ed5b5ebff253..c4afc8c981c0 100644 --- a/internal/service/rds/security_group.go +++ b/internal/service/rds/security_group.go @@ -192,7 +192,6 @@ func resourceSecurityGroupDelete(ctx context.Context, d *schema.ResourceData, me opts := rds.DeleteDBSecurityGroupInput{DBSecurityGroupName: aws.String(d.Id())} _, err := conn.DeleteDBSecurityGroupWithContext(ctx, &opts) - if err != nil { if tfawserr.ErrCodeEquals(err, "InvalidDBSecurityGroup.NotFound") { return diags @@ -213,7 +212,6 @@ func resourceSecurityGroupRetrieve(ctx context.Context, d *schema.ResourceData, log.Printf("[DEBUG] DB Security Group describe configuration: %#v", opts) resp, err := conn.DescribeDBSecurityGroupsWithContext(ctx, &opts) - if err != nil { return nil, fmt.Errorf("Error retrieving DB Security Groups: %s", err) } @@ -253,7 +251,6 @@ func resourceSecurityGroupAuthorizeRule(ctx context.Context, ingress interface{} log.Printf("[DEBUG] Authorize ingress rule configuration: %#v", opts) _, err := conn.AuthorizeDBSecurityGroupIngressWithContext(ctx, &opts) - if err != nil { return fmt.Errorf("Error authorizing security group ingress: %s", err) } @@ -288,7 +285,6 @@ func resourceSecurityGroupRevokeRule(ctx context.Context, ingress interface{}, d log.Printf("[DEBUG] Revoking ingress rule configuration: %#v", opts) _, err := conn.RevokeDBSecurityGroupIngressWithContext(ctx, &opts) - if err != nil { return fmt.Errorf("Error revoking security group ingress: %s", err) } diff --git a/internal/service/rds/snapshot.go b/internal/service/rds/snapshot.go index d362b1711fb4..cdd0520e1b54 100644 --- a/internal/service/rds/snapshot.go +++ b/internal/service/rds/snapshot.go @@ -140,7 +140,6 @@ func resourceSnapshotCreate(ctx context.Context, d *schema.ResourceData, meta in } output, err := conn.CreateDBSnapshotWithContext(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "creating RDS DB Snapshot (%s): %s", dbSnapshotID, err) } @@ -159,7 +158,6 @@ func resourceSnapshotCreate(ctx context.Context, d *schema.ResourceData, meta in } _, err := conn.ModifyDBSnapshotAttributeWithContext(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "modifying RDS DB Snapshot (%s) attribute: %s", d.Id(), err) } @@ -209,7 +207,6 @@ func resourceSnapshotRead(ctx context.Context, d *schema.ResourceData, meta inte } output, err := conn.DescribeDBSnapshotAttributesWithContext(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "reading RDS DB Snapshot (%s) attribute: %s", d.Id(), err) } @@ -239,7 +236,6 @@ func resourceSnapshotUpdate(ctx context.Context, d *schema.ResourceData, meta in } _, err := conn.ModifyDBSnapshotAttributeWithContext(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "modifying RDS DB Snapshot (%s) attribute: %s", d.Id(), err) } diff --git a/internal/service/rds/snapshot_copy.go b/internal/service/rds/snapshot_copy.go index 6e021e8bd5ee..6b844da221bc 100644 --- a/internal/service/rds/snapshot_copy.go +++ b/internal/service/rds/snapshot_copy.go @@ -175,7 +175,6 @@ func resourceSnapshotCopyCreate(ctx context.Context, d *schema.ResourceData, met } output, err := conn.CopyDBSnapshotWithContext(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "creating RDS DB Snapshot Copy (%s): %s", targetDBSnapshotID, err) } diff --git a/internal/service/rds/snapshot_copy_test.go b/internal/service/rds/snapshot_copy_test.go index 84f94b9c9123..8b7f138b4e9d 100644 --- a/internal/service/rds/snapshot_copy_test.go +++ b/internal/service/rds/snapshot_copy_test.go @@ -164,7 +164,6 @@ func testAccCheckSnapshotCopyExists(ctx context.Context, n string, v *rds.DBSnap conn := acctest.Provider.Meta().(*conns.AWSClient).RDSConn() output, err := tfrds.FindDBSnapshotByID(ctx, conn, rs.Primary.ID) - if err != nil { return err } diff --git a/internal/service/rds/snapshot_data_source.go b/internal/service/rds/snapshot_data_source.go index 57e752d6b01c..b776a5fcb206 100644 --- a/internal/service/rds/snapshot_data_source.go +++ b/internal/service/rds/snapshot_data_source.go @@ -20,7 +20,7 @@ func DataSourceSnapshot() *schema.Resource { ReadWithoutTimeout: dataSourceSnapshotRead, Schema: map[string]*schema.Schema{ - //selection criteria + // selection criteria "db_instance_identifier": { Type: schema.TypeString, Optional: true, @@ -53,7 +53,7 @@ func DataSourceSnapshot() *schema.Resource { Default: false, }, - //Computed values returned + // Computed values returned "allocated_storage": { Type: schema.TypeInt, Computed: true, diff --git a/internal/service/rds/snapshot_test.go b/internal/service/rds/snapshot_test.go index 69e458d31f8d..3f4300da2e7d 100644 --- a/internal/service/rds/snapshot_test.go +++ b/internal/service/rds/snapshot_test.go @@ -208,7 +208,6 @@ func testAccCheckDBSnapshotExists(ctx context.Context, n string, v *rds.DBSnapsh conn := acctest.Provider.Meta().(*conns.AWSClient).RDSConn() output, err := tfrds.FindDBSnapshotByID(ctx, conn, rs.Primary.ID) - if err != nil { return err } diff --git a/internal/service/rds/status.go b/internal/service/rds/status.go index 321fe90d8080..1226e020afe7 100644 --- a/internal/service/rds/status.go +++ b/internal/service/rds/status.go @@ -38,7 +38,6 @@ func statusEventSubscription(ctx context.Context, conn *rds.RDS, id string) retr func statusDBProxyEndpoint(ctx context.Context, conn *rds.RDS, id string) retry.StateRefreshFunc { return func() (interface{}, string, error) { output, err := FindDBProxyEndpoint(ctx, conn, id) - if err != nil { return nil, proxyEndpointStatusUnknown, err } diff --git a/internal/service/rds/subnet_group.go b/internal/service/rds/subnet_group.go index 718e3c41c401..8c81fa4c07da 100644 --- a/internal/service/rds/subnet_group.go +++ b/internal/service/rds/subnet_group.go @@ -90,7 +90,6 @@ func resourceSubnetGroupCreate(ctx context.Context, d *schema.ResourceData, meta log.Printf("[DEBUG] Creating RDS DB Subnet Group: %s", input) output, err := conn.CreateDBSubnetGroupWithContext(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "creating RDS DB Subnet Group (%s): %s", name, err) } @@ -144,7 +143,6 @@ func resourceSubnetGroupUpdate(ctx context.Context, d *schema.ResourceData, meta log.Printf("[DEBUG] Modifying RDS DB Subnet Group: %s", input) _, err := conn.ModifyDBSubnetGroupWithContext(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "updating RDS DB Subnet Group (%s): %s", d.Id(), err) } diff --git a/internal/service/rds/subnet_group_data_source.go b/internal/service/rds/subnet_group_data_source.go index 3ab967bc7428..93e04f7742ee 100644 --- a/internal/service/rds/subnet_group_data_source.go +++ b/internal/service/rds/subnet_group_data_source.go @@ -56,7 +56,6 @@ func dataSourceSubnetGroupRead(ctx context.Context, d *schema.ResourceData, meta conn := meta.(*conns.AWSClient).RDSConn() v, err := FindDBSubnetGroupByName(ctx, conn, d.Get("name").(string)) - if err != nil { return sdkdiag.AppendFromErr(diags, tfresource.SingularDataSourceFindError("RDS DB Subnet Group", err)) } diff --git a/internal/service/rds/subnet_group_test.go b/internal/service/rds/subnet_group_test.go index 42cfea0c542a..609ada756544 100644 --- a/internal/service/rds/subnet_group_test.go +++ b/internal/service/rds/subnet_group_test.go @@ -319,7 +319,6 @@ func testAccCheckSubnetGroupExists(ctx context.Context, n string, v *rds.DBSubne conn := acctest.Provider.Meta().(*conns.AWSClient).RDSConn() output, err := tfrds.FindDBSubnetGroupByName(ctx, conn, rs.Primary.ID) - if err != nil { return err } diff --git a/internal/service/rds/sweep.go b/internal/service/rds/sweep.go index 7b39155798e4..65cb9501b1c4 100644 --- a/internal/service/rds/sweep.go +++ b/internal/service/rds/sweep.go @@ -238,7 +238,6 @@ func sweepClusters(region string) error { if engineMode := aws.StringValue(v.EngineMode); engineMode == EngineModeGlobal || engineMode == EngineModeProvisioned { globalCluster, err := DescribeGlobalClusterFromClusterARN(ctx, conn, arn) - if err != nil { if !tfresource.NotFound(err) { sweeperErrs = multierror.Append(sweeperErrs, fmt.Errorf("reading RDS Global Cluster information for DB Cluster (%s): %s", id, err))