From f2fd8fb4d147e91728eacc89077cffc907a63ccf Mon Sep 17 00:00:00 2001 From: Paul Maddox Date: Thu, 5 Sep 2019 13:39:28 +0400 Subject: [PATCH] Renamed package to github.com/awslabs/fargatecli --- .circleci/config.yml | 2 +- CHANGELOG.md | 12 ++++++------ CONTRIBUTING.md | 4 ++-- README.md | 2 +- acm/certificate_test.go | 2 +- acm/main.go | 2 +- acm/mock/client/client.go | 14 ++++++++++++-- cloudwatchlogs/log_group.go | 2 +- cmd/certificate.go | 2 +- cmd/certificate_destroy.go | 2 +- cmd/certificate_destroy_test.go | 6 +++--- cmd/certificate_import.go | 2 +- cmd/certificate_import_test.go | 4 ++-- cmd/certificate_info.go | 2 +- cmd/certificate_info_test.go | 6 +++--- cmd/certificate_list.go | 2 +- cmd/certificate_list_test.go | 6 +++--- cmd/certificate_request.go | 2 +- cmd/certificate_request_test.go | 4 ++-- cmd/certificate_test.go | 6 +++--- cmd/certificate_validate.go | 4 ++-- cmd/certificate_validate_test.go | 10 +++++----- cmd/lb.go | 2 +- cmd/lb_alias.go | 4 ++-- cmd/lb_alias_test.go | 10 +++++----- cmd/lb_create.go | 6 +++--- cmd/lb_create_test.go | 12 ++++++------ cmd/lb_destroy.go | 4 ++-- cmd/lb_info.go | 8 ++++---- cmd/lb_list.go | 2 +- cmd/lb_list_test.go | 6 +++--- cmd/logs.go | 4 ++-- cmd/root.go | 4 ++-- cmd/service_create.go | 18 +++++++++--------- cmd/service_deploy.go | 10 +++++----- cmd/service_destroy.go | 6 +++--- cmd/service_env_list.go | 2 +- cmd/service_env_set.go | 4 ++-- cmd/service_env_unset.go | 4 ++-- cmd/service_info.go | 10 +++++----- cmd/service_list.go | 6 +++--- cmd/service_ps.go | 6 +++--- cmd/service_restart.go | 4 ++-- cmd/service_scale.go | 4 ++-- cmd/service_update.go | 4 ++-- cmd/task_info.go | 6 +++--- cmd/task_list.go | 4 ++-- cmd/task_ps.go | 6 +++--- cmd/task_run.go | 16 ++++++++-------- cmd/task_stop.go | 4 ++-- cmd/vpc_operation.go | 2 +- cmd/vpc_operation_test.go | 4 ++-- doc/website/index.html | 12 ++++++------ docker/main.go | 2 +- ec2/eni.go | 2 +- ec2/main.go | 2 +- ec2/mock/client/client.go | 12 +++++++++++- ec2/vpc_test.go | 2 +- ecr/repository.go | 2 +- ecs/service.go | 2 +- ecs/task.go | 2 +- ecs/task_definition.go | 2 +- elbv2/listener.go | 2 +- elbv2/listener_test.go | 2 +- elbv2/load_balancer.go | 2 +- elbv2/load_balancer_test.go | 2 +- elbv2/main.go | 2 +- elbv2/mock/client/client.go | 16 ++++++++++++++-- elbv2/target_group.go | 2 +- elbv2/target_group_test.go | 2 +- git/main.go | 2 +- go.mod | 11 +++++------ main.go | 2 +- route53/hosted_zone_test.go | 2 +- route53/main.go | 2 +- route53/mock/client/client.go | 10 ++++++++-- 76 files changed, 208 insertions(+), 171 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b92305c..e2b269f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build: docker: - image: circleci/golang:1.10 - working_directory: /go/src/github.com/jpignata/fargate + working_directory: /go/src/github.com/awslabs/fargatecli steps: - checkout diff --git a/CHANGELOG.md b/CHANGELOG.md index d2860cf..9105478 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -92,9 +92,9 @@ fail to be issued immediately after request would cause crashes in lb info and lb list as the resource record was never generated. -[issue-2]: https://github.com/jpignata/fargate/issues/2 -[issue-6]: https://github.com/jpignata/fargate/issues/6 -[issue-8]: https://github.com/jpignata/fargate/issues/8 -[issue-11]: https://github.com/jpignata/fargate/issues/11 -[issue-14]: https://github.com/jpignata/fargate/issues/14 -[issue-22]: https://github.com/jpignata/fargate/issues/22 +[issue-2]: https://github.com/awslabs/fargatecli/issues/2 +[issue-6]: https://github.com/awslabs/fargatecli/issues/6 +[issue-8]: https://github.com/awslabs/fargatecli/issues/8 +[issue-11]: https://github.com/awslabs/fargatecli/issues/11 +[issue-14]: https://github.com/awslabs/fargatecli/issues/14 +[issue-22]: https://github.com/awslabs/fargatecli/issues/22 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5a5351f..faf8a93 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,13 +33,13 @@ email and Google Hangouts at john@pignata.com. - Install the source code from GitHub ```console - go get github.com/jpignata/fargate + go get github.com/awslabs/fargatecli ``` - Run `dep ensure` to install required dependencies ```console - cd $GOPATH/src/github.com/jpignata/fargate + cd $GOPATH/src/github.com/awslabs/fargatecli dep ensure ``` diff --git a/README.md b/README.md index 0b62d29..b8a24de 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Fargate CLI [![CircleCI](https://circleci.com/gh/jpignata/fargate/tree/master.svg?style=svg)](https://circleci.com/gh/jpignata/fargate/tree/master) -[![GoDoc](https://godoc.org/github.com/jpignata/fargate?status.svg)](https://godoc.org/github.com/jpignata/fargate) +[![GoDoc](https://godoc.org/github.com/awslabs/fargatecli?status.svg)](https://godoc.org/github.com/awslabs/fargatecli) ## Screencast diff --git a/acm/certificate_test.go b/acm/certificate_test.go index 3dcdef6..8aa7b67 100644 --- a/acm/certificate_test.go +++ b/acm/certificate_test.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/aws" awsacm "github.com/aws/aws-sdk-go/service/acm" "github.com/golang/mock/gomock" - "github.com/jpignata/fargate/acm/mock/sdk" + "github.com/awslabs/fargatecli/acm/mock/sdk" ) func TestValidateAlias(t *testing.T) { diff --git a/acm/main.go b/acm/main.go index 4bb7912..23bf530 100644 --- a/acm/main.go +++ b/acm/main.go @@ -1,6 +1,6 @@ package acm -//go:generate mockgen -package client -destination=mock/client/client.go github.com/jpignata/fargate/acm Client +//go:generate mockgen -package client -destination=mock/client/client.go github.com/awslabs/fargatecli/acm Client //go:generate mockgen -package sdk -source ../vendor/github.com/aws/aws-sdk-go/service/acm/acmiface/interface.go -destination=mock/sdk/acmiface.go github.com/aws/aws-sdk-go/service/acm/acmiface ACMAPI import ( diff --git a/acm/mock/client/client.go b/acm/mock/client/client.go index 707a043..5a68127 100644 --- a/acm/mock/client/client.go +++ b/acm/mock/client/client.go @@ -1,12 +1,12 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/jpignata/fargate/acm (interfaces: Client) +// Source: github.com/awslabs/fargatecli/acm (interfaces: Client) // Package client is a generated GoMock package. package client import ( gomock "github.com/golang/mock/gomock" - acm "github.com/jpignata/fargate/acm" + acm "github.com/awslabs/fargatecli/acm" reflect "reflect" ) @@ -35,6 +35,7 @@ func (m *MockClient) EXPECT() *MockClientMockRecorder { // DeleteCertificate mocks base method func (m *MockClient) DeleteCertificate(arg0 string) error { + m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DeleteCertificate", arg0) ret0, _ := ret[0].(error) return ret0 @@ -42,11 +43,13 @@ func (m *MockClient) DeleteCertificate(arg0 string) error { // DeleteCertificate indicates an expected call of DeleteCertificate func (mr *MockClientMockRecorder) DeleteCertificate(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteCertificate", reflect.TypeOf((*MockClient)(nil).DeleteCertificate), arg0) } // ImportCertificate mocks base method func (m *MockClient) ImportCertificate(arg0, arg1, arg2 []byte) (string, error) { + m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ImportCertificate", arg0, arg1, arg2) ret0, _ := ret[0].(string) ret1, _ := ret[1].(error) @@ -55,11 +58,13 @@ func (m *MockClient) ImportCertificate(arg0, arg1, arg2 []byte) (string, error) // ImportCertificate indicates an expected call of ImportCertificate func (mr *MockClientMockRecorder) ImportCertificate(arg0, arg1, arg2 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ImportCertificate", reflect.TypeOf((*MockClient)(nil).ImportCertificate), arg0, arg1, arg2) } // InflateCertificate mocks base method func (m *MockClient) InflateCertificate(arg0 *acm.Certificate) error { + m.ctrl.T.Helper() ret := m.ctrl.Call(m, "InflateCertificate", arg0) ret0, _ := ret[0].(error) return ret0 @@ -67,11 +72,13 @@ func (m *MockClient) InflateCertificate(arg0 *acm.Certificate) error { // InflateCertificate indicates an expected call of InflateCertificate func (mr *MockClientMockRecorder) InflateCertificate(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InflateCertificate", reflect.TypeOf((*MockClient)(nil).InflateCertificate), arg0) } // ListCertificates mocks base method func (m *MockClient) ListCertificates() (acm.Certificates, error) { + m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ListCertificates") ret0, _ := ret[0].(acm.Certificates) ret1, _ := ret[1].(error) @@ -80,11 +87,13 @@ func (m *MockClient) ListCertificates() (acm.Certificates, error) { // ListCertificates indicates an expected call of ListCertificates func (mr *MockClientMockRecorder) ListCertificates() *gomock.Call { + mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListCertificates", reflect.TypeOf((*MockClient)(nil).ListCertificates)) } // RequestCertificate mocks base method func (m *MockClient) RequestCertificate(arg0 string, arg1 []string) (string, error) { + m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RequestCertificate", arg0, arg1) ret0, _ := ret[0].(string) ret1, _ := ret[1].(error) @@ -93,5 +102,6 @@ func (m *MockClient) RequestCertificate(arg0 string, arg1 []string) (string, err // RequestCertificate indicates an expected call of RequestCertificate func (mr *MockClientMockRecorder) RequestCertificate(arg0, arg1 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RequestCertificate", reflect.TypeOf((*MockClient)(nil).RequestCertificate), arg0, arg1) } diff --git a/cloudwatchlogs/log_group.go b/cloudwatchlogs/log_group.go index 9a64124..7aa7020 100644 --- a/cloudwatchlogs/log_group.go +++ b/cloudwatchlogs/log_group.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" awscwl "github.com/aws/aws-sdk-go/service/cloudwatchlogs" - "github.com/jpignata/fargate/console" + "github.com/awslabs/fargatecli/console" ) type GetLogsInput struct { diff --git a/cmd/certificate.go b/cmd/certificate.go index 438d269..9219b81 100644 --- a/cmd/certificate.go +++ b/cmd/certificate.go @@ -3,7 +3,7 @@ package cmd import ( "errors" - "github.com/jpignata/fargate/acm" + "github.com/awslabs/fargatecli/acm" "github.com/spf13/cobra" ) diff --git a/cmd/certificate_destroy.go b/cmd/certificate_destroy.go index ffaa189..a4549fa 100644 --- a/cmd/certificate_destroy.go +++ b/cmd/certificate_destroy.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/jpignata/fargate/acm" + "github.com/awslabs/fargatecli/acm" "github.com/spf13/cobra" ) diff --git a/cmd/certificate_destroy_test.go b/cmd/certificate_destroy_test.go index 80bcf7a..b60e605 100644 --- a/cmd/certificate_destroy_test.go +++ b/cmd/certificate_destroy_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/jpignata/fargate/acm" - "github.com/jpignata/fargate/acm/mock/client" - "github.com/jpignata/fargate/cmd/mock" + "github.com/awslabs/fargatecli/acm" + "github.com/awslabs/fargatecli/acm/mock/client" + "github.com/awslabs/fargatecli/cmd/mock" ) func TestCertificateDestroyOperation(t *testing.T) { diff --git a/cmd/certificate_import.go b/cmd/certificate_import.go index d66f8d5..a1930c7 100644 --- a/cmd/certificate_import.go +++ b/cmd/certificate_import.go @@ -4,7 +4,7 @@ import ( "fmt" "io/ioutil" - "github.com/jpignata/fargate/acm" + "github.com/awslabs/fargatecli/acm" "github.com/spf13/cobra" ) diff --git a/cmd/certificate_import_test.go b/cmd/certificate_import_test.go index 787d69e..407a34a 100644 --- a/cmd/certificate_import_test.go +++ b/cmd/certificate_import_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/jpignata/fargate/acm/mock/client" - "github.com/jpignata/fargate/cmd/mock" + "github.com/awslabs/fargatecli/acm/mock/client" + "github.com/awslabs/fargatecli/cmd/mock" ) func TestCertificateImportOperation(t *testing.T) { diff --git a/cmd/certificate_info.go b/cmd/certificate_info.go index e7fc332..e8ded5f 100644 --- a/cmd/certificate_info.go +++ b/cmd/certificate_info.go @@ -3,7 +3,7 @@ package cmd import ( "strings" - "github.com/jpignata/fargate/acm" + "github.com/awslabs/fargatecli/acm" "github.com/spf13/cobra" ) diff --git a/cmd/certificate_info_test.go b/cmd/certificate_info_test.go index 5853fda..41798a0 100644 --- a/cmd/certificate_info_test.go +++ b/cmd/certificate_info_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/jpignata/fargate/acm" - "github.com/jpignata/fargate/acm/mock/client" - "github.com/jpignata/fargate/cmd/mock" + "github.com/awslabs/fargatecli/acm" + "github.com/awslabs/fargatecli/acm/mock/client" + "github.com/awslabs/fargatecli/cmd/mock" ) func TestCertificateInfoOperation(t *testing.T) { diff --git a/cmd/certificate_list.go b/cmd/certificate_list.go index c547087..2d7ac11 100644 --- a/cmd/certificate_list.go +++ b/cmd/certificate_list.go @@ -6,7 +6,7 @@ import ( "strings" "sync" - "github.com/jpignata/fargate/acm" + "github.com/awslabs/fargatecli/acm" "github.com/spf13/cobra" "golang.org/x/time/rate" ) diff --git a/cmd/certificate_list_test.go b/cmd/certificate_list_test.go index d840ec3..68bd8e7 100644 --- a/cmd/certificate_list_test.go +++ b/cmd/certificate_list_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/jpignata/fargate/acm" - "github.com/jpignata/fargate/acm/mock/client" - "github.com/jpignata/fargate/cmd/mock" + "github.com/awslabs/fargatecli/acm" + "github.com/awslabs/fargatecli/acm/mock/client" + "github.com/awslabs/fargatecli/cmd/mock" ) func TestCertificateListOperation(t *testing.T) { diff --git a/cmd/certificate_request.go b/cmd/certificate_request.go index 546b0fe..df15a96 100644 --- a/cmd/certificate_request.go +++ b/cmd/certificate_request.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/jpignata/fargate/acm" + "github.com/awslabs/fargatecli/acm" "github.com/spf13/cobra" ) diff --git a/cmd/certificate_request_test.go b/cmd/certificate_request_test.go index 9ef2691..f7d14a2 100644 --- a/cmd/certificate_request_test.go +++ b/cmd/certificate_request_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/jpignata/fargate/acm/mock/client" - "github.com/jpignata/fargate/cmd/mock" + "github.com/awslabs/fargatecli/acm/mock/client" + "github.com/awslabs/fargatecli/cmd/mock" ) func TestCertificateRequestOperation(t *testing.T) { diff --git a/cmd/certificate_test.go b/cmd/certificate_test.go index 104f2dd..a98116d 100644 --- a/cmd/certificate_test.go +++ b/cmd/certificate_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/jpignata/fargate/acm" - "github.com/jpignata/fargate/acm/mock/client" - "github.com/jpignata/fargate/cmd/mock" + "github.com/awslabs/fargatecli/acm" + "github.com/awslabs/fargatecli/acm/mock/client" + "github.com/awslabs/fargatecli/cmd/mock" ) func TestFindCertificate(t *testing.T) { diff --git a/cmd/certificate_validate.go b/cmd/certificate_validate.go index 5226e7c..0554fc2 100644 --- a/cmd/certificate_validate.go +++ b/cmd/certificate_validate.go @@ -3,8 +3,8 @@ package cmd import ( "fmt" - "github.com/jpignata/fargate/acm" - "github.com/jpignata/fargate/route53" + "github.com/awslabs/fargatecli/acm" + "github.com/awslabs/fargatecli/route53" "github.com/spf13/cobra" ) diff --git a/cmd/certificate_validate_test.go b/cmd/certificate_validate_test.go index fabeb89..d7abd2b 100644 --- a/cmd/certificate_validate_test.go +++ b/cmd/certificate_validate_test.go @@ -5,11 +5,11 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/jpignata/fargate/acm" - acmclient "github.com/jpignata/fargate/acm/mock/client" - "github.com/jpignata/fargate/cmd/mock" - "github.com/jpignata/fargate/route53" - route53client "github.com/jpignata/fargate/route53/mock/client" + "github.com/awslabs/fargatecli/acm" + acmclient "github.com/awslabs/fargatecli/acm/mock/client" + "github.com/awslabs/fargatecli/cmd/mock" + "github.com/awslabs/fargatecli/route53" + route53client "github.com/awslabs/fargatecli/route53/mock/client" ) func TestCertificateValidateOperation(t *testing.T) { diff --git a/cmd/lb.go b/cmd/lb.go index 44c8090..c315269 100644 --- a/cmd/lb.go +++ b/cmd/lb.go @@ -3,7 +3,7 @@ package cmd import ( "errors" - "github.com/jpignata/fargate/elbv2" + "github.com/awslabs/fargatecli/elbv2" "github.com/spf13/cobra" ) diff --git a/cmd/lb_alias.go b/cmd/lb_alias.go index b9234b3..281c426 100644 --- a/cmd/lb_alias.go +++ b/cmd/lb_alias.go @@ -1,8 +1,8 @@ package cmd import ( - "github.com/jpignata/fargate/elbv2" - "github.com/jpignata/fargate/route53" + "github.com/awslabs/fargatecli/elbv2" + "github.com/awslabs/fargatecli/route53" "github.com/spf13/cobra" ) diff --git a/cmd/lb_alias_test.go b/cmd/lb_alias_test.go index de5ae2c..e5a2763 100644 --- a/cmd/lb_alias_test.go +++ b/cmd/lb_alias_test.go @@ -5,11 +5,11 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/jpignata/fargate/cmd/mock" - "github.com/jpignata/fargate/elbv2" - elbv2client "github.com/jpignata/fargate/elbv2/mock/client" - "github.com/jpignata/fargate/route53" - route53client "github.com/jpignata/fargate/route53/mock/client" + "github.com/awslabs/fargatecli/cmd/mock" + "github.com/awslabs/fargatecli/elbv2" + elbv2client "github.com/awslabs/fargatecli/elbv2/mock/client" + "github.com/awslabs/fargatecli/route53" + route53client "github.com/awslabs/fargatecli/route53/mock/client" ) var ( diff --git a/cmd/lb_create.go b/cmd/lb_create.go index cde83b5..1b8e860 100644 --- a/cmd/lb_create.go +++ b/cmd/lb_create.go @@ -3,9 +3,9 @@ package cmd import ( "fmt" - "github.com/jpignata/fargate/acm" - "github.com/jpignata/fargate/ec2" - "github.com/jpignata/fargate/elbv2" + "github.com/awslabs/fargatecli/acm" + "github.com/awslabs/fargatecli/ec2" + "github.com/awslabs/fargatecli/elbv2" "github.com/spf13/cobra" ) diff --git a/cmd/lb_create_test.go b/cmd/lb_create_test.go index 9c67d18..449ed1f 100644 --- a/cmd/lb_create_test.go +++ b/cmd/lb_create_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/jpignata/fargate/acm" - acmclient "github.com/jpignata/fargate/acm/mock/client" - "github.com/jpignata/fargate/cmd/mock" - ec2client "github.com/jpignata/fargate/ec2/mock/client" - "github.com/jpignata/fargate/elbv2" - elbv2client "github.com/jpignata/fargate/elbv2/mock/client" + "github.com/awslabs/fargatecli/acm" + acmclient "github.com/awslabs/fargatecli/acm/mock/client" + "github.com/awslabs/fargatecli/cmd/mock" + ec2client "github.com/awslabs/fargatecli/ec2/mock/client" + "github.com/awslabs/fargatecli/elbv2" + elbv2client "github.com/awslabs/fargatecli/elbv2/mock/client" ) var ( diff --git a/cmd/lb_destroy.go b/cmd/lb_destroy.go index 59ab9ea..c7ee292 100644 --- a/cmd/lb_destroy.go +++ b/cmd/lb_destroy.go @@ -3,8 +3,8 @@ package cmd import ( "fmt" - "github.com/jpignata/fargate/console" - ELBV2 "github.com/jpignata/fargate/elbv2" + "github.com/awslabs/fargatecli/console" + ELBV2 "github.com/awslabs/fargatecli/elbv2" "github.com/spf13/cobra" ) diff --git a/cmd/lb_info.go b/cmd/lb_info.go index bb96fc4..0904eeb 100644 --- a/cmd/lb_info.go +++ b/cmd/lb_info.go @@ -7,10 +7,10 @@ import ( "strings" "text/tabwriter" - ACM "github.com/jpignata/fargate/acm" - "github.com/jpignata/fargate/console" - ECS "github.com/jpignata/fargate/ecs" - ELBV2 "github.com/jpignata/fargate/elbv2" + ACM "github.com/awslabs/fargatecli/acm" + "github.com/awslabs/fargatecli/console" + ECS "github.com/awslabs/fargatecli/ecs" + ELBV2 "github.com/awslabs/fargatecli/elbv2" "github.com/spf13/cobra" ) diff --git a/cmd/lb_list.go b/cmd/lb_list.go index eec0ed5..8daef31 100644 --- a/cmd/lb_list.go +++ b/cmd/lb_list.go @@ -6,7 +6,7 @@ import ( "sort" "sync" - "github.com/jpignata/fargate/elbv2" + "github.com/awslabs/fargatecli/elbv2" "github.com/spf13/cobra" "golang.org/x/time/rate" ) diff --git a/cmd/lb_list_test.go b/cmd/lb_list_test.go index 9c3275d..183cb3f 100644 --- a/cmd/lb_list_test.go +++ b/cmd/lb_list_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/jpignata/fargate/cmd/mock" - "github.com/jpignata/fargate/elbv2" - elbv2client "github.com/jpignata/fargate/elbv2/mock/client" + "github.com/awslabs/fargatecli/cmd/mock" + "github.com/awslabs/fargatecli/elbv2" + elbv2client "github.com/awslabs/fargatecli/elbv2/mock/client" ) func TestLBListOperation(t *testing.T) { diff --git a/cmd/logs.go b/cmd/logs.go index 3117a19..89efdcc 100644 --- a/cmd/logs.go +++ b/cmd/logs.go @@ -7,8 +7,8 @@ import ( "time" lru "github.com/hashicorp/golang-lru" - CWL "github.com/jpignata/fargate/cloudwatchlogs" - "github.com/jpignata/fargate/console" + CWL "github.com/awslabs/fargatecli/cloudwatchlogs" + "github.com/awslabs/fargatecli/console" ) const ( diff --git a/cmd/root.go b/cmd/root.go index 6ec2e00..d182a20 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/session" - "github.com/jpignata/fargate/console" - ECS "github.com/jpignata/fargate/ecs" + "github.com/awslabs/fargatecli/console" + ECS "github.com/awslabs/fargatecli/ecs" "github.com/spf13/cobra" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/service_create.go b/cmd/service_create.go index fa5b211..9b070f2 100644 --- a/cmd/service_create.go +++ b/cmd/service_create.go @@ -5,15 +5,15 @@ import ( "regexp" "strings" - CWL "github.com/jpignata/fargate/cloudwatchlogs" - "github.com/jpignata/fargate/console" - "github.com/jpignata/fargate/docker" - EC2 "github.com/jpignata/fargate/ec2" - ECR "github.com/jpignata/fargate/ecr" - ECS "github.com/jpignata/fargate/ecs" - ELBV2 "github.com/jpignata/fargate/elbv2" - "github.com/jpignata/fargate/git" - IAM "github.com/jpignata/fargate/iam" + CWL "github.com/awslabs/fargatecli/cloudwatchlogs" + "github.com/awslabs/fargatecli/console" + "github.com/awslabs/fargatecli/docker" + EC2 "github.com/awslabs/fargatecli/ec2" + ECR "github.com/awslabs/fargatecli/ecr" + ECS "github.com/awslabs/fargatecli/ecs" + ELBV2 "github.com/awslabs/fargatecli/elbv2" + "github.com/awslabs/fargatecli/git" + IAM "github.com/awslabs/fargatecli/iam" "github.com/spf13/cobra" ) diff --git a/cmd/service_deploy.go b/cmd/service_deploy.go index c0b03fb..e982624 100644 --- a/cmd/service_deploy.go +++ b/cmd/service_deploy.go @@ -1,11 +1,11 @@ package cmd import ( - "github.com/jpignata/fargate/console" - "github.com/jpignata/fargate/docker" - ECR "github.com/jpignata/fargate/ecr" - ECS "github.com/jpignata/fargate/ecs" - "github.com/jpignata/fargate/git" + "github.com/awslabs/fargatecli/console" + "github.com/awslabs/fargatecli/docker" + ECR "github.com/awslabs/fargatecli/ecr" + ECS "github.com/awslabs/fargatecli/ecs" + "github.com/awslabs/fargatecli/git" "github.com/spf13/cobra" ) diff --git a/cmd/service_destroy.go b/cmd/service_destroy.go index 01d4d87..85324a9 100644 --- a/cmd/service_destroy.go +++ b/cmd/service_destroy.go @@ -3,9 +3,9 @@ package cmd import ( "fmt" - "github.com/jpignata/fargate/console" - ECS "github.com/jpignata/fargate/ecs" - ELBV2 "github.com/jpignata/fargate/elbv2" + "github.com/awslabs/fargatecli/console" + ECS "github.com/awslabs/fargatecli/ecs" + ELBV2 "github.com/awslabs/fargatecli/elbv2" "github.com/spf13/cobra" ) diff --git a/cmd/service_env_list.go b/cmd/service_env_list.go index 5fafead..b535847 100644 --- a/cmd/service_env_list.go +++ b/cmd/service_env_list.go @@ -2,7 +2,7 @@ package cmd import ( "fmt" - ECS "github.com/jpignata/fargate/ecs" + ECS "github.com/awslabs/fargatecli/ecs" "github.com/spf13/cobra" ) diff --git a/cmd/service_env_set.go b/cmd/service_env_set.go index f806446..ce60018 100644 --- a/cmd/service_env_set.go +++ b/cmd/service_env_set.go @@ -1,8 +1,8 @@ package cmd import ( - "github.com/jpignata/fargate/console" - ECS "github.com/jpignata/fargate/ecs" + "github.com/awslabs/fargatecli/console" + ECS "github.com/awslabs/fargatecli/ecs" "github.com/spf13/cobra" ) diff --git a/cmd/service_env_unset.go b/cmd/service_env_unset.go index 36d28e0..f93c304 100644 --- a/cmd/service_env_unset.go +++ b/cmd/service_env_unset.go @@ -3,8 +3,8 @@ package cmd import ( "strings" - "github.com/jpignata/fargate/console" - ECS "github.com/jpignata/fargate/ecs" + "github.com/awslabs/fargatecli/console" + ECS "github.com/awslabs/fargatecli/ecs" "github.com/spf13/cobra" ) diff --git a/cmd/service_info.go b/cmd/service_info.go index c730064..27c994b 100644 --- a/cmd/service_info.go +++ b/cmd/service_info.go @@ -7,11 +7,11 @@ import ( "strings" "text/tabwriter" - ACM "github.com/jpignata/fargate/acm" - "github.com/jpignata/fargate/console" - EC2 "github.com/jpignata/fargate/ec2" - ECS "github.com/jpignata/fargate/ecs" - ELBV2 "github.com/jpignata/fargate/elbv2" + ACM "github.com/awslabs/fargatecli/acm" + "github.com/awslabs/fargatecli/console" + EC2 "github.com/awslabs/fargatecli/ec2" + ECS "github.com/awslabs/fargatecli/ecs" + ELBV2 "github.com/awslabs/fargatecli/elbv2" "github.com/spf13/cobra" ) diff --git a/cmd/service_list.go b/cmd/service_list.go index 4bad70a..43c2da5 100644 --- a/cmd/service_list.go +++ b/cmd/service_list.go @@ -5,9 +5,9 @@ import ( "os" "text/tabwriter" - "github.com/jpignata/fargate/console" - ECS "github.com/jpignata/fargate/ecs" - ELBV2 "github.com/jpignata/fargate/elbv2" + "github.com/awslabs/fargatecli/console" + ECS "github.com/awslabs/fargatecli/ecs" + ELBV2 "github.com/awslabs/fargatecli/elbv2" "github.com/spf13/cobra" ) diff --git a/cmd/service_ps.go b/cmd/service_ps.go index 8f9acf0..c80e7ec 100644 --- a/cmd/service_ps.go +++ b/cmd/service_ps.go @@ -5,9 +5,9 @@ import ( "os" "text/tabwriter" - "github.com/jpignata/fargate/console" - EC2 "github.com/jpignata/fargate/ec2" - ECS "github.com/jpignata/fargate/ecs" + "github.com/awslabs/fargatecli/console" + EC2 "github.com/awslabs/fargatecli/ec2" + ECS "github.com/awslabs/fargatecli/ecs" "github.com/spf13/cobra" ) diff --git a/cmd/service_restart.go b/cmd/service_restart.go index 871fd88..c6185be 100644 --- a/cmd/service_restart.go +++ b/cmd/service_restart.go @@ -1,8 +1,8 @@ package cmd import ( - "github.com/jpignata/fargate/console" - ECS "github.com/jpignata/fargate/ecs" + "github.com/awslabs/fargatecli/console" + ECS "github.com/awslabs/fargatecli/ecs" "github.com/spf13/cobra" ) diff --git a/cmd/service_scale.go b/cmd/service_scale.go index 87d92bc..c122edd 100644 --- a/cmd/service_scale.go +++ b/cmd/service_scale.go @@ -5,8 +5,8 @@ import ( "regexp" "strconv" - "github.com/jpignata/fargate/console" - ECS "github.com/jpignata/fargate/ecs" + "github.com/awslabs/fargatecli/console" + ECS "github.com/awslabs/fargatecli/ecs" "github.com/spf13/cobra" ) diff --git a/cmd/service_update.go b/cmd/service_update.go index 701840e..508a2e8 100644 --- a/cmd/service_update.go +++ b/cmd/service_update.go @@ -3,8 +3,8 @@ package cmd import ( "fmt" - "github.com/jpignata/fargate/console" - ECS "github.com/jpignata/fargate/ecs" + "github.com/awslabs/fargatecli/console" + ECS "github.com/awslabs/fargatecli/ecs" "github.com/spf13/cobra" ) diff --git a/cmd/task_info.go b/cmd/task_info.go index 7c12aab..a5da827 100644 --- a/cmd/task_info.go +++ b/cmd/task_info.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/jpignata/fargate/console" - EC2 "github.com/jpignata/fargate/ec2" - ECS "github.com/jpignata/fargate/ecs" + "github.com/awslabs/fargatecli/console" + EC2 "github.com/awslabs/fargatecli/ec2" + ECS "github.com/awslabs/fargatecli/ecs" "github.com/spf13/cobra" ) diff --git a/cmd/task_list.go b/cmd/task_list.go index 08c3a07..665d683 100644 --- a/cmd/task_list.go +++ b/cmd/task_list.go @@ -5,8 +5,8 @@ import ( "os" "text/tabwriter" - "github.com/jpignata/fargate/console" - ECS "github.com/jpignata/fargate/ecs" + "github.com/awslabs/fargatecli/console" + ECS "github.com/awslabs/fargatecli/ecs" "github.com/spf13/cobra" ) diff --git a/cmd/task_ps.go b/cmd/task_ps.go index 216383a..56ab997 100644 --- a/cmd/task_ps.go +++ b/cmd/task_ps.go @@ -5,9 +5,9 @@ import ( "os" "text/tabwriter" - "github.com/jpignata/fargate/console" - EC2 "github.com/jpignata/fargate/ec2" - ECS "github.com/jpignata/fargate/ecs" + "github.com/awslabs/fargatecli/console" + EC2 "github.com/awslabs/fargatecli/ec2" + ECS "github.com/awslabs/fargatecli/ecs" "github.com/spf13/cobra" ) diff --git a/cmd/task_run.go b/cmd/task_run.go index 8fb8ee4..eecbe05 100644 --- a/cmd/task_run.go +++ b/cmd/task_run.go @@ -1,14 +1,14 @@ package cmd import ( - CWL "github.com/jpignata/fargate/cloudwatchlogs" - "github.com/jpignata/fargate/console" - "github.com/jpignata/fargate/docker" - EC2 "github.com/jpignata/fargate/ec2" - ECR "github.com/jpignata/fargate/ecr" - ECS "github.com/jpignata/fargate/ecs" - "github.com/jpignata/fargate/git" - IAM "github.com/jpignata/fargate/iam" + CWL "github.com/awslabs/fargatecli/cloudwatchlogs" + "github.com/awslabs/fargatecli/console" + "github.com/awslabs/fargatecli/docker" + EC2 "github.com/awslabs/fargatecli/ec2" + ECR "github.com/awslabs/fargatecli/ecr" + ECS "github.com/awslabs/fargatecli/ecs" + "github.com/awslabs/fargatecli/git" + IAM "github.com/awslabs/fargatecli/iam" "github.com/spf13/cobra" ) diff --git a/cmd/task_stop.go b/cmd/task_stop.go index a8604cc..3ec5662 100644 --- a/cmd/task_stop.go +++ b/cmd/task_stop.go @@ -1,8 +1,8 @@ package cmd import ( - "github.com/jpignata/fargate/console" - ECS "github.com/jpignata/fargate/ecs" + "github.com/awslabs/fargatecli/console" + ECS "github.com/awslabs/fargatecli/ecs" "github.com/spf13/cobra" ) diff --git a/cmd/vpc_operation.go b/cmd/vpc_operation.go index a9e612f..5285b38 100644 --- a/cmd/vpc_operation.go +++ b/cmd/vpc_operation.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/jpignata/fargate/ec2" + "github.com/awslabs/fargatecli/ec2" ) type vpcOperation struct { diff --git a/cmd/vpc_operation_test.go b/cmd/vpc_operation_test.go index 0e7ba90..9434f21 100644 --- a/cmd/vpc_operation_test.go +++ b/cmd/vpc_operation_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/jpignata/fargate/cmd/mock" - ec2client "github.com/jpignata/fargate/ec2/mock/client" + "github.com/awslabs/fargatecli/cmd/mock" + ec2client "github.com/awslabs/fargatecli/ec2/mock/client" ) func TestSetSubnetIDs(t *testing.T) { diff --git a/doc/website/index.html b/doc/website/index.html index 33c3c40..bb38882 100644 --- a/doc/website/index.html +++ b/doc/website/index.html @@ -38,7 +38,7 @@

fargate

Get Started - + jpignata/fargate @@ -231,7 +231,7 @@

Get Started

macOS

- 64-bit + 64-bit

@@ -239,9 +239,9 @@

macOS

Linux

- 64-bit | - 32-bit | - Arm + 64-bit | + 32-bit | + Arm

@@ -249,7 +249,7 @@

Linux

Source

- jpignata/fargate + jpignata/fargate

diff --git a/docker/main.go b/docker/main.go index 4a67528..6f6b055 100644 --- a/docker/main.go +++ b/docker/main.go @@ -5,7 +5,7 @@ import ( "os/exec" "time" - "github.com/jpignata/fargate/console" + "github.com/awslabs/fargatecli/console" ) const timestampFormat = "20060102150405" diff --git a/ec2/eni.go b/ec2/eni.go index 2ef71ce..4d0d6d0 100644 --- a/ec2/eni.go +++ b/ec2/eni.go @@ -3,7 +3,7 @@ package ec2 import ( "github.com/aws/aws-sdk-go/aws" awsec2 "github.com/aws/aws-sdk-go/service/ec2" - "github.com/jpignata/fargate/console" + "github.com/awslabs/fargatecli/console" ) type Eni struct { diff --git a/ec2/main.go b/ec2/main.go index b3c11be..3a8c045 100644 --- a/ec2/main.go +++ b/ec2/main.go @@ -1,6 +1,6 @@ package ec2 -//go:generate mockgen -package client -destination=mock/client/client.go github.com/jpignata/fargate/ec2 Client +//go:generate mockgen -package client -destination=mock/client/client.go github.com/awslabs/fargatecli/ec2 Client //go:generate mockgen -package sdk -source ../vendor/github.com/aws/aws-sdk-go/service/ec2/ec2iface/interface.go -destination=mock/sdk/ec2iface.go github.com/aws/aws-sdk-go/service/ec2/ec2iface EC2API import ( diff --git a/ec2/mock/client/client.go b/ec2/mock/client/client.go index 0da4bc4..e7ba83d 100644 --- a/ec2/mock/client/client.go +++ b/ec2/mock/client/client.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/jpignata/fargate/ec2 (interfaces: Client) +// Source: github.com/awslabs/fargatecli/ec2 (interfaces: Client) // Package client is a generated GoMock package. package client @@ -34,6 +34,7 @@ func (m *MockClient) EXPECT() *MockClientMockRecorder { // AuthorizeAllSecurityGroupIngress mocks base method func (m *MockClient) AuthorizeAllSecurityGroupIngress(arg0 string) error { + m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AuthorizeAllSecurityGroupIngress", arg0) ret0, _ := ret[0].(error) return ret0 @@ -41,11 +42,13 @@ func (m *MockClient) AuthorizeAllSecurityGroupIngress(arg0 string) error { // AuthorizeAllSecurityGroupIngress indicates an expected call of AuthorizeAllSecurityGroupIngress func (mr *MockClientMockRecorder) AuthorizeAllSecurityGroupIngress(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AuthorizeAllSecurityGroupIngress", reflect.TypeOf((*MockClient)(nil).AuthorizeAllSecurityGroupIngress), arg0) } // CreateDefaultSecurityGroup mocks base method func (m *MockClient) CreateDefaultSecurityGroup() (string, error) { + m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateDefaultSecurityGroup") ret0, _ := ret[0].(string) ret1, _ := ret[1].(error) @@ -54,11 +57,13 @@ func (m *MockClient) CreateDefaultSecurityGroup() (string, error) { // CreateDefaultSecurityGroup indicates an expected call of CreateDefaultSecurityGroup func (mr *MockClientMockRecorder) CreateDefaultSecurityGroup() *gomock.Call { + mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateDefaultSecurityGroup", reflect.TypeOf((*MockClient)(nil).CreateDefaultSecurityGroup)) } // GetDefaultSecurityGroupID mocks base method func (m *MockClient) GetDefaultSecurityGroupID() (string, error) { + m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetDefaultSecurityGroupID") ret0, _ := ret[0].(string) ret1, _ := ret[1].(error) @@ -67,11 +72,13 @@ func (m *MockClient) GetDefaultSecurityGroupID() (string, error) { // GetDefaultSecurityGroupID indicates an expected call of GetDefaultSecurityGroupID func (mr *MockClientMockRecorder) GetDefaultSecurityGroupID() *gomock.Call { + mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDefaultSecurityGroupID", reflect.TypeOf((*MockClient)(nil).GetDefaultSecurityGroupID)) } // GetDefaultSubnetIDs mocks base method func (m *MockClient) GetDefaultSubnetIDs() ([]string, error) { + m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetDefaultSubnetIDs") ret0, _ := ret[0].([]string) ret1, _ := ret[1].(error) @@ -80,11 +87,13 @@ func (m *MockClient) GetDefaultSubnetIDs() ([]string, error) { // GetDefaultSubnetIDs indicates an expected call of GetDefaultSubnetIDs func (mr *MockClientMockRecorder) GetDefaultSubnetIDs() *gomock.Call { + mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDefaultSubnetIDs", reflect.TypeOf((*MockClient)(nil).GetDefaultSubnetIDs)) } // GetSubnetVPCID mocks base method func (m *MockClient) GetSubnetVPCID(arg0 string) (string, error) { + m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetSubnetVPCID", arg0) ret0, _ := ret[0].(string) ret1, _ := ret[1].(error) @@ -93,5 +102,6 @@ func (m *MockClient) GetSubnetVPCID(arg0 string) (string, error) { // GetSubnetVPCID indicates an expected call of GetSubnetVPCID func (mr *MockClientMockRecorder) GetSubnetVPCID(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSubnetVPCID", reflect.TypeOf((*MockClient)(nil).GetSubnetVPCID), arg0) } diff --git a/ec2/vpc_test.go b/ec2/vpc_test.go index 08ae026..4aa5c86 100644 --- a/ec2/vpc_test.go +++ b/ec2/vpc_test.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" awsec2 "github.com/aws/aws-sdk-go/service/ec2" "github.com/golang/mock/gomock" - "github.com/jpignata/fargate/ec2/mock/sdk" + "github.com/awslabs/fargatecli/ec2/mock/sdk" ) func TestGetDefaultSubnetIDs(t *testing.T) { diff --git a/ecr/repository.go b/ecr/repository.go index 210eaca..baedadd 100644 --- a/ecr/repository.go +++ b/ecr/repository.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" awsecr "github.com/aws/aws-sdk-go/service/ecr" - "github.com/jpignata/fargate/console" + "github.com/awslabs/fargatecli/console" ) func (ecr *ECR) CreateRepository(repositoryName string) string { diff --git a/ecs/service.go b/ecs/service.go index 56ca0d1..416ace8 100644 --- a/ecs/service.go +++ b/ecs/service.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" awsecs "github.com/aws/aws-sdk-go/service/ecs" - "github.com/jpignata/fargate/console" + "github.com/awslabs/fargatecli/console" ) type CreateServiceInput struct { diff --git a/ecs/task.go b/ecs/task.go index b7daa4a..d22e554 100644 --- a/ecs/task.go +++ b/ecs/task.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" awsecs "github.com/aws/aws-sdk-go/service/ecs" - "github.com/jpignata/fargate/console" + "github.com/awslabs/fargatecli/console" ) const ( diff --git a/ecs/task_definition.go b/ecs/task_definition.go index 1db7295..0061df9 100644 --- a/ecs/task_definition.go +++ b/ecs/task_definition.go @@ -6,7 +6,7 @@ import ( "github.com/aws/aws-sdk-go/aws" awsecs "github.com/aws/aws-sdk-go/service/ecs" - "github.com/jpignata/fargate/console" + "github.com/awslabs/fargatecli/console" ) const logStreamPrefix = "fargate" diff --git a/elbv2/listener.go b/elbv2/listener.go index 5729b3e..4b3d53a 100644 --- a/elbv2/listener.go +++ b/elbv2/listener.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" awselbv2 "github.com/aws/aws-sdk-go/service/elbv2" - "github.com/jpignata/fargate/console" + "github.com/awslabs/fargatecli/console" ) // Listener accepts incoming traffic on a load balancer based upon the provided routing rules. diff --git a/elbv2/listener_test.go b/elbv2/listener_test.go index 46e0eec..3654b3f 100644 --- a/elbv2/listener_test.go +++ b/elbv2/listener_test.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" awselbv2 "github.com/aws/aws-sdk-go/service/elbv2" "github.com/golang/mock/gomock" - "github.com/jpignata/fargate/elbv2/mock/sdk" + "github.com/awslabs/fargatecli/elbv2/mock/sdk" ) func TestListenerString(t *testing.T) { diff --git a/elbv2/load_balancer.go b/elbv2/load_balancer.go index 6415b73..52e23c0 100644 --- a/elbv2/load_balancer.go +++ b/elbv2/load_balancer.go @@ -5,7 +5,7 @@ import ( "github.com/aws/aws-sdk-go/aws" awselbv2 "github.com/aws/aws-sdk-go/service/elbv2" - "github.com/jpignata/fargate/console" + "github.com/awslabs/fargatecli/console" ) // LoadBalancer represents an Elastic Load Balancing (v2) load balancer. diff --git a/elbv2/load_balancer_test.go b/elbv2/load_balancer_test.go index e91553b..450593f 100644 --- a/elbv2/load_balancer_test.go +++ b/elbv2/load_balancer_test.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" awselbv2 "github.com/aws/aws-sdk-go/service/elbv2" "github.com/golang/mock/gomock" - "github.com/jpignata/fargate/elbv2/mock/sdk" + "github.com/awslabs/fargatecli/elbv2/mock/sdk" ) var ( diff --git a/elbv2/main.go b/elbv2/main.go index 7e2148e..b3a402c 100644 --- a/elbv2/main.go +++ b/elbv2/main.go @@ -1,7 +1,7 @@ // Package elbv2 is a client for Elastic Load Balancing (v2). package elbv2 -//go:generate mockgen -package client -destination=mock/client/client.go github.com/jpignata/fargate/elbv2 Client +//go:generate mockgen -package client -destination=mock/client/client.go github.com/awslabs/fargatecli/elbv2 Client //go:generate mockgen -package sdk -source ../vendor/github.com/aws/aws-sdk-go/service/elbv2/elbv2iface/interface.go -destination=mock/sdk/elbv2iface.go github.com/aws/aws-sdk-go/service/elbv2/elbv2iface ELBV2API import ( diff --git a/elbv2/mock/client/client.go b/elbv2/mock/client/client.go index ee0429e..0a5a2b9 100644 --- a/elbv2/mock/client/client.go +++ b/elbv2/mock/client/client.go @@ -1,12 +1,12 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/jpignata/fargate/elbv2 (interfaces: Client) +// Source: github.com/awslabs/fargatecli/elbv2 (interfaces: Client) // Package client is a generated GoMock package. package client import ( gomock "github.com/golang/mock/gomock" - elbv2 "github.com/jpignata/fargate/elbv2" + elbv2 "github.com/awslabs/fargatecli/elbv2" reflect "reflect" ) @@ -35,6 +35,7 @@ func (m *MockClient) EXPECT() *MockClientMockRecorder { // CreateListener mocks base method func (m *MockClient) CreateListener(arg0 elbv2.CreateListenerParameters) (string, error) { + m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateListener", arg0) ret0, _ := ret[0].(string) ret1, _ := ret[1].(error) @@ -43,11 +44,13 @@ func (m *MockClient) CreateListener(arg0 elbv2.CreateListenerParameters) (string // CreateListener indicates an expected call of CreateListener func (mr *MockClientMockRecorder) CreateListener(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateListener", reflect.TypeOf((*MockClient)(nil).CreateListener), arg0) } // CreateLoadBalancer mocks base method func (m *MockClient) CreateLoadBalancer(arg0 elbv2.CreateLoadBalancerParameters) (string, error) { + m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateLoadBalancer", arg0) ret0, _ := ret[0].(string) ret1, _ := ret[1].(error) @@ -56,11 +59,13 @@ func (m *MockClient) CreateLoadBalancer(arg0 elbv2.CreateLoadBalancerParameters) // CreateLoadBalancer indicates an expected call of CreateLoadBalancer func (mr *MockClientMockRecorder) CreateLoadBalancer(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateLoadBalancer", reflect.TypeOf((*MockClient)(nil).CreateLoadBalancer), arg0) } // CreateTargetGroup mocks base method func (m *MockClient) CreateTargetGroup(arg0 elbv2.CreateTargetGroupParameters) (string, error) { + m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateTargetGroup", arg0) ret0, _ := ret[0].(string) ret1, _ := ret[1].(error) @@ -69,11 +74,13 @@ func (m *MockClient) CreateTargetGroup(arg0 elbv2.CreateTargetGroupParameters) ( // CreateTargetGroup indicates an expected call of CreateTargetGroup func (mr *MockClientMockRecorder) CreateTargetGroup(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateTargetGroup", reflect.TypeOf((*MockClient)(nil).CreateTargetGroup), arg0) } // DescribeListeners mocks base method func (m *MockClient) DescribeListeners(arg0 string) (elbv2.Listeners, error) { + m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DescribeListeners", arg0) ret0, _ := ret[0].(elbv2.Listeners) ret1, _ := ret[1].(error) @@ -82,11 +89,13 @@ func (m *MockClient) DescribeListeners(arg0 string) (elbv2.Listeners, error) { // DescribeListeners indicates an expected call of DescribeListeners func (mr *MockClientMockRecorder) DescribeListeners(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DescribeListeners", reflect.TypeOf((*MockClient)(nil).DescribeListeners), arg0) } // DescribeLoadBalancers mocks base method func (m *MockClient) DescribeLoadBalancers() (elbv2.LoadBalancers, error) { + m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DescribeLoadBalancers") ret0, _ := ret[0].(elbv2.LoadBalancers) ret1, _ := ret[1].(error) @@ -95,11 +104,13 @@ func (m *MockClient) DescribeLoadBalancers() (elbv2.LoadBalancers, error) { // DescribeLoadBalancers indicates an expected call of DescribeLoadBalancers func (mr *MockClientMockRecorder) DescribeLoadBalancers() *gomock.Call { + mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DescribeLoadBalancers", reflect.TypeOf((*MockClient)(nil).DescribeLoadBalancers)) } // DescribeLoadBalancersByName mocks base method func (m *MockClient) DescribeLoadBalancersByName(arg0 []string) (elbv2.LoadBalancers, error) { + m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DescribeLoadBalancersByName", arg0) ret0, _ := ret[0].(elbv2.LoadBalancers) ret1, _ := ret[1].(error) @@ -108,5 +119,6 @@ func (m *MockClient) DescribeLoadBalancersByName(arg0 []string) (elbv2.LoadBalan // DescribeLoadBalancersByName indicates an expected call of DescribeLoadBalancersByName func (mr *MockClientMockRecorder) DescribeLoadBalancersByName(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DescribeLoadBalancersByName", reflect.TypeOf((*MockClient)(nil).DescribeLoadBalancersByName), arg0) } diff --git a/elbv2/target_group.go b/elbv2/target_group.go index 9acf4f7..ed9d1ba 100644 --- a/elbv2/target_group.go +++ b/elbv2/target_group.go @@ -3,7 +3,7 @@ package elbv2 import ( "github.com/aws/aws-sdk-go/aws" awselbv2 "github.com/aws/aws-sdk-go/service/elbv2" - "github.com/jpignata/fargate/console" + "github.com/awslabs/fargatecli/console" ) type TargetGroup struct { diff --git a/elbv2/target_group_test.go b/elbv2/target_group_test.go index e61fbae..ce55cf7 100644 --- a/elbv2/target_group_test.go +++ b/elbv2/target_group_test.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" awselbv2 "github.com/aws/aws-sdk-go/service/elbv2" "github.com/golang/mock/gomock" - "github.com/jpignata/fargate/elbv2/mock/sdk" + "github.com/awslabs/fargatecli/elbv2/mock/sdk" ) func TestCreateTargetGroup(t *testing.T) { diff --git a/git/main.go b/git/main.go index 685fa74..b6d509f 100644 --- a/git/main.go +++ b/git/main.go @@ -5,7 +5,7 @@ import ( "os/exec" "strings" - "github.com/jpignata/fargate/console" + "github.com/awslabs/fargatecli/console" ) func GetShortSha() string { diff --git a/go.mod b/go.mod index 67b9a17..40ad3c3 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ -module github.com/jpignata/fargate +module github.com/awslabs/fargatecli require ( github.com/aws/aws-sdk-go v1.12.70 github.com/go-ini/ini v1.32.0 // indirect - github.com/golang/mock v1.2.0 + github.com/golang/mock v1.3.1 github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47 github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 // indirect @@ -15,10 +15,9 @@ require ( github.com/spf13/cobra v0.0.3 github.com/spf13/pflag v1.0.2 // indirect github.com/stretchr/testify v1.3.0 // indirect - golang.org/x/crypto v0.0.0-20180127211104-1875d0a70c90 - golang.org/x/net v0.0.0-20180202180947-2fb46b16b8dd // indirect - golang.org/x/sys v0.0.0-20180202135801-37707fdb30a5 // indirect - golang.org/x/text v0.3.0 // indirect + golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 golang.org/x/time v0.0.0-20170927054726-6dc17368e09b gopkg.in/ini.v1 v1.42.0 // indirect ) + +go 1.13 diff --git a/main.go b/main.go index 5f82c77..3229e03 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/jpignata/fargate/cmd" + "github.com/awslabs/fargatecli/cmd" ) func main() { diff --git a/route53/hosted_zone_test.go b/route53/hosted_zone_test.go index f31778c..6f75e77 100644 --- a/route53/hosted_zone_test.go +++ b/route53/hosted_zone_test.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" awsroute53 "github.com/aws/aws-sdk-go/service/route53" "github.com/golang/mock/gomock" - "github.com/jpignata/fargate/route53/mock/sdk" + "github.com/awslabs/fargatecli/route53/mock/sdk" ) func TestHostedZonesFindSuperDomainOf(t *testing.T) { diff --git a/route53/main.go b/route53/main.go index 39762a5..4a2ee39 100644 --- a/route53/main.go +++ b/route53/main.go @@ -1,6 +1,6 @@ package route53 -//go:generate mockgen -package client -destination=mock/client/client.go github.com/jpignata/fargate/route53 Client +//go:generate mockgen -package client -destination=mock/client/client.go github.com/awslabs/fargatecli/route53 Client //go:generate mockgen -package sdk -source ../vendor/github.com/aws/aws-sdk-go/service/route53/route53iface/interface.go -destination=mock/sdk/route53iface.go github.com/aws/aws-sdk-go/service/route53/route53iface Route53API import ( diff --git a/route53/mock/client/client.go b/route53/mock/client/client.go index 2617583..6ac0cb7 100644 --- a/route53/mock/client/client.go +++ b/route53/mock/client/client.go @@ -1,12 +1,12 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/jpignata/fargate/route53 (interfaces: Client) +// Source: github.com/awslabs/fargatecli/route53 (interfaces: Client) // Package client is a generated GoMock package. package client import ( gomock "github.com/golang/mock/gomock" - route53 "github.com/jpignata/fargate/route53" + route53 "github.com/awslabs/fargatecli/route53" reflect "reflect" ) @@ -35,6 +35,7 @@ func (m *MockClient) EXPECT() *MockClientMockRecorder { // CreateAlias mocks base method func (m *MockClient) CreateAlias(arg0 route53.CreateAliasInput) (string, error) { + m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateAlias", arg0) ret0, _ := ret[0].(string) ret1, _ := ret[1].(error) @@ -43,11 +44,13 @@ func (m *MockClient) CreateAlias(arg0 route53.CreateAliasInput) (string, error) // CreateAlias indicates an expected call of CreateAlias func (mr *MockClientMockRecorder) CreateAlias(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAlias", reflect.TypeOf((*MockClient)(nil).CreateAlias), arg0) } // CreateResourceRecord mocks base method func (m *MockClient) CreateResourceRecord(arg0 route53.CreateResourceRecordInput) (string, error) { + m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateResourceRecord", arg0) ret0, _ := ret[0].(string) ret1, _ := ret[1].(error) @@ -56,11 +59,13 @@ func (m *MockClient) CreateResourceRecord(arg0 route53.CreateResourceRecordInput // CreateResourceRecord indicates an expected call of CreateResourceRecord func (mr *MockClientMockRecorder) CreateResourceRecord(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateResourceRecord", reflect.TypeOf((*MockClient)(nil).CreateResourceRecord), arg0) } // ListHostedZones mocks base method func (m *MockClient) ListHostedZones() (route53.HostedZones, error) { + m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ListHostedZones") ret0, _ := ret[0].(route53.HostedZones) ret1, _ := ret[1].(error) @@ -69,5 +74,6 @@ func (m *MockClient) ListHostedZones() (route53.HostedZones, error) { // ListHostedZones indicates an expected call of ListHostedZones func (mr *MockClientMockRecorder) ListHostedZones() *gomock.Call { + mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListHostedZones", reflect.TypeOf((*MockClient)(nil).ListHostedZones)) }