diff --git a/google/resource_compute_ssl_certificate.go b/google/resource_compute_ssl_certificate.go index 32579cca..7a7dc2e2 100644 --- a/google/resource_compute_ssl_certificate.go +++ b/google/resource_compute_ssl_certificate.go @@ -61,7 +61,7 @@ func resourceComputeSslCertificate() *schema.Resource { ForceNew: true, }, - "id": &schema.Schema{ + "certificate_id": &schema.Schema{ Type: schema.TypeString, Computed: true, }, @@ -140,7 +140,7 @@ func resourceComputeSslCertificateRead(d *schema.ResourceData, meta interface{}) } d.Set("self_link", cert.SelfLink) - d.Set("id", strconv.FormatUint(cert.Id, 10)) + d.Set("certificate_id", strconv.FormatUint(cert.Id, 10)) return nil } diff --git a/google/resource_compute_target_http_proxy.go b/google/resource_compute_target_http_proxy.go index 2f7913b0..21a9a0a8 100644 --- a/google/resource_compute_target_http_proxy.go +++ b/google/resource_compute_target_http_proxy.go @@ -34,7 +34,7 @@ func resourceComputeTargetHttpProxy() *schema.Resource { ForceNew: true, }, - "id": &schema.Schema{ + "proxy_id": &schema.Schema{ Type: schema.TypeString, Computed: true, }, @@ -134,7 +134,7 @@ func resourceComputeTargetHttpProxyRead(d *schema.ResourceData, meta interface{} } d.Set("self_link", proxy.SelfLink) - d.Set("id", strconv.FormatUint(proxy.Id, 10)) + d.Set("proxy_id", strconv.FormatUint(proxy.Id, 10)) return nil } diff --git a/google/resource_compute_target_https_proxy.go b/google/resource_compute_target_https_proxy.go index fc75508f..1c86def4 100644 --- a/google/resource_compute_target_https_proxy.go +++ b/google/resource_compute_target_https_proxy.go @@ -5,9 +5,10 @@ import ( "log" "strconv" + "regexp" + "github.com/hashicorp/terraform/helper/schema" "google.golang.org/api/compute/v1" - "regexp" ) const ( @@ -55,7 +56,7 @@ func resourceComputeTargetHttpsProxy() *schema.Resource { Computed: true, }, - "id": &schema.Schema{ + "proxy_id": &schema.Schema{ Type: schema.TypeString, Computed: true, }, @@ -177,8 +178,8 @@ func resourceComputeTargetHttpsProxyRead(d *schema.ResourceData, meta interface{ } d.Set("ssl_certificates", proxy.SslCertificates) + d.Set("proxy_id", strconv.FormatUint(proxy.Id, 10)) d.Set("self_link", proxy.SelfLink) - d.Set("id", strconv.FormatUint(proxy.Id, 10)) return nil } diff --git a/google/resource_compute_url_map.go b/google/resource_compute_url_map.go index 855799e8..22933c07 100644 --- a/google/resource_compute_url_map.go +++ b/google/resource_compute_url_map.go @@ -63,7 +63,7 @@ func resourceComputeUrlMap() *schema.Resource { }, }, - "id": &schema.Schema{ + "map_id": &schema.Schema{ Type: schema.TypeString, Computed: true, }, @@ -315,7 +315,7 @@ func resourceComputeUrlMapRead(d *schema.ResourceData, meta interface{}) error { d.SetId(name) d.Set("self_link", urlMap.SelfLink) - d.Set("id", strconv.FormatUint(urlMap.Id, 10)) + d.Set("map_id", strconv.FormatUint(urlMap.Id, 10)) d.Set("fingerprint", urlMap.Fingerprint) hostRuleMap := make(map[string]*compute.HostRule) diff --git a/google/resource_google_project.go b/google/resource_google_project.go index 5b6efbce..0bbc7107 100644 --- a/google/resource_google_project.go +++ b/google/resource_google_project.go @@ -30,12 +30,6 @@ func resourceGoogleProject() *schema.Resource { MigrateState: resourceGoogleProjectMigrateState, Schema: map[string]*schema.Schema{ - "id": &schema.Schema{ - Type: schema.TypeString, - Optional: true, - Computed: true, - Removed: "The id field has been removed. Use project_id instead.", - }, "project_id": &schema.Schema{ Type: schema.TypeString, Required: true, diff --git a/website/docs/r/compute_ssl_certificate.html.markdown b/website/docs/r/compute_ssl_certificate.html.markdown index 1a97ac44..f3018789 100644 --- a/website/docs/r/compute_ssl_certificate.html.markdown +++ b/website/docs/r/compute_ssl_certificate.html.markdown @@ -84,9 +84,9 @@ The following arguments are supported: In addition to the arguments listed above, the following computed attributes are exported: -* `id` - A unique ID for the certificated, assigned by GCE. +* `certificate_id` - A unique ID for the certificate, assigned by GCE. * `self_link` - The URI of the created resource. [1]: /docs/providers/google/r/compute_target_https_proxy.html -[2]: /docs/configuration/resources.html#lifecycle \ No newline at end of file +[2]: /docs/configuration/resources.html#lifecycle diff --git a/website/docs/r/compute_target_http_proxy.html.markdown b/website/docs/r/compute_target_http_proxy.html.markdown index 63e0bf6f..ca6cd04f 100644 --- a/website/docs/r/compute_target_http_proxy.html.markdown +++ b/website/docs/r/compute_target_http_proxy.html.markdown @@ -86,6 +86,6 @@ The following arguments are supported: In addition to the arguments listed above, the following computed attributes are exported: -* `id` - A unique ID assigned by GCE. +* `proxy_id` - A unique ID assigned by GCE. * `self_link` - The URI of the created resource. diff --git a/website/docs/r/compute_target_https_proxy.html.markdown b/website/docs/r/compute_target_https_proxy.html.markdown index 1a71273e..3d6dd5f9 100644 --- a/website/docs/r/compute_target_https_proxy.html.markdown +++ b/website/docs/r/compute_target_https_proxy.html.markdown @@ -96,6 +96,6 @@ The following arguments are supported: In addition to the arguments listed above, the following computed attributes are exported: -* `id` - A unique ID assigned by GCE. +* `proxy_id` - A unique ID assigned by GCE. * `self_link` - The URI of the created resource. diff --git a/website/docs/r/compute_url_map.html.markdown b/website/docs/r/compute_url_map.html.markdown index a56888fc..5f91def1 100644 --- a/website/docs/r/compute_url_map.html.markdown +++ b/website/docs/r/compute_url_map.html.markdown @@ -157,6 +157,6 @@ exported: * `fingerprint` - The unique fingerprint for this resource. -* `id` - The GCE assigned ID of the resource. +* `map_id` - The GCE assigned ID of the resource. * `self_link` - The URI of the created resource.