diff --git a/.changelog/3197.txt b/.changelog/3197.txt new file mode 100644 index 00000000000..8ec013c0699 --- /dev/null +++ b/.changelog/3197.txt @@ -0,0 +1,3 @@ +```release-note:none + +``` diff --git a/google/resource_compute_instance.go b/google/resource_compute_instance.go index 0eb67fba119..58fe30fd604 100644 --- a/google/resource_compute_instance.go +++ b/google/resource_compute_instance.go @@ -186,15 +186,15 @@ func resourceComputeInstance() *schema.Resource { ForceNew: true, }, - "name": { + "network_ip": { Type: schema.TypeString, + Optional: true, + ForceNew: true, Computed: true, }, - "network_ip": { + "name": { Type: schema.TypeString, - Optional: true, - ForceNew: true, Computed: true, }, diff --git a/google/resource_compute_instance_template.go b/google/resource_compute_instance_template.go index 3143f056ac3..b266ac51585 100644 --- a/google/resource_compute_instance_template.go +++ b/google/resource_compute_instance_template.go @@ -231,12 +231,6 @@ func resourceComputeInstanceTemplate() *schema.Resource { DiffSuppressFunc: compareSelfLinkOrResourceName, }, - "network_ip": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - }, - "subnetwork": { Type: schema.TypeString, Optional: true, @@ -252,6 +246,17 @@ func resourceComputeInstanceTemplate() *schema.Resource { Computed: true, }, + "network_ip": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + + "name": { + Type: schema.TypeString, + Computed: true, + }, + "access_config": { Type: schema.TypeList, Optional: true, @@ -270,10 +275,15 @@ func resourceComputeInstanceTemplate() *schema.Resource { Computed: true, ValidateFunc: validation.StringInSlice([]string{"PREMIUM", "STANDARD"}, false), }, - "assigned_nat_ip": { + "assigned_nat_ip":{ + Type: schema.TypeString, + Computed: true, + Removed: "Use network_interface.access_config.nat_ip instead.", + }, + // Possibly configurable- this was added so we don't break if it's inadvertently set + "public_ptr_domain_name": { Type: schema.TypeString, Computed: true, - Removed: "Use network_interface.access_config.nat_ip instead.", }, }, },