From 10166c149138b5dde1529757adcc04a4851498d0 Mon Sep 17 00:00:00 2001 From: Eric Chiang Date: Mon, 14 Mar 2016 17:22:52 -0700 Subject: [PATCH] Godeps: revendor packags with more up-to-date godep version Closes #1161 --- Godeps/Godeps.json | 210 ++++++++++++++++++ .../stscreds/assume_role_provider.go | 134 ----------- .../seccomp/fixtures/proc_self_status | 47 ---- 3 files changed, 210 insertions(+), 181 deletions(-) delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go delete mode 100644 Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/seccomp/fixtures/proc_self_status diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 65a5df3c83..9a26ff2567 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -33,6 +33,61 @@ "Comment": "v1.1.3", "Rev": "72440a9c5a884936f1c679591fcf04e31a9b772a" }, + { + "ImportPath": "github.com/aws/aws-sdk-go/aws/awserr", + "Comment": "v1.1.3", + "Rev": "72440a9c5a884936f1c679591fcf04e31a9b772a" + }, + { + "ImportPath": "github.com/aws/aws-sdk-go/aws/awsutil", + "Comment": "v1.1.3", + "Rev": "72440a9c5a884936f1c679591fcf04e31a9b772a" + }, + { + "ImportPath": "github.com/aws/aws-sdk-go/aws/client", + "Comment": "v1.1.3", + "Rev": "72440a9c5a884936f1c679591fcf04e31a9b772a" + }, + { + "ImportPath": "github.com/aws/aws-sdk-go/aws/client/metadata", + "Comment": "v1.1.3", + "Rev": "72440a9c5a884936f1c679591fcf04e31a9b772a" + }, + { + "ImportPath": "github.com/aws/aws-sdk-go/aws/corehandlers", + "Comment": "v1.1.3", + "Rev": "72440a9c5a884936f1c679591fcf04e31a9b772a" + }, + { + "ImportPath": "github.com/aws/aws-sdk-go/aws/credentials", + "Comment": "v1.1.3", + "Rev": "72440a9c5a884936f1c679591fcf04e31a9b772a" + }, + { + "ImportPath": "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds", + "Comment": "v1.1.3", + "Rev": "72440a9c5a884936f1c679591fcf04e31a9b772a" + }, + { + "ImportPath": "github.com/aws/aws-sdk-go/aws/defaults", + "Comment": "v1.1.3", + "Rev": "72440a9c5a884936f1c679591fcf04e31a9b772a" + }, + { + "ImportPath": "github.com/aws/aws-sdk-go/aws/ec2metadata", + "Comment": "v1.1.3", + "Rev": "72440a9c5a884936f1c679591fcf04e31a9b772a" + }, + { + "ImportPath": "github.com/aws/aws-sdk-go/aws/request", + "Comment": "v1.1.3", + "Rev": "72440a9c5a884936f1c679591fcf04e31a9b772a" + }, + { + "ImportPath": "github.com/aws/aws-sdk-go/aws/session", + "Comment": "v1.1.3", + "Rev": "72440a9c5a884936f1c679591fcf04e31a9b772a" + }, { "ImportPath": "github.com/aws/aws-sdk-go/private/endpoints", "Comment": "v1.1.3", @@ -97,6 +152,66 @@ "Comment": "0.2.1-764-g412c004", "Rev": "412c004d923b7b89701e7a1632de83f843657a03" }, + { + "ImportPath": "github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus", + "Rev": "412c004d923b7b89701e7a1632de83f843657a03" + }, + { + "ImportPath": "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts", + "Rev": "412c004d923b7b89701e7a1632de83f843657a03" + }, + { + "ImportPath": "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive", + "Rev": "412c004d923b7b89701e7a1632de83f843657a03" + }, + { + "ImportPath": "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils", + "Rev": "412c004d923b7b89701e7a1632de83f843657a03" + }, + { + "ImportPath": "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/homedir", + "Rev": "412c004d923b7b89701e7a1632de83f843657a03" + }, + { + "ImportPath": "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils", + "Rev": "412c004d923b7b89701e7a1632de83f843657a03" + }, + { + "ImportPath": "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/parsers", + "Rev": "412c004d923b7b89701e7a1632de83f843657a03" + }, + { + "ImportPath": "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/pools", + "Rev": "412c004d923b7b89701e7a1632de83f843657a03" + }, + { + "ImportPath": "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/promise", + "Rev": "412c004d923b7b89701e7a1632de83f843657a03" + }, + { + "ImportPath": "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/stdcopy", + "Rev": "412c004d923b7b89701e7a1632de83f843657a03" + }, + { + "ImportPath": "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system", + "Rev": "412c004d923b7b89701e7a1632de83f843657a03" + }, + { + "ImportPath": "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ulimit", + "Rev": "412c004d923b7b89701e7a1632de83f843657a03" + }, + { + "ImportPath": "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/units", + "Rev": "412c004d923b7b89701e7a1632de83f843657a03" + }, + { + "ImportPath": "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/volume", + "Rev": "412c004d923b7b89701e7a1632de83f843657a03" + }, + { + "ImportPath": "github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user", + "Rev": "412c004d923b7b89701e7a1632de83f843657a03" + }, { "ImportPath": "github.com/garyburd/redigo/internal", "Rev": "535138d7bcd717d6531c701ef5933d98b1866257" @@ -174,6 +289,76 @@ "Comment": "v0.0.7", "Rev": "7ca2aa4873aea7cb4265b1726acb24b90d8726c6" }, + { + "ImportPath": "github.com/opencontainers/runc/libcontainer/apparmor", + "Comment": "v0.0.7-12-g7ca2aa4", + "Rev": "7ca2aa4873aea7cb4265b1726acb24b90d8726c6" + }, + { + "ImportPath": "github.com/opencontainers/runc/libcontainer/cgroups", + "Comment": "v0.0.7-12-g7ca2aa4", + "Rev": "7ca2aa4873aea7cb4265b1726acb24b90d8726c6" + }, + { + "ImportPath": "github.com/opencontainers/runc/libcontainer/cgroups/fs", + "Comment": "v0.0.7-12-g7ca2aa4", + "Rev": "7ca2aa4873aea7cb4265b1726acb24b90d8726c6" + }, + { + "ImportPath": "github.com/opencontainers/runc/libcontainer/cgroups/systemd", + "Comment": "v0.0.7-12-g7ca2aa4", + "Rev": "7ca2aa4873aea7cb4265b1726acb24b90d8726c6" + }, + { + "ImportPath": "github.com/opencontainers/runc/libcontainer/configs", + "Comment": "v0.0.7-12-g7ca2aa4", + "Rev": "7ca2aa4873aea7cb4265b1726acb24b90d8726c6" + }, + { + "ImportPath": "github.com/opencontainers/runc/libcontainer/configs/validate", + "Comment": "v0.0.7-12-g7ca2aa4", + "Rev": "7ca2aa4873aea7cb4265b1726acb24b90d8726c6" + }, + { + "ImportPath": "github.com/opencontainers/runc/libcontainer/criurpc", + "Comment": "v0.0.7-12-g7ca2aa4", + "Rev": "7ca2aa4873aea7cb4265b1726acb24b90d8726c6" + }, + { + "ImportPath": "github.com/opencontainers/runc/libcontainer/label", + "Comment": "v0.0.7-12-g7ca2aa4", + "Rev": "7ca2aa4873aea7cb4265b1726acb24b90d8726c6" + }, + { + "ImportPath": "github.com/opencontainers/runc/libcontainer/seccomp", + "Comment": "v0.0.7-12-g7ca2aa4", + "Rev": "7ca2aa4873aea7cb4265b1726acb24b90d8726c6" + }, + { + "ImportPath": "github.com/opencontainers/runc/libcontainer/selinux", + "Comment": "v0.0.7-12-g7ca2aa4", + "Rev": "7ca2aa4873aea7cb4265b1726acb24b90d8726c6" + }, + { + "ImportPath": "github.com/opencontainers/runc/libcontainer/stacktrace", + "Comment": "v0.0.7-12-g7ca2aa4", + "Rev": "7ca2aa4873aea7cb4265b1726acb24b90d8726c6" + }, + { + "ImportPath": "github.com/opencontainers/runc/libcontainer/system", + "Comment": "v0.0.7-12-g7ca2aa4", + "Rev": "7ca2aa4873aea7cb4265b1726acb24b90d8726c6" + }, + { + "ImportPath": "github.com/opencontainers/runc/libcontainer/user", + "Comment": "v0.0.7-12-g7ca2aa4", + "Rev": "7ca2aa4873aea7cb4265b1726acb24b90d8726c6" + }, + { + "ImportPath": "github.com/opencontainers/runc/libcontainer/utils", + "Comment": "v0.0.7-12-g7ca2aa4", + "Rev": "7ca2aa4873aea7cb4265b1726acb24b90d8726c6" + }, { "ImportPath": "github.com/pborman/uuid", "Rev": "cccd189d45f7ac3368a0d127efb7f4d08ae0b655" @@ -228,6 +413,10 @@ "ImportPath": "github.com/vishvananda/netlink", "Rev": "1e2e08e8a2dcdacaae3f14ac44c5cfa31361f270" }, + { + "ImportPath": "github.com/vishvananda/netlink/nl", + "Rev": "1e2e08e8a2dcdacaae3f14ac44c5cfa31361f270" + }, { "ImportPath": "golang.org/x/exp/inotify", "Rev": "d00e13ec443927751b2bd49e97dea7bf3b6a6487" @@ -240,6 +429,18 @@ "ImportPath": "golang.org/x/oauth2", "Rev": "ca8a464d23d55afd32571475db223e065ffd8a52" }, + { + "ImportPath": "golang.org/x/oauth2/internal", + "Rev": "ca8a464d23d55afd32571475db223e065ffd8a52" + }, + { + "ImportPath": "golang.org/x/oauth2/jws", + "Rev": "ca8a464d23d55afd32571475db223e065ffd8a52" + }, + { + "ImportPath": "golang.org/x/oauth2/jwt", + "Rev": "ca8a464d23d55afd32571475db223e065ffd8a52" + }, { "ImportPath": "google.golang.org/api/bigquery/v2", "Rev": "0c2979aeaa5b573e60d3ddffe5ce8dca8df309bd" @@ -248,6 +449,10 @@ "ImportPath": "google.golang.org/api/googleapi", "Rev": "0c2979aeaa5b573e60d3ddffe5ce8dca8df309bd" }, + { + "ImportPath": "google.golang.org/api/googleapi/internal/uritemplates", + "Rev": "0c2979aeaa5b573e60d3ddffe5ce8dca8df309bd" + }, { "ImportPath": "google.golang.org/cloud/compute/metadata", "Rev": "542bfb014d8e28df6e27be847dfdc40c510dab1a" @@ -260,6 +465,11 @@ "ImportPath": "gopkg.in/olivere/elastic.v2", "Comment": "v2.0.12", "Rev": "3cfe88295d20b6299bd935131fc0fd17316405ad" + }, + { + "ImportPath": "gopkg.in/olivere/elastic.v2/uritemplates", + "Comment": "v2.0.12", + "Rev": "3cfe88295d20b6299bd935131fc0fd17316405ad" } ] } diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go deleted file mode 100644 index 4d6408b9d8..0000000000 --- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go +++ /dev/null @@ -1,134 +0,0 @@ -// Package stscreds are credential Providers to retrieve STS AWS credentials. -// -// STS provides multiple ways to retrieve credentials which can be used when making -// future AWS service API operation calls. -package stscreds - -import ( - "fmt" - "time" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/client" - "github.com/aws/aws-sdk-go/aws/credentials" - "github.com/aws/aws-sdk-go/service/sts" -) - -// ProviderName provides a name of AssumeRole provider -const ProviderName = "AssumeRoleProvider" - -// AssumeRoler represents the minimal subset of the STS client API used by this provider. -type AssumeRoler interface { - AssumeRole(input *sts.AssumeRoleInput) (*sts.AssumeRoleOutput, error) -} - -// DefaultDuration is the default amount of time in minutes that the credentials -// will be valid for. -var DefaultDuration = time.Duration(15) * time.Minute - -// AssumeRoleProvider retrieves temporary credentials from the STS service, and -// keeps track of their expiration time. This provider must be used explicitly, -// as it is not included in the credentials chain. -type AssumeRoleProvider struct { - credentials.Expiry - - // STS client to make assume role request with. - Client AssumeRoler - - // Role to be assumed. - RoleARN string - - // Session name, if you wish to reuse the credentials elsewhere. - RoleSessionName string - - // Expiry duration of the STS credentials. Defaults to 15 minutes if not set. - Duration time.Duration - - // Optional ExternalID to pass along, defaults to nil if not set. - ExternalID *string - - // ExpiryWindow will allow the credentials to trigger refreshing prior to - // the credentials actually expiring. This is beneficial so race conditions - // with expiring credentials do not cause request to fail unexpectedly - // due to ExpiredTokenException exceptions. - // - // So a ExpiryWindow of 10s would cause calls to IsExpired() to return true - // 10 seconds before the credentials are actually expired. - // - // If ExpiryWindow is 0 or less it will be ignored. - ExpiryWindow time.Duration -} - -// NewCredentials returns a pointer to a new Credentials object wrapping the -// AssumeRoleProvider. The credentials will expire every 15 minutes and the -// role will be named after a nanosecond timestamp of this operation. -// -// Takes a Config provider to create the STS client. The ConfigProvider is -// satisfied by the session.Session type. -func NewCredentials(c client.ConfigProvider, roleARN string, options ...func(*AssumeRoleProvider)) *credentials.Credentials { - p := &AssumeRoleProvider{ - Client: sts.New(c), - RoleARN: roleARN, - Duration: DefaultDuration, - } - - for _, option := range options { - option(p) - } - - return credentials.NewCredentials(p) -} - -// NewCredentialsWithClient returns a pointer to a new Credentials object wrapping the -// AssumeRoleProvider. The credentials will expire every 15 minutes and the -// role will be named after a nanosecond timestamp of this operation. -// -// Takes an AssumeRoler which can be satisfiede by the STS client. -func NewCredentialsWithClient(svc AssumeRoler, roleARN string, options ...func(*AssumeRoleProvider)) *credentials.Credentials { - p := &AssumeRoleProvider{ - Client: svc, - RoleARN: roleARN, - Duration: DefaultDuration, - } - - for _, option := range options { - option(p) - } - - return credentials.NewCredentials(p) -} - -// Retrieve generates a new set of temporary credentials using STS. -func (p *AssumeRoleProvider) Retrieve() (credentials.Value, error) { - - // Apply defaults where parameters are not set. - if p.RoleSessionName == "" { - // Try to work out a role name that will hopefully end up unique. - p.RoleSessionName = fmt.Sprintf("%d", time.Now().UTC().UnixNano()) - } - if p.Duration == 0 { - // Expire as often as AWS permits. - p.Duration = DefaultDuration - } - - roleOutput, err := p.Client.AssumeRole(&sts.AssumeRoleInput{ - DurationSeconds: aws.Int64(int64(p.Duration / time.Second)), - RoleArn: aws.String(p.RoleARN), - RoleSessionName: aws.String(p.RoleSessionName), - ExternalId: p.ExternalID, - }) - - if err != nil { - return credentials.Value{ProviderName: ProviderName}, err - } - - // We will proactively generate new credentials before they expire. - p.SetExpiration(*roleOutput.Credentials.Expiration, p.ExpiryWindow) - - return credentials.Value{ - AccessKeyID: *roleOutput.Credentials.AccessKeyId, - SecretAccessKey: *roleOutput.Credentials.SecretAccessKey, - SessionToken: *roleOutput.Credentials.SessionToken, - ProviderName: ProviderName, - }, nil -} diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/seccomp/fixtures/proc_self_status b/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/seccomp/fixtures/proc_self_status deleted file mode 100644 index 0e0084f6c2..0000000000 --- a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/seccomp/fixtures/proc_self_status +++ /dev/null @@ -1,47 +0,0 @@ -Name: cat -State: R (running) -Tgid: 19383 -Ngid: 0 -Pid: 19383 -PPid: 19275 -TracerPid: 0 -Uid: 1000 1000 1000 1000 -Gid: 1000 1000 1000 1000 -FDSize: 256 -Groups: 24 25 27 29 30 44 46 102 104 108 111 1000 1001 -NStgid: 19383 -NSpid: 19383 -NSpgid: 19383 -NSsid: 19275 -VmPeak: 5944 kB -VmSize: 5944 kB -VmLck: 0 kB -VmPin: 0 kB -VmHWM: 744 kB -VmRSS: 744 kB -VmData: 324 kB -VmStk: 136 kB -VmExe: 48 kB -VmLib: 1776 kB -VmPTE: 32 kB -VmPMD: 12 kB -VmSwap: 0 kB -Threads: 1 -SigQ: 0/30067 -SigPnd: 0000000000000000 -ShdPnd: 0000000000000000 -SigBlk: 0000000000000000 -SigIgn: 0000000000000080 -SigCgt: 0000000000000000 -CapInh: 0000000000000000 -CapPrm: 0000000000000000 -CapEff: 0000000000000000 -CapBnd: 0000003fffffffff -CapAmb: 0000000000000000 -Seccomp: 0 -Cpus_allowed: f -Cpus_allowed_list: 0-3 -Mems_allowed: 00000000,00000001 -Mems_allowed_list: 0 -voluntary_ctxt_switches: 0 -nonvoluntary_ctxt_switches: 1