Skip to content

Commit

Permalink
Rename instead of removing.
Browse files Browse the repository at this point in the history
Rename all ID fields to {resource_noun}_id instead of removing them
outright. This means people can still get at the info.

Leave project's id deleted. It has been marked as Removed for months.
I'm fine with cleaning it up before 1.0.0.

Also, update website docs.
  • Loading branch information
paddycarver committed Sep 25, 2017
1 parent 505b551 commit dc45007
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 6 deletions.
7 changes: 7 additions & 0 deletions google/resource_compute_ssl_certificate.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package google

import (
"fmt"
"strconv"

"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
Expand Down Expand Up @@ -59,6 +60,11 @@ func resourceComputeSslCertificate() *schema.Resource {
ForceNew: true,
},

"certificate_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
},

"project": &schema.Schema{
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -133,6 +139,7 @@ func resourceComputeSslCertificateRead(d *schema.ResourceData, meta interface{})
}

d.Set("self_link", cert.SelfLink)
d.Set("certificate_id", strconv.FormatUint(cert.Id, 10))

return nil
}
Expand Down
7 changes: 7 additions & 0 deletions google/resource_compute_target_http_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package google
import (
"fmt"
"log"
"strconv"

"github.com/hashicorp/terraform/helper/schema"
"google.golang.org/api/compute/v1"
Expand Down Expand Up @@ -33,6 +34,11 @@ func resourceComputeTargetHttpProxy() *schema.Resource {
ForceNew: true,
},

"proxy_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
},

"project": &schema.Schema{
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -128,6 +134,7 @@ func resourceComputeTargetHttpProxyRead(d *schema.ResourceData, meta interface{}
}

d.Set("self_link", proxy.SelfLink)
d.Set("proxy_id", strconv.FormatUint(proxy.Id, 10))

return nil
}
Expand Down
10 changes: 9 additions & 1 deletion google/resource_compute_target_https_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ package google
import (
"fmt"
"log"
"strconv"

"regexp"

"github.com/hashicorp/terraform/helper/schema"
"google.golang.org/api/compute/v1"
"regexp"
)

const (
Expand Down Expand Up @@ -54,6 +56,11 @@ func resourceComputeTargetHttpsProxy() *schema.Resource {
Computed: true,
},

"proxy_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
},

"project": &schema.Schema{
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -171,6 +178,7 @@ 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)

return nil
Expand Down
7 changes: 7 additions & 0 deletions google/resource_compute_url_map.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package google

import (
"fmt"
"strconv"

"github.com/hashicorp/terraform/helper/schema"
"google.golang.org/api/compute/v1"
Expand Down Expand Up @@ -62,6 +63,11 @@ func resourceComputeUrlMap() *schema.Resource {
},
},

"map_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
},

"path_matcher": &schema.Schema{
Type: schema.TypeList,
Optional: true,
Expand Down Expand Up @@ -309,6 +315,7 @@ func resourceComputeUrlMapRead(d *schema.ResourceData, meta interface{}) error {

d.SetId(name)
d.Set("self_link", urlMap.SelfLink)
d.Set("map_id", strconv.FormatUint(urlMap.Id, 10))
d.Set("fingerprint", urlMap.Fingerprint)

hostRuleMap := make(map[string]*compute.HostRule)
Expand Down
Binary file added terraform-provider-google
Binary file not shown.
4 changes: 2 additions & 2 deletions website/docs/r/compute_ssl_certificate.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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
[2]: /docs/configuration/resources.html#lifecycle
2 changes: 1 addition & 1 deletion website/docs/r/compute_target_http_proxy.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion website/docs/r/compute_target_https_proxy.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion website/docs/r/compute_url_map.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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.

0 comments on commit dc45007

Please sign in to comment.