Merge pull request #15537 from terraform-providers/b-aws_db_proxy_tar…

…get-fixes service/rds: Increase default proxy deletion timeout, ensure proxy target import includes all attributes
hashicorp · Oct 8, 2020 · 34fd4af · 34fd4af
2 parents 4d7b28e + 033a858
commit 34fd4af
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/aws/resource_aws_db_proxy.go b/aws/resource_aws_db_proxy.go
@@ -26,7 +26,7 @@ func resourceAwsDbProxy() *schema.Resource {
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(30 * time.Minute),
 			Update: schema.DefaultTimeout(30 * time.Minute),
-			Delete: schema.DefaultTimeout(30 * time.Minute),
+			Delete: schema.DefaultTimeout(60 * time.Minute),
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/aws/resource_aws_db_proxy_target.go b/aws/resource_aws_db_proxy_target.go
@@ -154,10 +154,12 @@ func resourceAwsDbProxyTargetRead(d *schema.ResourceData, meta interface{}) erro
 		return nil
 	}
 
+	d.Set("db_proxy_name", dbProxyName)
 	d.Set("endpoint", dbProxyTarget.Endpoint)
 	d.Set("port", dbProxyTarget.Port)
 	d.Set("rds_resource_id", dbProxyTarget.RdsResourceId)
 	d.Set("target_arn", dbProxyTarget.TargetArn)
+	d.Set("target_group_name", targetGroupName)
 	d.Set("tracked_cluster_id", dbProxyTarget.TrackedClusterId)
 	d.Set("type", dbProxyTarget.Type)
 

diff --git a/website/docs/r/db_proxy.html.markdown b/website/docs/r/db_proxy.html.markdown
@@ -50,7 +50,6 @@ The following arguments are supported:
 * `role_arn` - (Required) The Amazon Resource Name (ARN) of the IAM role that the proxy uses to access secrets in AWS Secrets Manager.
 * `vpc_security_group_ids` - (Optional) One or more VPC security group IDs to associate with the new proxy.
 * `vpc_subnet_ids` - (Required) One or more VPC subnet IDs to associate with the new proxy.
-describe-db-parameters.html) after initial creation of the group.
 * `tags` - (Optional) A mapping of tags to assign to the resource.
 
 `auth` blocks support the following:
@@ -75,7 +74,7 @@ In addition to all arguments above, the following attributes are exported:
 
 - `create` - (Default `30 minutes`) Used for creating DB proxies.
 - `update` - (Default `30 minutes`) Used for modifying DB proxies.
-- `delete` - (Default `30 minutes`) Used for destroying DB proxies.
+- `delete` - (Default `60 minutes`) Used for destroying DB proxies.
 
 ## Import