From bde72e7576acbdd3624af4c0f9084c0207369a55 Mon Sep 17 00:00:00 2001 From: Dana Hoffman Date: Thu, 12 Apr 2018 16:08:31 -0700 Subject: [PATCH] un-deprecate name_prefix for instance templates (#1328) --- google/resource_compute_instance_template.go | 2 -- website/docs/r/compute_instance_template.html.markdown | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/google/resource_compute_instance_template.go b/google/resource_compute_instance_template.go index b71569ab8b5..c6392fa38d2 100644 --- a/google/resource_compute_instance_template.go +++ b/google/resource_compute_instance_template.go @@ -52,8 +52,6 @@ func resourceComputeInstanceTemplate() *schema.Resource { } return }, - Deprecated: "Use the random provider instead. See migration instructions at " + - "https://github.com/terraform-providers/terraform-provider-google/issues/1054#issuecomment-377390209", }, "disk": &schema.Schema{ diff --git a/website/docs/r/compute_instance_template.html.markdown b/website/docs/r/compute_instance_template.html.markdown index 5f9ff22acf6..b1ab1cc560b 100644 --- a/website/docs/r/compute_instance_template.html.markdown +++ b/website/docs/r/compute_instance_template.html.markdown @@ -125,7 +125,7 @@ The following arguments are supported: * `name` - (Optional) The name of the instance template. If you leave this blank, Terraform will auto-generate a unique name. -* `name_prefix` - (Deprecated, Optional) Creates a unique name beginning with the specified +* `name_prefix` - (Optional) Creates a unique name beginning with the specified prefix. Conflicts with `name`. * `can_ip_forward` - (Optional) Whether to allow sending and receiving of