baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

dep: fix constraint with dep >= 0.5.0

Browse source
This commit is contained in:
Vincent Demeester 2019-01-07 16:48:03 +01:00 • committed by Traefiker Bot
parent ddf199566c
commit 906f4fe8f7
6 changed files with 607 additions and 302 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

663
Gopkg.lock generated
View file

File diff suppressed because it is too large Load diff

14
Gopkg.toml
View file

@ -71,7 +71,7 @@
[[constraint]] [[constraint]]
name = "github.com/containous/staert" name = "github.com/containous/staert"
version = "3.1.1" version = "3.1.2"
#[[constraint]] #[[constraint]]
# name = "github.com/containous/traefik-extra-service-fabric" # name = "github.com/containous/traefik-extra-service-fabric"
@ -132,18 +132,6 @@
name = "github.com/mesosphere/mesos-dns" name = "github.com/mesosphere/mesos-dns"
source = "https://github.com/containous/mesos-dns.git" source = "https://github.com/containous/mesos-dns.git"
[[constraint]]
branch = "master"
name = "github.com/mitchellh/copystructure"
[[constraint]]
branch = "master"
name = "github.com/mitchellh/hashstructure"
[[constraint]]
branch = "master"
name = "github.com/mitchellh/mapstructure"
[[constraint]] [[constraint]]
name = "github.com/opentracing/opentracing-go" name = "github.com/opentracing/opentracing-go"
version = "1.0.2" version = "1.0.2"

2
build.Dockerfile
View file

@ -10,7 +10,7 @@ RUN go get golang.org/x/lint/golint \
# Which docker version to test on # Which docker version to test on
ARG DOCKER_VERSION=17.03.2 ARG DOCKER_VERSION=17.03.2
ARG DEP_VERSION=0.4.1 ARG DEP_VERSION=0.5.0
# Download go-bindata binary to bin folder in $GOPATH # Download go-bindata binary to bin folder in $GOPATH
RUN mkdir -p /usr/local/bin \ RUN mkdir -p /usr/local/bin \

110
vendor/github.com/aliyun/alibaba-cloud-sdk-go/services/push/push_notice_to_android.go generated vendored
View file

@ -1,110 +0,0 @@
package push
//Licensed under the Apache License, Version 2.0 (the "License");
//you may not use this file except in compliance with the License.
//You may obtain a copy of the License at
//
//http://www.apache.org/licenses/LICENSE-2.0
//
//Unless required by applicable law or agreed to in writing, software
//distributed under the License is distributed on an "AS IS" BASIS,
//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
//See the License for the specific language governing permissions and
//limitations under the License.
//
// Code generated by Alibaba Cloud SDK Code Generator.
// Changes may cause incorrect behavior and will be lost if the code is regenerated.
import (
"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
)
// PushNoticeToAndroid invokes the push.PushNoticeToAndroid API synchronously
// api document: https://help.aliyun.com/api/push/pushnoticetoandroid.html
func (client *Client) PushNoticeToAndroid(request *PushNoticeToAndroidRequest) (response *PushNoticeToAndroidResponse, err error) {
response = CreatePushNoticeToAndroidResponse()
err = client.DoAction(request, response)
return
}
// PushNoticeToAndroidWithChan invokes the push.PushNoticeToAndroid API asynchronously
// api document: https://help.aliyun.com/api/push/pushnoticetoandroid.html
// asynchronous document: https://help.aliyun.com/document_detail/66220.html
func (client *Client) PushNoticeToAndroidWithChan(request *PushNoticeToAndroidRequest) (<-chan *PushNoticeToAndroidResponse, <-chan error) {
responseChan := make(chan *PushNoticeToAndroidResponse, 1)
errChan := make(chan error, 1)
err := client.AddAsyncTask(func() {
defer close(responseChan)
defer close(errChan)
response, err := client.PushNoticeToAndroid(request)
if err != nil {
errChan <- err
} else {
responseChan <- response
}
})
if err != nil {
errChan <- err
close(responseChan)
close(errChan)
}
return responseChan, errChan
}
// PushNoticeToAndroidWithCallback invokes the push.PushNoticeToAndroid API asynchronously
// api document: https://help.aliyun.com/api/push/pushnoticetoandroid.html
// asynchronous document: https://help.aliyun.com/document_detail/66220.html
func (client *Client) PushNoticeToAndroidWithCallback(request *PushNoticeToAndroidRequest, callback func(response *PushNoticeToAndroidResponse, err error)) <-chan int {
result := make(chan int, 1)
err := client.AddAsyncTask(func() {
var response *PushNoticeToAndroidResponse
var err error
defer close(result)
response, err = client.PushNoticeToAndroid(request)
callback(response, err)
result <- 1
})
if err != nil {
defer close(result)
callback(nil, err)
result <- 0
}
return result
}
// PushNoticeToAndroidRequest is the request struct for api PushNoticeToAndroid
type PushNoticeToAndroidRequest struct {
*requests.RpcRequest
AppKey requests.Integer `position:"Query" name:"AppKey"`
Target string `position:"Query" name:"Target"`
TargetValue string `position:"Query" name:"TargetValue"`
Title string `position:"Query" name:"Title"`
Body string `position:"Query" name:"Body"`
JobKey string `position:"Query" name:"JobKey"`
ExtParameters string `position:"Query" name:"ExtParameters"`
}
// PushNoticeToAndroidResponse is the response struct for api PushNoticeToAndroid
type PushNoticeToAndroidResponse struct {
*responses.BaseResponse
RequestId string `json:"RequestId" xml:"RequestId"`
MessageId string `json:"MessageId" xml:"MessageId"`
}
// CreatePushNoticeToAndroidRequest creates a request to invoke PushNoticeToAndroid API
func CreatePushNoticeToAndroidRequest() (request *PushNoticeToAndroidRequest) {
request = &PushNoticeToAndroidRequest{
RpcRequest: &requests.RpcRequest{},
}
request.InitWithApiInfo("Push", "2016-08-01", "PushNoticeToAndroid", "", "")
return
}
// CreatePushNoticeToAndroidResponse creates a response to parse from PushNoticeToAndroid response
func CreatePushNoticeToAndroidResponse() (response *PushNoticeToAndroidResponse) {
response = &PushNoticeToAndroidResponse{
BaseResponse: &responses.BaseResponse{},
}
return
}

111
vendor/github.com/aliyun/alibaba-cloud-sdk-go/services/push/push_notice_toi_os.go generated vendored
View file

@ -1,111 +0,0 @@
package push
//Licensed under the Apache License, Version 2.0 (the "License");
//you may not use this file except in compliance with the License.
//You may obtain a copy of the License at
//
//http://www.apache.org/licenses/LICENSE-2.0
//
//Unless required by applicable law or agreed to in writing, software
//distributed under the License is distributed on an "AS IS" BASIS,
//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
//See the License for the specific language governing permissions and
//limitations under the License.
//
// Code generated by Alibaba Cloud SDK Code Generator.
// Changes may cause incorrect behavior and will be lost if the code is regenerated.
import (
"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
)
// PushNoticeToiOS invokes the push.PushNoticeToiOS API synchronously
// api document: https://help.aliyun.com/api/push/pushnoticetoios.html
func (client *Client) PushNoticeToiOS(request *PushNoticeToiOSRequest) (response *PushNoticeToiOSResponse, err error) {
response = CreatePushNoticeToiOSResponse()
err = client.DoAction(request, response)
return
}
// PushNoticeToiOSWithChan invokes the push.PushNoticeToiOS API asynchronously
// api document: https://help.aliyun.com/api/push/pushnoticetoios.html
// asynchronous document: https://help.aliyun.com/document_detail/66220.html
func (client *Client) PushNoticeToiOSWithChan(request *PushNoticeToiOSRequest) (<-chan *PushNoticeToiOSResponse, <-chan error) {
responseChan := make(chan *PushNoticeToiOSResponse, 1)
errChan := make(chan error, 1)
err := client.AddAsyncTask(func() {
defer close(responseChan)
defer close(errChan)
response, err := client.PushNoticeToiOS(request)
if err != nil {
errChan <- err
} else {
responseChan <- response
}
})
if err != nil {
errChan <- err
close(responseChan)
close(errChan)
}
return responseChan, errChan
}
// PushNoticeToiOSWithCallback invokes the push.PushNoticeToiOS API asynchronously
// api document: https://help.aliyun.com/api/push/pushnoticetoios.html
// asynchronous document: https://help.aliyun.com/document_detail/66220.html
func (client *Client) PushNoticeToiOSWithCallback(request *PushNoticeToiOSRequest, callback func(response *PushNoticeToiOSResponse, err error)) <-chan int {
result := make(chan int, 1)
err := client.AddAsyncTask(func() {
var response *PushNoticeToiOSResponse
var err error
defer close(result)
response, err = client.PushNoticeToiOS(request)
callback(response, err)
result <- 1
})
if err != nil {
defer close(result)
callback(nil, err)
result <- 0
}
return result
}
// PushNoticeToiOSRequest is the request struct for api PushNoticeToiOS
type PushNoticeToiOSRequest struct {
*requests.RpcRequest
AppKey requests.Integer `position:"Query" name:"AppKey"`
Target string `position:"Query" name:"Target"`
TargetValue string `position:"Query" name:"TargetValue"`
ApnsEnv string `position:"Query" name:"ApnsEnv"`
Title string `position:"Query" name:"Title"`
Body string `position:"Query" name:"Body"`
JobKey string `position:"Query" name:"JobKey"`
ExtParameters string `position:"Query" name:"ExtParameters"`
}
// PushNoticeToiOSResponse is the response struct for api PushNoticeToiOS
type PushNoticeToiOSResponse struct {
*responses.BaseResponse
RequestId string `json:"RequestId" xml:"RequestId"`
MessageId string `json:"MessageId" xml:"MessageId"`
}
// CreatePushNoticeToiOSRequest creates a request to invoke PushNoticeToiOS API
func CreatePushNoticeToiOSRequest() (request *PushNoticeToiOSRequest) {
request = &PushNoticeToiOSRequest{
RpcRequest: &requests.RpcRequest{},
}
request.InitWithApiInfo("Push", "2016-08-01", "PushNoticeToiOS", "", "")
return
}
// CreatePushNoticeToiOSResponse creates a response to parse from PushNoticeToiOS response
func CreatePushNoticeToiOSResponse() (response *PushNoticeToiOSResponse) {
response = &PushNoticeToiOSResponse{
BaseResponse: &responses.BaseResponse{},
}
return
}

9
vendor/github.com/containous/staert/toml.go generated vendored
View file

@ -47,10 +47,7 @@ func (ts *TomlSource) Parse(cmd *flaeg.Command) (*flaeg.Command, error) {
return nil, err return nil, err
} }
flgArgs, hasUnderField, err := generateArgs(metadata, boolFlags) flgArgs, hasUnderField := generateArgs(metadata, boolFlags)
if err != nil {
return nil, err
}
err = flaeg.Load(cmd.Config, cmd.DefaultPointersConfig, flgArgs) err = flaeg.Load(cmd.Config, cmd.DefaultPointersConfig, flgArgs)
if err != nil && err != flaeg.ErrParserNotFound { if err != nil && err != flaeg.ErrParserNotFound {
@ -89,7 +86,7 @@ func findFile(filename string, dirNFile []string) string {
return "" return ""
} }
func generateArgs(metadata toml.MetaData, flags []string) ([]string, bool, error) { func generateArgs(metadata toml.MetaData, flags []string) ([]string, bool) {
var flgArgs []string var flgArgs []string
keys := metadata.Keys() keys := metadata.Keys()
hasUnderField := false hasUnderField := false
@ -117,5 +114,5 @@ func generateArgs(metadata toml.MetaData, flags []string) ([]string, bool, error
} }
} }
return flgArgs, hasUnderField, nil return flgArgs, hasUnderField
} }