From 67c34edbb3432f434f46f58caa80630ae159a3ec Mon Sep 17 00:00:00 2001 From: Bowei Du Date: Wed, 17 Jan 2018 21:58:45 -0800 Subject: [PATCH] Update TargetProxy to use generated code --- .../providers/gce/gce_targetproxy.go | 76 +++++++------------ 1 file changed, 27 insertions(+), 49 deletions(-) diff --git a/pkg/cloudprovider/providers/gce/gce_targetproxy.go b/pkg/cloudprovider/providers/gce/gce_targetproxy.go index b92206cfc4e..446e7f08ce6 100644 --- a/pkg/cloudprovider/providers/gce/gce_targetproxy.go +++ b/pkg/cloudprovider/providers/gce/gce_targetproxy.go @@ -17,9 +17,13 @@ limitations under the License. package gce import ( + "context" "net/http" 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 newTargetProxyMetricContext(request string) *metricContext { @@ -29,49 +33,37 @@ func newTargetProxyMetricContext(request string) *metricContext { // GetTargetHttpProxy returns the UrlMap by name. func (gce *GCECloud) GetTargetHttpProxy(name string) (*compute.TargetHttpProxy, error) { mc := newTargetProxyMetricContext("get") - v, err := gce.service.TargetHttpProxies.Get(gce.projectID, name).Do() + v, err := gce.c.TargetHttpProxies().Get(context.Background(), meta.GlobalKey(name)) return v, mc.Observe(err) } // CreateTargetHttpProxy creates a TargetHttpProxy func (gce *GCECloud) CreateTargetHttpProxy(proxy *compute.TargetHttpProxy) error { mc := newTargetProxyMetricContext("create") - op, err := gce.service.TargetHttpProxies.Insert(gce.projectID, proxy).Do() - if err != nil { - return mc.Observe(err) - } - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.TargetHttpProxies().Insert(context.Background(), meta.GlobalKey(proxy.Name), proxy)) } // SetUrlMapForTargetHttpProxy sets the given UrlMap for the given TargetHttpProxy. func (gce *GCECloud) SetUrlMapForTargetHttpProxy(proxy *compute.TargetHttpProxy, urlMap *compute.UrlMap) error { + ref := &compute.UrlMapReference{UrlMap: urlMap.SelfLink} mc := newTargetProxyMetricContext("set_url_map") - op, err := gce.service.TargetHttpProxies.SetUrlMap( - gce.projectID, proxy.Name, &compute.UrlMapReference{UrlMap: urlMap.SelfLink}).Do() - if err != nil { - return mc.Observe(err) - } - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.TargetHttpProxies().SetUrlMap(context.Background(), meta.GlobalKey(proxy.Name), ref)) } // DeleteTargetHttpProxy deletes the TargetHttpProxy by name. func (gce *GCECloud) DeleteTargetHttpProxy(name string) error { mc := newTargetProxyMetricContext("delete") - op, err := gce.service.TargetHttpProxies.Delete(gce.projectID, name).Do() - if err != nil { - if isHTTPErrorCode(err, http.StatusNotFound) { - return nil - } - return mc.Observe(err) + err := gce.c.TargetHttpProxies().Delete(context.Background(), meta.GlobalKey(name)) + if isHTTPErrorCode(err, http.StatusNotFound) { + err = nil } - return gce.waitForGlobalOp(op, mc) + return mc.Observe(err) } // ListTargetHttpProxies lists all TargetHttpProxies in the project. -func (gce *GCECloud) ListTargetHttpProxies() (*compute.TargetHttpProxyList, error) { +func (gce *GCECloud) ListTargetHttpProxies() ([]*compute.TargetHttpProxy, error) { mc := newTargetProxyMetricContext("list") - // TODO: use PageToken to list all not just the first 500 - v, err := gce.service.TargetHttpProxies.List(gce.projectID).Do() + v, err := gce.c.TargetHttpProxies().List(context.Background(), filter.None) return v, mc.Observe(err) } @@ -80,59 +72,45 @@ func (gce *GCECloud) ListTargetHttpProxies() (*compute.TargetHttpProxyList, erro // GetTargetHttpsProxy returns the UrlMap by name. func (gce *GCECloud) GetTargetHttpsProxy(name string) (*compute.TargetHttpsProxy, error) { mc := newTargetProxyMetricContext("get") - v, err := gce.service.TargetHttpsProxies.Get(gce.projectID, name).Do() + v, err := gce.c.TargetHttpsProxies().Get(context.Background(), meta.GlobalKey(name)) return v, mc.Observe(err) } // CreateTargetHttpsProxy creates a TargetHttpsProxy func (gce *GCECloud) CreateTargetHttpsProxy(proxy *compute.TargetHttpsProxy) error { mc := newTargetProxyMetricContext("create") - op, err := gce.service.TargetHttpsProxies.Insert(gce.projectID, proxy).Do() - if err != nil { - return mc.Observe(err) - } - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.TargetHttpsProxies().Insert(context.Background(), meta.GlobalKey(proxy.Name), proxy)) } // SetUrlMapForTargetHttpsProxy sets the given UrlMap for the given TargetHttpsProxy. func (gce *GCECloud) SetUrlMapForTargetHttpsProxy(proxy *compute.TargetHttpsProxy, urlMap *compute.UrlMap) error { mc := newTargetProxyMetricContext("set_url_map") - op, err := gce.service.TargetHttpsProxies.SetUrlMap( - gce.projectID, proxy.Name, &compute.UrlMapReference{UrlMap: urlMap.SelfLink}).Do() - if err != nil { - return mc.Observe(err) - } - return gce.waitForGlobalOp(op, mc) + ref := &compute.UrlMapReference{UrlMap: urlMap.SelfLink} + return mc.Observe(gce.c.TargetHttpsProxies().SetUrlMap(context.Background(), meta.GlobalKey(proxy.Name), ref)) } // SetSslCertificateForTargetHttpsProxy sets the given SslCertificate for the given TargetHttpsProxy. func (gce *GCECloud) SetSslCertificateForTargetHttpsProxy(proxy *compute.TargetHttpsProxy, sslCert *compute.SslCertificate) error { mc := newTargetProxyMetricContext("set_ssl_cert") - op, err := gce.service.TargetHttpsProxies.SetSslCertificates( - gce.projectID, proxy.Name, &compute.TargetHttpsProxiesSetSslCertificatesRequest{SslCertificates: []string{sslCert.SelfLink}}).Do() - if err != nil { - return mc.Observe(err) + req := &compute.TargetHttpsProxiesSetSslCertificatesRequest{ + SslCertificates: []string{sslCert.SelfLink}, } - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.TargetHttpsProxies().SetSslCertificates(context.Background(), meta.GlobalKey(proxy.Name), req)) } // DeleteTargetHttpsProxy deletes the TargetHttpsProxy by name. func (gce *GCECloud) DeleteTargetHttpsProxy(name string) error { mc := newTargetProxyMetricContext("delete") - op, err := gce.service.TargetHttpsProxies.Delete(gce.projectID, name).Do() - if err != nil { - if isHTTPErrorCode(err, http.StatusNotFound) { - return nil - } - return mc.Observe(err) + err := gce.c.TargetHttpsProxies().Delete(context.Background(), meta.GlobalKey(name)) + if isHTTPErrorCode(err, http.StatusNotFound) { + err = nil } - return gce.waitForGlobalOp(op, mc) + return mc.Observe(err) } // ListTargetHttpsProxies lists all TargetHttpsProxies in the project. -func (gce *GCECloud) ListTargetHttpsProxies() (*compute.TargetHttpsProxyList, error) { +func (gce *GCECloud) ListTargetHttpsProxies() ([]*compute.TargetHttpsProxy, error) { mc := newTargetProxyMetricContext("list") - // TODO: use PageToken to list all not just the first 500 - v, err := gce.service.TargetHttpsProxies.List(gce.projectID).Do() + v, err := gce.c.TargetHttpsProxies().List(context.Background(), filter.None) return v, mc.Observe(err) }