Update InstanceGroup to use generated code

pkg/cloudprovider/providers/gce/gce_instancegroup.go

@@ -16,7 +16,14 @@ limitations under the License.
 
 package gce
 
-import compute "google.golang.org/api/compute/v1"
+import (
+	"context"
+
+	compute "google.golang.org/api/compute/v1"
+
+	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/filter"
+	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/meta"
+)
 
 func newInstanceGroupMetricContext(request string, zone string) *metricContext {
 	return newGenericMetricContext("instancegroup", request, unusedMetricLabel, zone, computeV1Version)
@@ -26,43 +33,29 @@ func newInstanceGroupMetricContext(request string, zone string) *metricContext {
 // instances. It is the callers responsibility to add named ports.
 func (gce *GCECloud) CreateInstanceGroup(ig *compute.InstanceGroup, zone string) error {
 	mc := newInstanceGroupMetricContext("create", zone)
-	op, err := gce.service.InstanceGroups.Insert(gce.projectID, zone, ig).Do()
+	return mc.Observe(gce.c.InstanceGroups().Insert(context.Background(), meta.ZonalKey(ig.Name, zone), ig))
-	if err != nil {
-		return mc.Observe(err)
-	}
-
-	return gce.waitForZoneOp(op, zone, mc)
 }
 
 // DeleteInstanceGroup deletes an instance group.
 func (gce *GCECloud) DeleteInstanceGroup(name string, zone string) error {
 	mc := newInstanceGroupMetricContext("delete", zone)
-	op, err := gce.service.InstanceGroups.Delete(
+	return mc.Observe(gce.c.InstanceGroups().Delete(context.Background(), meta.ZonalKey(name, zone)))
-		gce.projectID, zone, name).Do()
-	if err != nil {
-		return mc.Observe(err)
-	}
-
-	return gce.waitForZoneOp(op, zone, mc)
 }
 
 // ListInstanceGroups lists all InstanceGroups in the project and
 // zone.
-func (gce *GCECloud) ListInstanceGroups(zone string) (*compute.InstanceGroupList, error) {
+func (gce *GCECloud) ListInstanceGroups(zone string) ([]*compute.InstanceGroup, error) {
 	mc := newInstanceGroupMetricContext("list", zone)
-	// TODO: use PageToken to list all not just the first 500
+	v, err := gce.c.InstanceGroups().List(context.Background(), zone, filter.None)
-	v, err := gce.service.InstanceGroups.List(gce.projectID, zone).Do()
 	return v, mc.Observe(err)
 }
 
 // ListInstancesInInstanceGroup lists all the instances in a given
 // instance group and state.
-func (gce *GCECloud) ListInstancesInInstanceGroup(name string, zone string, state string) (*compute.InstanceGroupsListInstances, error) {
+func (gce *GCECloud) ListInstancesInInstanceGroup(name string, zone string, state string) ([]*compute.InstanceWithNamedPorts, error) {
 	mc := newInstanceGroupMetricContext("list_instances", zone)
-	// TODO: use PageToken to list all not just the first 500
+	req := &compute.InstanceGroupsListInstancesRequest{InstanceState: state}
-	v, err := gce.service.InstanceGroups.ListInstances(
+	v, err := gce.c.InstanceGroups().ListInstances(context.Background(), meta.ZonalKey(name, zone), req, filter.None)
-		gce.projectID, zone, name,
-		&compute.InstanceGroupsListInstancesRequest{InstanceState: state}).Do()
 	return v, mc.Observe(err)
 }
 
@@ -70,58 +63,40 @@ func (gce *GCECloud) ListInstancesInInstanceGroup(name string, zone string, stat
 // instance group.
 func (gce *GCECloud) AddInstancesToInstanceGroup(name string, zone string, instanceRefs []*compute.InstanceReference) error {
 	mc := newInstanceGroupMetricContext("add_instances", zone)
+	// TODO: should cull operation above this layer.
 	if len(instanceRefs) == 0 {
 		return nil
 	}
-
+	req := &compute.InstanceGroupsAddInstancesRequest{
-	op, err := gce.service.InstanceGroups.AddInstances(
-		gce.projectID, zone, name,
-		&compute.InstanceGroupsAddInstancesRequest{
 		Instances: instanceRefs,
-		}).Do()
-	if err != nil {
-		return mc.Observe(err)
 	}
-
+	return mc.Observe(gce.c.InstanceGroups().AddInstances(context.Background(), meta.ZonalKey(name, zone), req))
-	return gce.waitForZoneOp(op, zone, mc)
 }
 
 // RemoveInstancesFromInstanceGroup removes the given instances from
 // the instance group.
 func (gce *GCECloud) RemoveInstancesFromInstanceGroup(name string, zone string, instanceRefs []*compute.InstanceReference) error {
 	mc := newInstanceGroupMetricContext("remove_instances", zone)
+	// TODO: should cull operation above this layer.
 	if len(instanceRefs) == 0 {
 		return nil
 	}
-
+	req := &compute.InstanceGroupsRemoveInstancesRequest{
-	op, err := gce.service.InstanceGroups.RemoveInstances(
-		gce.projectID, zone, name,
-		&compute.InstanceGroupsRemoveInstancesRequest{
 		Instances: instanceRefs,
-		}).Do()
-	if err != nil {
-		return mc.Observe(err)
 	}
-
+	return mc.Observe(gce.c.InstanceGroups().RemoveInstances(context.Background(), meta.ZonalKey(name, zone), req))
-	return gce.waitForZoneOp(op, zone, mc)
 }
 
 // SetNamedPortsOfInstanceGroup sets the list of named ports on a given instance group
 func (gce *GCECloud) SetNamedPortsOfInstanceGroup(igName, zone string, namedPorts []*compute.NamedPort) error {
 	mc := newInstanceGroupMetricContext("set_namedports", zone)
-	op, err := gce.service.InstanceGroups.SetNamedPorts(
+	req := &compute.InstanceGroupsSetNamedPortsRequest{NamedPorts: namedPorts}
-		gce.projectID, zone, igName,
+	return mc.Observe(gce.c.InstanceGroups().SetNamedPorts(context.Background(), meta.ZonalKey(igName, zone), req))
-		&compute.InstanceGroupsSetNamedPortsRequest{NamedPorts: namedPorts}).Do()
-	if err != nil {
-		return mc.Observe(err)
-	}
-
-	return gce.waitForZoneOp(op, zone, mc)
 }
 
 // GetInstanceGroup returns an instance group by name.
 func (gce *GCECloud) GetInstanceGroup(name string, zone string) (*compute.InstanceGroup, error) {
 	mc := newInstanceGroupMetricContext("get", zone)
-	v, err := gce.service.InstanceGroups.Get(gce.projectID, zone, name).Do()
+	v, err := gce.c.InstanceGroups().Get(context.Background(), meta.ZonalKey(name, zone))
 	return v, mc.Observe(err)
 }