From b038cd10f5d0c1dece62504d72dc2c28d0f1a05f Mon Sep 17 00:00:00 2001
From: Adrien Delorme <adrien.delorme@icloud.com>
Date: Tue, 21 Aug 2018 10:09:30 +0200
Subject: [PATCH] GCP: Allow to set MinCpuPlatform

---
 builder/googlecompute/driver.go               | 1 +
 builder/googlecompute/driver_gce.go           | 3 ++-
 builder/googlecompute/step_create_instance.go | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/builder/googlecompute/driver.go b/builder/googlecompute/driver.go
index 54881dec8..af3daf4ee 100644
--- a/builder/googlecompute/driver.go
+++ b/builder/googlecompute/driver.go
@@ -69,6 +69,7 @@ type InstanceConfig struct {
 	Labels                       map[string]string
 	MachineType                  string
 	Metadata                     map[string]string
+	MinCpuPlatform               string
 	Name                         string
 	Network                      string
 	NetworkProjectId             string
diff --git a/builder/googlecompute/driver_gce.go b/builder/googlecompute/driver_gce.go
index 971d0f95f..5e1645767 100644
--- a/builder/googlecompute/driver_gce.go
+++ b/builder/googlecompute/driver_gce.go
@@ -377,7 +377,8 @@ func (d *driverGCE) RunInstance(c *InstanceConfig) (<-chan error, error) {
 		Metadata: &compute.Metadata{
 			Items: metadata,
 		},
-		Name: c.Name,
+		MinCpuPlatform: c.MinCpuPlatform,
+		Name:           c.Name,
 		NetworkInterfaces: []*compute.NetworkInterface{
 			{
 				AccessConfigs: []*compute.AccessConfig{accessconfig},
diff --git a/builder/googlecompute/step_create_instance.go b/builder/googlecompute/step_create_instance.go
index 06e5b8eb1..de3c7b2ac 100644
--- a/builder/googlecompute/step_create_instance.go
+++ b/builder/googlecompute/step_create_instance.go
@@ -111,6 +111,7 @@ func (s *StepCreateInstance) Run(_ context.Context, state multistep.StateBag) mu
 		Labels:                       c.Labels,
 		MachineType:                  c.MachineType,
 		Metadata:                     metadata,
+		MinCpuPlatform:               c.MinCpuPlatform,
 		Name:                         name,
 		Network:                      c.Network,
 		NetworkProjectId:             c.NetworkProjectId,