Add Confidential VM support to instances and instance templates (#3824)…

… (#7000) * added compute confidential vm support * fix typo * add tests for compute instance * added additional tests * add beta version gate to tests * added tests for instance template * updated testing and add beta provider to tests * remove import tests Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Aug 11, 2020 · e493153 · e493153
1 parent 37a3f25
commit e493153
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.changelog/3824.txt b/.changelog/3824.txt
@@ -0,0 +1,6 @@
+```release-note:enhancement
+compute: added confidential_instance_config block to google_compute_instance 
+```
+```release-note:enhancement
+compute: added confidential_instance_config block to google_compute_instance_template
+```
diff --git a/google/resource_compute_instance.go b/google/resource_compute_instance.go
@@ -600,7 +600,6 @@ func resourceComputeInstance() *schema.Resource {
 					},
 				},
 			},
-
 			"desired_status": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -1100,7 +1099,6 @@ func resourceComputeInstanceRead(d *schema.ResourceData, meta interface{}) error
 	d.Set("description", instance.Description)
 	d.Set("hostname", instance.Hostname)
 	d.Set("current_status", instance.Status)
-
 	if d.Get("desired_status") != "" {
 		d.Set("desired_status", instance.Status)
 	}

diff --git a/google/resource_compute_instance_template.go b/google/resource_compute_instance_template.go
@@ -514,7 +514,6 @@ func resourceComputeInstanceTemplate() *schema.Resource {
 					},
 				},
 			},
-
 			"guest_accelerator": {
 				Type:        schema.TypeList,
 				Optional:    true,
@@ -1191,6 +1190,7 @@ func resourceComputeInstanceTemplateRead(d *schema.ResourceData, meta interface{
 			return fmt.Errorf("Error setting shielded_instance_config: %s", err)
 		}
 	}
+
 	if instanceTemplate.Properties.DisplayDevice != nil {
 		if err = d.Set("enable_display", flattenEnableDisplay(instanceTemplate.Properties.DisplayDevice)); err != nil {
 			return fmt.Errorf("Error setting enable_display: %s", err)