From e4e7c0a215c542df305b8d65700ac46873603e3e Mon Sep 17 00:00:00 2001 From: Bowei Du Date: Wed, 17 Jan 2018 21:57:10 -0800 Subject: [PATCH] Update Firewall to use generated code --- .../providers/gce/gce_firewall.go | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/pkg/cloudprovider/providers/gce/gce_firewall.go b/pkg/cloudprovider/providers/gce/gce_firewall.go index 2e5297275f9..88db0ebd3b9 100644 --- a/pkg/cloudprovider/providers/gce/gce_firewall.go +++ b/pkg/cloudprovider/providers/gce/gce_firewall.go @@ -17,7 +17,11 @@ limitations under the License. package gce import ( + "context" + compute "google.golang.org/api/compute/v1" + + "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/meta" ) func newFirewallMetricContext(request string) *metricContext { @@ -27,38 +31,24 @@ func newFirewallMetricContext(request string) *metricContext { // GetFirewall returns the Firewall by name. func (gce *GCECloud) GetFirewall(name string) (*compute.Firewall, error) { mc := newFirewallMetricContext("get") - v, err := gce.service.Firewalls.Get(gce.NetworkProjectID(), name).Do() + v, err := gce.c.Firewalls().Get(context.Background(), meta.GlobalKey(name)) return v, mc.Observe(err) } // CreateFirewall creates the passed firewall func (gce *GCECloud) CreateFirewall(f *compute.Firewall) error { mc := newFirewallMetricContext("create") - op, err := gce.service.Firewalls.Insert(gce.NetworkProjectID(), f).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForGlobalOpInProject(op, gce.NetworkProjectID(), mc) + return mc.Observe(gce.c.Firewalls().Insert(context.Background(), meta.GlobalKey(f.Name), f)) } // DeleteFirewall deletes the given firewall rule. func (gce *GCECloud) DeleteFirewall(name string) error { mc := newFirewallMetricContext("delete") - op, err := gce.service.Firewalls.Delete(gce.NetworkProjectID(), name).Do() - if err != nil { - return mc.Observe(err) - } - return gce.waitForGlobalOpInProject(op, gce.NetworkProjectID(), mc) + return mc.Observe(gce.c.Firewalls().Delete(context.Background(), meta.GlobalKey(name))) } // UpdateFirewall applies the given firewall as an update to an existing service. func (gce *GCECloud) UpdateFirewall(f *compute.Firewall) error { mc := newFirewallMetricContext("update") - op, err := gce.service.Firewalls.Update(gce.NetworkProjectID(), f.Name, f).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForGlobalOpInProject(op, gce.NetworkProjectID(), mc) + return mc.Observe(gce.c.Firewalls().Update(context.Background(), meta.GlobalKey(f.Name), f)) }