Skip to content

Commit

Permalink
vendor: Update aws-sdk-go to v1.16.26
Browse files Browse the repository at this point in the history 
Support for Amazon ECR PrivateLink
  • Loading branch information
@samuelkarp
samuelkarp committed Jan 26, 2019
1 parent 6f41db0 commit 759c287
Show file tree
Hide file tree
Showing 58 changed files with 3,266 additions and 1,108 deletions.
11 changes: 6 additions & 5 deletions ecr-login/Gopkg.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,056 changes: 511 additions & 545 deletions ecr-login/api/mocks/api_mocks.go
View file

Large diffs are not rendered by default.

61 changes: 24 additions & 37 deletions ecr-login/cache/mocks/cache_mocks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,82 +11,69 @@
// express or implied. See the License for the specific language governing
// permissions and limitations under the License.

// Code generated by MockGen. DO NOT EDIT.
// Automatically generated by MockGen. DO NOT EDIT!
// Source: github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cache (interfaces: CredentialsCache)

// Package mock_cache is a generated GoMock package.
package mock_cache

import (
reflect "reflect"

cache "github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cache"
gomock "github.com/golang/mock/gomock"
)

// MockCredentialsCache is a mock of CredentialsCache interface
// Mock of CredentialsCache interface
type MockCredentialsCache struct {
ctrl *gomock.Controller
recorder *MockCredentialsCacheMockRecorder
recorder *_MockCredentialsCacheRecorder
}

// MockCredentialsCacheMockRecorder is the mock recorder for MockCredentialsCache
type MockCredentialsCacheMockRecorder struct {
// Recorder for MockCredentialsCache (not exported)
type _MockCredentialsCacheRecorder struct {
mock *MockCredentialsCache
}

// NewMockCredentialsCache creates a new mock instance
func NewMockCredentialsCache(ctrl *gomock.Controller) *MockCredentialsCache {
mock := &MockCredentialsCache{ctrl: ctrl}
mock.recorder = &MockCredentialsCacheMockRecorder{mock}
mock.recorder = &_MockCredentialsCacheRecorder{mock}
return mock
}

// EXPECT returns an object that allows the caller to indicate expected use
func (m *MockCredentialsCache) EXPECT() *MockCredentialsCacheMockRecorder {
return m.recorder
func (_m *MockCredentialsCache) EXPECT() *_MockCredentialsCacheRecorder {
return _m.recorder
}

// Clear mocks base method
func (m *MockCredentialsCache) Clear() {
m.ctrl.Call(m, "Clear")
func (_m *MockCredentialsCache) Clear() {
_m.ctrl.Call(_m, "Clear")
}

// Clear indicates an expected call of Clear
func (mr *MockCredentialsCacheMockRecorder) Clear() *gomock.Call {
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Clear", reflect.TypeOf((*MockCredentialsCache)(nil).Clear))
func (_mr *_MockCredentialsCacheRecorder) Clear() *gomock.Call {
return _mr.mock.ctrl.RecordCall(_mr.mock, "Clear")
}

// Get mocks base method
func (m *MockCredentialsCache) Get(arg0 string) *cache.AuthEntry {
ret := m.ctrl.Call(m, "Get", arg0)
func (_m *MockCredentialsCache) Get(_param0 string) *cache.AuthEntry {
ret := _m.ctrl.Call(_m, "Get", _param0)
ret0, _ := ret[0].(*cache.AuthEntry)
return ret0
}

// Get indicates an expected call of Get
func (mr *MockCredentialsCacheMockRecorder) Get(arg0 interface{}) *gomock.Call {
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockCredentialsCache)(nil).Get), arg0)
func (_mr *_MockCredentialsCacheRecorder) Get(arg0 interface{}) *gomock.Call {
return _mr.mock.ctrl.RecordCall(_mr.mock, "Get", arg0)
}

// List mocks base method
func (m *MockCredentialsCache) List() []*cache.AuthEntry {
ret := m.ctrl.Call(m, "List")
func (_m *MockCredentialsCache) List() []*cache.AuthEntry {
ret := _m.ctrl.Call(_m, "List")
ret0, _ := ret[0].([]*cache.AuthEntry)
return ret0
}

// List indicates an expected call of List
func (mr *MockCredentialsCacheMockRecorder) List() *gomock.Call {
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockCredentialsCache)(nil).List))
func (_mr *_MockCredentialsCacheRecorder) List() *gomock.Call {
return _mr.mock.ctrl.RecordCall(_mr.mock, "List")
}

// Set mocks base method
func (m *MockCredentialsCache) Set(arg0 string, arg1 *cache.AuthEntry) {
m.ctrl.Call(m, "Set", arg0, arg1)
func (_m *MockCredentialsCache) Set(_param0 string, _param1 *cache.AuthEntry) {
_m.ctrl.Call(_m, "Set", _param0, _param1)
}

// Set indicates an expected call of Set
func (mr *MockCredentialsCacheMockRecorder) Set(arg0, arg1 interface{}) *gomock.Call {
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Set", reflect.TypeOf((*MockCredentialsCache)(nil).Set), arg0, arg1)
func (_mr *_MockCredentialsCacheRecorder) Set(arg0, arg1 interface{}) *gomock.Call {
return _mr.mock.ctrl.RecordCall(_mr.mock, "Set", arg0, arg1)
}
117 changes: 47 additions & 70 deletions ecr-login/mocks/ecr_mocks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,163 +11,140 @@
// express or implied. See the License for the specific language governing
// permissions and limitations under the License.

// Code generated by MockGen. DO NOT EDIT.
// Automatically generated by MockGen. DO NOT EDIT!
// Source: github.com/awslabs/amazon-ecr-credential-helper/ecr-login/api (interfaces: ClientFactory,Client)

// Package mock_api is a generated GoMock package.
package mock_api

import (
reflect "reflect"

aws "github.com/aws/aws-sdk-go/aws"
session "github.com/aws/aws-sdk-go/aws/session"
api "github.com/awslabs/amazon-ecr-credential-helper/ecr-login/api"
gomock "github.com/golang/mock/gomock"
)

// MockClientFactory is a mock of ClientFactory interface
// Mock of ClientFactory interface
type MockClientFactory struct {
ctrl *gomock.Controller
recorder *MockClientFactoryMockRecorder
recorder *_MockClientFactoryRecorder
}

// MockClientFactoryMockRecorder is the mock recorder for MockClientFactory
type MockClientFactoryMockRecorder struct {
// Recorder for MockClientFactory (not exported)
type _MockClientFactoryRecorder struct {
mock *MockClientFactory
}

// NewMockClientFactory creates a new mock instance
func NewMockClientFactory(ctrl *gomock.Controller) *MockClientFactory {
mock := &MockClientFactory{ctrl: ctrl}
mock.recorder = &MockClientFactoryMockRecorder{mock}
mock.recorder = &_MockClientFactoryRecorder{mock}
return mock
}

// EXPECT returns an object that allows the caller to indicate expected use
func (m *MockClientFactory) EXPECT() *MockClientFactoryMockRecorder {
return m.recorder
func (_m *MockClientFactory) EXPECT() *_MockClientFactoryRecorder {
return _m.recorder
}

// NewClient mocks base method
func (m *MockClientFactory) NewClient(arg0 *session.Session, arg1 *aws.Config) api.Client {
ret := m.ctrl.Call(m, "NewClient", arg0, arg1)
func (_m *MockClientFactory) NewClient(_param0 *session.Session, _param1 *aws.Config) api.Client {
ret := _m.ctrl.Call(_m, "NewClient", _param0, _param1)
ret0, _ := ret[0].(api.Client)
return ret0
}

// NewClient indicates an expected call of NewClient
func (mr *MockClientFactoryMockRecorder) NewClient(arg0, arg1 interface{}) *gomock.Call {
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewClient", reflect.TypeOf((*MockClientFactory)(nil).NewClient), arg0, arg1)
func (_mr *_MockClientFactoryRecorder) NewClient(arg0, arg1 interface{}) *gomock.Call {
return _mr.mock.ctrl.RecordCall(_mr.mock, "NewClient", arg0, arg1)
}

// NewClientFromRegion mocks base method
func (m *MockClientFactory) NewClientFromRegion(arg0 string) api.Client {
ret := m.ctrl.Call(m, "NewClientFromRegion", arg0)
func (_m *MockClientFactory) NewClientFromRegion(_param0 string) api.Client {
ret := _m.ctrl.Call(_m, "NewClientFromRegion", _param0)
ret0, _ := ret[0].(api.Client)
return ret0
}

// NewClientFromRegion indicates an expected call of NewClientFromRegion
func (mr *MockClientFactoryMockRecorder) NewClientFromRegion(arg0 interface{}) *gomock.Call {
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewClientFromRegion", reflect.TypeOf((*MockClientFactory)(nil).NewClientFromRegion), arg0)
func (_mr *_MockClientFactoryRecorder) NewClientFromRegion(arg0 interface{}) *gomock.Call {
return _mr.mock.ctrl.RecordCall(_mr.mock, "NewClientFromRegion", arg0)
}

// NewClientWithDefaults mocks base method
func (m *MockClientFactory) NewClientWithDefaults() api.Client {
ret := m.ctrl.Call(m, "NewClientWithDefaults")
func (_m *MockClientFactory) NewClientWithDefaults() api.Client {
ret := _m.ctrl.Call(_m, "NewClientWithDefaults")
ret0, _ := ret[0].(api.Client)
return ret0
}

// NewClientWithDefaults indicates an expected call of NewClientWithDefaults
func (mr *MockClientFactoryMockRecorder) NewClientWithDefaults() *gomock.Call {
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewClientWithDefaults", reflect.TypeOf((*MockClientFactory)(nil).NewClientWithDefaults))
func (_mr *_MockClientFactoryRecorder) NewClientWithDefaults() *gomock.Call {
return _mr.mock.ctrl.RecordCall(_mr.mock, "NewClientWithDefaults")
}

// NewClientWithFipsEndpoint mocks base method
func (m *MockClientFactory) NewClientWithFipsEndpoint(arg0 string) (api.Client, error) {
ret := m.ctrl.Call(m, "NewClientWithFipsEndpoint", arg0)
func (_m *MockClientFactory) NewClientWithFipsEndpoint(_param0 string) (api.Client, error) {
ret := _m.ctrl.Call(_m, "NewClientWithFipsEndpoint", _param0)
ret0, _ := ret[0].(api.Client)
ret1, _ := ret[1].(error)
return ret0, ret1
}

// NewClientWithFipsEndpoint indicates an expected call of NewClientWithFipsEndpoint
func (mr *MockClientFactoryMockRecorder) NewClientWithFipsEndpoint(arg0 interface{}) *gomock.Call {
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewClientWithFipsEndpoint", reflect.TypeOf((*MockClientFactory)(nil).NewClientWithFipsEndpoint), arg0)
func (_mr *_MockClientFactoryRecorder) NewClientWithFipsEndpoint(arg0 interface{}) *gomock.Call {
return _mr.mock.ctrl.RecordCall(_mr.mock, "NewClientWithFipsEndpoint", arg0)
}

// NewClientWithOptions mocks base method
func (m *MockClientFactory) NewClientWithOptions(arg0 api.Options) api.Client {
ret := m.ctrl.Call(m, "NewClientWithOptions", arg0)
func (_m *MockClientFactory) NewClientWithOptions(_param0 api.Options) api.Client {
ret := _m.ctrl.Call(_m, "NewClientWithOptions", _param0)
ret0, _ := ret[0].(api.Client)
return ret0
}

// NewClientWithOptions indicates an expected call of NewClientWithOptions
func (mr *MockClientFactoryMockRecorder) NewClientWithOptions(arg0 interface{}) *gomock.Call {
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewClientWithOptions", reflect.TypeOf((*MockClientFactory)(nil).NewClientWithOptions), arg0)
func (_mr *_MockClientFactoryRecorder) NewClientWithOptions(arg0 interface{}) *gomock.Call {
return _mr.mock.ctrl.RecordCall(_mr.mock, "NewClientWithOptions", arg0)
}

// MockClient is a mock of Client interface
// Mock of Client interface
type MockClient struct {
ctrl *gomock.Controller
recorder *MockClientMockRecorder
recorder *_MockClientRecorder
}

// MockClientMockRecorder is the mock recorder for MockClient
type MockClientMockRecorder struct {
// Recorder for MockClient (not exported)
type _MockClientRecorder struct {
mock *MockClient
}

// NewMockClient creates a new mock instance
func NewMockClient(ctrl *gomock.Controller) *MockClient {
mock := &MockClient{ctrl: ctrl}
mock.recorder = &MockClientMockRecorder{mock}
mock.recorder = &_MockClientRecorder{mock}
return mock
}

// EXPECT returns an object that allows the caller to indicate expected use
func (m *MockClient) EXPECT() *MockClientMockRecorder {
return m.recorder
func (_m *MockClient) EXPECT() *_MockClientRecorder {
return _m.recorder
}

// GetCredentials mocks base method
func (m *MockClient) GetCredentials(arg0 string) (*api.Auth, error) {
ret := m.ctrl.Call(m, "GetCredentials", arg0)
func (_m *MockClient) GetCredentials(_param0 string) (*api.Auth, error) {
ret := _m.ctrl.Call(_m, "GetCredentials", _param0)
ret0, _ := ret[0].(*api.Auth)
ret1, _ := ret[1].(error)
return ret0, ret1
}

// GetCredentials indicates an expected call of GetCredentials
func (mr *MockClientMockRecorder) GetCredentials(arg0 interface{}) *gomock.Call {
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCredentials", reflect.TypeOf((*MockClient)(nil).GetCredentials), arg0)
func (_mr *_MockClientRecorder) GetCredentials(arg0 interface{}) *gomock.Call {
return _mr.mock.ctrl.RecordCall(_mr.mock, "GetCredentials", arg0)
}

// GetCredentialsByRegistryID mocks base method
func (m *MockClient) GetCredentialsByRegistryID(arg0 string) (*api.Auth, error) {
ret := m.ctrl.Call(m, "GetCredentialsByRegistryID", arg0)
func (_m *MockClient) GetCredentialsByRegistryID(_param0 string) (*api.Auth, error) {
ret := _m.ctrl.Call(_m, "GetCredentialsByRegistryID", _param0)
ret0, _ := ret[0].(*api.Auth)
ret1, _ := ret[1].(error)
return ret0, ret1
}

// GetCredentialsByRegistryID indicates an expected call of GetCredentialsByRegistryID
func (mr *MockClientMockRecorder) GetCredentialsByRegistryID(arg0 interface{}) *gomock.Call {
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCredentialsByRegistryID", reflect.TypeOf((*MockClient)(nil).GetCredentialsByRegistryID), arg0)
func (_mr *_MockClientRecorder) GetCredentialsByRegistryID(arg0 interface{}) *gomock.Call {
return _mr.mock.ctrl.RecordCall(_mr.mock, "GetCredentialsByRegistryID", arg0)
}

// ListCredentials mocks base method
func (m *MockClient) ListCredentials() ([]*api.Auth, error) {
ret := m.ctrl.Call(m, "ListCredentials")
func (_m *MockClient) ListCredentials() ([]*api.Auth, error) {
ret := _m.ctrl.Call(_m, "ListCredentials")
ret0, _ := ret[0].([]*api.Auth)
ret1, _ := ret[1].(error)
return ret0, ret1
}

// ListCredentials indicates an expected call of ListCredentials
func (mr *MockClientMockRecorder) ListCredentials() *gomock.Call {
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListCredentials", reflect.TypeOf((*MockClient)(nil).ListCredentials))
func (_mr *_MockClientRecorder) ListCredentials() *gomock.Call {
return _mr.mock.ctrl.RecordCall(_mr.mock, "ListCredentials")
}
Loading

0 comments on commit 759c287

Please sign in to comment.