resilien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12236 from hashicorp/jbardin/vendor 

Vendor fixes
This commit is contained in:
James Bardin 2017-02-24 17:25:59 -05:00 committed by GitHub
parent 8ce8839397 79e13b92d9
commit 38748f0cd8
14 changed files with 112 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -10,7 +10,7 @@ install:
- bash scripts/gogetcookie.sh
- go get github.com/kardianos/govendor
script:
- make vet test
- make vet vendor-status test
- GOOS=windows go build
branches:
only:

2
vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/client.go generated vendored
View File

@ -18,7 +18,7 @@ package containerservice
// See the License for the specific language governing permissions and
// limitations under the License.
//
// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.

58
vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/containerservices.go generated vendored
View File

@ -14,7 +14,7 @@ package containerservice
// See the License for the specific language governing permissions and
// limitations under the License.
//
// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.
@ -43,15 +43,15 @@ func NewContainerServicesClientWithBaseURI(baseURI string, subscriptionID string
}
// CreateOrUpdate creates or updates a container service with the specified
// configuration of orchestrator, masters, and agents. This method may poll
// for completion. Polling can be canceled by passing the cancel channel
// argument. The channel will be used to cancel polling and any outstanding
// HTTP requests.
// configuration of orchestrator, masters, and agents. This method may poll for
// completion. Polling can be canceled by passing the cancel channel argument.
// The channel will be used to cancel polling and any outstanding HTTP
// requests.
//
// resourceGroupName is the name of the resource group. containerServiceName
// is the name of the container service in the specified subscription and
// resource group. parameters is parameters supplied to the Create or Update
// a Container Service operation.
// resourceGroupName is the name of the resource group. containerServiceName is
// the name of the container service in the specified subscription and resource
// group. parameters is parameters supplied to the Create or Update a Container
// Service operation.
func (client ContainerServicesClient) CreateOrUpdate(resourceGroupName string, containerServiceName string, parameters ContainerService, cancel <-chan struct{}) (result autorest.Response, err error) {
if err := validation.Validate([]validation.Validation{
{TargetValue: parameters,
@ -63,9 +63,7 @@ func (client ContainerServicesClient) CreateOrUpdate(resourceGroupName string, c
{Target: "parameters.Properties.ServicePrincipalProfile.Secret", Name: validation.Null, Rule: true, Chain: nil},
}},
{Target: "parameters.Properties.MasterProfile", Name: validation.Null, Rule: true,
Chain: []validation.Constraint{{Target: "parameters.Properties.MasterProfile.DNSPrefix", Name: validation.Null, Rule: true, Chain: nil},
{Target: "parameters.Properties.MasterProfile.Fqdn", Name: validation.ReadOnly, Rule: true, Chain: nil},
}},
Chain: []validation.Constraint{{Target: "parameters.Properties.MasterProfile.DNSPrefix", Name: validation.Null, Rule: true, Chain: nil}}},
{Target: "parameters.Properties.AgentPoolProfiles", Name: validation.Null, Rule: true, Chain: nil},
{Target: "parameters.Properties.WindowsProfile", Name: validation.Null, Rule: false,
Chain: []validation.Constraint{{Target: "parameters.Properties.WindowsProfile.AdminUsername", Name: validation.Null, Rule: true,
@ -81,11 +79,8 @@ func (client ContainerServicesClient) CreateOrUpdate(resourceGroupName string, c
}},
{Target: "parameters.Properties.DiagnosticsProfile", Name: validation.Null, Rule: false,
Chain: []validation.Constraint{{Target: "parameters.Properties.DiagnosticsProfile.VMDiagnostics", Name: validation.Null, Rule: true,
Chain: []validation.Constraint{{Target: "parameters.Properties.DiagnosticsProfile.VMDiagnostics.Enabled", Name: validation.Null, Rule: true, Chain: nil},
{Target: "parameters.Properties.DiagnosticsProfile.VMDiagnostics.StorageURI", Name: validation.ReadOnly, Rule: true, Chain: nil},
}},
Chain: []validation.Constraint{{Target: "parameters.Properties.DiagnosticsProfile.VMDiagnostics.Enabled", Name: validation.Null, Rule: true, Chain: nil}}},
}},
{Target: "parameters.Properties.ProvisioningState", Name: validation.ReadOnly, Rule: true, Chain: nil},
}}}}}); err != nil {
return result, validation.NewErrorWithValidationError(err, "containerservice.ContainerServicesClient", "CreateOrUpdate")
}
@ -151,18 +146,18 @@ func (client ContainerServicesClient) CreateOrUpdateResponder(resp *http.Respons
return
}
// Delete deletes the specified container service in the specified
// subscription and resource group. The operation does not delete other
// resources created as part of creating a container service, including
// storage accounts, VMs, and availability sets. All the other resources
// created with the container service are part of the same resource group and
// can be deleted individually. This method may poll for completion. Polling
// can be canceled by passing the cancel channel argument. The channel will
// be used to cancel polling and any outstanding HTTP requests.
// Delete deletes the specified container service in the specified subscription
// and resource group. The operation does not delete other resources created as
// part of creating a container service, including storage accounts, VMs, and
// availability sets. All the other resources created with the container
// service are part of the same resource group and can be deleted individually.
// This method may poll for completion. Polling can be canceled by passing the
// cancel channel argument. The channel will be used to cancel polling and any
// outstanding HTTP requests.
//
// resourceGroupName is the name of the resource group. containerServiceName
// is the name of the container service in the specified subscription and
// resource group.
// resourceGroupName is the name of the resource group. containerServiceName is
// the name of the container service in the specified subscription and resource
// group.
func (client ContainerServicesClient) Delete(resourceGroupName string, containerServiceName string, cancel <-chan struct{}) (result autorest.Response, err error) {
req, err := client.DeletePreparer(resourceGroupName, containerServiceName, cancel)
if err != nil {
@ -228,9 +223,9 @@ func (client ContainerServicesClient) DeleteResponder(resp *http.Response) (resu
// including state, orchestrator, number of masters and agents, and FQDNs of
// masters and agents.
//
// resourceGroupName is the name of the resource group. containerServiceName
// is the name of the container service in the specified subscription and
// resource group.
// resourceGroupName is the name of the resource group. containerServiceName is
// the name of the container service in the specified subscription and resource
// group.
func (client ContainerServicesClient) Get(resourceGroupName string, containerServiceName string) (result ContainerService, err error) {
req, err := client.GetPreparer(resourceGroupName, containerServiceName)
if err != nil {
@ -292,8 +287,7 @@ func (client ContainerServicesClient) GetResponder(resp *http.Response) (result
// List gets a list of container services in the specified subscription. The
// operation returns properties of each container service including state,
// orchestrator, number of masters and agents, and FQDNs of masters and
// agents.
// orchestrator, number of masters and agents, and FQDNs of masters and agents.
func (client ContainerServicesClient) List() (result ListResult, err error) {
req, err := client.ListPreparer()
if err != nil {

4
vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/models.go generated vendored
View File

@ -14,7 +14,7 @@ package containerservice
// See the License for the specific language governing permissions and
// limitations under the License.
//
// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.
@ -218,7 +218,7 @@ type Properties struct {
DiagnosticsProfile *DiagnosticsProfile `json:"diagnosticsProfile,omitempty"`
}
// Resource is the resource model definition.
// Resource is the Resource model definition.
type Resource struct {
ID *string `json:"id,omitempty"`
Name *string `json:"name,omitempty"`

37
vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/version.go generated vendored
View File

@ -14,30 +14,47 @@ package containerservice
// See the License for the specific language governing permissions and
// limitations under the License.
//
// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0
// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.
import (
"bytes"
"fmt"
"strings"
)
const (
major = "7"
minor = "0"
patch = "1"
// Always begin a "tag" with a dash (as per http://semver.org)
tag = "-beta"
semVerFormat = "%s.%s.%s%s"
userAgentFormat = "Azure-SDK-for-Go/%s arm-%s/%s"
major = "8"
minor = "0"
patch = "0"
tag = "beta"
userAgentFormat = "Azure-SDK-For-Go/%s arm-%s/%s"
)
// cached results of UserAgent and Version to prevent repeated operations.
var (
userAgent string
version string
)
// UserAgent returns the UserAgent string to use when sending http.Requests.
func UserAgent() string {
return fmt.Sprintf(userAgentFormat, Version(), "containerservice", "2016-09-30")
if userAgent == "" {
userAgent = fmt.Sprintf(userAgentFormat, Version(), "containerservice", "2016-09-30")
}
return userAgent
}
// Version returns the semantic version (see http://semver.org) of the client.
func Version() string {
return fmt.Sprintf(semVerFormat, major, minor, patch, tag)
if version == "" {
versionBuilder := bytes.NewBufferString(fmt.Sprintf("%s.%s.%s", major, minor, patch))
if tag != "" {
versionBuilder.WriteRune('-')
versionBuilder.WriteString(strings.TrimPrefix(tag, "-"))
}
version = string(versionBuilder.Bytes())
}
return version
}

2
vendor/github.com/docker/docker/NOTICE generated vendored
View File

@ -1,5 +1,5 @@
Docker
Copyright 2012-2016 Docker, Inc.
Copyright 2012-2017 Docker, Inc.
This product includes software developed at Docker, Inc. (https://www.docker.com).

2
vendor/github.com/scaleway/scaleway-cli/pkg/scwversion/version.go generated vendored
View File

@ -4,7 +4,7 @@ import "fmt"
var (
// VERSION represents the semver version of the package
VERSION = "v1.11+dev"
VERSION = "v1.11.1+dev"
// GITCOMMIT represents the git commit hash of the package, it is configured at build time
GITCOMMIT string

8
vendor/golang.org/x/crypto/curve25519/const_amd64.h generated vendored Normal file
View File

@ -0,0 +1,8 @@
// Copyright 2012 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// This code was translated into a form compatible with 6a from the public
// domain sources in SUPERCOP: http://bench.cr.yp.to/supercop.html
#define REDMASK51 0x0007FFFFFFFFFFFF

4
vendor/golang.org/x/crypto/curve25519/const_amd64.s generated vendored
View File

@ -7,8 +7,8 @@
// +build amd64,!gccgo,!appengine
DATA ·REDMASK51(SB)/8, $0x0007FFFFFFFFFFFF
GLOBL ·REDMASK51(SB), 8, $8
// These constants cannot be encoded in non-MOVQ immediates.
// We access them directly from memory instead.
DATA ·_121666_213(SB)/8, $996687872
GLOBL ·_121666_213(SB), 8, $8

4
vendor/golang.org/x/crypto/curve25519/freeze_amd64.s generated vendored
View File

@ -7,6 +7,8 @@
// +build amd64,!gccgo,!appengine
#include "const_amd64.h"
// func freeze(inout *[5]uint64)
TEXT ·freeze(SB),7,$0-8
MOVQ inout+0(FP), DI
@ -16,7 +18,7 @@ TEXT ·freeze(SB),7,$0-8
MOVQ 16(DI),CX
MOVQ 24(DI),R8
MOVQ 32(DI),R9
MOVQ ·REDMASK51(SB),AX
MOVQ $REDMASK51,AX
MOVQ AX,R10
SUBQ $18,R10
MOVQ $3,R11

20
vendor/golang.org/x/crypto/curve25519/ladderstep_amd64.s generated vendored
View File

@ -7,6 +7,8 @@
// +build amd64,!gccgo,!appengine
#include "const_amd64.h"
// func ladderstep(inout *[5][5]uint64)
TEXT ·ladderstep(SB),0,$296-8
MOVQ inout+0(FP),DI
@ -118,7 +120,7 @@ TEXT ·ladderstep(SB),0,$296-8
MULQ 72(SP)
ADDQ AX,R12
ADCQ DX,R13
MOVQ ·REDMASK51(SB),DX
MOVQ $REDMASK51,DX
SHLQ $13,CX:SI
ANDQ DX,SI
SHLQ $13,R9:R8
@ -233,7 +235,7 @@ TEXT ·ladderstep(SB),0,$296-8
MULQ 32(SP)
ADDQ AX,R12
ADCQ DX,R13
MOVQ ·REDMASK51(SB),DX
MOVQ $REDMASK51,DX
SHLQ $13,CX:SI
ANDQ DX,SI
SHLQ $13,R9:R8
@ -438,7 +440,7 @@ TEXT ·ladderstep(SB),0,$296-8
MULQ 72(SP)
ADDQ AX,R12
ADCQ DX,R13
MOVQ ·REDMASK51(SB),DX
MOVQ $REDMASK51,DX
SHLQ $13,CX:SI
ANDQ DX,SI
SHLQ $13,R9:R8
@ -588,7 +590,7 @@ TEXT ·ladderstep(SB),0,$296-8
MULQ 32(SP)
ADDQ AX,R12
ADCQ DX,R13
MOVQ ·REDMASK51(SB),DX
MOVQ $REDMASK51,DX
SHLQ $13,CX:SI
ANDQ DX,SI
SHLQ $13,R9:R8
@ -728,7 +730,7 @@ TEXT ·ladderstep(SB),0,$296-8
MULQ 152(DI)
ADDQ AX,R12
ADCQ DX,R13
MOVQ ·REDMASK51(SB),DX
MOVQ $REDMASK51,DX
SHLQ $13,CX:SI
ANDQ DX,SI
SHLQ $13,R9:R8
@ -843,7 +845,7 @@ TEXT ·ladderstep(SB),0,$296-8
MULQ 192(DI)
ADDQ AX,R12
ADCQ DX,R13
MOVQ ·REDMASK51(SB),DX
MOVQ $REDMASK51,DX
SHLQ $13,CX:SI
ANDQ DX,SI
SHLQ $13,R9:R8
@ -993,7 +995,7 @@ TEXT ·ladderstep(SB),0,$296-8
MULQ 32(DI)
ADDQ AX,R12
ADCQ DX,R13
MOVQ ·REDMASK51(SB),DX
MOVQ $REDMASK51,DX
SHLQ $13,CX:SI
ANDQ DX,SI
SHLQ $13,R9:R8
@ -1143,7 +1145,7 @@ TEXT ·ladderstep(SB),0,$296-8
MULQ 112(SP)
ADDQ AX,R12
ADCQ DX,R13
MOVQ ·REDMASK51(SB),DX
MOVQ $REDMASK51,DX
SHLQ $13,CX:SI
ANDQ DX,SI
SHLQ $13,R9:R8
@ -1329,7 +1331,7 @@ TEXT ·ladderstep(SB),0,$296-8
MULQ 192(SP)
ADDQ AX,R12
ADCQ DX,R13
MOVQ ·REDMASK51(SB),DX
MOVQ $REDMASK51,DX
SHLQ $13,CX:SI
ANDQ DX,SI
SHLQ $13,R9:R8

4
vendor/golang.org/x/crypto/curve25519/mul_amd64.s generated vendored
View File

@ -7,6 +7,8 @@
// +build amd64,!gccgo,!appengine
#include "const_amd64.h"
// func mul(dest, a, b *[5]uint64)
TEXT ·mul(SB),0,$16-24
MOVQ dest+0(FP), DI
@ -121,7 +123,7 @@ TEXT ·mul(SB),0,$16-24
MULQ 32(CX)
ADDQ AX,R14
ADCQ DX,R15
MOVQ ·REDMASK51(SB),SI
MOVQ $REDMASK51,SI
SHLQ $13,R9:R8
ANDQ SI,R8
SHLQ $13,R11:R10

4
vendor/golang.org/x/crypto/curve25519/square_amd64.s generated vendored
View File

@ -7,6 +7,8 @@
// +build amd64,!gccgo,!appengine
#include "const_amd64.h"
// func square(out, in *[5]uint64)
TEXT ·square(SB),7,$0-16
MOVQ out+0(FP), DI
@ -84,7 +86,7 @@ TEXT ·square(SB),7,$0-16
MULQ 32(SI)
ADDQ AX,R13
ADCQ DX,R14
MOVQ ·REDMASK51(SB),SI
MOVQ $REDMASK51,SI
SHLQ $13,R8:CX
ANDQ SI,CX
SHLQ $13,R10:R9

50
vendor/vendor.json vendored
View File

@ -42,22 +42,18 @@
"versionExact": "v8.0.1-beta"
},
{
"checksumSHA1": "Amd1JuJVsI9wU3+KI4Ba4jBbxps=",
"checksumSHA1": "N5cEhrAIjNoOIwciU7M8XBxUBdk=",
"comment": "v2.1.1-beta-8-gca4d906",
"path": "github.com/Azure/azure-sdk-for-go/arm/containerservice",
"revision": "0984e0641ae43b89283223034574d6465be93bf4",
"revisionTime": "2016-11-30T22:29:01Z",
"version": "v7.0.1-beta",
"versionExact": "v7.0.1-beta"
"revision": "8e625d1702a32d01cef05a9252198d231c4af113",
"revisionTime": "2017-02-08T01:01:20Z"
},
{
"checksumSHA1": "NJGBM6QQwUQEhaCBZlN9sCoaBZE=",
"checksumSHA1": "Amd1JuJVsI9wU3+KI4Ba4jBbxps=",
"comment": "v2.1.1-beta-8-gca4d906",
"path": "github.com/Azure/azure-sdk-for-go/arm/eventhub",
"revision": "8e625d1702a32d01cef05a9252198d231c4af113",
"revisionTime": "2017-02-08T01:01:20Z",
"version": "v8.0.1-beta",
"versionExact": "v8.0.1-beta"
"revisionTime": "2017-02-08T01:01:20Z"
},
{
"checksumSHA1": "HqDiYte7S7N9SRNpPJE7U/cDw3c=",
@ -824,12 +820,10 @@
"versionExact": "v1.6.25"
},
{
"checksumSHA1": "tTOqlqLdJim89F/7bLsXe5WfIyQ=",
"checksumSHA1": "NYRd4lqocAcZdkEvLHAZYyXz8Bs=",
"path": "github.com/aws/aws-sdk-go/service/configservice",
"revision": "b2852089fcfd0794d25d57f193e15121ab8a6d9e",
"revisionTime": "2017-02-17T18:38:06Z",
"version": "v1.6.25",
"versionExact": "v1.6.25"
"revisionTime": "2017-02-17T18:38:06Z"
},
{
"checksumSHA1": "fcYSy6jPQjLB7mtOfxsMqWnjobU=",
@ -2675,21 +2669,22 @@
"revisionTime": "2016-09-27T10:08:44Z"
},
{
"checksumSHA1": "6NyHxCamdKavA6RYSRuCEG3MtKA=",
"path": "github.com/scaleway/scaleway-cli/pkg/api",
"revision": "15e90c8d6bd96a674cfe6539f0dc0fa122a7412b",
"revisionTime": "2016-12-07T13:39:28Z"
"revision": "2938313569b7f6cee34fdaae2a23c0daa7de5f3c",
"revisionTime": "2017-02-07T21:56:28Z"
},
{
"checksumSHA1": "aU2+iXO1oHS4vBtAXXBgicA9YBY=",
"checksumSHA1": "puRmTVCmWrk+Qq6/yeHjNC3uvy0=",
"path": "github.com/scaleway/scaleway-cli/pkg/scwversion",
"revision": "88132ecdd39da62f7c73c5a8e1a383d7da5e0e09",
"revisionTime": "2016-10-27T15:40:24Z"
"revision": "2938313569b7f6cee34fdaae2a23c0daa7de5f3c",
"revisionTime": "2017-02-07T21:56:28Z"
},
{
"checksumSHA1": "kveaAmNlnvmIIuEkFcMlB+N7TqY=",
"path": "github.com/scaleway/scaleway-cli/pkg/sshcommand",
"revision": "15e90c8d6bd96a674cfe6539f0dc0fa122a7412b",
"revisionTime": "2016-12-07T13:39:28Z"
"revision": "2938313569b7f6cee34fdaae2a23c0daa7de5f3c",
"revisionTime": "2017-02-07T21:56:28Z"
},
{
"checksumSHA1": "tEKRyau4iRjmq2iwJbduD9RhN5s=",
@ -2735,6 +2730,7 @@
"revisionTime": "2017-02-13T08:20:48Z"
},
{
"checksumSHA1": "GQ9bu6PuydK3Yor1JgtVKUfEJm8=",
"path": "github.com/tent/http-link-go",
"revision": "ac974c61c2f990f4115b119354b5e0b47550e888",
"revisionTime": "2013-07-02T22:55:49Z"
@ -2892,10 +2888,10 @@
"revision": "75ce5fbba34b1912a3641adbd58cf317d7315821"
},
{
"checksumSHA1": "9x64JhJGo6z8TS0Q33cGcR64kjA=",
"checksumSHA1": "C1KKOxFoW7/W/NFNpiXK+boguNo=",
"path": "golang.org/x/crypto/curve25519",
"revision": "b8a2a83acfe6e6770b75de42d5ff4c67596675c0",
"revisionTime": "2017-01-13T19:21:00Z"
"revision": "453249f01cfeb54c3d549ddb75ff152ca243f9d8",
"revisionTime": "2017-02-08T20:51:15Z"
},
{
"checksumSHA1": "wGb//LjBPNxYHqk+dcLo7BjPXK8=",
@ -2918,14 +2914,14 @@
{
"checksumSHA1": "SJ3Ma3Ozavxpbh1usZWBCnzMKIc=",
"path": "golang.org/x/crypto/ssh/agent",
"revision": "b8a2a83acfe6e6770b75de42d5ff4c67596675c0",
"revisionTime": "2017-01-13T19:21:00Z"
"revision": "453249f01cfeb54c3d549ddb75ff152ca243f9d8",
"revisionTime": "2017-02-08T20:51:15Z"
},
{
"checksumSHA1": "xiderUuvye8Kpn7yX3niiJg32bE=",
"path": "golang.org/x/crypto/ssh/terminal",
"revision": "b8a2a83acfe6e6770b75de42d5ff4c67596675c0",
"revisionTime": "2017-01-13T19:21:00Z"
"revision": "453249f01cfeb54c3d549ddb75ff152ca243f9d8",
"revisionTime": "2017-02-08T20:51:15Z"
},
{
"checksumSHA1": "9jjO5GjLa0XF/nfWihF02RoH4qc=",