@@ -106,7 +106,7 @@ func resourceComputeInstance() *schema.Resource {
106106 Elem : & schema.Resource {
107107 Schema : map [string ]* schema.Schema {
108108 "nat_ip" : & schema.Schema {
109- Type : schema .TypeString ,
109+ Type : schema .TypeString ,
110110 Computed : true ,
111111 Optional : true ,
112112 },
@@ -248,7 +248,6 @@ func resourceOperationWaitZone(
248248 return nil
249249}
250250
251-
252251func resourceComputeInstanceCreate (d * schema.ResourceData , meta interface {}) error {
253252 config := meta .(* Config )
254253
@@ -308,7 +307,6 @@ func resourceComputeInstanceCreate(d *schema.ResourceData, meta interface{}) err
308307 if v , ok := d .GetOk (prefix + ".image" ); ok {
309308 imageName := v .(string )
310309
311-
312310 imageUrl , err := resolveImage (config , imageName )
313311 if err != nil {
314312 return fmt .Errorf (
@@ -557,7 +555,6 @@ func resourceComputeInstanceRead(d *schema.ResourceData, meta interface{}) error
557555 internalIP = iface .NetworkIP
558556 }
559557
560-
561558 }
562559 }
563560
@@ -654,7 +651,7 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
654651 for i := 0 ; i < networkInterfacesCount ; i ++ {
655652 prefix := fmt .Sprintf ("network_interface.%d" , i )
656653 instNetworkInterface := instance .NetworkInterfaces [i ]
657- networkName := d .Get (prefix + ".name" ).(string )
654+ networkName := d .Get (prefix + ".name" ).(string )
658655
659656 // TODO: This sanity check is broken by #929, disabled for now (by forcing the equality)
660657 networkName = instNetworkInterface .Name
@@ -663,7 +660,7 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
663660 return fmt .Errorf ("Instance networkInterface had unexpected name: %s" , instNetworkInterface .Name )
664661 }
665662
666- if d .HasChange (prefix + ".access_config" ) {
663+ if d .HasChange (prefix + ".access_config" ) {
667664
668665 // TODO: This code deletes then recreates accessConfigs. This is bad because it may
669666 // leave the machine inaccessible from either ip if the creation part fails (network
@@ -672,9 +669,9 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
672669 // necessary, and also add before removing.
673670
674671 // Delete any accessConfig that currently exists in instNetworkInterface
675- for _ , ac := range ( instNetworkInterface .AccessConfigs ) {
672+ for _ , ac := range instNetworkInterface .AccessConfigs {
676673 op , err := config .clientCompute .Instances .DeleteAccessConfig (
677- config .Project , zone , d .Id (), networkName , ac .Name ).Do ();
674+ config .Project , zone , d .Id (), networkName , ac .Name ).Do ()
678675 if err != nil {
679676 return fmt .Errorf ("Error deleting old access_config: %s" , err )
680677 }
@@ -693,7 +690,7 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
693690 NatIP : d .Get (acPrefix + ".nat_ip" ).(string ),
694691 }
695692 op , err := config .clientCompute .Instances .AddAccessConfig (
696- config .Project , zone , d .Id (), networkName , ac ).Do ();
693+ config .Project , zone , d .Id (), networkName , ac ).Do ()
697694 if err != nil {
698695 return fmt .Errorf ("Error adding new access_config: %s" , err )
699696 }
0 commit comments