Add missing fields to instance template's network_interfaces sc… (#3197)

GoogleCloudPlatform · Mar 2, 2020 · f5ef599 · f5ef599
1 parent a972c48
commit f5ef599
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/third_party/terraform/resources/resource_compute_instance.go b/third_party/terraform/resources/resource_compute_instance.go
@@ -230,15 +230,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/third_party/terraform/resources/resource_compute_instance_template.go b/third_party/terraform/resources/resource_compute_instance_template.go
@@ -246,12 +246,6 @@ func resourceComputeInstanceTemplate() *schema.Resource {
 							DiffSuppressFunc: compareSelfLinkOrResourceName,
 						},
 
-						"network_ip": {
-							Type:     schema.TypeString,
-							Optional: true,
-							ForceNew: true,
-						},
-
 						"subnetwork": {
 							Type:             schema.TypeString,
 							Optional:         true,
@@ -267,6 +261,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,
@@ -285,6 +290,11 @@ func resourceComputeInstanceTemplate() *schema.Resource {
 										Computed:     true,
 										ValidateFunc: validation.StringInSlice([]string{"PREMIUM", "STANDARD"}, false),
 									},
+									// Possibly configurable- this was added so we don't break if it's inadvertently set
+									"public_ptr_domain_name": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
 								},
 							},
 						},