From 4007fd2bc8773fe61e64beb68a5f77abd41b8347 Mon Sep 17 00:00:00 2001 From: clint shryock Date: Wed, 14 Dec 2016 10:08:11 -0600 Subject: [PATCH] provider/aws: Removed deprecated parameter group from RDS Cluster --- .../providers/aws/resource_aws_rds_cluster.go | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/builtin/providers/aws/resource_aws_rds_cluster.go b/builtin/providers/aws/resource_aws_rds_cluster.go index 5fa49ad14..89b2a35ea 100644 --- a/builtin/providers/aws/resource_aws_rds_cluster.go +++ b/builtin/providers/aws/resource_aws_rds_cluster.go @@ -64,16 +64,6 @@ func resourceAwsRDSCluster() *schema.Resource { Computed: true, }, - // TODO: remove parameter_group_name - // See https://github.com/hashicorp/terraform/issues/7046 - // Likely need migration to remove from state - "parameter_group_name": { - Type: schema.TypeString, - Optional: true, - Computed: true, - Deprecated: "Use db_cluster_parameter_group_name instead. This attribute will be removed in a future version", - }, - "db_cluster_parameter_group_name": { Type: schema.TypeString, Optional: true, @@ -326,10 +316,6 @@ func resourceAwsRDSClusterCreate(d *schema.ResourceData, meta interface{}) error createOpts.DBSubnetGroupName = aws.String(attr.(string)) } - if attr, ok := d.GetOk("parameter_group_name"); ok { - createOpts.DBClusterParameterGroupName = aws.String(attr.(string)) - } - if attr, ok := d.GetOk("db_cluster_parameter_group_name"); ok { createOpts.DBClusterParameterGroupName = aws.String(attr.(string)) } @@ -438,7 +424,6 @@ func resourceAwsRDSClusterRead(d *schema.ResourceData, meta interface{}) error { d.Set("cluster_identifier", dbc.DBClusterIdentifier) d.Set("db_subnet_group_name", dbc.DBSubnetGroup) - d.Set("parameter_group_name", dbc.DBClusterParameterGroup) d.Set("db_cluster_parameter_group_name", dbc.DBClusterParameterGroup) d.Set("endpoint", dbc.Endpoint) d.Set("engine", dbc.Engine) @@ -518,12 +503,6 @@ func resourceAwsRDSClusterUpdate(d *schema.ResourceData, meta interface{}) error requestUpdate = true } - if d.HasChange("parameter_group_name") { - d.SetPartial("parameter_group_name") - req.DBClusterParameterGroupName = aws.String(d.Get("parameter_group_name").(string)) - requestUpdate = true - } - if d.HasChange("db_cluster_parameter_group_name") { d.SetPartial("db_cluster_parameter_group_name") req.DBClusterParameterGroupName = aws.String(d.Get("db_cluster_parameter_group_name").(string))