Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Confidential VM support to instances and instance templates #7000

Merged
merged 1 commit into from
Aug 11, 2020
Merged

Add Confidential VM support to instances and instance templates #7000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changelog/3824.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
```
2 changes: 0 additions & 2 deletions google/resource_compute_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,6 @@ func resourceComputeInstance() *schema.Resource {
},
},
},

"desired_status": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion google/resource_compute_instance_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,6 @@ func resourceComputeInstanceTemplate() *schema.Resource {
},
},
},

"guest_accelerator": {
Type: schema.TypeList,
Optional: true,
Expand Down Expand Up @@ -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)
Expand Down