mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-07-09 11:38:29 +00:00
Merge pull request #399 from terraform-providers/vendor-tf-0.10.3
Remove 'id' fields from schemas
This commit is contained in:
commit
c882a77db6
|
@ -61,7 +61,7 @@ func resourceComputeSslCertificate() *schema.Resource {
|
||||||
ForceNew: true,
|
ForceNew: true,
|
||||||
},
|
},
|
||||||
|
|
||||||
"id": &schema.Schema{
|
"certificate_id": &schema.Schema{
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
Computed: true,
|
Computed: true,
|
||||||
},
|
},
|
||||||
|
@ -140,7 +140,7 @@ func resourceComputeSslCertificateRead(d *schema.ResourceData, meta interface{})
|
||||||
}
|
}
|
||||||
|
|
||||||
d.Set("self_link", cert.SelfLink)
|
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
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,7 @@ func resourceComputeTargetHttpProxy() *schema.Resource {
|
||||||
ForceNew: true,
|
ForceNew: true,
|
||||||
},
|
},
|
||||||
|
|
||||||
"id": &schema.Schema{
|
"proxy_id": &schema.Schema{
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
Computed: true,
|
Computed: true,
|
||||||
},
|
},
|
||||||
|
@ -134,7 +134,7 @@ func resourceComputeTargetHttpProxyRead(d *schema.ResourceData, meta interface{}
|
||||||
}
|
}
|
||||||
|
|
||||||
d.Set("self_link", proxy.SelfLink)
|
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
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,9 +5,10 @@ import (
|
||||||
"log"
|
"log"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
|
"regexp"
|
||||||
|
|
||||||
"github.com/hashicorp/terraform/helper/schema"
|
"github.com/hashicorp/terraform/helper/schema"
|
||||||
"google.golang.org/api/compute/v1"
|
"google.golang.org/api/compute/v1"
|
||||||
"regexp"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -55,7 +56,7 @@ func resourceComputeTargetHttpsProxy() *schema.Resource {
|
||||||
Computed: true,
|
Computed: true,
|
||||||
},
|
},
|
||||||
|
|
||||||
"id": &schema.Schema{
|
"proxy_id": &schema.Schema{
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
Computed: true,
|
Computed: true,
|
||||||
},
|
},
|
||||||
|
@ -177,8 +178,8 @@ func resourceComputeTargetHttpsProxyRead(d *schema.ResourceData, meta interface{
|
||||||
}
|
}
|
||||||
|
|
||||||
d.Set("ssl_certificates", proxy.SslCertificates)
|
d.Set("ssl_certificates", proxy.SslCertificates)
|
||||||
|
d.Set("proxy_id", strconv.FormatUint(proxy.Id, 10))
|
||||||
d.Set("self_link", proxy.SelfLink)
|
d.Set("self_link", proxy.SelfLink)
|
||||||
d.Set("id", strconv.FormatUint(proxy.Id, 10))
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,7 +63,7 @@ func resourceComputeUrlMap() *schema.Resource {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
"id": &schema.Schema{
|
"map_id": &schema.Schema{
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
Computed: true,
|
Computed: true,
|
||||||
},
|
},
|
||||||
|
@ -315,7 +315,7 @@ func resourceComputeUrlMapRead(d *schema.ResourceData, meta interface{}) error {
|
||||||
|
|
||||||
d.SetId(name)
|
d.SetId(name)
|
||||||
d.Set("self_link", urlMap.SelfLink)
|
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)
|
d.Set("fingerprint", urlMap.Fingerprint)
|
||||||
|
|
||||||
hostRuleMap := make(map[string]*compute.HostRule)
|
hostRuleMap := make(map[string]*compute.HostRule)
|
||||||
|
|
|
@ -30,12 +30,6 @@ func resourceGoogleProject() *schema.Resource {
|
||||||
MigrateState: resourceGoogleProjectMigrateState,
|
MigrateState: resourceGoogleProjectMigrateState,
|
||||||
|
|
||||||
Schema: map[string]*schema.Schema{
|
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{
|
"project_id": &schema.Schema{
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
Required: true,
|
Required: true,
|
||||||
|
|
|
@ -84,9 +84,9 @@ The following arguments are supported:
|
||||||
In addition to the arguments listed above, the following computed attributes are
|
In addition to the arguments listed above, the following computed attributes are
|
||||||
exported:
|
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.
|
* `self_link` - The URI of the created resource.
|
||||||
|
|
||||||
[1]: /docs/providers/google/r/compute_target_https_proxy.html
|
[1]: /docs/providers/google/r/compute_target_https_proxy.html
|
||||||
[2]: /docs/configuration/resources.html#lifecycle
|
[2]: /docs/configuration/resources.html#lifecycle
|
||||||
|
|
|
@ -86,6 +86,6 @@ The following arguments are supported:
|
||||||
In addition to the arguments listed above, the following computed attributes are
|
In addition to the arguments listed above, the following computed attributes are
|
||||||
exported:
|
exported:
|
||||||
|
|
||||||
* `id` - A unique ID assigned by GCE.
|
* `proxy_id` - A unique ID assigned by GCE.
|
||||||
|
|
||||||
* `self_link` - The URI of the created resource.
|
* `self_link` - The URI of the created resource.
|
||||||
|
|
|
@ -96,6 +96,6 @@ The following arguments are supported:
|
||||||
In addition to the arguments listed above, the following computed attributes are
|
In addition to the arguments listed above, the following computed attributes are
|
||||||
exported:
|
exported:
|
||||||
|
|
||||||
* `id` - A unique ID assigned by GCE.
|
* `proxy_id` - A unique ID assigned by GCE.
|
||||||
|
|
||||||
* `self_link` - The URI of the created resource.
|
* `self_link` - The URI of the created resource.
|
||||||
|
|
|
@ -157,6 +157,6 @@ exported:
|
||||||
|
|
||||||
* `fingerprint` - The unique fingerprint for this resource.
|
* `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.
|
* `self_link` - The URI of the created resource.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user