From 09a856cbb880d6fcac224d1484f507f51a735f44 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Wed, 4 Apr 2018 00:00:29 +0200 Subject: [PATCH] vendor update --- vendor.conf | 4 +- .../github.com/gorilla/websocket/.gitignore | 25 - .../github.com/gorilla/websocket/.travis.yml | 19 - vendor/github.com/gorilla/websocket/AUTHORS | 8 - vendor/github.com/gorilla/websocket/LICENSE | 22 - vendor/github.com/gorilla/websocket/README.md | 64 - vendor/github.com/gorilla/websocket/client.go | 392 ------ .../gorilla/websocket/client_clone.go | 16 - .../gorilla/websocket/client_clone_legacy.go | 38 - .../gorilla/websocket/compression.go | 148 --- vendor/github.com/gorilla/websocket/conn.go | 1149 ----------------- .../github.com/gorilla/websocket/conn_read.go | 18 - .../gorilla/websocket/conn_read_legacy.go | 21 - vendor/github.com/gorilla/websocket/doc.go | 180 --- vendor/github.com/gorilla/websocket/json.go | 55 - vendor/github.com/gorilla/websocket/mask.go | 55 - .../github.com/gorilla/websocket/mask_safe.go | 15 - .../github.com/gorilla/websocket/prepared.go | 103 -- vendor/github.com/gorilla/websocket/server.go | 291 ----- vendor/github.com/gorilla/websocket/util.go | 214 --- .../rancher/norman/clientbase/client.go | 19 - .../rancher/norman/clientbase/common.go | 329 ----- .../rancher/norman/clientbase/ops.go | 298 ----- .../norman/controller/generic_controller.go | 4 +- .../rancher/norman/lifecycle/object.go | 6 +- .../object_client.go | 2 +- .../rancher/norman/types/reflection.go | 21 +- .../apis/management.cattle.io/v3/rke_types.go | 2 + .../v3/zz_generated_auth_config_controller.go | 8 +- .../v3/zz_generated_catalog_controller.go | 8 +- .../zz_generated_cluster_alert_controller.go | 8 +- ...rated_cluster_compose_config_controller.go | 8 +- .../v3/zz_generated_cluster_controller.go | 8 +- .../zz_generated_cluster_event_controller.go | 8 +- ...zz_generated_cluster_logging_controller.go | 8 +- ...z_generated_cluster_pipeline_controller.go | 8 +- ...d_cluster_registration_token_controller.go | 8 +- ...luster_role_template_binding_controller.go | 8 +- .../zz_generated_dynamic_schema_controller.go | 8 +- ...erated_global_compose_config_controller.go | 8 +- ...enerated_global_role_binding_controller.go | 8 +- .../v3/zz_generated_global_role_controller.go | 8 +- .../v3/zz_generated_group_controller.go | 8 +- .../zz_generated_group_member_controller.go | 8 +- .../v3/zz_generated_k8s_client.go | 86 +- .../zz_generated_listen_config_controller.go | 8 +- .../v3/zz_generated_node_controller.go | 8 +- .../v3/zz_generated_node_driver_controller.go | 8 +- .../v3/zz_generated_node_pool_controller.go | 8 +- .../zz_generated_node_template_controller.go | 8 +- .../v3/zz_generated_notifier_controller.go | 8 +- .../v3/zz_generated_pipeline_controller.go | 8 +- ...generated_pipeline_execution_controller.go | 8 +- ...rated_pipeline_execution_log_controller.go | 8 +- ...pod_security_policy_template_controller.go | 8 +- ...icy_template_project_binding_controller.go | 8 +- .../v3/zz_generated_preference_controller.go | 8 +- .../v3/zz_generated_principal_controller.go | 8 +- .../zz_generated_project_alert_controller.go | 8 +- .../v3/zz_generated_project_controller.go | 8 +- ...zz_generated_project_logging_controller.go | 8 +- ...rated_project_network_policy_controller.go | 8 +- ...roject_role_template_binding_controller.go | 8 +- .../zz_generated_role_template_controller.go | 8 +- .../v3/zz_generated_setting_controller.go | 8 +- ...rated_source_code_credential_controller.go | 8 +- ...rated_source_code_repository_controller.go | 8 +- .../v3/zz_generated_template_controller.go | 8 +- ...z_generated_template_version_controller.go | 8 +- .../v3/zz_generated_token_controller.go | 8 +- .../v3/zz_generated_user_controller.go | 8 +- vendor/github.com/rancher/types/vendor.conf | 2 +- 72 files changed, 235 insertions(+), 3707 deletions(-) delete mode 100644 vendor/github.com/gorilla/websocket/.gitignore delete mode 100644 vendor/github.com/gorilla/websocket/.travis.yml delete mode 100644 vendor/github.com/gorilla/websocket/AUTHORS delete mode 100644 vendor/github.com/gorilla/websocket/LICENSE delete mode 100644 vendor/github.com/gorilla/websocket/README.md delete mode 100644 vendor/github.com/gorilla/websocket/client.go delete mode 100644 vendor/github.com/gorilla/websocket/client_clone.go delete mode 100644 vendor/github.com/gorilla/websocket/client_clone_legacy.go delete mode 100644 vendor/github.com/gorilla/websocket/compression.go delete mode 100644 vendor/github.com/gorilla/websocket/conn.go delete mode 100644 vendor/github.com/gorilla/websocket/conn_read.go delete mode 100644 vendor/github.com/gorilla/websocket/conn_read_legacy.go delete mode 100644 vendor/github.com/gorilla/websocket/doc.go delete mode 100644 vendor/github.com/gorilla/websocket/json.go delete mode 100644 vendor/github.com/gorilla/websocket/mask.go delete mode 100644 vendor/github.com/gorilla/websocket/mask_safe.go delete mode 100644 vendor/github.com/gorilla/websocket/prepared.go delete mode 100644 vendor/github.com/gorilla/websocket/server.go delete mode 100644 vendor/github.com/gorilla/websocket/util.go delete mode 100644 vendor/github.com/rancher/norman/clientbase/client.go delete mode 100644 vendor/github.com/rancher/norman/clientbase/common.go delete mode 100644 vendor/github.com/rancher/norman/clientbase/ops.go rename vendor/github.com/rancher/norman/{clientbase => objectclient}/object_client.go (99%) diff --git a/vendor.conf b/vendor.conf index 8d5a251d..9b49ca9b 100644 --- a/vendor.conf +++ b/vendor.conf @@ -23,5 +23,5 @@ github.com/coreos/etcd 52f73c5a6cb0d1d196ffd6eced406c9d8502078 github.com/coreos/go-semver e214231b295a8ea9479f11b70b35d5acf3556d9b github.com/ugorji/go/codec ccfe18359b55b97855cee1d3f74e5efbda4869dc -github.com/rancher/norman 510ed570d2e29a00e6bc1bcd18bdcad6c6860a13 -github.com/rancher/types 0efe60ff1a97dbe1a55eed74e685c73ca4cd8c82 +github.com/rancher/norman ff60298f31f081b06d198815b4c178a578664f7d +github.com/rancher/types 2e66000b6b101dbad981c350fd8216bd90ad562a diff --git a/vendor/github.com/gorilla/websocket/.gitignore b/vendor/github.com/gorilla/websocket/.gitignore deleted file mode 100644 index ac710204..00000000 --- a/vendor/github.com/gorilla/websocket/.gitignore +++ /dev/null @@ -1,25 +0,0 @@ -# Compiled Object files, Static and Dynamic libs (Shared Objects) -*.o -*.a -*.so - -# Folders -_obj -_test - -# Architecture specific extensions/prefixes -*.[568vq] -[568vq].out - -*.cgo1.go -*.cgo2.c -_cgo_defun.c -_cgo_gotypes.go -_cgo_export.* - -_testmain.go - -*.exe - -.idea/ -*.iml \ No newline at end of file diff --git a/vendor/github.com/gorilla/websocket/.travis.yml b/vendor/github.com/gorilla/websocket/.travis.yml deleted file mode 100644 index 3d8d29cf..00000000 --- a/vendor/github.com/gorilla/websocket/.travis.yml +++ /dev/null @@ -1,19 +0,0 @@ -language: go -sudo: false - -matrix: - include: - - go: 1.4 - - go: 1.5 - - go: 1.6 - - go: 1.7 - - go: 1.8 - - go: tip - allow_failures: - - go: tip - -script: - - go get -t -v ./... - - diff -u <(echo -n) <(gofmt -d .) - - go vet $(go list ./... | grep -v /vendor/) - - go test -v -race ./... diff --git a/vendor/github.com/gorilla/websocket/AUTHORS b/vendor/github.com/gorilla/websocket/AUTHORS deleted file mode 100644 index b003eca0..00000000 --- a/vendor/github.com/gorilla/websocket/AUTHORS +++ /dev/null @@ -1,8 +0,0 @@ -# This is the official list of Gorilla WebSocket authors for copyright -# purposes. -# -# Please keep the list sorted. - -Gary Burd -Joachim Bauch - diff --git a/vendor/github.com/gorilla/websocket/LICENSE b/vendor/github.com/gorilla/websocket/LICENSE deleted file mode 100644 index 9171c972..00000000 --- a/vendor/github.com/gorilla/websocket/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (c) 2013 The Gorilla WebSocket Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/github.com/gorilla/websocket/README.md b/vendor/github.com/gorilla/websocket/README.md deleted file mode 100644 index 33c3d2be..00000000 --- a/vendor/github.com/gorilla/websocket/README.md +++ /dev/null @@ -1,64 +0,0 @@ -# Gorilla WebSocket - -Gorilla WebSocket is a [Go](http://golang.org/) implementation of the -[WebSocket](http://www.rfc-editor.org/rfc/rfc6455.txt) protocol. - -[![Build Status](https://travis-ci.org/gorilla/websocket.svg?branch=master)](https://travis-ci.org/gorilla/websocket) -[![GoDoc](https://godoc.org/github.com/gorilla/websocket?status.svg)](https://godoc.org/github.com/gorilla/websocket) - -### Documentation - -* [API Reference](http://godoc.org/github.com/gorilla/websocket) -* [Chat example](https://github.com/gorilla/websocket/tree/master/examples/chat) -* [Command example](https://github.com/gorilla/websocket/tree/master/examples/command) -* [Client and server example](https://github.com/gorilla/websocket/tree/master/examples/echo) -* [File watch example](https://github.com/gorilla/websocket/tree/master/examples/filewatch) - -### Status - -The Gorilla WebSocket package provides a complete and tested implementation of -the [WebSocket](http://www.rfc-editor.org/rfc/rfc6455.txt) protocol. The -package API is stable. - -### Installation - - go get github.com/gorilla/websocket - -### Protocol Compliance - -The Gorilla WebSocket package passes the server tests in the [Autobahn Test -Suite](http://autobahn.ws/testsuite) using the application in the [examples/autobahn -subdirectory](https://github.com/gorilla/websocket/tree/master/examples/autobahn). - -### Gorilla WebSocket compared with other packages - - - - - - - - - - - - - - - - - - -
github.com/gorillagolang.org/x/net
RFC 6455 Features
Passes Autobahn Test SuiteYesNo
Receive fragmented messageYesNo, see note 1
Send close messageYesNo
Send pings and receive pongsYesNo
Get the type of a received data messageYesYes, see note 2
Other Features
Compression ExtensionsExperimentalNo
Read message using io.ReaderYesNo, see note 3
Write message using io.WriteCloserYesNo, see note 3
- -Notes: - -1. Large messages are fragmented in [Chrome's new WebSocket implementation](http://www.ietf.org/mail-archive/web/hybi/current/msg10503.html). -2. The application can get the type of a received data message by implementing - a [Codec marshal](http://godoc.org/golang.org/x/net/websocket#Codec.Marshal) - function. -3. The go.net io.Reader and io.Writer operate across WebSocket frame boundaries. - Read returns when the input buffer is full or a frame boundary is - encountered. Each call to Write sends a single frame message. The Gorilla - io.Reader and io.WriteCloser operate on a single WebSocket message. - diff --git a/vendor/github.com/gorilla/websocket/client.go b/vendor/github.com/gorilla/websocket/client.go deleted file mode 100644 index 43a87c75..00000000 --- a/vendor/github.com/gorilla/websocket/client.go +++ /dev/null @@ -1,392 +0,0 @@ -// Copyright 2013 The Gorilla WebSocket Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package websocket - -import ( - "bufio" - "bytes" - "crypto/tls" - "encoding/base64" - "errors" - "io" - "io/ioutil" - "net" - "net/http" - "net/url" - "strings" - "time" -) - -// ErrBadHandshake is returned when the server response to opening handshake is -// invalid. -var ErrBadHandshake = errors.New("websocket: bad handshake") - -var errInvalidCompression = errors.New("websocket: invalid compression negotiation") - -// NewClient creates a new client connection using the given net connection. -// The URL u specifies the host and request URI. Use requestHeader to specify -// the origin (Origin), subprotocols (Sec-WebSocket-Protocol) and cookies -// (Cookie). Use the response.Header to get the selected subprotocol -// (Sec-WebSocket-Protocol) and cookies (Set-Cookie). -// -// If the WebSocket handshake fails, ErrBadHandshake is returned along with a -// non-nil *http.Response so that callers can handle redirects, authentication, -// etc. -// -// Deprecated: Use Dialer instead. -func NewClient(netConn net.Conn, u *url.URL, requestHeader http.Header, readBufSize, writeBufSize int) (c *Conn, response *http.Response, err error) { - d := Dialer{ - ReadBufferSize: readBufSize, - WriteBufferSize: writeBufSize, - NetDial: func(net, addr string) (net.Conn, error) { - return netConn, nil - }, - } - return d.Dial(u.String(), requestHeader) -} - -// A Dialer contains options for connecting to WebSocket server. -type Dialer struct { - // NetDial specifies the dial function for creating TCP connections. If - // NetDial is nil, net.Dial is used. - NetDial func(network, addr string) (net.Conn, error) - - // Proxy specifies a function to return a proxy for a given - // Request. If the function returns a non-nil error, the - // request is aborted with the provided error. - // If Proxy is nil or returns a nil *URL, no proxy is used. - Proxy func(*http.Request) (*url.URL, error) - - // TLSClientConfig specifies the TLS configuration to use with tls.Client. - // If nil, the default configuration is used. - TLSClientConfig *tls.Config - - // HandshakeTimeout specifies the duration for the handshake to complete. - HandshakeTimeout time.Duration - - // ReadBufferSize and WriteBufferSize specify I/O buffer sizes. If a buffer - // size is zero, then a useful default size is used. The I/O buffer sizes - // do not limit the size of the messages that can be sent or received. - ReadBufferSize, WriteBufferSize int - - // Subprotocols specifies the client's requested subprotocols. - Subprotocols []string - - // EnableCompression specifies if the client should attempt to negotiate - // per message compression (RFC 7692). Setting this value to true does not - // guarantee that compression will be supported. Currently only "no context - // takeover" modes are supported. - EnableCompression bool - - // Jar specifies the cookie jar. - // If Jar is nil, cookies are not sent in requests and ignored - // in responses. - Jar http.CookieJar -} - -var errMalformedURL = errors.New("malformed ws or wss URL") - -// parseURL parses the URL. -// -// This function is a replacement for the standard library url.Parse function. -// In Go 1.4 and earlier, url.Parse loses information from the path. -func parseURL(s string) (*url.URL, error) { - // From the RFC: - // - // ws-URI = "ws:" "//" host [ ":" port ] path [ "?" query ] - // wss-URI = "wss:" "//" host [ ":" port ] path [ "?" query ] - var u url.URL - switch { - case strings.HasPrefix(s, "ws://"): - u.Scheme = "ws" - s = s[len("ws://"):] - case strings.HasPrefix(s, "wss://"): - u.Scheme = "wss" - s = s[len("wss://"):] - default: - return nil, errMalformedURL - } - - if i := strings.Index(s, "?"); i >= 0 { - u.RawQuery = s[i+1:] - s = s[:i] - } - - if i := strings.Index(s, "/"); i >= 0 { - u.Opaque = s[i:] - s = s[:i] - } else { - u.Opaque = "/" - } - - u.Host = s - - if strings.Contains(u.Host, "@") { - // Don't bother parsing user information because user information is - // not allowed in websocket URIs. - return nil, errMalformedURL - } - - return &u, nil -} - -func hostPortNoPort(u *url.URL) (hostPort, hostNoPort string) { - hostPort = u.Host - hostNoPort = u.Host - if i := strings.LastIndex(u.Host, ":"); i > strings.LastIndex(u.Host, "]") { - hostNoPort = hostNoPort[:i] - } else { - switch u.Scheme { - case "wss": - hostPort += ":443" - case "https": - hostPort += ":443" - default: - hostPort += ":80" - } - } - return hostPort, hostNoPort -} - -// DefaultDialer is a dialer with all fields set to the default zero values. -var DefaultDialer = &Dialer{ - Proxy: http.ProxyFromEnvironment, -} - -// Dial creates a new client connection. Use requestHeader to specify the -// origin (Origin), subprotocols (Sec-WebSocket-Protocol) and cookies (Cookie). -// Use the response.Header to get the selected subprotocol -// (Sec-WebSocket-Protocol) and cookies (Set-Cookie). -// -// If the WebSocket handshake fails, ErrBadHandshake is returned along with a -// non-nil *http.Response so that callers can handle redirects, authentication, -// etcetera. The response body may not contain the entire response and does not -// need to be closed by the application. -func (d *Dialer) Dial(urlStr string, requestHeader http.Header) (*Conn, *http.Response, error) { - - if d == nil { - d = &Dialer{ - Proxy: http.ProxyFromEnvironment, - } - } - - challengeKey, err := generateChallengeKey() - if err != nil { - return nil, nil, err - } - - u, err := parseURL(urlStr) - if err != nil { - return nil, nil, err - } - - switch u.Scheme { - case "ws": - u.Scheme = "http" - case "wss": - u.Scheme = "https" - default: - return nil, nil, errMalformedURL - } - - if u.User != nil { - // User name and password are not allowed in websocket URIs. - return nil, nil, errMalformedURL - } - - req := &http.Request{ - Method: "GET", - URL: u, - Proto: "HTTP/1.1", - ProtoMajor: 1, - ProtoMinor: 1, - Header: make(http.Header), - Host: u.Host, - } - - // Set the cookies present in the cookie jar of the dialer - if d.Jar != nil { - for _, cookie := range d.Jar.Cookies(u) { - req.AddCookie(cookie) - } - } - - // Set the request headers using the capitalization for names and values in - // RFC examples. Although the capitalization shouldn't matter, there are - // servers that depend on it. The Header.Set method is not used because the - // method canonicalizes the header names. - req.Header["Upgrade"] = []string{"websocket"} - req.Header["Connection"] = []string{"Upgrade"} - req.Header["Sec-WebSocket-Key"] = []string{challengeKey} - req.Header["Sec-WebSocket-Version"] = []string{"13"} - if len(d.Subprotocols) > 0 { - req.Header["Sec-WebSocket-Protocol"] = []string{strings.Join(d.Subprotocols, ", ")} - } - for k, vs := range requestHeader { - switch { - case k == "Host": - if len(vs) > 0 { - req.Host = vs[0] - } - case k == "Upgrade" || - k == "Connection" || - k == "Sec-Websocket-Key" || - k == "Sec-Websocket-Version" || - k == "Sec-Websocket-Extensions" || - (k == "Sec-Websocket-Protocol" && len(d.Subprotocols) > 0): - return nil, nil, errors.New("websocket: duplicate header not allowed: " + k) - default: - req.Header[k] = vs - } - } - - if d.EnableCompression { - req.Header.Set("Sec-Websocket-Extensions", "permessage-deflate; server_no_context_takeover; client_no_context_takeover") - } - - hostPort, hostNoPort := hostPortNoPort(u) - - var proxyURL *url.URL - // Check wether the proxy method has been configured - if d.Proxy != nil { - proxyURL, err = d.Proxy(req) - } - if err != nil { - return nil, nil, err - } - - var targetHostPort string - if proxyURL != nil { - targetHostPort, _ = hostPortNoPort(proxyURL) - } else { - targetHostPort = hostPort - } - - var deadline time.Time - if d.HandshakeTimeout != 0 { - deadline = time.Now().Add(d.HandshakeTimeout) - } - - netDial := d.NetDial - if netDial == nil { - netDialer := &net.Dialer{Deadline: deadline} - netDial = netDialer.Dial - } - - netConn, err := netDial("tcp", targetHostPort) - if err != nil { - return nil, nil, err - } - - defer func() { - if netConn != nil { - netConn.Close() - } - }() - - if err := netConn.SetDeadline(deadline); err != nil { - return nil, nil, err - } - - if proxyURL != nil { - connectHeader := make(http.Header) - if user := proxyURL.User; user != nil { - proxyUser := user.Username() - if proxyPassword, passwordSet := user.Password(); passwordSet { - credential := base64.StdEncoding.EncodeToString([]byte(proxyUser + ":" + proxyPassword)) - connectHeader.Set("Proxy-Authorization", "Basic "+credential) - } - } - connectReq := &http.Request{ - Method: "CONNECT", - URL: &url.URL{Opaque: hostPort}, - Host: hostPort, - Header: connectHeader, - } - - connectReq.Write(netConn) - - // Read response. - // Okay to use and discard buffered reader here, because - // TLS server will not speak until spoken to. - br := bufio.NewReader(netConn) - resp, err := http.ReadResponse(br, connectReq) - if err != nil { - return nil, nil, err - } - if resp.StatusCode != 200 { - f := strings.SplitN(resp.Status, " ", 2) - return nil, nil, errors.New(f[1]) - } - } - - if u.Scheme == "https" { - cfg := cloneTLSConfig(d.TLSClientConfig) - if cfg.ServerName == "" { - cfg.ServerName = hostNoPort - } - tlsConn := tls.Client(netConn, cfg) - netConn = tlsConn - if err := tlsConn.Handshake(); err != nil { - return nil, nil, err - } - if !cfg.InsecureSkipVerify { - if err := tlsConn.VerifyHostname(cfg.ServerName); err != nil { - return nil, nil, err - } - } - } - - conn := newConn(netConn, false, d.ReadBufferSize, d.WriteBufferSize) - - if err := req.Write(netConn); err != nil { - return nil, nil, err - } - - resp, err := http.ReadResponse(conn.br, req) - if err != nil { - return nil, nil, err - } - - if d.Jar != nil { - if rc := resp.Cookies(); len(rc) > 0 { - d.Jar.SetCookies(u, rc) - } - } - - if resp.StatusCode != 101 || - !strings.EqualFold(resp.Header.Get("Upgrade"), "websocket") || - !strings.EqualFold(resp.Header.Get("Connection"), "upgrade") || - resp.Header.Get("Sec-Websocket-Accept") != computeAcceptKey(challengeKey) { - // Before closing the network connection on return from this - // function, slurp up some of the response to aid application - // debugging. - buf := make([]byte, 1024) - n, _ := io.ReadFull(resp.Body, buf) - resp.Body = ioutil.NopCloser(bytes.NewReader(buf[:n])) - return nil, resp, ErrBadHandshake - } - - for _, ext := range parseExtensions(resp.Header) { - if ext[""] != "permessage-deflate" { - continue - } - _, snct := ext["server_no_context_takeover"] - _, cnct := ext["client_no_context_takeover"] - if !snct || !cnct { - return nil, resp, errInvalidCompression - } - conn.newCompressionWriter = compressNoContextTakeover - conn.newDecompressionReader = decompressNoContextTakeover - break - } - - resp.Body = ioutil.NopCloser(bytes.NewReader([]byte{})) - conn.subprotocol = resp.Header.Get("Sec-Websocket-Protocol") - - netConn.SetDeadline(time.Time{}) - netConn = nil // to avoid close in defer. - return conn, resp, nil -} diff --git a/vendor/github.com/gorilla/websocket/client_clone.go b/vendor/github.com/gorilla/websocket/client_clone.go deleted file mode 100644 index 4f0d9437..00000000 --- a/vendor/github.com/gorilla/websocket/client_clone.go +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2013 The Gorilla WebSocket Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build go1.8 - -package websocket - -import "crypto/tls" - -func cloneTLSConfig(cfg *tls.Config) *tls.Config { - if cfg == nil { - return &tls.Config{} - } - return cfg.Clone() -} diff --git a/vendor/github.com/gorilla/websocket/client_clone_legacy.go b/vendor/github.com/gorilla/websocket/client_clone_legacy.go deleted file mode 100644 index babb007f..00000000 --- a/vendor/github.com/gorilla/websocket/client_clone_legacy.go +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2013 The Gorilla WebSocket Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build !go1.8 - -package websocket - -import "crypto/tls" - -// cloneTLSConfig clones all public fields except the fields -// SessionTicketsDisabled and SessionTicketKey. This avoids copying the -// sync.Mutex in the sync.Once and makes it safe to call cloneTLSConfig on a -// config in active use. -func cloneTLSConfig(cfg *tls.Config) *tls.Config { - if cfg == nil { - return &tls.Config{} - } - return &tls.Config{ - Rand: cfg.Rand, - Time: cfg.Time, - Certificates: cfg.Certificates, - NameToCertificate: cfg.NameToCertificate, - GetCertificate: cfg.GetCertificate, - RootCAs: cfg.RootCAs, - NextProtos: cfg.NextProtos, - ServerName: cfg.ServerName, - ClientAuth: cfg.ClientAuth, - ClientCAs: cfg.ClientCAs, - InsecureSkipVerify: cfg.InsecureSkipVerify, - CipherSuites: cfg.CipherSuites, - PreferServerCipherSuites: cfg.PreferServerCipherSuites, - ClientSessionCache: cfg.ClientSessionCache, - MinVersion: cfg.MinVersion, - MaxVersion: cfg.MaxVersion, - CurvePreferences: cfg.CurvePreferences, - } -} diff --git a/vendor/github.com/gorilla/websocket/compression.go b/vendor/github.com/gorilla/websocket/compression.go deleted file mode 100644 index 813ffb1e..00000000 --- a/vendor/github.com/gorilla/websocket/compression.go +++ /dev/null @@ -1,148 +0,0 @@ -// Copyright 2017 The Gorilla WebSocket Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package websocket - -import ( - "compress/flate" - "errors" - "io" - "strings" - "sync" -) - -const ( - minCompressionLevel = -2 // flate.HuffmanOnly not defined in Go < 1.6 - maxCompressionLevel = flate.BestCompression - defaultCompressionLevel = 1 -) - -var ( - flateWriterPools [maxCompressionLevel - minCompressionLevel + 1]sync.Pool - flateReaderPool = sync.Pool{New: func() interface{} { - return flate.NewReader(nil) - }} -) - -func decompressNoContextTakeover(r io.Reader) io.ReadCloser { - const tail = - // Add four bytes as specified in RFC - "\x00\x00\xff\xff" + - // Add final block to squelch unexpected EOF error from flate reader. - "\x01\x00\x00\xff\xff" - - fr, _ := flateReaderPool.Get().(io.ReadCloser) - fr.(flate.Resetter).Reset(io.MultiReader(r, strings.NewReader(tail)), nil) - return &flateReadWrapper{fr} -} - -func isValidCompressionLevel(level int) bool { - return minCompressionLevel <= level && level <= maxCompressionLevel -} - -func compressNoContextTakeover(w io.WriteCloser, level int) io.WriteCloser { - p := &flateWriterPools[level-minCompressionLevel] - tw := &truncWriter{w: w} - fw, _ := p.Get().(*flate.Writer) - if fw == nil { - fw, _ = flate.NewWriter(tw, level) - } else { - fw.Reset(tw) - } - return &flateWriteWrapper{fw: fw, tw: tw, p: p} -} - -// truncWriter is an io.Writer that writes all but the last four bytes of the -// stream to another io.Writer. -type truncWriter struct { - w io.WriteCloser - n int - p [4]byte -} - -func (w *truncWriter) Write(p []byte) (int, error) { - n := 0 - - // fill buffer first for simplicity. - if w.n < len(w.p) { - n = copy(w.p[w.n:], p) - p = p[n:] - w.n += n - if len(p) == 0 { - return n, nil - } - } - - m := len(p) - if m > len(w.p) { - m = len(w.p) - } - - if nn, err := w.w.Write(w.p[:m]); err != nil { - return n + nn, err - } - - copy(w.p[:], w.p[m:]) - copy(w.p[len(w.p)-m:], p[len(p)-m:]) - nn, err := w.w.Write(p[:len(p)-m]) - return n + nn, err -} - -type flateWriteWrapper struct { - fw *flate.Writer - tw *truncWriter - p *sync.Pool -} - -func (w *flateWriteWrapper) Write(p []byte) (int, error) { - if w.fw == nil { - return 0, errWriteClosed - } - return w.fw.Write(p) -} - -func (w *flateWriteWrapper) Close() error { - if w.fw == nil { - return errWriteClosed - } - err1 := w.fw.Flush() - w.p.Put(w.fw) - w.fw = nil - if w.tw.p != [4]byte{0, 0, 0xff, 0xff} { - return errors.New("websocket: internal error, unexpected bytes at end of flate stream") - } - err2 := w.tw.w.Close() - if err1 != nil { - return err1 - } - return err2 -} - -type flateReadWrapper struct { - fr io.ReadCloser -} - -func (r *flateReadWrapper) Read(p []byte) (int, error) { - if r.fr == nil { - return 0, io.ErrClosedPipe - } - n, err := r.fr.Read(p) - if err == io.EOF { - // Preemptively place the reader back in the pool. This helps with - // scenarios where the application does not call NextReader() soon after - // this final read. - r.Close() - } - return n, err -} - -func (r *flateReadWrapper) Close() error { - if r.fr == nil { - return io.ErrClosedPipe - } - err := r.fr.Close() - flateReaderPool.Put(r.fr) - r.fr = nil - return err -} diff --git a/vendor/github.com/gorilla/websocket/conn.go b/vendor/github.com/gorilla/websocket/conn.go deleted file mode 100644 index 97e1dbac..00000000 --- a/vendor/github.com/gorilla/websocket/conn.go +++ /dev/null @@ -1,1149 +0,0 @@ -// Copyright 2013 The Gorilla WebSocket Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package websocket - -import ( - "bufio" - "encoding/binary" - "errors" - "io" - "io/ioutil" - "math/rand" - "net" - "strconv" - "sync" - "time" - "unicode/utf8" -) - -const ( - // Frame header byte 0 bits from Section 5.2 of RFC 6455 - finalBit = 1 << 7 - rsv1Bit = 1 << 6 - rsv2Bit = 1 << 5 - rsv3Bit = 1 << 4 - - // Frame header byte 1 bits from Section 5.2 of RFC 6455 - maskBit = 1 << 7 - - maxFrameHeaderSize = 2 + 8 + 4 // Fixed header + length + mask - maxControlFramePayloadSize = 125 - - writeWait = time.Second - - defaultReadBufferSize = 4096 - defaultWriteBufferSize = 4096 - - continuationFrame = 0 - noFrame = -1 -) - -// Close codes defined in RFC 6455, section 11.7. -const ( - CloseNormalClosure = 1000 - CloseGoingAway = 1001 - CloseProtocolError = 1002 - CloseUnsupportedData = 1003 - CloseNoStatusReceived = 1005 - CloseAbnormalClosure = 1006 - CloseInvalidFramePayloadData = 1007 - ClosePolicyViolation = 1008 - CloseMessageTooBig = 1009 - CloseMandatoryExtension = 1010 - CloseInternalServerErr = 1011 - CloseServiceRestart = 1012 - CloseTryAgainLater = 1013 - CloseTLSHandshake = 1015 -) - -// The message types are defined in RFC 6455, section 11.8. -const ( - // TextMessage denotes a text data message. The text message payload is - // interpreted as UTF-8 encoded text data. - TextMessage = 1 - - // BinaryMessage denotes a binary data message. - BinaryMessage = 2 - - // CloseMessage denotes a close control message. The optional message - // payload contains a numeric code and text. Use the FormatCloseMessage - // function to format a close message payload. - CloseMessage = 8 - - // PingMessage denotes a ping control message. The optional message payload - // is UTF-8 encoded text. - PingMessage = 9 - - // PongMessage denotes a ping control message. The optional message payload - // is UTF-8 encoded text. - PongMessage = 10 -) - -// ErrCloseSent is returned when the application writes a message to the -// connection after sending a close message. -var ErrCloseSent = errors.New("websocket: close sent") - -// ErrReadLimit is returned when reading a message that is larger than the -// read limit set for the connection. -var ErrReadLimit = errors.New("websocket: read limit exceeded") - -// netError satisfies the net Error interface. -type netError struct { - msg string - temporary bool - timeout bool -} - -func (e *netError) Error() string { return e.msg } -func (e *netError) Temporary() bool { return e.temporary } -func (e *netError) Timeout() bool { return e.timeout } - -// CloseError represents close frame. -type CloseError struct { - - // Code is defined in RFC 6455, section 11.7. - Code int - - // Text is the optional text payload. - Text string -} - -func (e *CloseError) Error() string { - s := []byte("websocket: close ") - s = strconv.AppendInt(s, int64(e.Code), 10) - switch e.Code { - case CloseNormalClosure: - s = append(s, " (normal)"...) - case CloseGoingAway: - s = append(s, " (going away)"...) - case CloseProtocolError: - s = append(s, " (protocol error)"...) - case CloseUnsupportedData: - s = append(s, " (unsupported data)"...) - case CloseNoStatusReceived: - s = append(s, " (no status)"...) - case CloseAbnormalClosure: - s = append(s, " (abnormal closure)"...) - case CloseInvalidFramePayloadData: - s = append(s, " (invalid payload data)"...) - case ClosePolicyViolation: - s = append(s, " (policy violation)"...) - case CloseMessageTooBig: - s = append(s, " (message too big)"...) - case CloseMandatoryExtension: - s = append(s, " (mandatory extension missing)"...) - case CloseInternalServerErr: - s = append(s, " (internal server error)"...) - case CloseTLSHandshake: - s = append(s, " (TLS handshake error)"...) - } - if e.Text != "" { - s = append(s, ": "...) - s = append(s, e.Text...) - } - return string(s) -} - -// IsCloseError returns boolean indicating whether the error is a *CloseError -// with one of the specified codes. -func IsCloseError(err error, codes ...int) bool { - if e, ok := err.(*CloseError); ok { - for _, code := range codes { - if e.Code == code { - return true - } - } - } - return false -} - -// IsUnexpectedCloseError returns boolean indicating whether the error is a -// *CloseError with a code not in the list of expected codes. -func IsUnexpectedCloseError(err error, expectedCodes ...int) bool { - if e, ok := err.(*CloseError); ok { - for _, code := range expectedCodes { - if e.Code == code { - return false - } - } - return true - } - return false -} - -var ( - errWriteTimeout = &netError{msg: "websocket: write timeout", timeout: true, temporary: true} - errUnexpectedEOF = &CloseError{Code: CloseAbnormalClosure, Text: io.ErrUnexpectedEOF.Error()} - errBadWriteOpCode = errors.New("websocket: bad write message type") - errWriteClosed = errors.New("websocket: write closed") - errInvalidControlFrame = errors.New("websocket: invalid control frame") -) - -func newMaskKey() [4]byte { - n := rand.Uint32() - return [4]byte{byte(n), byte(n >> 8), byte(n >> 16), byte(n >> 24)} -} - -func hideTempErr(err error) error { - if e, ok := err.(net.Error); ok && e.Temporary() { - err = &netError{msg: e.Error(), timeout: e.Timeout()} - } - return err -} - -func isControl(frameType int) bool { - return frameType == CloseMessage || frameType == PingMessage || frameType == PongMessage -} - -func isData(frameType int) bool { - return frameType == TextMessage || frameType == BinaryMessage -} - -var validReceivedCloseCodes = map[int]bool{ - // see http://www.iana.org/assignments/websocket/websocket.xhtml#close-code-number - - CloseNormalClosure: true, - CloseGoingAway: true, - CloseProtocolError: true, - CloseUnsupportedData: true, - CloseNoStatusReceived: false, - CloseAbnormalClosure: false, - CloseInvalidFramePayloadData: true, - ClosePolicyViolation: true, - CloseMessageTooBig: true, - CloseMandatoryExtension: true, - CloseInternalServerErr: true, - CloseServiceRestart: true, - CloseTryAgainLater: true, - CloseTLSHandshake: false, -} - -func isValidReceivedCloseCode(code int) bool { - return validReceivedCloseCodes[code] || (code >= 3000 && code <= 4999) -} - -// The Conn type represents a WebSocket connection. -type Conn struct { - conn net.Conn - isServer bool - subprotocol string - - // Write fields - mu chan bool // used as mutex to protect write to conn - writeBuf []byte // frame is constructed in this buffer. - writeDeadline time.Time - writer io.WriteCloser // the current writer returned to the application - isWriting bool // for best-effort concurrent write detection - - writeErrMu sync.Mutex - writeErr error - - enableWriteCompression bool - compressionLevel int - newCompressionWriter func(io.WriteCloser, int) io.WriteCloser - - // Read fields - reader io.ReadCloser // the current reader returned to the application - readErr error - br *bufio.Reader - readRemaining int64 // bytes remaining in current frame. - readFinal bool // true the current message has more frames. - readLength int64 // Message size. - readLimit int64 // Maximum message size. - readMaskPos int - readMaskKey [4]byte - handlePong func(string) error - handlePing func(string) error - handleClose func(int, string) error - readErrCount int - messageReader *messageReader // the current low-level reader - - readDecompress bool // whether last read frame had RSV1 set - newDecompressionReader func(io.Reader) io.ReadCloser -} - -func newConn(conn net.Conn, isServer bool, readBufferSize, writeBufferSize int) *Conn { - return newConnBRW(conn, isServer, readBufferSize, writeBufferSize, nil) -} - -type writeHook struct { - p []byte -} - -func (wh *writeHook) Write(p []byte) (int, error) { - wh.p = p - return len(p), nil -} - -func newConnBRW(conn net.Conn, isServer bool, readBufferSize, writeBufferSize int, brw *bufio.ReadWriter) *Conn { - mu := make(chan bool, 1) - mu <- true - - var br *bufio.Reader - if readBufferSize == 0 && brw != nil && brw.Reader != nil { - // Reuse the supplied bufio.Reader if the buffer has a useful size. - // This code assumes that peek on a reader returns - // bufio.Reader.buf[:0]. - brw.Reader.Reset(conn) - if p, err := brw.Reader.Peek(0); err == nil && cap(p) >= 256 { - br = brw.Reader - } - } - if br == nil { - if readBufferSize == 0 { - readBufferSize = defaultReadBufferSize - } - if readBufferSize < maxControlFramePayloadSize { - readBufferSize = maxControlFramePayloadSize - } - br = bufio.NewReaderSize(conn, readBufferSize) - } - - var writeBuf []byte - if writeBufferSize == 0 && brw != nil && brw.Writer != nil { - // Use the bufio.Writer's buffer if the buffer has a useful size. This - // code assumes that bufio.Writer.buf[:1] is passed to the - // bufio.Writer's underlying writer. - var wh writeHook - brw.Writer.Reset(&wh) - brw.Writer.WriteByte(0) - brw.Flush() - if cap(wh.p) >= maxFrameHeaderSize+256 { - writeBuf = wh.p[:cap(wh.p)] - } - } - - if writeBuf == nil { - if writeBufferSize == 0 { - writeBufferSize = defaultWriteBufferSize - } - writeBuf = make([]byte, writeBufferSize+maxFrameHeaderSize) - } - - c := &Conn{ - isServer: isServer, - br: br, - conn: conn, - mu: mu, - readFinal: true, - writeBuf: writeBuf, - enableWriteCompression: true, - compressionLevel: defaultCompressionLevel, - } - c.SetCloseHandler(nil) - c.SetPingHandler(nil) - c.SetPongHandler(nil) - return c -} - -// Subprotocol returns the negotiated protocol for the connection. -func (c *Conn) Subprotocol() string { - return c.subprotocol -} - -// Close closes the underlying network connection without sending or waiting for a close frame. -func (c *Conn) Close() error { - return c.conn.Close() -} - -// LocalAddr returns the local network address. -func (c *Conn) LocalAddr() net.Addr { - return c.conn.LocalAddr() -} - -// RemoteAddr returns the remote network address. -func (c *Conn) RemoteAddr() net.Addr { - return c.conn.RemoteAddr() -} - -// Write methods - -func (c *Conn) writeFatal(err error) error { - err = hideTempErr(err) - c.writeErrMu.Lock() - if c.writeErr == nil { - c.writeErr = err - } - c.writeErrMu.Unlock() - return err -} - -func (c *Conn) write(frameType int, deadline time.Time, bufs ...[]byte) error { - <-c.mu - defer func() { c.mu <- true }() - - c.writeErrMu.Lock() - err := c.writeErr - c.writeErrMu.Unlock() - if err != nil { - return err - } - - c.conn.SetWriteDeadline(deadline) - for _, buf := range bufs { - if len(buf) > 0 { - _, err := c.conn.Write(buf) - if err != nil { - return c.writeFatal(err) - } - } - } - - if frameType == CloseMessage { - c.writeFatal(ErrCloseSent) - } - return nil -} - -// WriteControl writes a control message with the given deadline. The allowed -// message types are CloseMessage, PingMessage and PongMessage. -func (c *Conn) WriteControl(messageType int, data []byte, deadline time.Time) error { - if !isControl(messageType) { - return errBadWriteOpCode - } - if len(data) > maxControlFramePayloadSize { - return errInvalidControlFrame - } - - b0 := byte(messageType) | finalBit - b1 := byte(len(data)) - if !c.isServer { - b1 |= maskBit - } - - buf := make([]byte, 0, maxFrameHeaderSize+maxControlFramePayloadSize) - buf = append(buf, b0, b1) - - if c.isServer { - buf = append(buf, data...) - } else { - key := newMaskKey() - buf = append(buf, key[:]...) - buf = append(buf, data...) - maskBytes(key, 0, buf[6:]) - } - - d := time.Hour * 1000 - if !deadline.IsZero() { - d = deadline.Sub(time.Now()) - if d < 0 { - return errWriteTimeout - } - } - - timer := time.NewTimer(d) - select { - case <-c.mu: - timer.Stop() - case <-timer.C: - return errWriteTimeout - } - defer func() { c.mu <- true }() - - c.writeErrMu.Lock() - err := c.writeErr - c.writeErrMu.Unlock() - if err != nil { - return err - } - - c.conn.SetWriteDeadline(deadline) - _, err = c.conn.Write(buf) - if err != nil { - return c.writeFatal(err) - } - if messageType == CloseMessage { - c.writeFatal(ErrCloseSent) - } - return err -} - -func (c *Conn) prepWrite(messageType int) error { - // Close previous writer if not already closed by the application. It's - // probably better to return an error in this situation, but we cannot - // change this without breaking existing applications. - if c.writer != nil { - c.writer.Close() - c.writer = nil - } - - if !isControl(messageType) && !isData(messageType) { - return errBadWriteOpCode - } - - c.writeErrMu.Lock() - err := c.writeErr - c.writeErrMu.Unlock() - return err -} - -// NextWriter returns a writer for the next message to send. The writer's Close -// method flushes the complete message to the network. -// -// There can be at most one open writer on a connection. NextWriter closes the -// previous writer if the application has not already done so. -func (c *Conn) NextWriter(messageType int) (io.WriteCloser, error) { - if err := c.prepWrite(messageType); err != nil { - return nil, err - } - - mw := &messageWriter{ - c: c, - frameType: messageType, - pos: maxFrameHeaderSize, - } - c.writer = mw - if c.newCompressionWriter != nil && c.enableWriteCompression && isData(messageType) { - w := c.newCompressionWriter(c.writer, c.compressionLevel) - mw.compress = true - c.writer = w - } - return c.writer, nil -} - -type messageWriter struct { - c *Conn - compress bool // whether next call to flushFrame should set RSV1 - pos int // end of data in writeBuf. - frameType int // type of the current frame. - err error -} - -func (w *messageWriter) fatal(err error) error { - if w.err != nil { - w.err = err - w.c.writer = nil - } - return err -} - -// flushFrame writes buffered data and extra as a frame to the network. The -// final argument indicates that this is the last frame in the message. -func (w *messageWriter) flushFrame(final bool, extra []byte) error { - c := w.c - length := w.pos - maxFrameHeaderSize + len(extra) - - // Check for invalid control frames. - if isControl(w.frameType) && - (!final || length > maxControlFramePayloadSize) { - return w.fatal(errInvalidControlFrame) - } - - b0 := byte(w.frameType) - if final { - b0 |= finalBit - } - if w.compress { - b0 |= rsv1Bit - } - w.compress = false - - b1 := byte(0) - if !c.isServer { - b1 |= maskBit - } - - // Assume that the frame starts at beginning of c.writeBuf. - framePos := 0 - if c.isServer { - // Adjust up if mask not included in the header. - framePos = 4 - } - - switch { - case length >= 65536: - c.writeBuf[framePos] = b0 - c.writeBuf[framePos+1] = b1 | 127 - binary.BigEndian.PutUint64(c.writeBuf[framePos+2:], uint64(length)) - case length > 125: - framePos += 6 - c.writeBuf[framePos] = b0 - c.writeBuf[framePos+1] = b1 | 126 - binary.BigEndian.PutUint16(c.writeBuf[framePos+2:], uint16(length)) - default: - framePos += 8 - c.writeBuf[framePos] = b0 - c.writeBuf[framePos+1] = b1 | byte(length) - } - - if !c.isServer { - key := newMaskKey() - copy(c.writeBuf[maxFrameHeaderSize-4:], key[:]) - maskBytes(key, 0, c.writeBuf[maxFrameHeaderSize:w.pos]) - if len(extra) > 0 { - return c.writeFatal(errors.New("websocket: internal error, extra used in client mode")) - } - } - - // Write the buffers to the connection with best-effort detection of - // concurrent writes. See the concurrency section in the package - // documentation for more info. - - if c.isWriting { - panic("concurrent write to websocket connection") - } - c.isWriting = true - - err := c.write(w.frameType, c.writeDeadline, c.writeBuf[framePos:w.pos], extra) - - if !c.isWriting { - panic("concurrent write to websocket connection") - } - c.isWriting = false - - if err != nil { - return w.fatal(err) - } - - if final { - c.writer = nil - return nil - } - - // Setup for next frame. - w.pos = maxFrameHeaderSize - w.frameType = continuationFrame - return nil -} - -func (w *messageWriter) ncopy(max int) (int, error) { - n := len(w.c.writeBuf) - w.pos - if n <= 0 { - if err := w.flushFrame(false, nil); err != nil { - return 0, err - } - n = len(w.c.writeBuf) - w.pos - } - if n > max { - n = max - } - return n, nil -} - -func (w *messageWriter) Write(p []byte) (int, error) { - if w.err != nil { - return 0, w.err - } - - if len(p) > 2*len(w.c.writeBuf) && w.c.isServer { - // Don't buffer large messages. - err := w.flushFrame(false, p) - if err != nil { - return 0, err - } - return len(p), nil - } - - nn := len(p) - for len(p) > 0 { - n, err := w.ncopy(len(p)) - if err != nil { - return 0, err - } - copy(w.c.writeBuf[w.pos:], p[:n]) - w.pos += n - p = p[n:] - } - return nn, nil -} - -func (w *messageWriter) WriteString(p string) (int, error) { - if w.err != nil { - return 0, w.err - } - - nn := len(p) - for len(p) > 0 { - n, err := w.ncopy(len(p)) - if err != nil { - return 0, err - } - copy(w.c.writeBuf[w.pos:], p[:n]) - w.pos += n - p = p[n:] - } - return nn, nil -} - -func (w *messageWriter) ReadFrom(r io.Reader) (nn int64, err error) { - if w.err != nil { - return 0, w.err - } - for { - if w.pos == len(w.c.writeBuf) { - err = w.flushFrame(false, nil) - if err != nil { - break - } - } - var n int - n, err = r.Read(w.c.writeBuf[w.pos:]) - w.pos += n - nn += int64(n) - if err != nil { - if err == io.EOF { - err = nil - } - break - } - } - return nn, err -} - -func (w *messageWriter) Close() error { - if w.err != nil { - return w.err - } - if err := w.flushFrame(true, nil); err != nil { - return err - } - w.err = errWriteClosed - return nil -} - -// WritePreparedMessage writes prepared message into connection. -func (c *Conn) WritePreparedMessage(pm *PreparedMessage) error { - frameType, frameData, err := pm.frame(prepareKey{ - isServer: c.isServer, - compress: c.newCompressionWriter != nil && c.enableWriteCompression && isData(pm.messageType), - compressionLevel: c.compressionLevel, - }) - if err != nil { - return err - } - if c.isWriting { - panic("concurrent write to websocket connection") - } - c.isWriting = true - err = c.write(frameType, c.writeDeadline, frameData, nil) - if !c.isWriting { - panic("concurrent write to websocket connection") - } - c.isWriting = false - return err -} - -// WriteMessage is a helper method for getting a writer using NextWriter, -// writing the message and closing the writer. -func (c *Conn) WriteMessage(messageType int, data []byte) error { - - if c.isServer && (c.newCompressionWriter == nil || !c.enableWriteCompression) { - // Fast path with no allocations and single frame. - - if err := c.prepWrite(messageType); err != nil { - return err - } - mw := messageWriter{c: c, frameType: messageType, pos: maxFrameHeaderSize} - n := copy(c.writeBuf[mw.pos:], data) - mw.pos += n - data = data[n:] - return mw.flushFrame(true, data) - } - - w, err := c.NextWriter(messageType) - if err != nil { - return err - } - if _, err = w.Write(data); err != nil { - return err - } - return w.Close() -} - -// SetWriteDeadline sets the write deadline on the underlying network -// connection. After a write has timed out, the websocket state is corrupt and -// all future writes will return an error. A zero value for t means writes will -// not time out. -func (c *Conn) SetWriteDeadline(t time.Time) error { - c.writeDeadline = t - return nil -} - -// Read methods - -func (c *Conn) advanceFrame() (int, error) { - - // 1. Skip remainder of previous frame. - - if c.readRemaining > 0 { - if _, err := io.CopyN(ioutil.Discard, c.br, c.readRemaining); err != nil { - return noFrame, err - } - } - - // 2. Read and parse first two bytes of frame header. - - p, err := c.read(2) - if err != nil { - return noFrame, err - } - - final := p[0]&finalBit != 0 - frameType := int(p[0] & 0xf) - mask := p[1]&maskBit != 0 - c.readRemaining = int64(p[1] & 0x7f) - - c.readDecompress = false - if c.newDecompressionReader != nil && (p[0]&rsv1Bit) != 0 { - c.readDecompress = true - p[0] &^= rsv1Bit - } - - if rsv := p[0] & (rsv1Bit | rsv2Bit | rsv3Bit); rsv != 0 { - return noFrame, c.handleProtocolError("unexpected reserved bits 0x" + strconv.FormatInt(int64(rsv), 16)) - } - - switch frameType { - case CloseMessage, PingMessage, PongMessage: - if c.readRemaining > maxControlFramePayloadSize { - return noFrame, c.handleProtocolError("control frame length > 125") - } - if !final { - return noFrame, c.handleProtocolError("control frame not final") - } - case TextMessage, BinaryMessage: - if !c.readFinal { - return noFrame, c.handleProtocolError("message start before final message frame") - } - c.readFinal = final - case continuationFrame: - if c.readFinal { - return noFrame, c.handleProtocolError("continuation after final message frame") - } - c.readFinal = final - default: - return noFrame, c.handleProtocolError("unknown opcode " + strconv.Itoa(frameType)) - } - - // 3. Read and parse frame length. - - switch c.readRemaining { - case 126: - p, err := c.read(2) - if err != nil { - return noFrame, err - } - c.readRemaining = int64(binary.BigEndian.Uint16(p)) - case 127: - p, err := c.read(8) - if err != nil { - return noFrame, err - } - c.readRemaining = int64(binary.BigEndian.Uint64(p)) - } - - // 4. Handle frame masking. - - if mask != c.isServer { - return noFrame, c.handleProtocolError("incorrect mask flag") - } - - if mask { - c.readMaskPos = 0 - p, err := c.read(len(c.readMaskKey)) - if err != nil { - return noFrame, err - } - copy(c.readMaskKey[:], p) - } - - // 5. For text and binary messages, enforce read limit and return. - - if frameType == continuationFrame || frameType == TextMessage || frameType == BinaryMessage { - - c.readLength += c.readRemaining - if c.readLimit > 0 && c.readLength > c.readLimit { - c.WriteControl(CloseMessage, FormatCloseMessage(CloseMessageTooBig, ""), time.Now().Add(writeWait)) - return noFrame, ErrReadLimit - } - - return frameType, nil - } - - // 6. Read control frame payload. - - var payload []byte - if c.readRemaining > 0 { - payload, err = c.read(int(c.readRemaining)) - c.readRemaining = 0 - if err != nil { - return noFrame, err - } - if c.isServer { - maskBytes(c.readMaskKey, 0, payload) - } - } - - // 7. Process control frame payload. - - switch frameType { - case PongMessage: - if err := c.handlePong(string(payload)); err != nil { - return noFrame, err - } - case PingMessage: - if err := c.handlePing(string(payload)); err != nil { - return noFrame, err - } - case CloseMessage: - closeCode := CloseNoStatusReceived - closeText := "" - if len(payload) >= 2 { - closeCode = int(binary.BigEndian.Uint16(payload)) - if !isValidReceivedCloseCode(closeCode) { - return noFrame, c.handleProtocolError("invalid close code") - } - closeText = string(payload[2:]) - if !utf8.ValidString(closeText) { - return noFrame, c.handleProtocolError("invalid utf8 payload in close frame") - } - } - if err := c.handleClose(closeCode, closeText); err != nil { - return noFrame, err - } - return noFrame, &CloseError{Code: closeCode, Text: closeText} - } - - return frameType, nil -} - -func (c *Conn) handleProtocolError(message string) error { - c.WriteControl(CloseMessage, FormatCloseMessage(CloseProtocolError, message), time.Now().Add(writeWait)) - return errors.New("websocket: " + message) -} - -// NextReader returns the next data message received from the peer. The -// returned messageType is either TextMessage or BinaryMessage. -// -// There can be at most one open reader on a connection. NextReader discards -// the previous message if the application has not already consumed it. -// -// Applications must break out of the application's read loop when this method -// returns a non-nil error value. Errors returned from this method are -// permanent. Once this method returns a non-nil error, all subsequent calls to -// this method return the same error. -func (c *Conn) NextReader() (messageType int, r io.Reader, err error) { - // Close previous reader, only relevant for decompression. - if c.reader != nil { - c.reader.Close() - c.reader = nil - } - - c.messageReader = nil - c.readLength = 0 - - for c.readErr == nil { - frameType, err := c.advanceFrame() - if err != nil { - c.readErr = hideTempErr(err) - break - } - if frameType == TextMessage || frameType == BinaryMessage { - c.messageReader = &messageReader{c} - c.reader = c.messageReader - if c.readDecompress { - c.reader = c.newDecompressionReader(c.reader) - } - return frameType, c.reader, nil - } - } - - // Applications that do handle the error returned from this method spin in - // tight loop on connection failure. To help application developers detect - // this error, panic on repeated reads to the failed connection. - c.readErrCount++ - if c.readErrCount >= 1000 { - panic("repeated read on failed websocket connection") - } - - return noFrame, nil, c.readErr -} - -type messageReader struct{ c *Conn } - -func (r *messageReader) Read(b []byte) (int, error) { - c := r.c - if c.messageReader != r { - return 0, io.EOF - } - - for c.readErr == nil { - - if c.readRemaining > 0 { - if int64(len(b)) > c.readRemaining { - b = b[:c.readRemaining] - } - n, err := c.br.Read(b) - c.readErr = hideTempErr(err) - if c.isServer { - c.readMaskPos = maskBytes(c.readMaskKey, c.readMaskPos, b[:n]) - } - c.readRemaining -= int64(n) - if c.readRemaining > 0 && c.readErr == io.EOF { - c.readErr = errUnexpectedEOF - } - return n, c.readErr - } - - if c.readFinal { - c.messageReader = nil - return 0, io.EOF - } - - frameType, err := c.advanceFrame() - switch { - case err != nil: - c.readErr = hideTempErr(err) - case frameType == TextMessage || frameType == BinaryMessage: - c.readErr = errors.New("websocket: internal error, unexpected text or binary in Reader") - } - } - - err := c.readErr - if err == io.EOF && c.messageReader == r { - err = errUnexpectedEOF - } - return 0, err -} - -func (r *messageReader) Close() error { - return nil -} - -// ReadMessage is a helper method for getting a reader using NextReader and -// reading from that reader to a buffer. -func (c *Conn) ReadMessage() (messageType int, p []byte, err error) { - var r io.Reader - messageType, r, err = c.NextReader() - if err != nil { - return messageType, nil, err - } - p, err = ioutil.ReadAll(r) - return messageType, p, err -} - -// SetReadDeadline sets the read deadline on the underlying network connection. -// After a read has timed out, the websocket connection state is corrupt and -// all future reads will return an error. A zero value for t means reads will -// not time out. -func (c *Conn) SetReadDeadline(t time.Time) error { - return c.conn.SetReadDeadline(t) -} - -// SetReadLimit sets the maximum size for a message read from the peer. If a -// message exceeds the limit, the connection sends a close frame to the peer -// and returns ErrReadLimit to the application. -func (c *Conn) SetReadLimit(limit int64) { - c.readLimit = limit -} - -// CloseHandler returns the current close handler -func (c *Conn) CloseHandler() func(code int, text string) error { - return c.handleClose -} - -// SetCloseHandler sets the handler for close messages received from the peer. -// The code argument to h is the received close code or CloseNoStatusReceived -// if the close message is empty. The default close handler sends a close frame -// back to the peer. -// -// The application must read the connection to process close messages as -// described in the section on Control Frames above. -// -// The connection read methods return a CloseError when a close frame is -// received. Most applications should handle close messages as part of their -// normal error handling. Applications should only set a close handler when the -// application must perform some action before sending a close frame back to -// the peer. -func (c *Conn) SetCloseHandler(h func(code int, text string) error) { - if h == nil { - h = func(code int, text string) error { - message := []byte{} - if code != CloseNoStatusReceived { - message = FormatCloseMessage(code, "") - } - c.WriteControl(CloseMessage, message, time.Now().Add(writeWait)) - return nil - } - } - c.handleClose = h -} - -// PingHandler returns the current ping handler -func (c *Conn) PingHandler() func(appData string) error { - return c.handlePing -} - -// SetPingHandler sets the handler for ping messages received from the peer. -// The appData argument to h is the PING frame application data. The default -// ping handler sends a pong to the peer. -// -// The application must read the connection to process ping messages as -// described in the section on Control Frames above. -func (c *Conn) SetPingHandler(h func(appData string) error) { - if h == nil { - h = func(message string) error { - err := c.WriteControl(PongMessage, []byte(message), time.Now().Add(writeWait)) - if err == ErrCloseSent { - return nil - } else if e, ok := err.(net.Error); ok && e.Temporary() { - return nil - } - return err - } - } - c.handlePing = h -} - -// PongHandler returns the current pong handler -func (c *Conn) PongHandler() func(appData string) error { - return c.handlePong -} - -// SetPongHandler sets the handler for pong messages received from the peer. -// The appData argument to h is the PONG frame application data. The default -// pong handler does nothing. -// -// The application must read the connection to process ping messages as -// described in the section on Control Frames above. -func (c *Conn) SetPongHandler(h func(appData string) error) { - if h == nil { - h = func(string) error { return nil } - } - c.handlePong = h -} - -// UnderlyingConn returns the internal net.Conn. This can be used to further -// modifications to connection specific flags. -func (c *Conn) UnderlyingConn() net.Conn { - return c.conn -} - -// EnableWriteCompression enables and disables write compression of -// subsequent text and binary messages. This function is a noop if -// compression was not negotiated with the peer. -func (c *Conn) EnableWriteCompression(enable bool) { - c.enableWriteCompression = enable -} - -// SetCompressionLevel sets the flate compression level for subsequent text and -// binary messages. This function is a noop if compression was not negotiated -// with the peer. See the compress/flate package for a description of -// compression levels. -func (c *Conn) SetCompressionLevel(level int) error { - if !isValidCompressionLevel(level) { - return errors.New("websocket: invalid compression level") - } - c.compressionLevel = level - return nil -} - -// FormatCloseMessage formats closeCode and text as a WebSocket close message. -func FormatCloseMessage(closeCode int, text string) []byte { - buf := make([]byte, 2+len(text)) - binary.BigEndian.PutUint16(buf, uint16(closeCode)) - copy(buf[2:], text) - return buf -} diff --git a/vendor/github.com/gorilla/websocket/conn_read.go b/vendor/github.com/gorilla/websocket/conn_read.go deleted file mode 100644 index 1ea15059..00000000 --- a/vendor/github.com/gorilla/websocket/conn_read.go +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2016 The Gorilla WebSocket Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build go1.5 - -package websocket - -import "io" - -func (c *Conn) read(n int) ([]byte, error) { - p, err := c.br.Peek(n) - if err == io.EOF { - err = errUnexpectedEOF - } - c.br.Discard(len(p)) - return p, err -} diff --git a/vendor/github.com/gorilla/websocket/conn_read_legacy.go b/vendor/github.com/gorilla/websocket/conn_read_legacy.go deleted file mode 100644 index 018541cf..00000000 --- a/vendor/github.com/gorilla/websocket/conn_read_legacy.go +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2016 The Gorilla WebSocket Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build !go1.5 - -package websocket - -import "io" - -func (c *Conn) read(n int) ([]byte, error) { - p, err := c.br.Peek(n) - if err == io.EOF { - err = errUnexpectedEOF - } - if len(p) > 0 { - // advance over the bytes just read - io.ReadFull(c.br, p) - } - return p, err -} diff --git a/vendor/github.com/gorilla/websocket/doc.go b/vendor/github.com/gorilla/websocket/doc.go deleted file mode 100644 index e291a952..00000000 --- a/vendor/github.com/gorilla/websocket/doc.go +++ /dev/null @@ -1,180 +0,0 @@ -// Copyright 2013 The Gorilla WebSocket Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package websocket implements the WebSocket protocol defined in RFC 6455. -// -// Overview -// -// The Conn type represents a WebSocket connection. A server application uses -// the Upgrade function from an Upgrader object with a HTTP request handler -// to get a pointer to a Conn: -// -// var upgrader = websocket.Upgrader{ -// ReadBufferSize: 1024, -// WriteBufferSize: 1024, -// } -// -// func handler(w http.ResponseWriter, r *http.Request) { -// conn, err := upgrader.Upgrade(w, r, nil) -// if err != nil { -// log.Println(err) -// return -// } -// ... Use conn to send and receive messages. -// } -// -// Call the connection's WriteMessage and ReadMessage methods to send and -// receive messages as a slice of bytes. This snippet of code shows how to echo -// messages using these methods: -// -// for { -// messageType, p, err := conn.ReadMessage() -// if err != nil { -// return -// } -// if err = conn.WriteMessage(messageType, p); err != nil { -// return err -// } -// } -// -// In above snippet of code, p is a []byte and messageType is an int with value -// websocket.BinaryMessage or websocket.TextMessage. -// -// An application can also send and receive messages using the io.WriteCloser -// and io.Reader interfaces. To send a message, call the connection NextWriter -// method to get an io.WriteCloser, write the message to the writer and close -// the writer when done. To receive a message, call the connection NextReader -// method to get an io.Reader and read until io.EOF is returned. This snippet -// shows how to echo messages using the NextWriter and NextReader methods: -// -// for { -// messageType, r, err := conn.NextReader() -// if err != nil { -// return -// } -// w, err := conn.NextWriter(messageType) -// if err != nil { -// return err -// } -// if _, err := io.Copy(w, r); err != nil { -// return err -// } -// if err := w.Close(); err != nil { -// return err -// } -// } -// -// Data Messages -// -// The WebSocket protocol distinguishes between text and binary data messages. -// Text messages are interpreted as UTF-8 encoded text. The interpretation of -// binary messages is left to the application. -// -// This package uses the TextMessage and BinaryMessage integer constants to -// identify the two data message types. The ReadMessage and NextReader methods -// return the type of the received message. The messageType argument to the -// WriteMessage and NextWriter methods specifies the type of a sent message. -// -// It is the application's responsibility to ensure that text messages are -// valid UTF-8 encoded text. -// -// Control Messages -// -// The WebSocket protocol defines three types of control messages: close, ping -// and pong. Call the connection WriteControl, WriteMessage or NextWriter -// methods to send a control message to the peer. -// -// Connections handle received close messages by sending a close message to the -// peer and returning a *CloseError from the the NextReader, ReadMessage or the -// message Read method. -// -// Connections handle received ping and pong messages by invoking callback -// functions set with SetPingHandler and SetPongHandler methods. The callback -// functions are called from the NextReader, ReadMessage and the message Read -// methods. -// -// The default ping handler sends a pong to the peer. The application's reading -// goroutine can block for a short time while the handler writes the pong data -// to the connection. -// -// The application must read the connection to process ping, pong and close -// messages sent from the peer. If the application is not otherwise interested -// in messages from the peer, then the application should start a goroutine to -// read and discard messages from the peer. A simple example is: -// -// func readLoop(c *websocket.Conn) { -// for { -// if _, _, err := c.NextReader(); err != nil { -// c.Close() -// break -// } -// } -// } -// -// Concurrency -// -// Connections support one concurrent reader and one concurrent writer. -// -// Applications are responsible for ensuring that no more than one goroutine -// calls the write methods (NextWriter, SetWriteDeadline, WriteMessage, -// WriteJSON, EnableWriteCompression, SetCompressionLevel) concurrently and -// that no more than one goroutine calls the read methods (NextReader, -// SetReadDeadline, ReadMessage, ReadJSON, SetPongHandler, SetPingHandler) -// concurrently. -// -// The Close and WriteControl methods can be called concurrently with all other -// methods. -// -// Origin Considerations -// -// Web browsers allow Javascript applications to open a WebSocket connection to -// any host. It's up to the server to enforce an origin policy using the Origin -// request header sent by the browser. -// -// The Upgrader calls the function specified in the CheckOrigin field to check -// the origin. If the CheckOrigin function returns false, then the Upgrade -// method fails the WebSocket handshake with HTTP status 403. -// -// If the CheckOrigin field is nil, then the Upgrader uses a safe default: fail -// the handshake if the Origin request header is present and not equal to the -// Host request header. -// -// An application can allow connections from any origin by specifying a -// function that always returns true: -// -// var upgrader = websocket.Upgrader{ -// CheckOrigin: func(r *http.Request) bool { return true }, -// } -// -// The deprecated Upgrade function does not enforce an origin policy. It's the -// application's responsibility to check the Origin header before calling -// Upgrade. -// -// Compression EXPERIMENTAL -// -// Per message compression extensions (RFC 7692) are experimentally supported -// by this package in a limited capacity. Setting the EnableCompression option -// to true in Dialer or Upgrader will attempt to negotiate per message deflate -// support. -// -// var upgrader = websocket.Upgrader{ -// EnableCompression: true, -// } -// -// If compression was successfully negotiated with the connection's peer, any -// message received in compressed form will be automatically decompressed. -// All Read methods will return uncompressed bytes. -// -// Per message compression of messages written to a connection can be enabled -// or disabled by calling the corresponding Conn method: -// -// conn.EnableWriteCompression(false) -// -// Currently this package does not support compression with "context takeover". -// This means that messages must be compressed and decompressed in isolation, -// without retaining sliding window or dictionary state across messages. For -// more details refer to RFC 7692. -// -// Use of compression is experimental and may result in decreased performance. -package websocket diff --git a/vendor/github.com/gorilla/websocket/json.go b/vendor/github.com/gorilla/websocket/json.go deleted file mode 100644 index 4f0e3687..00000000 --- a/vendor/github.com/gorilla/websocket/json.go +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright 2013 The Gorilla WebSocket Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package websocket - -import ( - "encoding/json" - "io" -) - -// WriteJSON is deprecated, use c.WriteJSON instead. -func WriteJSON(c *Conn, v interface{}) error { - return c.WriteJSON(v) -} - -// WriteJSON writes the JSON encoding of v to the connection. -// -// See the documentation for encoding/json Marshal for details about the -// conversion of Go values to JSON. -func (c *Conn) WriteJSON(v interface{}) error { - w, err := c.NextWriter(TextMessage) - if err != nil { - return err - } - err1 := json.NewEncoder(w).Encode(v) - err2 := w.Close() - if err1 != nil { - return err1 - } - return err2 -} - -// ReadJSON is deprecated, use c.ReadJSON instead. -func ReadJSON(c *Conn, v interface{}) error { - return c.ReadJSON(v) -} - -// ReadJSON reads the next JSON-encoded message from the connection and stores -// it in the value pointed to by v. -// -// See the documentation for the encoding/json Unmarshal function for details -// about the conversion of JSON to a Go value. -func (c *Conn) ReadJSON(v interface{}) error { - _, r, err := c.NextReader() - if err != nil { - return err - } - err = json.NewDecoder(r).Decode(v) - if err == io.EOF { - // One value is expected in the message. - err = io.ErrUnexpectedEOF - } - return err -} diff --git a/vendor/github.com/gorilla/websocket/mask.go b/vendor/github.com/gorilla/websocket/mask.go deleted file mode 100644 index 6a88bbc7..00000000 --- a/vendor/github.com/gorilla/websocket/mask.go +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright 2016 The Gorilla WebSocket Authors. All rights reserved. Use of -// this source code is governed by a BSD-style license that can be found in the -// LICENSE file. - -// +build !appengine - -package websocket - -import "unsafe" - -const wordSize = int(unsafe.Sizeof(uintptr(0))) - -func maskBytes(key [4]byte, pos int, b []byte) int { - - // Mask one byte at a time for small buffers. - if len(b) < 2*wordSize { - for i := range b { - b[i] ^= key[pos&3] - pos++ - } - return pos & 3 - } - - // Mask one byte at a time to word boundary. - if n := int(uintptr(unsafe.Pointer(&b[0]))) % wordSize; n != 0 { - n = wordSize - n - for i := range b[:n] { - b[i] ^= key[pos&3] - pos++ - } - b = b[n:] - } - - // Create aligned word size key. - var k [wordSize]byte - for i := range k { - k[i] = key[(pos+i)&3] - } - kw := *(*uintptr)(unsafe.Pointer(&k)) - - // Mask one word at a time. - n := (len(b) / wordSize) * wordSize - for i := 0; i < n; i += wordSize { - *(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&b[0])) + uintptr(i))) ^= kw - } - - // Mask one byte at a time for remaining bytes. - b = b[n:] - for i := range b { - b[i] ^= key[pos&3] - pos++ - } - - return pos & 3 -} diff --git a/vendor/github.com/gorilla/websocket/mask_safe.go b/vendor/github.com/gorilla/websocket/mask_safe.go deleted file mode 100644 index 2aac060e..00000000 --- a/vendor/github.com/gorilla/websocket/mask_safe.go +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2016 The Gorilla WebSocket Authors. All rights reserved. Use of -// this source code is governed by a BSD-style license that can be found in the -// LICENSE file. - -// +build appengine - -package websocket - -func maskBytes(key [4]byte, pos int, b []byte) int { - for i := range b { - b[i] ^= key[pos&3] - pos++ - } - return pos & 3 -} diff --git a/vendor/github.com/gorilla/websocket/prepared.go b/vendor/github.com/gorilla/websocket/prepared.go deleted file mode 100644 index 1efffbd1..00000000 --- a/vendor/github.com/gorilla/websocket/prepared.go +++ /dev/null @@ -1,103 +0,0 @@ -// Copyright 2017 The Gorilla WebSocket Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package websocket - -import ( - "bytes" - "net" - "sync" - "time" -) - -// PreparedMessage caches on the wire representations of a message payload. -// Use PreparedMessage to efficiently send a message payload to multiple -// connections. PreparedMessage is especially useful when compression is used -// because the CPU and memory expensive compression operation can be executed -// once for a given set of compression options. -type PreparedMessage struct { - messageType int - data []byte - err error - mu sync.Mutex - frames map[prepareKey]*preparedFrame -} - -// prepareKey defines a unique set of options to cache prepared frames in PreparedMessage. -type prepareKey struct { - isServer bool - compress bool - compressionLevel int -} - -// preparedFrame contains data in wire representation. -type preparedFrame struct { - once sync.Once - data []byte -} - -// NewPreparedMessage returns an initialized PreparedMessage. You can then send -// it to connection using WritePreparedMessage method. Valid wire -// representation will be calculated lazily only once for a set of current -// connection options. -func NewPreparedMessage(messageType int, data []byte) (*PreparedMessage, error) { - pm := &PreparedMessage{ - messageType: messageType, - frames: make(map[prepareKey]*preparedFrame), - data: data, - } - - // Prepare a plain server frame. - _, frameData, err := pm.frame(prepareKey{isServer: true, compress: false}) - if err != nil { - return nil, err - } - - // To protect against caller modifying the data argument, remember the data - // copied to the plain server frame. - pm.data = frameData[len(frameData)-len(data):] - return pm, nil -} - -func (pm *PreparedMessage) frame(key prepareKey) (int, []byte, error) { - pm.mu.Lock() - frame, ok := pm.frames[key] - if !ok { - frame = &preparedFrame{} - pm.frames[key] = frame - } - pm.mu.Unlock() - - var err error - frame.once.Do(func() { - // Prepare a frame using a 'fake' connection. - // TODO: Refactor code in conn.go to allow more direct construction of - // the frame. - mu := make(chan bool, 1) - mu <- true - var nc prepareConn - c := &Conn{ - conn: &nc, - mu: mu, - isServer: key.isServer, - compressionLevel: key.compressionLevel, - enableWriteCompression: true, - writeBuf: make([]byte, defaultWriteBufferSize+maxFrameHeaderSize), - } - if key.compress { - c.newCompressionWriter = compressNoContextTakeover - } - err = c.WriteMessage(pm.messageType, pm.data) - frame.data = nc.buf.Bytes() - }) - return pm.messageType, frame.data, err -} - -type prepareConn struct { - buf bytes.Buffer - net.Conn -} - -func (pc *prepareConn) Write(p []byte) (int, error) { return pc.buf.Write(p) } -func (pc *prepareConn) SetWriteDeadline(t time.Time) error { return nil } diff --git a/vendor/github.com/gorilla/websocket/server.go b/vendor/github.com/gorilla/websocket/server.go deleted file mode 100644 index 3495e0f1..00000000 --- a/vendor/github.com/gorilla/websocket/server.go +++ /dev/null @@ -1,291 +0,0 @@ -// Copyright 2013 The Gorilla WebSocket Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package websocket - -import ( - "bufio" - "errors" - "net" - "net/http" - "net/url" - "strings" - "time" -) - -// HandshakeError describes an error with the handshake from the peer. -type HandshakeError struct { - message string -} - -func (e HandshakeError) Error() string { return e.message } - -// Upgrader specifies parameters for upgrading an HTTP connection to a -// WebSocket connection. -type Upgrader struct { - // HandshakeTimeout specifies the duration for the handshake to complete. - HandshakeTimeout time.Duration - - // ReadBufferSize and WriteBufferSize specify I/O buffer sizes. If a buffer - // size is zero, then buffers allocated by the HTTP server are used. The - // I/O buffer sizes do not limit the size of the messages that can be sent - // or received. - ReadBufferSize, WriteBufferSize int - - // Subprotocols specifies the server's supported protocols in order of - // preference. If this field is set, then the Upgrade method negotiates a - // subprotocol by selecting the first match in this list with a protocol - // requested by the client. - Subprotocols []string - - // Error specifies the function for generating HTTP error responses. If Error - // is nil, then http.Error is used to generate the HTTP response. - Error func(w http.ResponseWriter, r *http.Request, status int, reason error) - - // CheckOrigin returns true if the request Origin header is acceptable. If - // CheckOrigin is nil, the host in the Origin header must not be set or - // must match the host of the request. - CheckOrigin func(r *http.Request) bool - - // EnableCompression specify if the server should attempt to negotiate per - // message compression (RFC 7692). Setting this value to true does not - // guarantee that compression will be supported. Currently only "no context - // takeover" modes are supported. - EnableCompression bool -} - -func (u *Upgrader) returnError(w http.ResponseWriter, r *http.Request, status int, reason string) (*Conn, error) { - err := HandshakeError{reason} - if u.Error != nil { - u.Error(w, r, status, err) - } else { - w.Header().Set("Sec-Websocket-Version", "13") - http.Error(w, http.StatusText(status), status) - } - return nil, err -} - -// checkSameOrigin returns true if the origin is not set or is equal to the request host. -func checkSameOrigin(r *http.Request) bool { - origin := r.Header["Origin"] - if len(origin) == 0 { - return true - } - u, err := url.Parse(origin[0]) - if err != nil { - return false - } - return u.Host == r.Host -} - -func (u *Upgrader) selectSubprotocol(r *http.Request, responseHeader http.Header) string { - if u.Subprotocols != nil { - clientProtocols := Subprotocols(r) - for _, serverProtocol := range u.Subprotocols { - for _, clientProtocol := range clientProtocols { - if clientProtocol == serverProtocol { - return clientProtocol - } - } - } - } else if responseHeader != nil { - return responseHeader.Get("Sec-Websocket-Protocol") - } - return "" -} - -// Upgrade upgrades the HTTP server connection to the WebSocket protocol. -// -// The responseHeader is included in the response to the client's upgrade -// request. Use the responseHeader to specify cookies (Set-Cookie) and the -// application negotiated subprotocol (Sec-Websocket-Protocol). -// -// If the upgrade fails, then Upgrade replies to the client with an HTTP error -// response. -func (u *Upgrader) Upgrade(w http.ResponseWriter, r *http.Request, responseHeader http.Header) (*Conn, error) { - if r.Method != "GET" { - return u.returnError(w, r, http.StatusMethodNotAllowed, "websocket: not a websocket handshake: request method is not GET") - } - - if _, ok := responseHeader["Sec-Websocket-Extensions"]; ok { - return u.returnError(w, r, http.StatusInternalServerError, "websocket: application specific 'Sec-Websocket-Extensions' headers are unsupported") - } - - if !tokenListContainsValue(r.Header, "Connection", "upgrade") { - return u.returnError(w, r, http.StatusBadRequest, "websocket: not a websocket handshake: 'upgrade' token not found in 'Connection' header") - } - - if !tokenListContainsValue(r.Header, "Upgrade", "websocket") { - return u.returnError(w, r, http.StatusBadRequest, "websocket: not a websocket handshake: 'websocket' token not found in 'Upgrade' header") - } - - if !tokenListContainsValue(r.Header, "Sec-Websocket-Version", "13") { - return u.returnError(w, r, http.StatusBadRequest, "websocket: unsupported version: 13 not found in 'Sec-Websocket-Version' header") - } - - checkOrigin := u.CheckOrigin - if checkOrigin == nil { - checkOrigin = checkSameOrigin - } - if !checkOrigin(r) { - return u.returnError(w, r, http.StatusForbidden, "websocket: 'Origin' header value not allowed") - } - - challengeKey := r.Header.Get("Sec-Websocket-Key") - if challengeKey == "" { - return u.returnError(w, r, http.StatusBadRequest, "websocket: not a websocket handshake: `Sec-Websocket-Key' header is missing or blank") - } - - subprotocol := u.selectSubprotocol(r, responseHeader) - - // Negotiate PMCE - var compress bool - if u.EnableCompression { - for _, ext := range parseExtensions(r.Header) { - if ext[""] != "permessage-deflate" { - continue - } - compress = true - break - } - } - - var ( - netConn net.Conn - err error - ) - - h, ok := w.(http.Hijacker) - if !ok { - return u.returnError(w, r, http.StatusInternalServerError, "websocket: response does not implement http.Hijacker") - } - var brw *bufio.ReadWriter - netConn, brw, err = h.Hijack() - if err != nil { - return u.returnError(w, r, http.StatusInternalServerError, err.Error()) - } - - if brw.Reader.Buffered() > 0 { - netConn.Close() - return nil, errors.New("websocket: client sent data before handshake is complete") - } - - c := newConnBRW(netConn, true, u.ReadBufferSize, u.WriteBufferSize, brw) - c.subprotocol = subprotocol - - if compress { - c.newCompressionWriter = compressNoContextTakeover - c.newDecompressionReader = decompressNoContextTakeover - } - - p := c.writeBuf[:0] - p = append(p, "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: "...) - p = append(p, computeAcceptKey(challengeKey)...) - p = append(p, "\r\n"...) - if c.subprotocol != "" { - p = append(p, "Sec-Websocket-Protocol: "...) - p = append(p, c.subprotocol...) - p = append(p, "\r\n"...) - } - if compress { - p = append(p, "Sec-Websocket-Extensions: permessage-deflate; server_no_context_takeover; client_no_context_takeover\r\n"...) - } - for k, vs := range responseHeader { - if k == "Sec-Websocket-Protocol" { - continue - } - for _, v := range vs { - p = append(p, k...) - p = append(p, ": "...) - for i := 0; i < len(v); i++ { - b := v[i] - if b <= 31 { - // prevent response splitting. - b = ' ' - } - p = append(p, b) - } - p = append(p, "\r\n"...) - } - } - p = append(p, "\r\n"...) - - // Clear deadlines set by HTTP server. - netConn.SetDeadline(time.Time{}) - - if u.HandshakeTimeout > 0 { - netConn.SetWriteDeadline(time.Now().Add(u.HandshakeTimeout)) - } - if _, err = netConn.Write(p); err != nil { - netConn.Close() - return nil, err - } - if u.HandshakeTimeout > 0 { - netConn.SetWriteDeadline(time.Time{}) - } - - return c, nil -} - -// Upgrade upgrades the HTTP server connection to the WebSocket protocol. -// -// This function is deprecated, use websocket.Upgrader instead. -// -// The application is responsible for checking the request origin before -// calling Upgrade. An example implementation of the same origin policy is: -// -// if req.Header.Get("Origin") != "http://"+req.Host { -// http.Error(w, "Origin not allowed", 403) -// return -// } -// -// If the endpoint supports subprotocols, then the application is responsible -// for negotiating the protocol used on the connection. Use the Subprotocols() -// function to get the subprotocols requested by the client. Use the -// Sec-Websocket-Protocol response header to specify the subprotocol selected -// by the application. -// -// The responseHeader is included in the response to the client's upgrade -// request. Use the responseHeader to specify cookies (Set-Cookie) and the -// negotiated subprotocol (Sec-Websocket-Protocol). -// -// The connection buffers IO to the underlying network connection. The -// readBufSize and writeBufSize parameters specify the size of the buffers to -// use. Messages can be larger than the buffers. -// -// If the request is not a valid WebSocket handshake, then Upgrade returns an -// error of type HandshakeError. Applications should handle this error by -// replying to the client with an HTTP error response. -func Upgrade(w http.ResponseWriter, r *http.Request, responseHeader http.Header, readBufSize, writeBufSize int) (*Conn, error) { - u := Upgrader{ReadBufferSize: readBufSize, WriteBufferSize: writeBufSize} - u.Error = func(w http.ResponseWriter, r *http.Request, status int, reason error) { - // don't return errors to maintain backwards compatibility - } - u.CheckOrigin = func(r *http.Request) bool { - // allow all connections by default - return true - } - return u.Upgrade(w, r, responseHeader) -} - -// Subprotocols returns the subprotocols requested by the client in the -// Sec-Websocket-Protocol header. -func Subprotocols(r *http.Request) []string { - h := strings.TrimSpace(r.Header.Get("Sec-Websocket-Protocol")) - if h == "" { - return nil - } - protocols := strings.Split(h, ",") - for i := range protocols { - protocols[i] = strings.TrimSpace(protocols[i]) - } - return protocols -} - -// IsWebSocketUpgrade returns true if the client requested upgrade to the -// WebSocket protocol. -func IsWebSocketUpgrade(r *http.Request) bool { - return tokenListContainsValue(r.Header, "Connection", "upgrade") && - tokenListContainsValue(r.Header, "Upgrade", "websocket") -} diff --git a/vendor/github.com/gorilla/websocket/util.go b/vendor/github.com/gorilla/websocket/util.go deleted file mode 100644 index 9a4908df..00000000 --- a/vendor/github.com/gorilla/websocket/util.go +++ /dev/null @@ -1,214 +0,0 @@ -// Copyright 2013 The Gorilla WebSocket Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package websocket - -import ( - "crypto/rand" - "crypto/sha1" - "encoding/base64" - "io" - "net/http" - "strings" -) - -var keyGUID = []byte("258EAFA5-E914-47DA-95CA-C5AB0DC85B11") - -func computeAcceptKey(challengeKey string) string { - h := sha1.New() - h.Write([]byte(challengeKey)) - h.Write(keyGUID) - return base64.StdEncoding.EncodeToString(h.Sum(nil)) -} - -func generateChallengeKey() (string, error) { - p := make([]byte, 16) - if _, err := io.ReadFull(rand.Reader, p); err != nil { - return "", err - } - return base64.StdEncoding.EncodeToString(p), nil -} - -// Octet types from RFC 2616. -var octetTypes [256]byte - -const ( - isTokenOctet = 1 << iota - isSpaceOctet -) - -func init() { - // From RFC 2616 - // - // OCTET = - // CHAR = - // CTL = - // CR = - // LF = - // SP = - // HT = - // <"> = - // CRLF = CR LF - // LWS = [CRLF] 1*( SP | HT ) - // TEXT = - // separators = "(" | ")" | "<" | ">" | "@" | "," | ";" | ":" | "\" | <"> - // | "/" | "[" | "]" | "?" | "=" | "{" | "}" | SP | HT - // token = 1* - // qdtext = > - - for c := 0; c < 256; c++ { - var t byte - isCtl := c <= 31 || c == 127 - isChar := 0 <= c && c <= 127 - isSeparator := strings.IndexRune(" \t\"(),/:;<=>?@[]\\{}", rune(c)) >= 0 - if strings.IndexRune(" \t\r\n", rune(c)) >= 0 { - t |= isSpaceOctet - } - if isChar && !isCtl && !isSeparator { - t |= isTokenOctet - } - octetTypes[c] = t - } -} - -func skipSpace(s string) (rest string) { - i := 0 - for ; i < len(s); i++ { - if octetTypes[s[i]]&isSpaceOctet == 0 { - break - } - } - return s[i:] -} - -func nextToken(s string) (token, rest string) { - i := 0 - for ; i < len(s); i++ { - if octetTypes[s[i]]&isTokenOctet == 0 { - break - } - } - return s[:i], s[i:] -} - -func nextTokenOrQuoted(s string) (value string, rest string) { - if !strings.HasPrefix(s, "\"") { - return nextToken(s) - } - s = s[1:] - for i := 0; i < len(s); i++ { - switch s[i] { - case '"': - return s[:i], s[i+1:] - case '\\': - p := make([]byte, len(s)-1) - j := copy(p, s[:i]) - escape := true - for i = i + 1; i < len(s); i++ { - b := s[i] - switch { - case escape: - escape = false - p[j] = b - j += 1 - case b == '\\': - escape = true - case b == '"': - return string(p[:j]), s[i+1:] - default: - p[j] = b - j += 1 - } - } - return "", "" - } - } - return "", "" -} - -// tokenListContainsValue returns true if the 1#token header with the given -// name contains token. -func tokenListContainsValue(header http.Header, name string, value string) bool { -headers: - for _, s := range header[name] { - for { - var t string - t, s = nextToken(skipSpace(s)) - if t == "" { - continue headers - } - s = skipSpace(s) - if s != "" && s[0] != ',' { - continue headers - } - if strings.EqualFold(t, value) { - return true - } - if s == "" { - continue headers - } - s = s[1:] - } - } - return false -} - -// parseExtensiosn parses WebSocket extensions from a header. -func parseExtensions(header http.Header) []map[string]string { - - // From RFC 6455: - // - // Sec-WebSocket-Extensions = extension-list - // extension-list = 1#extension - // extension = extension-token *( ";" extension-param ) - // extension-token = registered-token - // registered-token = token - // extension-param = token [ "=" (token | quoted-string) ] - // ;When using the quoted-string syntax variant, the value - // ;after quoted-string unescaping MUST conform to the - // ;'token' ABNF. - - var result []map[string]string -headers: - for _, s := range header["Sec-Websocket-Extensions"] { - for { - var t string - t, s = nextToken(skipSpace(s)) - if t == "" { - continue headers - } - ext := map[string]string{"": t} - for { - s = skipSpace(s) - if !strings.HasPrefix(s, ";") { - break - } - var k string - k, s = nextToken(skipSpace(s[1:])) - if k == "" { - continue headers - } - s = skipSpace(s) - var v string - if strings.HasPrefix(s, "=") { - v, s = nextTokenOrQuoted(skipSpace(s[1:])) - s = skipSpace(s) - } - if s != "" && s[0] != ',' && s[0] != ';' { - continue headers - } - ext[k] = v - } - if s != "" && s[0] != ',' { - continue headers - } - result = append(result, ext) - if s == "" { - continue headers - } - s = s[1:] - } - } - return result -} diff --git a/vendor/github.com/rancher/norman/clientbase/client.go b/vendor/github.com/rancher/norman/clientbase/client.go deleted file mode 100644 index 69805cab..00000000 --- a/vendor/github.com/rancher/norman/clientbase/client.go +++ /dev/null @@ -1,19 +0,0 @@ -package clientbase - -import ( - "net/http" - - "github.com/rancher/norman/types" -) - -type APIBaseClient struct { - Ops *APIOperations - Opts *ClientOpts - Types map[string]types.Schema -} - -type APIOperations struct { - Opts *ClientOpts - Types map[string]types.Schema - Client *http.Client -} diff --git a/vendor/github.com/rancher/norman/clientbase/common.go b/vendor/github.com/rancher/norman/clientbase/common.go deleted file mode 100644 index 73dcb7a0..00000000 --- a/vendor/github.com/rancher/norman/clientbase/common.go +++ /dev/null @@ -1,329 +0,0 @@ -package clientbase - -import ( - "bytes" - "crypto/tls" - "crypto/x509" - "encoding/base64" - "encoding/json" - "fmt" - "io/ioutil" - "net/http" - "net/url" - "os" - "time" - - "github.com/gorilla/websocket" - "github.com/pkg/errors" - "github.com/rancher/norman/types" -) - -const ( - SELF = "self" - COLLECTION = "collection" -) - -var ( - debug = false - dialer = &websocket.Dialer{} -) - -type ClientOpts struct { - URL string - AccessKey string - SecretKey string - TokenKey string - Timeout time.Duration - HTTPClient *http.Client - CACerts string - Insecure bool -} - -func (c *ClientOpts) getAuthHeader() string { - if c.TokenKey != "" { - return "Bearer " + c.TokenKey - } - if c.AccessKey != "" && c.SecretKey != "" { - s := c.AccessKey + ":" + c.SecretKey - return "Basic " + base64.StdEncoding.EncodeToString([]byte(s)) - } - return "" -} - -type APIError struct { - StatusCode int - URL string - Msg string - Status string - Body string -} - -func (e *APIError) Error() string { - return e.Msg -} - -func IsNotFound(err error) bool { - apiError, ok := err.(*APIError) - if !ok { - return false - } - - return apiError.StatusCode == http.StatusNotFound -} - -func newAPIError(resp *http.Response, url string) *APIError { - contents, err := ioutil.ReadAll(resp.Body) - var body string - if err != nil { - body = "Unreadable body." - } else { - body = string(contents) - } - - data := map[string]interface{}{} - if json.Unmarshal(contents, &data) == nil { - delete(data, "id") - delete(data, "links") - delete(data, "actions") - delete(data, "type") - delete(data, "status") - buf := &bytes.Buffer{} - for k, v := range data { - if v == nil { - continue - } - if buf.Len() > 0 { - buf.WriteString(", ") - } - fmt.Fprintf(buf, "%s=%v", k, v) - } - body = buf.String() - } - formattedMsg := fmt.Sprintf("Bad response statusCode [%d]. Status [%s]. Body: [%s] from [%s]", - resp.StatusCode, resp.Status, body, url) - return &APIError{ - URL: url, - Msg: formattedMsg, - StatusCode: resp.StatusCode, - Status: resp.Status, - Body: body, - } -} - -func contains(array []string, item string) bool { - for _, check := range array { - if check == item { - return true - } - } - - return false -} - -func appendFilters(urlString string, filters map[string]interface{}) (string, error) { - if len(filters) == 0 { - return urlString, nil - } - - u, err := url.Parse(urlString) - if err != nil { - return "", err - } - - q := u.Query() - for k, v := range filters { - if l, ok := v.([]string); ok { - for _, v := range l { - q.Add(k, v) - } - } else { - q.Add(k, fmt.Sprintf("%v", v)) - } - } - - u.RawQuery = q.Encode() - return u.String(), nil -} - -func NewAPIClient(opts *ClientOpts) (APIBaseClient, error) { - var err error - - result := APIBaseClient{ - Types: map[string]types.Schema{}, - } - - client := opts.HTTPClient - if client == nil { - client = &http.Client{} - } - - if opts.Timeout == 0 { - opts.Timeout = time.Second * 10 - } - - client.Timeout = opts.Timeout - - if opts.CACerts != "" { - roots := x509.NewCertPool() - ok := roots.AppendCertsFromPEM([]byte(opts.CACerts)) - if !ok { - return result, err - } - tr := &http.Transport{ - TLSClientConfig: &tls.Config{ - RootCAs: roots, - }, - } - client.Transport = tr - } - - if opts.Insecure { - tr := &http.Transport{ - TLSClientConfig: &tls.Config{ - InsecureSkipVerify: opts.Insecure, - }, - } - client.Transport = tr - } - - req, err := http.NewRequest("GET", opts.URL, nil) - if err != nil { - return result, err - } - - req.Header.Add("Authorization", opts.getAuthHeader()) - - resp, err := client.Do(req) - if err != nil { - return result, err - } - defer resp.Body.Close() - - if resp.StatusCode != 200 { - return result, newAPIError(resp, opts.URL) - } - - schemasURLs := resp.Header.Get("X-API-Schemas") - if len(schemasURLs) == 0 { - return result, errors.New("Failed to find schema at [" + opts.URL + "]") - } - - if schemasURLs != opts.URL { - req, err = http.NewRequest("GET", schemasURLs, nil) - req.Header.Add("Authorization", opts.getAuthHeader()) - if err != nil { - return result, err - } - - resp, err = client.Do(req) - if err != nil { - return result, err - } - - defer resp.Body.Close() - - if resp.StatusCode != 200 { - return result, newAPIError(resp, opts.URL) - } - } - - var schemas types.SchemaCollection - bytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - return result, err - } - - err = json.Unmarshal(bytes, &schemas) - if err != nil { - return result, err - } - - for _, schema := range schemas.Data { - result.Types[schema.ID] = schema - } - - result.Opts = opts - result.Ops = &APIOperations{ - Opts: opts, - Client: client, - Types: result.Types, - } - - return result, nil -} - -func NewListOpts() *types.ListOpts { - return &types.ListOpts{ - Filters: map[string]interface{}{}, - } -} - -func (a *APIBaseClient) Websocket(url string, headers map[string][]string) (*websocket.Conn, *http.Response, error) { - httpHeaders := http.Header{} - for k, v := range httpHeaders { - httpHeaders[k] = v - } - - if a.Opts != nil { - httpHeaders.Add("Authorization", a.Opts.getAuthHeader()) - } - - return dialer.Dial(url, http.Header(httpHeaders)) -} - -func (a *APIBaseClient) List(schemaType string, opts *types.ListOpts, respObject interface{}) error { - return a.Ops.DoList(schemaType, opts, respObject) -} - -func (a *APIBaseClient) Post(url string, createObj interface{}, respObject interface{}) error { - return a.Ops.DoModify("POST", url, createObj, respObject) -} - -func (a *APIBaseClient) GetLink(resource types.Resource, link string, respObject interface{}) error { - url := resource.Links[link] - if url == "" { - return fmt.Errorf("failed to find link: %s", link) - } - - return a.Ops.DoGet(url, &types.ListOpts{}, respObject) -} - -func (a *APIBaseClient) Create(schemaType string, createObj interface{}, respObject interface{}) error { - return a.Ops.DoCreate(schemaType, createObj, respObject) -} - -func (a *APIBaseClient) Update(schemaType string, existing *types.Resource, updates interface{}, respObject interface{}) error { - return a.Ops.DoUpdate(schemaType, existing, updates, respObject) -} - -func (a *APIBaseClient) ByID(schemaType string, id string, respObject interface{}) error { - return a.Ops.DoByID(schemaType, id, respObject) -} - -func (a *APIBaseClient) Delete(existing *types.Resource) error { - if existing == nil { - return nil - } - return a.Ops.DoResourceDelete(existing.Type, existing) -} - -func (a *APIBaseClient) Reload(existing *types.Resource, output interface{}) error { - selfURL, ok := existing.Links[SELF] - if !ok { - return fmt.Errorf("failed to find self URL of [%v]", existing) - } - - return a.Ops.DoGet(selfURL, NewListOpts(), output) -} - -func (a *APIBaseClient) Action(schemaType string, action string, - existing *types.Resource, inputObject, respObject interface{}) error { - return a.Ops.DoAction(schemaType, action, existing, inputObject, respObject) -} - -func init() { - debug = os.Getenv("RANCHER_CLIENT_DEBUG") == "true" - if debug { - fmt.Println("Rancher client debug on") - } -} diff --git a/vendor/github.com/rancher/norman/clientbase/ops.go b/vendor/github.com/rancher/norman/clientbase/ops.go deleted file mode 100644 index 0ea03eb7..00000000 --- a/vendor/github.com/rancher/norman/clientbase/ops.go +++ /dev/null @@ -1,298 +0,0 @@ -package clientbase - -import ( - "bytes" - "encoding/json" - "fmt" - "io" - "io/ioutil" - "net/http" - - "github.com/pkg/errors" - "github.com/rancher/norman/types" -) - -func (a *APIOperations) setupRequest(req *http.Request) { - req.Header.Add("Authorization", a.Opts.getAuthHeader()) -} - -func (a *APIOperations) DoDelete(url string) error { - req, err := http.NewRequest("DELETE", url, nil) - if err != nil { - return err - } - - a.setupRequest(req) - - resp, err := a.Client.Do(req) - if err != nil { - return err - } - defer resp.Body.Close() - - io.Copy(ioutil.Discard, resp.Body) - - if resp.StatusCode >= 300 { - return newAPIError(resp, url) - } - - return nil -} - -func (a *APIOperations) DoGet(url string, opts *types.ListOpts, respObject interface{}) error { - if opts == nil { - opts = NewListOpts() - } - url, err := appendFilters(url, opts.Filters) - if err != nil { - return err - } - - if debug { - fmt.Println("GET " + url) - } - - req, err := http.NewRequest("GET", url, nil) - if err != nil { - return err - } - - a.setupRequest(req) - - resp, err := a.Client.Do(req) - if err != nil { - return err - } - - defer resp.Body.Close() - - if resp.StatusCode != 200 { - return newAPIError(resp, url) - } - - byteContent, err := ioutil.ReadAll(resp.Body) - if err != nil { - return err - } - - if debug { - fmt.Println("Response <= " + string(byteContent)) - } - - if err := json.Unmarshal(byteContent, respObject); err != nil { - return errors.Wrap(err, fmt.Sprintf("Failed to parse: %s", byteContent)) - } - - return nil -} - -func (a *APIOperations) DoList(schemaType string, opts *types.ListOpts, respObject interface{}) error { - schema, ok := a.Types[schemaType] - if !ok { - return errors.New("Unknown schema type [" + schemaType + "]") - } - - if !contains(schema.CollectionMethods, "GET") { - return errors.New("Resource type [" + schemaType + "] is not listable") - } - - return a.DoGet(a.Opts.URL+"/"+schemaType, opts, respObject) -} - -func (a *APIOperations) DoNext(nextURL string, respObject interface{}) error { - return a.DoGet(nextURL, nil, respObject) -} - -func (a *APIOperations) DoModify(method string, url string, createObj interface{}, respObject interface{}) error { - bodyContent, err := json.Marshal(createObj) - if err != nil { - return err - } - - if debug { - fmt.Println(method + " " + url) - fmt.Println("Request => " + string(bodyContent)) - } - - req, err := http.NewRequest(method, url, bytes.NewBuffer(bodyContent)) - if err != nil { - return err - } - - a.setupRequest(req) - req.Header.Set("Content-Type", "application/json") - - resp, err := a.Client.Do(req) - if err != nil { - return err - } - - defer resp.Body.Close() - - if resp.StatusCode >= 300 { - return newAPIError(resp, url) - } - - byteContent, err := ioutil.ReadAll(resp.Body) - if err != nil { - return err - } - - if len(byteContent) > 0 { - if debug { - fmt.Println("Response <= " + string(byteContent)) - } - return json.Unmarshal(byteContent, respObject) - } - - return nil -} - -func (a *APIOperations) DoCreate(schemaType string, createObj interface{}, respObject interface{}) error { - if createObj == nil { - createObj = map[string]string{} - } - if respObject == nil { - respObject = &map[string]interface{}{} - } - schema, ok := a.Types[schemaType] - if !ok { - return errors.New("Unknown schema type [" + schemaType + "]") - } - - if !contains(schema.CollectionMethods, "POST") { - return errors.New("Resource type [" + schemaType + "] is not creatable") - } - - // using collection link to post doesn't help the resources under project or cluster, because they need a projectId or clusterId in the path - // for example, v3/projects/foo/apps, v3/cluster/bar/namespaces - return a.DoModify("POST", a.Opts.URL+"/"+schemaType, createObj, respObject) -} - -func (a *APIOperations) DoUpdate(schemaType string, existing *types.Resource, updates interface{}, respObject interface{}) error { - if existing == nil { - return errors.New("Existing object is nil") - } - - selfURL, ok := existing.Links[SELF] - if !ok { - return fmt.Errorf("failed to find self URL of [%v]", existing) - } - - if updates == nil { - updates = map[string]string{} - } - - if respObject == nil { - respObject = &map[string]interface{}{} - } - - schema, ok := a.Types[schemaType] - if !ok { - return errors.New("Unknown schema type [" + schemaType + "]") - } - - if !contains(schema.ResourceMethods, "PUT") { - return errors.New("Resource type [" + schemaType + "] is not updatable") - } - - return a.DoModify("PUT", selfURL, updates, respObject) -} - -func (a *APIOperations) DoByID(schemaType string, id string, respObject interface{}) error { - schema, ok := a.Types[schemaType] - if !ok { - return errors.New("Unknown schema type [" + schemaType + "]") - } - - if !contains(schema.ResourceMethods, "GET") { - return errors.New("Resource type [" + schemaType + "] can not be looked up by ID") - } - - collectionURL, ok := schema.Links[COLLECTION] - if !ok { - return errors.New("Failed to find collection URL for [" + schemaType + "]") - } - - return a.DoGet(collectionURL+"/"+id, nil, respObject) -} - -func (a *APIOperations) DoResourceDelete(schemaType string, existing *types.Resource) error { - schema, ok := a.Types[schemaType] - if !ok { - return errors.New("Unknown schema type [" + schemaType + "]") - } - - if !contains(schema.ResourceMethods, "DELETE") { - return errors.New("Resource type [" + schemaType + "] can not be deleted") - } - - selfURL, ok := existing.Links[SELF] - if !ok { - return fmt.Errorf("failed to find self URL of [%v]", existing) - } - - return a.DoDelete(selfURL) -} - -func (a *APIOperations) DoAction(schemaType string, action string, - existing *types.Resource, inputObject, respObject interface{}) error { - - if existing == nil { - return errors.New("Existing object is nil") - } - - actionURL, ok := existing.Actions[action] - if !ok { - return fmt.Errorf("action [%v] not available on [%v]", action, existing) - } - - _, ok = a.Types[schemaType] - if !ok { - return errors.New("Unknown schema type [" + schemaType + "]") - } - - var input io.Reader - - if inputObject != nil { - bodyContent, err := json.Marshal(inputObject) - if err != nil { - return err - } - if debug { - fmt.Println("Request => " + string(bodyContent)) - } - input = bytes.NewBuffer(bodyContent) - } - - req, err := http.NewRequest("POST", actionURL, input) - if err != nil { - return err - } - - a.setupRequest(req) - req.Header.Set("Content-Type", "application/json") - req.Header.Set("Content-Length", "0") - - resp, err := a.Client.Do(req) - if err != nil { - return err - } - - defer resp.Body.Close() - - if resp.StatusCode >= 300 { - return newAPIError(resp, actionURL) - } - - byteContent, err := ioutil.ReadAll(resp.Body) - if err != nil { - return err - } - - if debug { - fmt.Println("Response <= " + string(byteContent)) - } - - return json.Unmarshal(byteContent, respObject) -} diff --git a/vendor/github.com/rancher/norman/controller/generic_controller.go b/vendor/github.com/rancher/norman/controller/generic_controller.go index bc3cdfa9..37cead8e 100644 --- a/vendor/github.com/rancher/norman/controller/generic_controller.go +++ b/vendor/github.com/rancher/norman/controller/generic_controller.go @@ -9,7 +9,7 @@ import ( "github.com/juju/ratelimit" errors2 "github.com/pkg/errors" - "github.com/rancher/norman/clientbase" + "github.com/rancher/norman/objectclient" "github.com/rancher/norman/types" "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/api/errors" @@ -40,7 +40,7 @@ type GenericController interface { type Backend interface { List(opts metav1.ListOptions) (runtime.Object, error) Watch(opts metav1.ListOptions) (watch.Interface, error) - ObjectFactory() clientbase.ObjectFactory + ObjectFactory() objectclient.ObjectFactory } type handlerDef struct { diff --git a/vendor/github.com/rancher/norman/lifecycle/object.go b/vendor/github.com/rancher/norman/lifecycle/object.go index 725bd7d6..120f341f 100644 --- a/vendor/github.com/rancher/norman/lifecycle/object.go +++ b/vendor/github.com/rancher/norman/lifecycle/object.go @@ -4,7 +4,7 @@ import ( "fmt" "reflect" - "github.com/rancher/norman/clientbase" + "github.com/rancher/norman/objectclient" "github.com/rancher/norman/types/slice" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -27,10 +27,10 @@ type objectLifecycleAdapter struct { name string clusterScoped bool lifecycle ObjectLifecycle - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient } -func NewObjectLifecycleAdapter(name string, clusterScoped bool, lifecycle ObjectLifecycle, objectClient *clientbase.ObjectClient) func(key string, obj runtime.Object) error { +func NewObjectLifecycleAdapter(name string, clusterScoped bool, lifecycle ObjectLifecycle, objectClient *objectclient.ObjectClient) func(key string, obj runtime.Object) error { o := objectLifecycleAdapter{ name: name, clusterScoped: clusterScoped, diff --git a/vendor/github.com/rancher/norman/clientbase/object_client.go b/vendor/github.com/rancher/norman/objectclient/object_client.go similarity index 99% rename from vendor/github.com/rancher/norman/clientbase/object_client.go rename to vendor/github.com/rancher/norman/objectclient/object_client.go index 19102f2d..80a565d9 100644 --- a/vendor/github.com/rancher/norman/clientbase/object_client.go +++ b/vendor/github.com/rancher/norman/objectclient/object_client.go @@ -1,4 +1,4 @@ -package clientbase +package objectclient import ( "encoding/json" diff --git a/vendor/github.com/rancher/norman/types/reflection.go b/vendor/github.com/rancher/norman/types/reflection.go index 263566b0..dcb82592 100644 --- a/vendor/github.com/rancher/norman/types/reflection.go +++ b/vendor/github.com/rancher/norman/types/reflection.go @@ -2,24 +2,20 @@ package types import ( "fmt" + "net/http" "reflect" "strconv" "strings" - "net/http" - "github.com/rancher/norman/types/convert" "github.com/rancher/norman/types/definition" "github.com/rancher/norman/types/slice" "github.com/sirupsen/logrus" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) var ( namespacedType = reflect.TypeOf(Namespaced{}) resourceType = reflect.TypeOf(Resource{}) - typeType = reflect.TypeOf(metav1.TypeMeta{}) - metaType = reflect.TypeOf(metav1.ObjectMeta{}) blacklistNames = map[string]bool{ "links": true, "actions": true, @@ -194,6 +190,16 @@ func jsonName(f reflect.StructField) string { return strings.SplitN(f.Tag.Get("json"), ",", 2)[0] } +func k8sType(field reflect.StructField) bool { + return field.Type.Name() == "TypeMeta" && + strings.HasSuffix(field.Type.PkgPath(), "k8s.io/apimachinery/pkg/apis/meta/v1") +} + +func k8sObject(field reflect.StructField) bool { + return field.Type.Name() == "ObjectMeta" && + strings.HasSuffix(field.Type.PkgPath(), "k8s.io/apimachinery/pkg/apis/meta/v1") +} + func (s *Schemas) readFields(schema *Schema, t reflect.Type) error { if t == resourceType { schema.CollectionMethods = []string{"GET", "POST"} @@ -212,16 +218,15 @@ func (s *Schemas) readFields(schema *Schema, t reflect.Type) error { } jsonName := jsonName(field) - if jsonName == "-" { continue } - if field.Anonymous && jsonName == "" && field.Type == typeType { + if field.Anonymous && jsonName == "" && k8sType(field) { hasType = true } - if field.Anonymous && jsonName == "metadata" && field.Type == metaType { + if field.Anonymous && jsonName == "metadata" && k8sObject(field) { hasMeta = true } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go index 7c0f5bec..5b2f7608 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go @@ -281,6 +281,8 @@ type Process struct { Env []string `json:"env,omitempty"` // Process docker image Image string `json:"image,omitempty"` + //AuthConfig for image private registry + ImageRegistryAuthConfig string `json:"imageRegistryAuthConfig,omitempty"` // Process docker image VolumesFrom VolumesFrom []string `json:"volumesFrom,omitempty"` // Process docker container bind mounts diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_auth_config_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_auth_config_controller.go index bf5a93a8..ff00c36b 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_auth_config_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_auth_config_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -52,7 +52,7 @@ type AuthConfigController interface { } type AuthConfigInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*AuthConfig) (*AuthConfig, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*AuthConfig, error) Get(name string, opts metav1.GetOptions) (*AuthConfig, error) @@ -177,11 +177,11 @@ func (s *authConfigClient) Controller() AuthConfigController { type authConfigClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller AuthConfigController } -func (s *authConfigClient) ObjectClient() *clientbase.ObjectClient { +func (s *authConfigClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_catalog_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_catalog_controller.go index 80ed1c59..104e17a3 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_catalog_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_catalog_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -52,7 +52,7 @@ type CatalogController interface { } type CatalogInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*Catalog) (*Catalog, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*Catalog, error) Get(name string, opts metav1.GetOptions) (*Catalog, error) @@ -177,11 +177,11 @@ func (s *catalogClient) Controller() CatalogController { type catalogClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller CatalogController } -func (s *catalogClient) ObjectClient() *clientbase.ObjectClient { +func (s *catalogClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_alert_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_alert_controller.go index b81aa40e..18aad8b1 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_alert_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_alert_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type ClusterAlertController interface { } type ClusterAlertInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*ClusterAlert) (*ClusterAlert, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*ClusterAlert, error) Get(name string, opts metav1.GetOptions) (*ClusterAlert, error) @@ -178,11 +178,11 @@ func (s *clusterAlertClient) Controller() ClusterAlertController { type clusterAlertClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller ClusterAlertController } -func (s *clusterAlertClient) ObjectClient() *clientbase.ObjectClient { +func (s *clusterAlertClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_compose_config_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_compose_config_controller.go index 7ec062d3..3d333218 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_compose_config_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_compose_config_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type ClusterComposeConfigController interface { } type ClusterComposeConfigInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*ClusterComposeConfig) (*ClusterComposeConfig, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*ClusterComposeConfig, error) Get(name string, opts metav1.GetOptions) (*ClusterComposeConfig, error) @@ -178,11 +178,11 @@ func (s *clusterComposeConfigClient) Controller() ClusterComposeConfigController type clusterComposeConfigClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller ClusterComposeConfigController } -func (s *clusterComposeConfigClient) ObjectClient() *clientbase.ObjectClient { +func (s *clusterComposeConfigClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_controller.go index f675fbea..3f1c9c26 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -52,7 +52,7 @@ type ClusterController interface { } type ClusterInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*Cluster) (*Cluster, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*Cluster, error) Get(name string, opts metav1.GetOptions) (*Cluster, error) @@ -177,11 +177,11 @@ func (s *clusterClient) Controller() ClusterController { type clusterClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller ClusterController } -func (s *clusterClient) ObjectClient() *clientbase.ObjectClient { +func (s *clusterClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_event_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_event_controller.go index 9d6812dc..b029f1d1 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_event_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_event_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type ClusterEventController interface { } type ClusterEventInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*ClusterEvent) (*ClusterEvent, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*ClusterEvent, error) Get(name string, opts metav1.GetOptions) (*ClusterEvent, error) @@ -178,11 +178,11 @@ func (s *clusterEventClient) Controller() ClusterEventController { type clusterEventClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller ClusterEventController } -func (s *clusterEventClient) ObjectClient() *clientbase.ObjectClient { +func (s *clusterEventClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_logging_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_logging_controller.go index e5b6a115..19de7669 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_logging_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_logging_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type ClusterLoggingController interface { } type ClusterLoggingInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*ClusterLogging) (*ClusterLogging, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*ClusterLogging, error) Get(name string, opts metav1.GetOptions) (*ClusterLogging, error) @@ -178,11 +178,11 @@ func (s *clusterLoggingClient) Controller() ClusterLoggingController { type clusterLoggingClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller ClusterLoggingController } -func (s *clusterLoggingClient) ObjectClient() *clientbase.ObjectClient { +func (s *clusterLoggingClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_pipeline_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_pipeline_controller.go index c23dc70c..da4c0b85 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_pipeline_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_pipeline_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type ClusterPipelineController interface { } type ClusterPipelineInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*ClusterPipeline) (*ClusterPipeline, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*ClusterPipeline, error) Get(name string, opts metav1.GetOptions) (*ClusterPipeline, error) @@ -178,11 +178,11 @@ func (s *clusterPipelineClient) Controller() ClusterPipelineController { type clusterPipelineClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller ClusterPipelineController } -func (s *clusterPipelineClient) ObjectClient() *clientbase.ObjectClient { +func (s *clusterPipelineClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_controller.go index 58132301..cab297ad 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type ClusterRegistrationTokenController interface { } type ClusterRegistrationTokenInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*ClusterRegistrationToken) (*ClusterRegistrationToken, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*ClusterRegistrationToken, error) Get(name string, opts metav1.GetOptions) (*ClusterRegistrationToken, error) @@ -178,11 +178,11 @@ func (s *clusterRegistrationTokenClient) Controller() ClusterRegistrationTokenCo type clusterRegistrationTokenClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller ClusterRegistrationTokenController } -func (s *clusterRegistrationTokenClient) ObjectClient() *clientbase.ObjectClient { +func (s *clusterRegistrationTokenClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go index 7b874da8..101bb371 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type ClusterRoleTemplateBindingController interface { } type ClusterRoleTemplateBindingInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*ClusterRoleTemplateBinding) (*ClusterRoleTemplateBinding, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*ClusterRoleTemplateBinding, error) Get(name string, opts metav1.GetOptions) (*ClusterRoleTemplateBinding, error) @@ -178,11 +178,11 @@ func (s *clusterRoleTemplateBindingClient) Controller() ClusterRoleTemplateBindi type clusterRoleTemplateBindingClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller ClusterRoleTemplateBindingController } -func (s *clusterRoleTemplateBindingClient) ObjectClient() *clientbase.ObjectClient { +func (s *clusterRoleTemplateBindingClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_dynamic_schema_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_dynamic_schema_controller.go index 0830a9ec..6a5d7053 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_dynamic_schema_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_dynamic_schema_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -52,7 +52,7 @@ type DynamicSchemaController interface { } type DynamicSchemaInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*DynamicSchema) (*DynamicSchema, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*DynamicSchema, error) Get(name string, opts metav1.GetOptions) (*DynamicSchema, error) @@ -177,11 +177,11 @@ func (s *dynamicSchemaClient) Controller() DynamicSchemaController { type dynamicSchemaClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller DynamicSchemaController } -func (s *dynamicSchemaClient) ObjectClient() *clientbase.ObjectClient { +func (s *dynamicSchemaClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_compose_config_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_compose_config_controller.go index fe7600dc..5a50d28b 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_compose_config_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_compose_config_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -52,7 +52,7 @@ type GlobalComposeConfigController interface { } type GlobalComposeConfigInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*GlobalComposeConfig) (*GlobalComposeConfig, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*GlobalComposeConfig, error) Get(name string, opts metav1.GetOptions) (*GlobalComposeConfig, error) @@ -177,11 +177,11 @@ func (s *globalComposeConfigClient) Controller() GlobalComposeConfigController { type globalComposeConfigClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller GlobalComposeConfigController } -func (s *globalComposeConfigClient) ObjectClient() *clientbase.ObjectClient { +func (s *globalComposeConfigClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_role_binding_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_role_binding_controller.go index 8b58ee04..3bcb5079 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_role_binding_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_role_binding_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -52,7 +52,7 @@ type GlobalRoleBindingController interface { } type GlobalRoleBindingInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*GlobalRoleBinding) (*GlobalRoleBinding, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*GlobalRoleBinding, error) Get(name string, opts metav1.GetOptions) (*GlobalRoleBinding, error) @@ -177,11 +177,11 @@ func (s *globalRoleBindingClient) Controller() GlobalRoleBindingController { type globalRoleBindingClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller GlobalRoleBindingController } -func (s *globalRoleBindingClient) ObjectClient() *clientbase.ObjectClient { +func (s *globalRoleBindingClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_role_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_role_controller.go index 93b8f444..6b754ba5 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_role_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_role_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -52,7 +52,7 @@ type GlobalRoleController interface { } type GlobalRoleInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*GlobalRole) (*GlobalRole, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*GlobalRole, error) Get(name string, opts metav1.GetOptions) (*GlobalRole, error) @@ -177,11 +177,11 @@ func (s *globalRoleClient) Controller() GlobalRoleController { type globalRoleClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller GlobalRoleController } -func (s *globalRoleClient) ObjectClient() *clientbase.ObjectClient { +func (s *globalRoleClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_group_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_group_controller.go index e4d5f4e4..a09b8d6a 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_group_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_group_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -52,7 +52,7 @@ type GroupController interface { } type GroupInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*Group) (*Group, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*Group, error) Get(name string, opts metav1.GetOptions) (*Group, error) @@ -177,11 +177,11 @@ func (s *groupClient) Controller() GroupController { type groupClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller GroupController } -func (s *groupClient) ObjectClient() *clientbase.ObjectClient { +func (s *groupClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_group_member_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_group_member_controller.go index 1a616357..1edf0623 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_group_member_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_group_member_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -52,7 +52,7 @@ type GroupMemberController interface { } type GroupMemberInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*GroupMember) (*GroupMember, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*GroupMember, error) Get(name string, opts metav1.GetOptions) (*GroupMember, error) @@ -177,11 +177,11 @@ func (s *groupMemberClient) Controller() GroupMemberController { type groupMemberClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller GroupMemberController } -func (s *groupMemberClient) ObjectClient() *clientbase.ObjectClient { +func (s *groupMemberClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_k8s_client.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_k8s_client.go index 8f8b74c9..359fa60c 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_k8s_client.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_k8s_client.go @@ -4,8 +4,8 @@ import ( "context" "sync" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "github.com/rancher/norman/restwatch" "k8s.io/client-go/dynamic" "k8s.io/client-go/rest" @@ -184,7 +184,7 @@ type NodePoolsGetter interface { } func (c *Client) NodePools(namespace string) NodePoolInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &NodePoolResource, NodePoolGroupVersionKind, nodePoolFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &NodePoolResource, NodePoolGroupVersionKind, nodePoolFactory{}) return &nodePoolClient{ ns: namespace, client: c, @@ -197,7 +197,7 @@ type NodesGetter interface { } func (c *Client) Nodes(namespace string) NodeInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &NodeResource, NodeGroupVersionKind, nodeFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &NodeResource, NodeGroupVersionKind, nodeFactory{}) return &nodeClient{ ns: namespace, client: c, @@ -210,7 +210,7 @@ type NodeDriversGetter interface { } func (c *Client) NodeDrivers(namespace string) NodeDriverInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &NodeDriverResource, NodeDriverGroupVersionKind, nodeDriverFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &NodeDriverResource, NodeDriverGroupVersionKind, nodeDriverFactory{}) return &nodeDriverClient{ ns: namespace, client: c, @@ -223,7 +223,7 @@ type NodeTemplatesGetter interface { } func (c *Client) NodeTemplates(namespace string) NodeTemplateInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &NodeTemplateResource, NodeTemplateGroupVersionKind, nodeTemplateFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &NodeTemplateResource, NodeTemplateGroupVersionKind, nodeTemplateFactory{}) return &nodeTemplateClient{ ns: namespace, client: c, @@ -236,7 +236,7 @@ type ProjectsGetter interface { } func (c *Client) Projects(namespace string) ProjectInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ProjectResource, ProjectGroupVersionKind, projectFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &ProjectResource, ProjectGroupVersionKind, projectFactory{}) return &projectClient{ ns: namespace, client: c, @@ -249,7 +249,7 @@ type GlobalRolesGetter interface { } func (c *Client) GlobalRoles(namespace string) GlobalRoleInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &GlobalRoleResource, GlobalRoleGroupVersionKind, globalRoleFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &GlobalRoleResource, GlobalRoleGroupVersionKind, globalRoleFactory{}) return &globalRoleClient{ ns: namespace, client: c, @@ -262,7 +262,7 @@ type GlobalRoleBindingsGetter interface { } func (c *Client) GlobalRoleBindings(namespace string) GlobalRoleBindingInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &GlobalRoleBindingResource, GlobalRoleBindingGroupVersionKind, globalRoleBindingFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &GlobalRoleBindingResource, GlobalRoleBindingGroupVersionKind, globalRoleBindingFactory{}) return &globalRoleBindingClient{ ns: namespace, client: c, @@ -275,7 +275,7 @@ type RoleTemplatesGetter interface { } func (c *Client) RoleTemplates(namespace string) RoleTemplateInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &RoleTemplateResource, RoleTemplateGroupVersionKind, roleTemplateFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &RoleTemplateResource, RoleTemplateGroupVersionKind, roleTemplateFactory{}) return &roleTemplateClient{ ns: namespace, client: c, @@ -288,7 +288,7 @@ type PodSecurityPolicyTemplatesGetter interface { } func (c *Client) PodSecurityPolicyTemplates(namespace string) PodSecurityPolicyTemplateInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &PodSecurityPolicyTemplateResource, PodSecurityPolicyTemplateGroupVersionKind, podSecurityPolicyTemplateFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &PodSecurityPolicyTemplateResource, PodSecurityPolicyTemplateGroupVersionKind, podSecurityPolicyTemplateFactory{}) return &podSecurityPolicyTemplateClient{ ns: namespace, client: c, @@ -301,7 +301,7 @@ type PodSecurityPolicyTemplateProjectBindingsGetter interface { } func (c *Client) PodSecurityPolicyTemplateProjectBindings(namespace string) PodSecurityPolicyTemplateProjectBindingInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &PodSecurityPolicyTemplateProjectBindingResource, PodSecurityPolicyTemplateProjectBindingGroupVersionKind, podSecurityPolicyTemplateProjectBindingFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &PodSecurityPolicyTemplateProjectBindingResource, PodSecurityPolicyTemplateProjectBindingGroupVersionKind, podSecurityPolicyTemplateProjectBindingFactory{}) return &podSecurityPolicyTemplateProjectBindingClient{ ns: namespace, client: c, @@ -314,7 +314,7 @@ type ClusterRoleTemplateBindingsGetter interface { } func (c *Client) ClusterRoleTemplateBindings(namespace string) ClusterRoleTemplateBindingInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ClusterRoleTemplateBindingResource, ClusterRoleTemplateBindingGroupVersionKind, clusterRoleTemplateBindingFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &ClusterRoleTemplateBindingResource, ClusterRoleTemplateBindingGroupVersionKind, clusterRoleTemplateBindingFactory{}) return &clusterRoleTemplateBindingClient{ ns: namespace, client: c, @@ -327,7 +327,7 @@ type ProjectRoleTemplateBindingsGetter interface { } func (c *Client) ProjectRoleTemplateBindings(namespace string) ProjectRoleTemplateBindingInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ProjectRoleTemplateBindingResource, ProjectRoleTemplateBindingGroupVersionKind, projectRoleTemplateBindingFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &ProjectRoleTemplateBindingResource, ProjectRoleTemplateBindingGroupVersionKind, projectRoleTemplateBindingFactory{}) return &projectRoleTemplateBindingClient{ ns: namespace, client: c, @@ -340,7 +340,7 @@ type ClustersGetter interface { } func (c *Client) Clusters(namespace string) ClusterInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ClusterResource, ClusterGroupVersionKind, clusterFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &ClusterResource, ClusterGroupVersionKind, clusterFactory{}) return &clusterClient{ ns: namespace, client: c, @@ -353,7 +353,7 @@ type ClusterEventsGetter interface { } func (c *Client) ClusterEvents(namespace string) ClusterEventInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ClusterEventResource, ClusterEventGroupVersionKind, clusterEventFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &ClusterEventResource, ClusterEventGroupVersionKind, clusterEventFactory{}) return &clusterEventClient{ ns: namespace, client: c, @@ -366,7 +366,7 @@ type ClusterRegistrationTokensGetter interface { } func (c *Client) ClusterRegistrationTokens(namespace string) ClusterRegistrationTokenInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ClusterRegistrationTokenResource, ClusterRegistrationTokenGroupVersionKind, clusterRegistrationTokenFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &ClusterRegistrationTokenResource, ClusterRegistrationTokenGroupVersionKind, clusterRegistrationTokenFactory{}) return &clusterRegistrationTokenClient{ ns: namespace, client: c, @@ -379,7 +379,7 @@ type CatalogsGetter interface { } func (c *Client) Catalogs(namespace string) CatalogInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &CatalogResource, CatalogGroupVersionKind, catalogFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &CatalogResource, CatalogGroupVersionKind, catalogFactory{}) return &catalogClient{ ns: namespace, client: c, @@ -392,7 +392,7 @@ type TemplatesGetter interface { } func (c *Client) Templates(namespace string) TemplateInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &TemplateResource, TemplateGroupVersionKind, templateFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &TemplateResource, TemplateGroupVersionKind, templateFactory{}) return &templateClient{ ns: namespace, client: c, @@ -405,7 +405,7 @@ type TemplateVersionsGetter interface { } func (c *Client) TemplateVersions(namespace string) TemplateVersionInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &TemplateVersionResource, TemplateVersionGroupVersionKind, templateVersionFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &TemplateVersionResource, TemplateVersionGroupVersionKind, templateVersionFactory{}) return &templateVersionClient{ ns: namespace, client: c, @@ -418,7 +418,7 @@ type GroupsGetter interface { } func (c *Client) Groups(namespace string) GroupInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &GroupResource, GroupGroupVersionKind, groupFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &GroupResource, GroupGroupVersionKind, groupFactory{}) return &groupClient{ ns: namespace, client: c, @@ -431,7 +431,7 @@ type GroupMembersGetter interface { } func (c *Client) GroupMembers(namespace string) GroupMemberInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &GroupMemberResource, GroupMemberGroupVersionKind, groupMemberFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &GroupMemberResource, GroupMemberGroupVersionKind, groupMemberFactory{}) return &groupMemberClient{ ns: namespace, client: c, @@ -444,7 +444,7 @@ type PrincipalsGetter interface { } func (c *Client) Principals(namespace string) PrincipalInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &PrincipalResource, PrincipalGroupVersionKind, principalFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &PrincipalResource, PrincipalGroupVersionKind, principalFactory{}) return &principalClient{ ns: namespace, client: c, @@ -457,7 +457,7 @@ type UsersGetter interface { } func (c *Client) Users(namespace string) UserInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &UserResource, UserGroupVersionKind, userFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &UserResource, UserGroupVersionKind, userFactory{}) return &userClient{ ns: namespace, client: c, @@ -470,7 +470,7 @@ type AuthConfigsGetter interface { } func (c *Client) AuthConfigs(namespace string) AuthConfigInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &AuthConfigResource, AuthConfigGroupVersionKind, authConfigFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &AuthConfigResource, AuthConfigGroupVersionKind, authConfigFactory{}) return &authConfigClient{ ns: namespace, client: c, @@ -483,7 +483,7 @@ type TokensGetter interface { } func (c *Client) Tokens(namespace string) TokenInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &TokenResource, TokenGroupVersionKind, tokenFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &TokenResource, TokenGroupVersionKind, tokenFactory{}) return &tokenClient{ ns: namespace, client: c, @@ -496,7 +496,7 @@ type DynamicSchemasGetter interface { } func (c *Client) DynamicSchemas(namespace string) DynamicSchemaInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &DynamicSchemaResource, DynamicSchemaGroupVersionKind, dynamicSchemaFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &DynamicSchemaResource, DynamicSchemaGroupVersionKind, dynamicSchemaFactory{}) return &dynamicSchemaClient{ ns: namespace, client: c, @@ -509,7 +509,7 @@ type PreferencesGetter interface { } func (c *Client) Preferences(namespace string) PreferenceInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &PreferenceResource, PreferenceGroupVersionKind, preferenceFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &PreferenceResource, PreferenceGroupVersionKind, preferenceFactory{}) return &preferenceClient{ ns: namespace, client: c, @@ -522,7 +522,7 @@ type ProjectNetworkPoliciesGetter interface { } func (c *Client) ProjectNetworkPolicies(namespace string) ProjectNetworkPolicyInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ProjectNetworkPolicyResource, ProjectNetworkPolicyGroupVersionKind, projectNetworkPolicyFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &ProjectNetworkPolicyResource, ProjectNetworkPolicyGroupVersionKind, projectNetworkPolicyFactory{}) return &projectNetworkPolicyClient{ ns: namespace, client: c, @@ -535,7 +535,7 @@ type ClusterLoggingsGetter interface { } func (c *Client) ClusterLoggings(namespace string) ClusterLoggingInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ClusterLoggingResource, ClusterLoggingGroupVersionKind, clusterLoggingFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &ClusterLoggingResource, ClusterLoggingGroupVersionKind, clusterLoggingFactory{}) return &clusterLoggingClient{ ns: namespace, client: c, @@ -548,7 +548,7 @@ type ProjectLoggingsGetter interface { } func (c *Client) ProjectLoggings(namespace string) ProjectLoggingInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ProjectLoggingResource, ProjectLoggingGroupVersionKind, projectLoggingFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &ProjectLoggingResource, ProjectLoggingGroupVersionKind, projectLoggingFactory{}) return &projectLoggingClient{ ns: namespace, client: c, @@ -561,7 +561,7 @@ type ListenConfigsGetter interface { } func (c *Client) ListenConfigs(namespace string) ListenConfigInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ListenConfigResource, ListenConfigGroupVersionKind, listenConfigFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &ListenConfigResource, ListenConfigGroupVersionKind, listenConfigFactory{}) return &listenConfigClient{ ns: namespace, client: c, @@ -574,7 +574,7 @@ type SettingsGetter interface { } func (c *Client) Settings(namespace string) SettingInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &SettingResource, SettingGroupVersionKind, settingFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &SettingResource, SettingGroupVersionKind, settingFactory{}) return &settingClient{ ns: namespace, client: c, @@ -587,7 +587,7 @@ type NotifiersGetter interface { } func (c *Client) Notifiers(namespace string) NotifierInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &NotifierResource, NotifierGroupVersionKind, notifierFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &NotifierResource, NotifierGroupVersionKind, notifierFactory{}) return ¬ifierClient{ ns: namespace, client: c, @@ -600,7 +600,7 @@ type ClusterAlertsGetter interface { } func (c *Client) ClusterAlerts(namespace string) ClusterAlertInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ClusterAlertResource, ClusterAlertGroupVersionKind, clusterAlertFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &ClusterAlertResource, ClusterAlertGroupVersionKind, clusterAlertFactory{}) return &clusterAlertClient{ ns: namespace, client: c, @@ -613,7 +613,7 @@ type ProjectAlertsGetter interface { } func (c *Client) ProjectAlerts(namespace string) ProjectAlertInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ProjectAlertResource, ProjectAlertGroupVersionKind, projectAlertFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &ProjectAlertResource, ProjectAlertGroupVersionKind, projectAlertFactory{}) return &projectAlertClient{ ns: namespace, client: c, @@ -626,7 +626,7 @@ type ClusterPipelinesGetter interface { } func (c *Client) ClusterPipelines(namespace string) ClusterPipelineInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ClusterPipelineResource, ClusterPipelineGroupVersionKind, clusterPipelineFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &ClusterPipelineResource, ClusterPipelineGroupVersionKind, clusterPipelineFactory{}) return &clusterPipelineClient{ ns: namespace, client: c, @@ -639,7 +639,7 @@ type SourceCodeCredentialsGetter interface { } func (c *Client) SourceCodeCredentials(namespace string) SourceCodeCredentialInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &SourceCodeCredentialResource, SourceCodeCredentialGroupVersionKind, sourceCodeCredentialFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &SourceCodeCredentialResource, SourceCodeCredentialGroupVersionKind, sourceCodeCredentialFactory{}) return &sourceCodeCredentialClient{ ns: namespace, client: c, @@ -652,7 +652,7 @@ type PipelinesGetter interface { } func (c *Client) Pipelines(namespace string) PipelineInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &PipelineResource, PipelineGroupVersionKind, pipelineFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &PipelineResource, PipelineGroupVersionKind, pipelineFactory{}) return &pipelineClient{ ns: namespace, client: c, @@ -665,7 +665,7 @@ type PipelineExecutionsGetter interface { } func (c *Client) PipelineExecutions(namespace string) PipelineExecutionInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &PipelineExecutionResource, PipelineExecutionGroupVersionKind, pipelineExecutionFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &PipelineExecutionResource, PipelineExecutionGroupVersionKind, pipelineExecutionFactory{}) return &pipelineExecutionClient{ ns: namespace, client: c, @@ -678,7 +678,7 @@ type PipelineExecutionLogsGetter interface { } func (c *Client) PipelineExecutionLogs(namespace string) PipelineExecutionLogInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &PipelineExecutionLogResource, PipelineExecutionLogGroupVersionKind, pipelineExecutionLogFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &PipelineExecutionLogResource, PipelineExecutionLogGroupVersionKind, pipelineExecutionLogFactory{}) return &pipelineExecutionLogClient{ ns: namespace, client: c, @@ -691,7 +691,7 @@ type SourceCodeRepositoriesGetter interface { } func (c *Client) SourceCodeRepositories(namespace string) SourceCodeRepositoryInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &SourceCodeRepositoryResource, SourceCodeRepositoryGroupVersionKind, sourceCodeRepositoryFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &SourceCodeRepositoryResource, SourceCodeRepositoryGroupVersionKind, sourceCodeRepositoryFactory{}) return &sourceCodeRepositoryClient{ ns: namespace, client: c, @@ -704,7 +704,7 @@ type GlobalComposeConfigsGetter interface { } func (c *Client) GlobalComposeConfigs(namespace string) GlobalComposeConfigInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &GlobalComposeConfigResource, GlobalComposeConfigGroupVersionKind, globalComposeConfigFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &GlobalComposeConfigResource, GlobalComposeConfigGroupVersionKind, globalComposeConfigFactory{}) return &globalComposeConfigClient{ ns: namespace, client: c, @@ -717,7 +717,7 @@ type ClusterComposeConfigsGetter interface { } func (c *Client) ClusterComposeConfigs(namespace string) ClusterComposeConfigInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ClusterComposeConfigResource, ClusterComposeConfigGroupVersionKind, clusterComposeConfigFactory{}) + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &ClusterComposeConfigResource, ClusterComposeConfigGroupVersionKind, clusterComposeConfigFactory{}) return &clusterComposeConfigClient{ ns: namespace, client: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_listen_config_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_listen_config_controller.go index 5dfad4a1..a9995bcf 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_listen_config_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_listen_config_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -52,7 +52,7 @@ type ListenConfigController interface { } type ListenConfigInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*ListenConfig) (*ListenConfig, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*ListenConfig, error) Get(name string, opts metav1.GetOptions) (*ListenConfig, error) @@ -177,11 +177,11 @@ func (s *listenConfigClient) Controller() ListenConfigController { type listenConfigClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller ListenConfigController } -func (s *listenConfigClient) ObjectClient() *clientbase.ObjectClient { +func (s *listenConfigClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_controller.go index 6107d3b3..36c5b6bf 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type NodeController interface { } type NodeInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*Node) (*Node, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*Node, error) Get(name string, opts metav1.GetOptions) (*Node, error) @@ -178,11 +178,11 @@ func (s *nodeClient) Controller() NodeController { type nodeClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller NodeController } -func (s *nodeClient) ObjectClient() *clientbase.ObjectClient { +func (s *nodeClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_driver_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_driver_controller.go index 86384c0b..3307aad6 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_driver_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_driver_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -52,7 +52,7 @@ type NodeDriverController interface { } type NodeDriverInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*NodeDriver) (*NodeDriver, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*NodeDriver, error) Get(name string, opts metav1.GetOptions) (*NodeDriver, error) @@ -177,11 +177,11 @@ func (s *nodeDriverClient) Controller() NodeDriverController { type nodeDriverClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller NodeDriverController } -func (s *nodeDriverClient) ObjectClient() *clientbase.ObjectClient { +func (s *nodeDriverClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_pool_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_pool_controller.go index a7f63f4b..4e115a6a 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_pool_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_pool_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type NodePoolController interface { } type NodePoolInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*NodePool) (*NodePool, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*NodePool, error) Get(name string, opts metav1.GetOptions) (*NodePool, error) @@ -178,11 +178,11 @@ func (s *nodePoolClient) Controller() NodePoolController { type nodePoolClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller NodePoolController } -func (s *nodePoolClient) ObjectClient() *clientbase.ObjectClient { +func (s *nodePoolClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_template_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_template_controller.go index 4e1d17e1..81b95e43 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_template_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_template_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type NodeTemplateController interface { } type NodeTemplateInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*NodeTemplate) (*NodeTemplate, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*NodeTemplate, error) Get(name string, opts metav1.GetOptions) (*NodeTemplate, error) @@ -178,11 +178,11 @@ func (s *nodeTemplateClient) Controller() NodeTemplateController { type nodeTemplateClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller NodeTemplateController } -func (s *nodeTemplateClient) ObjectClient() *clientbase.ObjectClient { +func (s *nodeTemplateClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_notifier_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_notifier_controller.go index 758fab7b..b0375a9d 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_notifier_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_notifier_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type NotifierController interface { } type NotifierInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*Notifier) (*Notifier, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*Notifier, error) Get(name string, opts metav1.GetOptions) (*Notifier, error) @@ -178,11 +178,11 @@ func (s *notifierClient) Controller() NotifierController { type notifierClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller NotifierController } -func (s *notifierClient) ObjectClient() *clientbase.ObjectClient { +func (s *notifierClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pipeline_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pipeline_controller.go index dae252f6..4ec85578 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pipeline_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pipeline_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type PipelineController interface { } type PipelineInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*Pipeline) (*Pipeline, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*Pipeline, error) Get(name string, opts metav1.GetOptions) (*Pipeline, error) @@ -178,11 +178,11 @@ func (s *pipelineClient) Controller() PipelineController { type pipelineClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller PipelineController } -func (s *pipelineClient) ObjectClient() *clientbase.ObjectClient { +func (s *pipelineClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pipeline_execution_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pipeline_execution_controller.go index aa8f6509..868f4706 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pipeline_execution_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pipeline_execution_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type PipelineExecutionController interface { } type PipelineExecutionInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*PipelineExecution) (*PipelineExecution, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*PipelineExecution, error) Get(name string, opts metav1.GetOptions) (*PipelineExecution, error) @@ -178,11 +178,11 @@ func (s *pipelineExecutionClient) Controller() PipelineExecutionController { type pipelineExecutionClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller PipelineExecutionController } -func (s *pipelineExecutionClient) ObjectClient() *clientbase.ObjectClient { +func (s *pipelineExecutionClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pipeline_execution_log_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pipeline_execution_log_controller.go index 38924596..0516ba43 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pipeline_execution_log_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pipeline_execution_log_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type PipelineExecutionLogController interface { } type PipelineExecutionLogInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*PipelineExecutionLog) (*PipelineExecutionLog, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*PipelineExecutionLog, error) Get(name string, opts metav1.GetOptions) (*PipelineExecutionLog, error) @@ -178,11 +178,11 @@ func (s *pipelineExecutionLogClient) Controller() PipelineExecutionLogController type pipelineExecutionLogClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller PipelineExecutionLogController } -func (s *pipelineExecutionLogClient) ObjectClient() *clientbase.ObjectClient { +func (s *pipelineExecutionLogClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go index a4fd5420..8ef8df24 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -52,7 +52,7 @@ type PodSecurityPolicyTemplateController interface { } type PodSecurityPolicyTemplateInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*PodSecurityPolicyTemplate) (*PodSecurityPolicyTemplate, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*PodSecurityPolicyTemplate, error) Get(name string, opts metav1.GetOptions) (*PodSecurityPolicyTemplate, error) @@ -177,11 +177,11 @@ func (s *podSecurityPolicyTemplateClient) Controller() PodSecurityPolicyTemplate type podSecurityPolicyTemplateClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller PodSecurityPolicyTemplateController } -func (s *podSecurityPolicyTemplateClient) ObjectClient() *clientbase.ObjectClient { +func (s *podSecurityPolicyTemplateClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_project_binding_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_project_binding_controller.go index 160b16da..63c8a773 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_project_binding_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_project_binding_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type PodSecurityPolicyTemplateProjectBindingController interface { } type PodSecurityPolicyTemplateProjectBindingInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*PodSecurityPolicyTemplateProjectBinding) (*PodSecurityPolicyTemplateProjectBinding, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*PodSecurityPolicyTemplateProjectBinding, error) Get(name string, opts metav1.GetOptions) (*PodSecurityPolicyTemplateProjectBinding, error) @@ -178,11 +178,11 @@ func (s *podSecurityPolicyTemplateProjectBindingClient) Controller() PodSecurity type podSecurityPolicyTemplateProjectBindingClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller PodSecurityPolicyTemplateProjectBindingController } -func (s *podSecurityPolicyTemplateProjectBindingClient) ObjectClient() *clientbase.ObjectClient { +func (s *podSecurityPolicyTemplateProjectBindingClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_preference_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_preference_controller.go index 3f5f50e9..caf921e9 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_preference_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_preference_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type PreferenceController interface { } type PreferenceInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*Preference) (*Preference, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*Preference, error) Get(name string, opts metav1.GetOptions) (*Preference, error) @@ -178,11 +178,11 @@ func (s *preferenceClient) Controller() PreferenceController { type preferenceClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller PreferenceController } -func (s *preferenceClient) ObjectClient() *clientbase.ObjectClient { +func (s *preferenceClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_principal_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_principal_controller.go index 9a0b5e0d..492515ca 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_principal_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_principal_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -52,7 +52,7 @@ type PrincipalController interface { } type PrincipalInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*Principal) (*Principal, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*Principal, error) Get(name string, opts metav1.GetOptions) (*Principal, error) @@ -177,11 +177,11 @@ func (s *principalClient) Controller() PrincipalController { type principalClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller PrincipalController } -func (s *principalClient) ObjectClient() *clientbase.ObjectClient { +func (s *principalClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_alert_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_alert_controller.go index e1c60e61..1783cd77 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_alert_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_alert_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type ProjectAlertController interface { } type ProjectAlertInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*ProjectAlert) (*ProjectAlert, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*ProjectAlert, error) Get(name string, opts metav1.GetOptions) (*ProjectAlert, error) @@ -178,11 +178,11 @@ func (s *projectAlertClient) Controller() ProjectAlertController { type projectAlertClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller ProjectAlertController } -func (s *projectAlertClient) ObjectClient() *clientbase.ObjectClient { +func (s *projectAlertClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_controller.go index ca08d315..78850a17 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type ProjectController interface { } type ProjectInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*Project) (*Project, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*Project, error) Get(name string, opts metav1.GetOptions) (*Project, error) @@ -178,11 +178,11 @@ func (s *projectClient) Controller() ProjectController { type projectClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller ProjectController } -func (s *projectClient) ObjectClient() *clientbase.ObjectClient { +func (s *projectClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_logging_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_logging_controller.go index 768f5067..94cbf3ed 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_logging_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_logging_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type ProjectLoggingController interface { } type ProjectLoggingInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*ProjectLogging) (*ProjectLogging, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*ProjectLogging, error) Get(name string, opts metav1.GetOptions) (*ProjectLogging, error) @@ -178,11 +178,11 @@ func (s *projectLoggingClient) Controller() ProjectLoggingController { type projectLoggingClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller ProjectLoggingController } -func (s *projectLoggingClient) ObjectClient() *clientbase.ObjectClient { +func (s *projectLoggingClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_network_policy_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_network_policy_controller.go index eee3b3a4..afd14aad 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_network_policy_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_network_policy_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type ProjectNetworkPolicyController interface { } type ProjectNetworkPolicyInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*ProjectNetworkPolicy) (*ProjectNetworkPolicy, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*ProjectNetworkPolicy, error) Get(name string, opts metav1.GetOptions) (*ProjectNetworkPolicy, error) @@ -178,11 +178,11 @@ func (s *projectNetworkPolicyClient) Controller() ProjectNetworkPolicyController type projectNetworkPolicyClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller ProjectNetworkPolicyController } -func (s *projectNetworkPolicyClient) ObjectClient() *clientbase.ObjectClient { +func (s *projectNetworkPolicyClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go index 642daf71..90c0bda3 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type ProjectRoleTemplateBindingController interface { } type ProjectRoleTemplateBindingInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*ProjectRoleTemplateBinding) (*ProjectRoleTemplateBinding, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*ProjectRoleTemplateBinding, error) Get(name string, opts metav1.GetOptions) (*ProjectRoleTemplateBinding, error) @@ -178,11 +178,11 @@ func (s *projectRoleTemplateBindingClient) Controller() ProjectRoleTemplateBindi type projectRoleTemplateBindingClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller ProjectRoleTemplateBindingController } -func (s *projectRoleTemplateBindingClient) ObjectClient() *clientbase.ObjectClient { +func (s *projectRoleTemplateBindingClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_role_template_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_role_template_controller.go index c1a7b457..9d451d94 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_role_template_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_role_template_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -52,7 +52,7 @@ type RoleTemplateController interface { } type RoleTemplateInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*RoleTemplate) (*RoleTemplate, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*RoleTemplate, error) Get(name string, opts metav1.GetOptions) (*RoleTemplate, error) @@ -177,11 +177,11 @@ func (s *roleTemplateClient) Controller() RoleTemplateController { type roleTemplateClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller RoleTemplateController } -func (s *roleTemplateClient) ObjectClient() *clientbase.ObjectClient { +func (s *roleTemplateClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_setting_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_setting_controller.go index c563c5e4..e0b0b0b4 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_setting_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_setting_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -52,7 +52,7 @@ type SettingController interface { } type SettingInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*Setting) (*Setting, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*Setting, error) Get(name string, opts metav1.GetOptions) (*Setting, error) @@ -177,11 +177,11 @@ func (s *settingClient) Controller() SettingController { type settingClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller SettingController } -func (s *settingClient) ObjectClient() *clientbase.ObjectClient { +func (s *settingClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_source_code_credential_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_source_code_credential_controller.go index a9dbfda7..09d73841 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_source_code_credential_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_source_code_credential_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type SourceCodeCredentialController interface { } type SourceCodeCredentialInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*SourceCodeCredential) (*SourceCodeCredential, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*SourceCodeCredential, error) Get(name string, opts metav1.GetOptions) (*SourceCodeCredential, error) @@ -178,11 +178,11 @@ func (s *sourceCodeCredentialClient) Controller() SourceCodeCredentialController type sourceCodeCredentialClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller SourceCodeCredentialController } -func (s *sourceCodeCredentialClient) ObjectClient() *clientbase.ObjectClient { +func (s *sourceCodeCredentialClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_source_code_repository_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_source_code_repository_controller.go index 851cca64..fd7c67cb 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_source_code_repository_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_source_code_repository_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -53,7 +53,7 @@ type SourceCodeRepositoryController interface { } type SourceCodeRepositoryInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*SourceCodeRepository) (*SourceCodeRepository, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*SourceCodeRepository, error) Get(name string, opts metav1.GetOptions) (*SourceCodeRepository, error) @@ -178,11 +178,11 @@ func (s *sourceCodeRepositoryClient) Controller() SourceCodeRepositoryController type sourceCodeRepositoryClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller SourceCodeRepositoryController } -func (s *sourceCodeRepositoryClient) ObjectClient() *clientbase.ObjectClient { +func (s *sourceCodeRepositoryClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_controller.go index a8eeab5b..e71043f3 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -52,7 +52,7 @@ type TemplateController interface { } type TemplateInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*Template) (*Template, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*Template, error) Get(name string, opts metav1.GetOptions) (*Template, error) @@ -177,11 +177,11 @@ func (s *templateClient) Controller() TemplateController { type templateClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller TemplateController } -func (s *templateClient) ObjectClient() *clientbase.ObjectClient { +func (s *templateClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_version_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_version_controller.go index 16c9f2cf..0d6c7bff 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_version_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_version_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -52,7 +52,7 @@ type TemplateVersionController interface { } type TemplateVersionInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*TemplateVersion) (*TemplateVersion, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*TemplateVersion, error) Get(name string, opts metav1.GetOptions) (*TemplateVersion, error) @@ -177,11 +177,11 @@ func (s *templateVersionClient) Controller() TemplateVersionController { type templateVersionClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller TemplateVersionController } -func (s *templateVersionClient) ObjectClient() *clientbase.ObjectClient { +func (s *templateVersionClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_token_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_token_controller.go index 7b674d6e..50db4d4c 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_token_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_token_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -52,7 +52,7 @@ type TokenController interface { } type TokenInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*Token) (*Token, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*Token, error) Get(name string, opts metav1.GetOptions) (*Token, error) @@ -177,11 +177,11 @@ func (s *tokenClient) Controller() TokenController { type tokenClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller TokenController } -func (s *tokenClient) ObjectClient() *clientbase.ObjectClient { +func (s *tokenClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_user_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_user_controller.go index 694917d9..3219afdd 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_user_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_user_controller.go @@ -3,8 +3,8 @@ package v3 import ( "context" - "github.com/rancher/norman/clientbase" "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -52,7 +52,7 @@ type UserController interface { } type UserInterface interface { - ObjectClient() *clientbase.ObjectClient + ObjectClient() *objectclient.ObjectClient Create(*User) (*User, error) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*User, error) Get(name string, opts metav1.GetOptions) (*User, error) @@ -177,11 +177,11 @@ func (s *userClient) Controller() UserController { type userClient struct { client *Client ns string - objectClient *clientbase.ObjectClient + objectClient *objectclient.ObjectClient controller UserController } -func (s *userClient) ObjectClient() *clientbase.ObjectClient { +func (s *userClient) ObjectClient() *objectclient.ObjectClient { return s.objectClient } diff --git a/vendor/github.com/rancher/types/vendor.conf b/vendor/github.com/rancher/types/vendor.conf index 6a45ccc0..0f0e9994 100644 --- a/vendor/github.com/rancher/types/vendor.conf +++ b/vendor/github.com/rancher/types/vendor.conf @@ -5,4 +5,4 @@ k8s.io/kubernetes v1.8.3 bitbucket.org/ww/goautoneg a547fc61f48d567d5b4ec6f8aee5573d8efce11d https://github.com/rancher/goautoneg.git golang.org/x/sync fd80eb99c8f653c847d294a001bdf2a3a6f768f5 -github.com/rancher/norman 510ed570d2e29a00e6bc1bcd18bdcad6c6860a13 +github.com/rancher/norman ff60298f31f081b06d198815b4c178a578664f7d