From e49315398c5f9eac2de72f0506c2e7a91160fea8 Mon Sep 17 00:00:00 2001 From: The Magician Date: Tue, 11 Aug 2020 14:37:22 -0700 Subject: [PATCH] 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 --- .changelog/3824.txt | 6 ++++++ google/resource_compute_instance.go | 2 -- google/resource_compute_instance_template.go | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 .changelog/3824.txt diff --git a/.changelog/3824.txt b/.changelog/3824.txt new file mode 100644 index 00000000000..df992816d4a --- /dev/null +++ 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 index 07f341672ff..a77b1388ab0 100644 --- 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 index 12e659aaee6..0396b8cb866 100644 --- 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)