From e02d8d549b258e454a0ba94267692434c6660e32 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Mon, 17 Aug 2020 17:48:52 +0200 Subject: [PATCH] Make ECS integration a compose-cli backend Signed-off-by: Nicolas De Loof --- aci/backend.go | 15 +- cli/cmd/compose/down.go | 4 +- cli/cmd/compose/logs.go | 7 +- cli/cmd/compose/ps.go | 4 +- cli/cmd/compose/up.go | 4 +- compose/api.go | 27 +- {ecs/pkg/compose => compose}/tags.go | 0 ecs/Dockerfile | 57 -- ecs/LICENSE | 191 ------- ecs/Makefile | 48 -- ecs/README.md | 110 ---- ecs/backend.go | 27 +- ecs/builder.Makefile | 39 -- .../amazon/backend => }/cloudformation.go | 18 +- .../backend => }/cloudformation_test.go | 3 +- ecs/cmd/commands/compose.go | 152 ------ ecs/cmd/commands/context.go | 31 -- ecs/cmd/commands/opts.go | 28 - ecs/cmd/commands/root.go | 32 -- ecs/cmd/commands/root_test.go | 13 - ecs/cmd/commands/secret.go | 140 ----- ecs/cmd/commands/setup.go | 262 --------- ecs/cmd/commands/version.go | 20 - ecs/cmd/commands/version_test.go | 20 - ecs/cmd/main/main.go | 23 - ecs/{pkg/console => }/colors.go | 2 +- ecs/{pkg/amazon/backend => }/compatibility.go | 2 +- ecs/context.go | 2 - ecs/{pkg/amazon/backend => }/convert.go | 9 +- ecs/doc.go | 14 - ecs/docs/get-started-linux.md | 82 --- ecs/docs/requirements.md | 31 -- ecs/{pkg/amazon/backend => }/down.go | 11 +- ecs/example/Makefile | 25 - ecs/example/README.md | 181 ------- ecs/example/app/Dockerfile | 7 - ecs/example/app/app.py | 19 - ecs/example/app/requirements.txt | 2 - ecs/example/app/scripts/entrypoint.sh | 4 - ecs/example/app/templates/index.html | 125 ----- ecs/example/docker-compose.yml | 12 - ecs/go.mod | 61 --- ecs/go.sum | 496 ------------------ ecs/golangci.yaml | 12 - ecs/{pkg/amazon/backend => }/iam.go | 2 +- ecs/internal/version.go | 8 - ecs/{pkg/amazon/backend => }/list.go | 12 +- ecs/{pkg/amazon/backend => }/logs.go | 14 +- .../amazon/cloudformation => }/marshall.go | 2 +- ecs/pkg/amazon/amazon.go | 8 - ecs/pkg/amazon/backend/backend.go | 30 -- ecs/pkg/amazon/backend/context.go | 33 -- ecs/pkg/amazon/backend/secrets.go | 23 - ecs/pkg/amazon/sdk/api.go | 42 -- ecs/pkg/compose/api.go | 26 - .../simple/compose-with-overrides.yaml | 4 - ecs/pkg/compose/testdata/simple/compose.yaml | 4 - ecs/pkg/docker/contextStore.go | 76 --- ecs/pkg/progress/plain.go | 29 - ecs/pkg/progress/spinner.go | 50 -- ecs/pkg/progress/tty.go | 177 ------- ecs/pkg/progress/writer.go | 112 ---- ecs/{pkg/amazon/sdk => }/sdk.go | 45 +- ecs/secrets.go | 21 + ecs/secrets/Dockerfile | 2 +- ecs/secrets/main/main.go | 3 +- .../backend => }/testdata/input/envfile | 0 .../testdata/input/simple-single-service.yaml | 0 .../testdata/invalid_network_mode.yaml | 0 .../simple-cloudformation-conversion.golden | 0 ecs/tests/e2e_deploy_services_test.go | 65 --- ecs/tests/main_test.go | 126 ----- .../testdata/input/simple-single-service.yaml | 6 - ecs/tests/testdata/plugin-usage.golden | 14 - ecs/tests/version_test.go | 18 - ecs/{pkg/compose => }/types.go | 18 +- ecs/{pkg/amazon/backend => }/up.go | 41 +- ecs/{pkg/amazon/backend => }/wait.go | 21 +- ecs/{pkg/compose => }/x.go | 2 +- example/backend.go | 14 +- go.mod | 8 +- go.sum | 175 +----- 82 files changed, 180 insertions(+), 3423 deletions(-) rename {ecs/pkg/compose => compose}/tags.go (100%) delete mode 100644 ecs/Dockerfile delete mode 100644 ecs/LICENSE delete mode 100644 ecs/Makefile delete mode 100644 ecs/README.md delete mode 100644 ecs/builder.Makefile rename ecs/{pkg/amazon/backend => }/cloudformation.go (97%) rename ecs/{pkg/amazon/backend => }/cloudformation_test.go (99%) delete mode 100644 ecs/cmd/commands/compose.go delete mode 100644 ecs/cmd/commands/context.go delete mode 100644 ecs/cmd/commands/opts.go delete mode 100644 ecs/cmd/commands/root.go delete mode 100644 ecs/cmd/commands/root_test.go delete mode 100644 ecs/cmd/commands/secret.go delete mode 100644 ecs/cmd/commands/setup.go delete mode 100644 ecs/cmd/commands/version.go delete mode 100644 ecs/cmd/commands/version_test.go delete mode 100644 ecs/cmd/main/main.go rename ecs/{pkg/console => }/colors.go (98%) rename ecs/{pkg/amazon/backend => }/compatibility.go (99%) rename ecs/{pkg/amazon/backend => }/convert.go (98%) delete mode 100644 ecs/doc.go delete mode 100644 ecs/docs/get-started-linux.md delete mode 100644 ecs/docs/requirements.md rename ecs/{pkg/amazon/backend => }/down.go (52%) delete mode 100644 ecs/example/Makefile delete mode 100644 ecs/example/README.md delete mode 100644 ecs/example/app/Dockerfile delete mode 100644 ecs/example/app/app.py delete mode 100644 ecs/example/app/requirements.txt delete mode 100755 ecs/example/app/scripts/entrypoint.sh delete mode 100644 ecs/example/app/templates/index.html delete mode 100644 ecs/example/docker-compose.yml delete mode 100644 ecs/go.mod delete mode 100644 ecs/go.sum delete mode 100644 ecs/golangci.yaml rename ecs/{pkg/amazon/backend => }/iam.go (98%) delete mode 100644 ecs/internal/version.go rename ecs/{pkg/amazon/backend => }/list.go (71%) rename ecs/{pkg/amazon/backend => }/logs.go (77%) rename ecs/{pkg/amazon/cloudformation => }/marshall.go (98%) delete mode 100644 ecs/pkg/amazon/amazon.go delete mode 100644 ecs/pkg/amazon/backend/backend.go delete mode 100644 ecs/pkg/amazon/backend/context.go delete mode 100644 ecs/pkg/amazon/backend/secrets.go delete mode 100644 ecs/pkg/amazon/sdk/api.go delete mode 100644 ecs/pkg/compose/api.go delete mode 100644 ecs/pkg/compose/testdata/simple/compose-with-overrides.yaml delete mode 100644 ecs/pkg/compose/testdata/simple/compose.yaml delete mode 100644 ecs/pkg/docker/contextStore.go delete mode 100644 ecs/pkg/progress/plain.go delete mode 100644 ecs/pkg/progress/spinner.go delete mode 100644 ecs/pkg/progress/tty.go delete mode 100644 ecs/pkg/progress/writer.go rename ecs/{pkg/amazon/sdk => }/sdk.go (93%) create mode 100644 ecs/secrets.go rename ecs/{pkg/amazon/backend => }/testdata/input/envfile (100%) rename ecs/{pkg/amazon/backend => }/testdata/input/simple-single-service.yaml (100%) rename ecs/{pkg/amazon/backend => }/testdata/invalid_network_mode.yaml (100%) rename ecs/{pkg/amazon/backend => }/testdata/simple/simple-cloudformation-conversion.golden (100%) delete mode 100644 ecs/tests/e2e_deploy_services_test.go delete mode 100644 ecs/tests/main_test.go delete mode 100644 ecs/tests/testdata/input/simple-single-service.yaml delete mode 100644 ecs/tests/testdata/plugin-usage.golden delete mode 100644 ecs/tests/version_test.go rename ecs/{pkg/compose => }/types.go (78%) rename ecs/{pkg/amazon/backend => }/up.go (65%) rename ecs/{pkg/amazon/backend => }/wait.go (75%) rename ecs/{pkg/compose => }/x.go (97%) diff --git a/aci/backend.go b/aci/backend.go index 71679a07..fc5fe758 100644 --- a/aci/backend.go +++ b/aci/backend.go @@ -19,6 +19,7 @@ package aci import ( "context" "fmt" + "io" "net/http" "strconv" "strings" @@ -31,8 +32,6 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - ecstypes "github.com/docker/ecs-plugin/pkg/compose" - "github.com/docker/api/aci/convert" "github.com/docker/api/aci/login" "github.com/docker/api/backend" @@ -404,8 +403,8 @@ type aciComposeService struct { ctx store.AciContext } -func (cs *aciComposeService) Up(ctx context.Context, opts cli.ProjectOptions) error { - project, err := cli.ProjectFromOptions(&opts) +func (cs *aciComposeService) Up(ctx context.Context, opts *cli.ProjectOptions) error { + project, err := cli.ProjectFromOptions(opts) if err != nil { return err } @@ -419,13 +418,13 @@ func (cs *aciComposeService) Up(ctx context.Context, opts cli.ProjectOptions) er return createOrUpdateACIContainers(ctx, cs.ctx, groupDefinition) } -func (cs *aciComposeService) Down(ctx context.Context, opts cli.ProjectOptions) error { +func (cs *aciComposeService) Down(ctx context.Context, opts *cli.ProjectOptions) error { var project types.Project if opts.Name != "" { project = types.Project{Name: opts.Name} } else { - fullProject, err := cli.ProjectFromOptions(&opts) + fullProject, err := cli.ProjectFromOptions(opts) if err != nil { return err } @@ -444,11 +443,11 @@ func (cs *aciComposeService) Down(ctx context.Context, opts cli.ProjectOptions) return err } -func (cs *aciComposeService) Ps(ctx context.Context, opts cli.ProjectOptions) ([]ecstypes.ServiceStatus, error) { +func (cs *aciComposeService) Ps(ctx context.Context, opts *cli.ProjectOptions) ([]compose.ServiceStatus, error) { return nil, errdefs.ErrNotImplemented } -func (cs *aciComposeService) Logs(ctx context.Context, opts cli.ProjectOptions) error { +func (cs *aciComposeService) Logs(ctx context.Context, opts *cli.ProjectOptions, w io.Writer) error { return errdefs.ErrNotImplemented } diff --git a/cli/cmd/compose/down.go b/cli/cmd/compose/down.go index 20544358..7389dadc 100644 --- a/cli/cmd/compose/down.go +++ b/cli/cmd/compose/down.go @@ -31,7 +31,7 @@ func downCommand() *cobra.Command { downCmd := &cobra.Command{ Use: "down", RunE: func(cmd *cobra.Command, args []string) error { - return runDown(cmd.Context(), opts) + return runDown(cmd.Context(), &opts) }, } downCmd.Flags().StringVarP(&opts.Name, "project-name", "p", "", "Project name") @@ -41,7 +41,7 @@ func downCommand() *cobra.Command { return downCmd } -func runDown(ctx context.Context, opts cli.ProjectOptions) error { +func runDown(ctx context.Context, opts *cli.ProjectOptions) error { c, err := client.New(ctx) if err != nil { return err diff --git a/cli/cmd/compose/logs.go b/cli/cmd/compose/logs.go index 15e0a260..84ddda0e 100644 --- a/cli/cmd/compose/logs.go +++ b/cli/cmd/compose/logs.go @@ -19,6 +19,7 @@ package compose import ( "context" "errors" + "os" "github.com/compose-spec/compose-go/cli" "github.com/spf13/cobra" @@ -31,7 +32,7 @@ func logsCommand() *cobra.Command { logsCmd := &cobra.Command{ Use: "logs", RunE: func(cmd *cobra.Command, args []string) error { - return runLogs(cmd.Context(), opts) + return runLogs(cmd.Context(), &opts) }, } logsCmd.Flags().StringVarP(&opts.Name, "project-name", "p", "", "Project name") @@ -41,7 +42,7 @@ func logsCommand() *cobra.Command { return logsCmd } -func runLogs(ctx context.Context, opts cli.ProjectOptions) error { +func runLogs(ctx context.Context, opts *cli.ProjectOptions) error { c, err := client.New(ctx) if err != nil { return err @@ -52,5 +53,5 @@ func runLogs(ctx context.Context, opts cli.ProjectOptions) error { return errors.New("compose not implemented in current context") } - return composeService.Logs(ctx, opts) + return composeService.Logs(ctx, opts, os.Stdout) } diff --git a/cli/cmd/compose/ps.go b/cli/cmd/compose/ps.go index e5930740..ee152e23 100644 --- a/cli/cmd/compose/ps.go +++ b/cli/cmd/compose/ps.go @@ -36,7 +36,7 @@ func psCommand() *cobra.Command { psCmd := &cobra.Command{ Use: "ps", RunE: func(cmd *cobra.Command, args []string) error { - return runPs(cmd.Context(), opts) + return runPs(cmd.Context(), &opts) }, } psCmd.Flags().StringVarP(&opts.Name, "project-name", "p", "", "Project name") @@ -46,7 +46,7 @@ func psCommand() *cobra.Command { return psCmd } -func runPs(ctx context.Context, opts cli.ProjectOptions) error { +func runPs(ctx context.Context, opts *cli.ProjectOptions) error { c, err := client.New(ctx) if err != nil { return err diff --git a/cli/cmd/compose/up.go b/cli/cmd/compose/up.go index 4ac19a43..91e7bf25 100644 --- a/cli/cmd/compose/up.go +++ b/cli/cmd/compose/up.go @@ -32,7 +32,7 @@ func upCommand() *cobra.Command { upCmd := &cobra.Command{ Use: "up", RunE: func(cmd *cobra.Command, args []string) error { - return runUp(cmd.Context(), opts) + return runUp(cmd.Context(), &opts) }, } upCmd.Flags().StringVarP(&opts.Name, "project-name", "p", "", "Project name") @@ -44,7 +44,7 @@ func upCommand() *cobra.Command { return upCmd } -func runUp(ctx context.Context, opts cli.ProjectOptions) error { +func runUp(ctx context.Context, opts *cli.ProjectOptions) error { c, err := client.New(ctx) if err != nil { return err diff --git a/compose/api.go b/compose/api.go index a9592d69..d80050f0 100644 --- a/compose/api.go +++ b/compose/api.go @@ -18,19 +18,36 @@ package compose import ( "context" + "io" "github.com/compose-spec/compose-go/cli" - types "github.com/docker/ecs-plugin/pkg/compose" ) // Service manages a compose project type Service interface { // Up executes the equivalent to a `compose up` - Up(ctx context.Context, opts cli.ProjectOptions) error + Up(ctx context.Context, opts *cli.ProjectOptions) error // Down executes the equivalent to a `compose down` - Down(ctx context.Context, opts cli.ProjectOptions) error + Down(ctx context.Context, opts *cli.ProjectOptions) error // Logs executes the equivalent to a `compose logs` - Logs(ctx context.Context, opts cli.ProjectOptions) error + Logs(ctx context.Context, opts *cli.ProjectOptions, w io.Writer) error // Ps executes the equivalent to a `compose ps` - Ps(ctx context.Context, opts cli.ProjectOptions) ([]types.ServiceStatus, error) + Ps(ctx context.Context, opts *cli.ProjectOptions) ([]ServiceStatus, error) } + + +type LoadBalancer struct { + URL string + TargetPort int + PublishedPort int + Protocol string +} + +type ServiceStatus struct { + ID string + Name string + Replicas int + Desired int + Ports []string + LoadBalancers []LoadBalancer +} \ No newline at end of file diff --git a/ecs/pkg/compose/tags.go b/compose/tags.go similarity index 100% rename from ecs/pkg/compose/tags.go rename to compose/tags.go diff --git a/ecs/Dockerfile b/ecs/Dockerfile deleted file mode 100644 index e5b506b9..00000000 --- a/ecs/Dockerfile +++ /dev/null @@ -1,57 +0,0 @@ -# syntax = docker/dockerfile:experimental -ARG GO_VERSION=1.14.4-alpine -ARG ALPINE_PKG_DOCKER_VERSION=19.03.12-r0 -ARG GOLANGCI_LINT_VERSION=v1.27.0-alpine - -FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS base -WORKDIR /ecs-plugin -ENV GO111MODULE=on -ARG ALPINE_PKG_DOCKER_VERSION -RUN apk add --no-cache \ - docker=${ALPINE_PKG_DOCKER_VERSION} \ - make \ - build-base -COPY go.* . -RUN --mount=type=cache,target=/go/pkg/mod \ - go mod download - -FROM base AS make-plugin -ARG TARGETOS -ARG TARGETARCH -ARG COMMIT -ARG TAG -COPY . . -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/go/pkg/mod \ - GOOS=${TARGETOS} \ - GOARCH=${TARGETARCH} \ - make -f builder.Makefile build - -FROM base AS make-cross -ARG COMMIT -ARG TAG -COPY . . -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/go/pkg/mod \ - make -f builder.Makefile cross - -FROM scratch AS build -COPY --from=make-plugin /ecs-plugin/dist/docker-ecs . - -FROM scratch AS cross -COPY --from=make-cross /ecs-plugin/dist/* . - -FROM make-plugin AS test -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/go/pkg/mod \ - make -f builder.Makefile test - -FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION} AS lint-base - -FROM base AS lint -COPY --from=lint-base /usr/bin/golangci-lint /usr/bin/golangci-lint -RUN --mount=target=. \ - --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/go/pkg/mod \ - --mount=type=cache,target=/root/.cache/golangci-lint \ - make -f builder.Makefile lint diff --git a/ecs/LICENSE b/ecs/LICENSE deleted file mode 100644 index 6d8d58fb..00000000 --- a/ecs/LICENSE +++ /dev/null @@ -1,191 +0,0 @@ - - Apache License - Version 2.0, January 2004 - https://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - Copyright 2013-2018 Docker, Inc. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/ecs/Makefile b/ecs/Makefile deleted file mode 100644 index 10932586..00000000 --- a/ecs/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -PLATFORM?=local -PWD=$(shell pwd) - -export DOCKER_BUILDKIT=1 - -COMMIT := $(shell git rev-parse --short HEAD) -TAG := $(shell git describe --tags --dirty --match "v*") - -.DEFAULT_GOAL := build - -build: ## Build for the current - @docker build . \ - --output ./dist \ - --platform ${PLATFORM} \ - --build-arg COMMIT=${COMMIT} \ - --build-arg TAG=${TAG} \ - --target build - -cross: ## Cross build for linux, macos and windows - @docker build . \ - --output ./dist \ - --build-arg COMMIT=${COMMIT} \ - --build-arg TAG=${TAG} \ - --target cross - -test: build ## Run tests - @docker build . \ - --build-arg COMMIT=${COMMIT} \ - --build-arg TAG=${TAG} \ - --target test - -e2e: build ## Run tests - go test ./... -v -tags=e2e - -dev: build - @mkdir -p ~/.docker/cli-plugins/ - ln -f -s "${PWD}/dist/docker-ecs" "${HOME}/.docker/cli-plugins/docker-ecs" - -lint: ## Verify Go files - @docker build . --target lint - -fmt: ## Format go files - go fmt ./... - -clean: - rm -rf dist/ - -.PHONY: clean build test dev lint e2e cross fmt diff --git a/ecs/README.md b/ecs/README.md deleted file mode 100644 index 5faeb696..00000000 --- a/ecs/README.md +++ /dev/null @@ -1,110 +0,0 @@ -# Docker CLI plugin for Amazon ECS - -This was announced at AWS Cloud Containers Conference 2020, read the -[blog post](https://www.docker.com/blog/from-docker-straight-to-aws/). - -## Status - -:exclamation: The Docker ECS plugin is still in Beta. -Its design and UX will evolve until 1.0 Final release. - -## Get started - -If you're using macOS or Windows you just need to install -Docker Desktop **Edge** and you will have the ECS integration installed. -You can find links here: -- [macOS](https://hub.docker.com/editions/community/docker-ce-desktop-mac) -- [Windows](https://hub.docker.com/editions/community/docker-ce-desktop-windows) - -Linux install instructions are [here](./docs/get-started-linux.md). - -## Example and documentation - -You can find an application for testing this in [example](./example). - -You can find more documentation about using the Docker ECS integration -[here](https://docs.docker.com/engine/context/ecs-integration/). - -## Architecture - -The Docker ECS integration is a -[Docker CLI plugin](https://docs.docker.com/engine/extend/cli_plugins/) -with the root command of `ecs`. -It requires an AWS profile to select the AWS API credentials from -`~/.aws/credentials` as well as an AWS region. You can read more about CLI AWS -credential management -[here](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html). -Once setup, the AWS profile and region are stored in a Docker context. - -A `compose.yaml` file is parsed and converted into a -[CloudFormation](https://aws.amazon.com/cloudformation/) template, -which is then used to create all application resources in dependent order. -Resources are cleaned up with the `down` command or in the case of a deployment -failure. - -The architecture of the ECS integration is shown below: - -``` - +--------------------------------------+ - | compose.yaml file | - +--------------------------------------+ -- Load - +--------------------------------------+ - | Compose Model | - +--------------------------------------+ -- Validate - +--------------------------------------+ - | Compose Model suitable for ECS | - +--------------------------------------+ -- Convert - +--------------------------------------+ - | CloudFormation Template | - +--------------------------------------+ -- Apply - +--------------+ +----------------+ - | AWS API | or | stack file | - +--------------+ +----------------+ -``` - -* The _Load_ phase relies on - [compose-go](https://github.com/compose-spec/compose-go). - Any generic code we write for this purpose should be proposed upstream. -* The _Validate_ phase is responsible for injecting sane ECS defaults into the - compose-go model, and validating the `compose.yaml` file does not include - unsupported features. -* The _Convert_ phase produces a CloudFormation template to define all - application resources required to implement the application model on AWS. -* The _Apply_ phase does the actual apply of the CloudFormation template, - either by exporting to a stack file or to deploy on AWS. - -## Application model - -### Services - -Compose services are mapped to ECS services. The Compose specification does not -have support for multi-container services (like Kubernetes pods) or sidecars. -When an ECS feature requires a sidecar, we use a custom Compose extension -(`x-aws-*`) to expose the ECS features as a service-level feature, -and keep the plumbing details from the user. - -### Networking - -We map the "network" abstraction from the Compose model to AWS security groups. -The whole application is created within a single VPC, -security groups are created per Compose network, including the implicit -`default` one. -Services are attached according to the networks declared in Compose model. -This approach means that services attached to a common security group can -communicate together, while services from distinct security groups cannot. -This matches the intent of the Compose network model with the limitation that we -cannot set service aliases per network. - -A [CloudMap](https://aws.amazon.com/cloud-map/) private namespace is created for -each application as `{project}.local`. Services get registered so that we -have service discovery and DNS round-robin -(equivalent to Compose's `endpoint_mode: dnsrr`). Docker images SHOULD include -an entrypoint script to replicate this feature: - -```shell script -if [ ! -z LOCALDOMAIN ]; then echo "search ${LOCALDOMAIN}" >> /etc/resolv.conf; fi -``` diff --git a/ecs/backend.go b/ecs/backend.go index 02cf121a..fd0d4685 100644 --- a/ecs/backend.go +++ b/ecs/backend.go @@ -1,5 +1,3 @@ -// +build ecs - /* Copyright 2020 Docker, Inc. Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,8 +15,8 @@ package ecs import ( "context" - - ecsplugin "github.com/docker/ecs-plugin/pkg/amazon/backend" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/session" "github.com/docker/api/backend" "github.com/docker/api/compose" @@ -58,19 +56,28 @@ func service(ctx context.Context) (backend.Service, error) { } func getEcsAPIService(ecsCtx store.EcsContext) (*ecsAPIService, error) { - backend, err := ecsplugin.NewBackend(ecsCtx.Profile, ecsCtx.Region) + sess, err := session.NewSessionWithOptions(session.Options{ + Profile: ecsCtx.Profile, + SharedConfigState: session.SharedConfigEnable, + Config: aws.Config{ + Region: aws.String(ecsCtx.Region), + }, + }) if err != nil { return nil, err } + return &ecsAPIService{ - ctx: ecsCtx, - composeBackend: backend, + ctx: ecsCtx, + Region: ecsCtx.Region, + SDK: NewSDK(sess), }, nil } type ecsAPIService struct { - ctx store.EcsContext - composeBackend *ecsplugin.Backend + ctx store.EcsContext + Region string + SDK sdk } func (a *ecsAPIService) ContainerService() containers.Service { @@ -78,7 +85,7 @@ func (a *ecsAPIService) ContainerService() containers.Service { } func (a *ecsAPIService) ComposeService() compose.Service { - return a.composeBackend + return a } func getCloudService() (cloud.Service, error) { diff --git a/ecs/builder.Makefile b/ecs/builder.Makefile deleted file mode 100644 index ae52173d..00000000 --- a/ecs/builder.Makefile +++ /dev/null @@ -1,39 +0,0 @@ -GOOS?=$(shell go env GOOS) -GOARCH?=$(shell go env GOARCH) - -EXTENSION := -ifeq ($(GOOS),windows) - EXTENSION := .exe -endif - -STATIC_FLAGS=CGO_ENABLED=0 -LDFLAGS := "-s -w \ - -X github.com/docker/ecs-plugin/internal.GitCommit=$(COMMIT) \ - -X github.com/docker/ecs-plugin/internal.Version=$(TAG)" -GO_BUILD=$(STATIC_FLAGS) go build -trimpath -ldflags=$(LDFLAGS) - -BINARY=dist/docker-ecs -BINARY_WITH_EXTENSION=$(BINARY)$(EXTENSION) - -export DOCKER_BUILDKIT=1 - -all: build - -clean: - rm -rf dist/ - -build: - $(GO_BUILD) -v -o $(BINARY_WITH_EXTENSION) cmd/main/main.go - -cross: - @GOOS=linux GOARCH=amd64 $(GO_BUILD) -v -o $(BINARY)-linux-amd64 cmd/main/main.go - @GOOS=darwin GOARCH=amd64 $(GO_BUILD) -v -o $(BINARY)-darwin-amd64 cmd/main/main.go - @GOOS=windows GOARCH=amd64 $(GO_BUILD) -v -o $(BINARY)-windows-amd64.exe cmd/main/main.go - -test: ## Run tests - @$(STATIC_FLAGS) go test -cover $(shell go list ./... | grep -vE 'e2e') - -lint: ## Verify Go files - $(STATIC_FLAGS) golangci-lint run --timeout 10m0s --config ./golangci.yaml ./... - -.PHONY: all clean build cross test dev lint diff --git a/ecs/pkg/amazon/backend/cloudformation.go b/ecs/cloudformation.go similarity index 97% rename from ecs/pkg/amazon/backend/cloudformation.go rename to ecs/cloudformation.go index c6c033db..dda69f00 100644 --- a/ecs/pkg/amazon/backend/cloudformation.go +++ b/ecs/cloudformation.go @@ -1,7 +1,8 @@ -package backend +package ecs import ( "fmt" + "github.com/docker/api/compose" "io/ioutil" "regexp" "strings" @@ -21,7 +22,6 @@ import ( "github.com/compose-spec/compose-go/compatibility" "github.com/compose-spec/compose-go/errdefs" "github.com/compose-spec/compose-go/types" - "github.com/docker/ecs-plugin/pkg/compose" "github.com/sirupsen/logrus" ) @@ -34,7 +34,7 @@ const ( ) // Convert a compose project into a CloudFormation template -func (b Backend) Convert(project *types.Project) (*cloudformation.Template, error) { +func (b ecsAPIService) Convert(project *types.Project) (*cloudformation.Template, error) { var checker compatibility.Checker = &FargateCompatibilityChecker{ compatibility.AllowList{ Supported: compatibleComposeAttributes, @@ -236,7 +236,7 @@ func (b Backend) Convert(project *types.Project) (*cloudformation.Template, erro func createLogGroup(project *types.Project, template *cloudformation.Template) { retention := 0 - if v, ok := project.Extensions[compose.ExtensionRetention]; ok { + if v, ok := project.Extensions[ExtensionRetention]; ok { retention = v.(int) } logGroup := fmt.Sprintf("/docker-compose/%s", project.Name) @@ -253,11 +253,11 @@ func computeRollingUpdateLimits(service types.ServiceConfig) (int, int, error) { return minPercent, maxPercent, nil } updateConfig := service.Deploy.UpdateConfig - min, okMin := updateConfig.Extensions[compose.ExtensionMinPercent] + min, okMin := updateConfig.Extensions[ExtensionMinPercent] if okMin { minPercent = min.(int) } - max, okMax := updateConfig.Extensions[compose.ExtensionMaxPercent] + max, okMax := updateConfig.Extensions[ExtensionMaxPercent] if okMax { maxPercent = max.(int) } @@ -442,7 +442,7 @@ func createTaskExecutionRole(service types.ServiceConfig, err error, definition }) } - if roles, ok := service.Extensions[compose.ExtensionRole]; ok { + if roles, ok := service.Extensions[ExtensionRole]; ok { rolePolicies = append(rolePolicies, iam.Role_Policy{ PolicyDocument: roles, }) @@ -451,7 +451,7 @@ func createTaskExecutionRole(service types.ServiceConfig, err error, definition ECSTaskExecutionPolicy, ECRReadOnlyPolicy, } - if v, ok := service.Extensions[compose.ExtensionManagedPolicies]; ok { + if v, ok := service.Extensions[ExtensionManagedPolicies]; ok { for _, s := range v.([]interface{}) { managedPolicies = append(managedPolicies, s.(string)) } @@ -488,7 +488,7 @@ func createCloudMap(project *types.Project, template *cloudformation.Template) { } func convertNetwork(project *types.Project, net types.NetworkConfig, vpc string, template *cloudformation.Template) string { - if sg, ok := net.Extensions[compose.ExtensionSecurityGroup]; ok { + if sg, ok := net.Extensions[ExtensionSecurityGroup]; ok { logrus.Debugf("Security Group for network %q set by user to %q", net.Name, sg) return sg.(string) } diff --git a/ecs/pkg/amazon/backend/cloudformation_test.go b/ecs/cloudformation_test.go similarity index 99% rename from ecs/pkg/amazon/backend/cloudformation_test.go rename to ecs/cloudformation_test.go index 307b6036..e93dc86b 100644 --- a/ecs/pkg/amazon/backend/cloudformation_test.go +++ b/ecs/cloudformation_test.go @@ -1,4 +1,4 @@ -package backend +package ecs import ( "fmt" @@ -15,7 +15,6 @@ import ( "github.com/compose-spec/compose-go/cli" "github.com/compose-spec/compose-go/loader" "github.com/compose-spec/compose-go/types" - "github.com/docker/ecs-plugin/pkg/compose" "gotest.tools/v3/assert" "gotest.tools/v3/golden" ) diff --git a/ecs/cmd/commands/compose.go b/ecs/cmd/commands/compose.go deleted file mode 100644 index 7fea85e9..00000000 --- a/ecs/cmd/commands/compose.go +++ /dev/null @@ -1,152 +0,0 @@ -package commands - -import ( - "context" - "fmt" - "io" - "os" - "strings" - - "github.com/compose-spec/compose-go/cli" - "github.com/docker/cli/cli/command" - amazon "github.com/docker/ecs-plugin/pkg/amazon/backend" - "github.com/docker/ecs-plugin/pkg/amazon/cloudformation" - "github.com/docker/ecs-plugin/pkg/docker" - "github.com/docker/ecs-plugin/pkg/progress" - "github.com/spf13/cobra" -) - -func ComposeCommand(dockerCli command.Cli) *cobra.Command { - cmd := &cobra.Command{ - Use: "compose", - } - opts := &composeOptions{} - AddFlags(opts, cmd.Flags()) - - cmd.AddCommand( - ConvertCommand(dockerCli, opts), - UpCommand(dockerCli, opts), - DownCommand(dockerCli, opts), - LogsCommand(dockerCli, opts), - PsCommand(dockerCli, opts), - ) - return cmd -} - -type upOptions struct { - loadBalancerArn string -} - -func (o upOptions) LoadBalancerArn() *string { - if o.loadBalancerArn == "" { - return nil - } - return &o.loadBalancerArn -} - -func ConvertCommand(dockerCli command.Cli, options *composeOptions) *cobra.Command { - cmd := &cobra.Command{ - Use: "convert", - RunE: WithAwsContext(dockerCli, func(ctx docker.AwsContext, backend *amazon.Backend, args []string) error { - opts, err := options.toProjectOptions() - if err != nil { - return err - } - project, err := cli.ProjectFromOptions(opts) - if err != nil { - return err - } - template, err := backend.Convert(project) - if err != nil { - return err - } - json, err := cloudformation.Marshall(template) - if err != nil { - return err - } - fmt.Printf("%s\n", string(json)) - return nil - }), - } - return cmd -} - -func UpCommand(dockerCli command.Cli, options *composeOptions) *cobra.Command { - opts := upOptions{} - cmd := &cobra.Command{ - Use: "up", - RunE: WithAwsContext(dockerCli, func(clusteropts docker.AwsContext, backend *amazon.Backend, args []string) error { - opts, err := options.toProjectOptions() - if err != nil { - return err - } - - return progress.Run(context.Background(), func(ctx context.Context) error { - return backend.Up(ctx, opts) - }) - }), - } - cmd.Flags().StringVar(&opts.loadBalancerArn, "load-balancer", "", "") - return cmd -} - -func PsCommand(dockerCli command.Cli, options *composeOptions) *cobra.Command { - opts := upOptions{} - cmd := &cobra.Command{ - Use: "ps", - RunE: WithAwsContext(dockerCli, func(clusteropts docker.AwsContext, backend *amazon.Backend, args []string) error { - opts, err := options.toProjectOptions() - if err != nil { - return err - } - status, err := backend.Ps(context.Background(), opts) - if err != nil { - return err - } - printSection(os.Stdout, len(status), func(w io.Writer) { - for _, service := range status { - fmt.Fprintf(w, "%s\t%s\t%d/%d\t%s\n", service.ID, service.Name, service.Replicas, service.Desired, strings.Join(service.Ports, ", ")) - } - }, "ID", "NAME", "REPLICAS", "PORTS") - return nil - }), - } - cmd.Flags().StringVar(&opts.loadBalancerArn, "load-balancer", "", "") - return cmd -} - -type downOptions struct { - DeleteCluster bool -} - -func DownCommand(dockerCli command.Cli, options *composeOptions) *cobra.Command { - opts := downOptions{} - cmd := &cobra.Command{ - Use: "down", - RunE: WithAwsContext(dockerCli, func(clusteropts docker.AwsContext, backend *amazon.Backend, args []string) error { - opts, err := options.toProjectOptions() - if err != nil { - return err - } - return progress.Run(context.Background(), func(ctx context.Context) error { - return backend.Down(ctx, opts) - }) - }), - } - cmd.Flags().BoolVar(&opts.DeleteCluster, "delete-cluster", false, "Delete cluster") - return cmd -} - -func LogsCommand(dockerCli command.Cli, options *composeOptions) *cobra.Command { - cmd := &cobra.Command{ - Use: "logs [PROJECT NAME]", - RunE: WithAwsContext(dockerCli, func(clusteropts docker.AwsContext, backend *amazon.Backend, args []string) error { - opts, err := options.toProjectOptions() - if err != nil { - return err - } - return backend.Logs(context.Background(), opts, os.Stdout) - }), - } - return cmd -} diff --git a/ecs/cmd/commands/context.go b/ecs/cmd/commands/context.go deleted file mode 100644 index 080d3b7d..00000000 --- a/ecs/cmd/commands/context.go +++ /dev/null @@ -1,31 +0,0 @@ -package commands - -import ( - "fmt" - - "github.com/aws/aws-sdk-go/aws/awserr" - "github.com/docker/cli/cli/command" - amazon "github.com/docker/ecs-plugin/pkg/amazon/backend" - "github.com/docker/ecs-plugin/pkg/docker" - "github.com/spf13/cobra" -) - -type ContextFunc func(ctx docker.AwsContext, backend *amazon.Backend, args []string) error - -func WithAwsContext(dockerCli command.Cli, f ContextFunc) func(cmd *cobra.Command, args []string) error { - return func(cmd *cobra.Command, args []string) error { - ctx, err := docker.GetAwsContext(dockerCli) - if err != nil { - return err - } - backend, err := amazon.NewBackend(ctx.Profile, ctx.Region) - if err != nil { - return err - } - err = f(*ctx, backend, args) - if e, ok := err.(awserr.Error); ok { - return fmt.Errorf(e.Message()) - } - return err - } -} diff --git a/ecs/cmd/commands/opts.go b/ecs/cmd/commands/opts.go deleted file mode 100644 index 2124ca24..00000000 --- a/ecs/cmd/commands/opts.go +++ /dev/null @@ -1,28 +0,0 @@ -package commands - -import ( - "github.com/compose-spec/compose-go/cli" - "github.com/spf13/pflag" -) - -type composeOptions struct { - Name string - WorkingDir string - ConfigPaths []string - Environment []string -} - -func AddFlags(o *composeOptions, flags *pflag.FlagSet) { - flags.StringArrayVarP(&o.ConfigPaths, "file", "f", nil, "Specify an alternate compose file") - flags.StringVarP(&o.Name, "project-name", "n", "", "Specify an alternate project name (default: directory name)") - flags.StringVarP(&o.WorkingDir, "workdir", "w", "", "Working directory") - flags.StringSliceVarP(&o.Environment, "environment", "e", []string{}, "Environment variables") -} - -func (o *composeOptions) toProjectOptions() (*cli.ProjectOptions, error) { - return cli.NewProjectOptions(o.ConfigPaths, - cli.WithOsEnv, - cli.WithEnv(o.Environment), - cli.WithWorkingDirectory(o.WorkingDir), - cli.WithName(o.Name)) -} diff --git a/ecs/cmd/commands/root.go b/ecs/cmd/commands/root.go deleted file mode 100644 index a9c22921..00000000 --- a/ecs/cmd/commands/root.go +++ /dev/null @@ -1,32 +0,0 @@ -package commands - -import ( - "fmt" - - "github.com/docker/cli/cli/command" - "github.com/spf13/cobra" -) - -// NewRootCmd returns the base root command. -func NewRootCmd(dockerCli command.Cli) *cobra.Command { - cmd := &cobra.Command{ - Short: "Docker ECS", - Long: `run multi-container applications on Amazon ECS.`, - Use: "ecs", - Annotations: map[string]string{"experimentalCLI": "true"}, - RunE: func(cmd *cobra.Command, args []string) error { - if len(args) != 0 { - return fmt.Errorf("%q is not a docker ecs command\nSee 'docker ecs --help'", args[0]) - } - cmd.Help() - return nil - }, - } - cmd.AddCommand( - VersionCommand(), - ComposeCommand(dockerCli), - SecretCommand(dockerCli), - SetupCommand(), - ) - return cmd -} diff --git a/ecs/cmd/commands/root_test.go b/ecs/cmd/commands/root_test.go deleted file mode 100644 index 80f2a72d..00000000 --- a/ecs/cmd/commands/root_test.go +++ /dev/null @@ -1,13 +0,0 @@ -package commands - -import ( - "testing" - - "gotest.tools/v3/assert" -) - -func TestUnknownCommand(t *testing.T) { - root := NewRootCmd(nil) - _, _, err := root.Find([]string{"unknown_command"}) - assert.Error(t, err, "unknown command \"unknown_command\" for \"ecs\"") -} diff --git a/ecs/cmd/commands/secret.go b/ecs/cmd/commands/secret.go deleted file mode 100644 index 3246e123..00000000 --- a/ecs/cmd/commands/secret.go +++ /dev/null @@ -1,140 +0,0 @@ -package commands - -import ( - "context" - "errors" - "fmt" - "io" - "os" - "strings" - "text/tabwriter" - - "github.com/docker/cli/cli/command" - amazon "github.com/docker/ecs-plugin/pkg/amazon/backend" - "github.com/docker/ecs-plugin/pkg/compose" - "github.com/docker/ecs-plugin/pkg/docker" - "github.com/spf13/cobra" -) - -type createSecretOptions struct { - Label string - Username string - Password string - Description string -} - -type deleteSecretOptions struct { - recover bool -} - -func SecretCommand(dockerCli command.Cli) *cobra.Command { - cmd := &cobra.Command{ - Use: "secret", - Short: "Manages secrets", - } - - cmd.AddCommand( - CreateSecret(dockerCli), - InspectSecret(dockerCli), - ListSecrets(dockerCli), - DeleteSecret(dockerCli), - ) - return cmd -} - -func CreateSecret(dockerCli command.Cli) *cobra.Command { - opts := createSecretOptions{} - cmd := &cobra.Command{ - Use: "create NAME", - Short: "Creates a secret.", - RunE: WithAwsContext(dockerCli, func(clusteropts docker.AwsContext, backend *amazon.Backend, args []string) error { - if len(args) == 0 { - return errors.New("Missing mandatory parameter: NAME") - } - name := args[0] - - secret := compose.NewSecret(name, opts.Username, opts.Password, opts.Description) - id, err := backend.CreateSecret(context.Background(), secret) - fmt.Println(id) - return err - }), - } - cmd.Flags().StringVarP(&opts.Username, "username", "u", "", "username") - cmd.Flags().StringVarP(&opts.Password, "password", "p", "", "password") - cmd.Flags().StringVarP(&opts.Description, "description", "d", "", "Secret description") - return cmd -} - -func InspectSecret(dockerCli command.Cli) *cobra.Command { - cmd := &cobra.Command{ - Use: "inspect ID", - Short: "Displays secret details", - RunE: WithAwsContext(dockerCli, func(clusteropts docker.AwsContext, backend *amazon.Backend, args []string) error { - if len(args) == 0 { - return errors.New("Missing mandatory parameter: ID") - } - id := args[0] - secret, err := backend.InspectSecret(context.Background(), id) - if err != nil { - return err - } - out, err := secret.ToJSON() - if err != nil { - return err - } - fmt.Println(out) - return nil - }), - } - return cmd -} - -func ListSecrets(dockerCli command.Cli) *cobra.Command { - cmd := &cobra.Command{ - Use: "list", - Aliases: []string{"ls"}, - Short: "List secrets stored for the existing account.", - RunE: WithAwsContext(dockerCli, func(clusteropts docker.AwsContext, backend *amazon.Backend, args []string) error { - secrets, err := backend.ListSecrets(context.Background()) - if err != nil { - return err - } - - printList(os.Stdout, secrets) - return nil - }), - } - return cmd -} - -func DeleteSecret(dockerCli command.Cli) *cobra.Command { - opts := deleteSecretOptions{} - cmd := &cobra.Command{ - Use: "delete NAME", - Aliases: []string{"rm", "remove"}, - Short: "Removes a secret.", - RunE: WithAwsContext(dockerCli, func(clusteropts docker.AwsContext, backend *amazon.Backend, args []string) error { - if len(args) == 0 { - return errors.New("Missing mandatory parameter: [NAME]") - } - return backend.DeleteSecret(context.Background(), args[0], opts.recover) - }), - } - cmd.Flags().BoolVar(&opts.recover, "recover", false, "Enable recovery.") - return cmd -} - -func printList(out io.Writer, secrets []compose.Secret) { - printSection(out, len(secrets), func(w io.Writer) { - for _, secret := range secrets { - fmt.Fprintf(w, "%s\t%s\t%s\n", secret.ID, secret.Name, secret.Description) - } - }, "ID", "NAME", "DESCRIPTION") -} - -func printSection(out io.Writer, len int, printer func(io.Writer), headers ...string) { - w := tabwriter.NewWriter(out, 20, 1, 3, ' ', 0) - fmt.Fprintln(w, strings.Join(headers, "\t")) - printer(w) - w.Flush() -} diff --git a/ecs/cmd/commands/setup.go b/ecs/cmd/commands/setup.go deleted file mode 100644 index da733f71..00000000 --- a/ecs/cmd/commands/setup.go +++ /dev/null @@ -1,262 +0,0 @@ -package commands - -import ( - "context" - "fmt" - "os" - "path/filepath" - "reflect" - "strings" - - "github.com/aws/aws-sdk-go/aws/awserr" - "github.com/aws/aws-sdk-go/aws/credentials" - "github.com/aws/aws-sdk-go/aws/defaults" - amazon "github.com/docker/ecs-plugin/pkg/amazon/backend" - contextStore "github.com/docker/ecs-plugin/pkg/docker" - "github.com/manifoldco/promptui" - "github.com/spf13/cobra" - "gopkg.in/ini.v1" -) - -const enterLabelPrefix = "Enter " - -type setupOptions struct { - name string - profile string - region string - accessKeyID string - secretAccessKey string -} - -func (s setupOptions) unsetRequiredArgs() []string { - unset := []string{} - if s.profile == "" { - unset = append(unset, "profile") - } - if s.region == "" { - unset = append(unset, "region") - } - return unset -} - -func SetupCommand() *cobra.Command { - var opts setupOptions - - cmd := &cobra.Command{ - Use: "setup", - Short: "", - RunE: func(cmd *cobra.Command, args []string) error { - if requiredFlag := opts.unsetRequiredArgs(); len(requiredFlag) > 0 { - if err := interactiveCli(&opts); err != nil { - return err - } - } - if opts.accessKeyID != "" && opts.secretAccessKey != "" { - if err := saveCredentials(opts.profile, opts.accessKeyID, opts.secretAccessKey); err != nil { - return err - } - } - backend, err := amazon.NewBackend(opts.profile, opts.region) - if err != nil { - return err - } - - context, _, err := backend.CreateContextData(context.Background(), map[string]string{ - amazon.ContextParamProfile: opts.profile, - amazon.ContextParamRegion: opts.region, - }) - if err != nil { - return err - } - return contextStore.NewContext(opts.name, context) - }, - } - cmd.Flags().StringVarP(&opts.name, "name", "n", "ecs", "Context Name") - cmd.Flags().StringVarP(&opts.profile, "profile", "p", "", "AWS Profile") - cmd.Flags().StringVarP(&opts.region, "region", "r", "", "AWS region") - cmd.Flags().StringVarP(&opts.accessKeyID, "aws-key-id", "k", "", "AWS Access Key ID") - cmd.Flags().StringVarP(&opts.secretAccessKey, "aws-secret-key", "s", "", "AWS Secret Access Key") - - return cmd -} - -func interactiveCli(opts *setupOptions) error { - var section ini.Section - - if err := setContextName(opts); err != nil { - return err - } - - section, err := setProfile(opts, section) - if err != nil { - return err - } - - if err := setRegion(opts, section); err != nil { - return err - } - - if err := setCredentials(opts); err != nil { - return err - } - - return nil -} - -func saveCredentials(profile string, accessKeyID string, secretAccessKey string) error { - p := credentials.SharedCredentialsProvider{Profile: profile} - _, err := p.Retrieve() - if err == nil { - fmt.Println("credentials already exists!") - return nil - } - - if err.(awserr.Error).Code() == "SharedCredsLoad" && err.(awserr.Error).Message() == "failed to load shared credentials file" { - err = os.MkdirAll(filepath.Dir(p.Filename), 0700) - if err != nil { - return err - } - _, err = os.Create(p.Filename) - if err != nil { - return err - } - } - - credIni, err := ini.LooseLoad(p.Filename) - if err != nil { - return err - } - section, err := credIni.NewSection(profile) - if err != nil { - return err - } - section.NewKey("aws_access_key_id", accessKeyID) - section.NewKey("aws_secret_access_key", secretAccessKey) - return credIni.SaveTo(p.Filename) -} - -func awsProfiles(filename string) (map[string]ini.Section, error) { - profiles := map[string]ini.Section{"new profile": {}} - if filename == "" { - filename = defaults.SharedConfigFilename() - } - credIni, err := ini.LooseLoad(filename) - if err != nil { - return nil, err - } - if err != nil { - return nil, err - } - for _, section := range credIni.Sections() { - if strings.HasPrefix(section.Name(), "profile") { - profiles[section.Name()[len("profile "):]] = *section - } - } - return profiles, nil -} - -func setContextName(opts *setupOptions) error { - if opts.name == "ecs" { - result, err := promptString(opts.name, "context name", enterLabelPrefix, 2) - if err != nil { - return err - } - opts.name = result - } - return nil -} - -func setProfile(opts *setupOptions, section ini.Section) (ini.Section, error) { - profilesList, err := awsProfiles("") - if err != nil { - return ini.Section{}, err - } - section, ok := profilesList[opts.profile] - if !ok { - prompt := promptui.Select{ - Label: "Select AWS Profile", - Items: reflect.ValueOf(profilesList).MapKeys(), - } - _, result, err := prompt.Run() - if result == "new profile" { - result, err := promptString(opts.profile, "profile name", enterLabelPrefix, 2) - if err != nil { - return ini.Section{}, err - } - opts.profile = result - } else { - section = profilesList[result] - opts.profile = result - } - if err != nil { - return ini.Section{}, err - } - } - return section, nil -} - -func setRegion(opts *setupOptions, section ini.Section) error { - defaultRegion := opts.region - if defaultRegion == "" && section.Name() != "" { - region, err := section.GetKey("region") - if err == nil { - defaultRegion = region.Value() - } - } - result, err := promptString(defaultRegion, "region", enterLabelPrefix, 2) - if err != nil { - return err - } - opts.region = result - return nil -} - -func setCredentials(opts *setupOptions) error { - prompt := promptui.Prompt{ - Label: "Enter credentials", - IsConfirm: true, - } - _, err := prompt.Run() - if err == nil { - result, err := promptString(opts.accessKeyID, "AWS Access Key ID", enterLabelPrefix, 3) - if err != nil { - return err - } - opts.accessKeyID = result - - prompt = promptui.Prompt{ - Label: "Enter AWS Secret Access Key", - Validate: validateMinLen("AWS Secret Access Key", 3), - Mask: '*', - Default: opts.secretAccessKey, - } - result, err = prompt.Run() - if err != nil { - return err - } - opts.secretAccessKey = result - } - return nil -} - -func promptString(defaultValue string, label string, labelPrefix string, minLength int) (string, error) { - prompt := promptui.Prompt{ - Label: labelPrefix + label, - Validate: validateMinLen(label, minLength), - Default: defaultValue, - } - result, err := prompt.Run() - if err != nil { - return "", err - } - return result, nil -} - -func validateMinLen(label string, minLength int) func(input string) error { - return func(input string) error { - if len(input) < minLength { - return fmt.Errorf("%s must have more than %d characters", label, minLength) - } - return nil - } -} diff --git a/ecs/cmd/commands/version.go b/ecs/cmd/commands/version.go deleted file mode 100644 index ce025389..00000000 --- a/ecs/cmd/commands/version.go +++ /dev/null @@ -1,20 +0,0 @@ -package commands - -import ( - "fmt" - - "github.com/docker/ecs-plugin/internal" - - "github.com/spf13/cobra" -) - -func VersionCommand() *cobra.Command { - return &cobra.Command{ - Use: "version", - Short: "Show version.", - RunE: func(cmd *cobra.Command, args []string) error { - fmt.Fprintf(cmd.OutOrStdout(), "Docker ECS plugin %s (%s)\n", internal.Version, internal.GitCommit) - return nil - }, - } -} diff --git a/ecs/cmd/commands/version_test.go b/ecs/cmd/commands/version_test.go deleted file mode 100644 index 43a9ab81..00000000 --- a/ecs/cmd/commands/version_test.go +++ /dev/null @@ -1,20 +0,0 @@ -package commands - -import ( - "bytes" - "strings" - "testing" - - "github.com/docker/ecs-plugin/internal" - - "gotest.tools/v3/assert" -) - -func TestVersion(t *testing.T) { - root := NewRootCmd(nil) - var out bytes.Buffer - root.SetOut(&out) - root.SetArgs([]string{"version"}) - root.Execute() - assert.Check(t, strings.Contains(out.String(), internal.Version)) -} diff --git a/ecs/cmd/main/main.go b/ecs/cmd/main/main.go deleted file mode 100644 index f4140394..00000000 --- a/ecs/cmd/main/main.go +++ /dev/null @@ -1,23 +0,0 @@ -package main - -import ( - "github.com/docker/ecs-plugin/cmd/commands" - "github.com/docker/ecs-plugin/internal" - - "github.com/docker/cli/cli-plugins/manager" - "github.com/docker/cli/cli-plugins/plugin" - "github.com/docker/cli/cli/command" - "github.com/spf13/cobra" -) - -func main() { - plugin.Run(func(dockerCli command.Cli) *cobra.Command { - cmd := commands.NewRootCmd(dockerCli) - return cmd - }, manager.Metadata{ - SchemaVersion: "0.1.0", - Vendor: "Docker Inc.", - Version: internal.Version, - Experimental: true, - }) -} diff --git a/ecs/pkg/console/colors.go b/ecs/colors.go similarity index 98% rename from ecs/pkg/console/colors.go rename to ecs/colors.go index 672b61f5..3af58af5 100644 --- a/ecs/pkg/console/colors.go +++ b/ecs/colors.go @@ -1,4 +1,4 @@ -package console +package ecs import ( "fmt" diff --git a/ecs/pkg/amazon/backend/compatibility.go b/ecs/compatibility.go similarity index 99% rename from ecs/pkg/amazon/backend/compatibility.go rename to ecs/compatibility.go index d217ca48..2fdd527a 100644 --- a/ecs/pkg/amazon/backend/compatibility.go +++ b/ecs/compatibility.go @@ -1,4 +1,4 @@ -package backend +package ecs import ( "github.com/compose-spec/compose-go/compatibility" diff --git a/ecs/context.go b/ecs/context.go index de7a3415..46c2422e 100644 --- a/ecs/context.go +++ b/ecs/context.go @@ -1,5 +1,3 @@ -// +build ecs - /* Copyright 2020 Docker, Inc. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/ecs/pkg/amazon/backend/convert.go b/ecs/convert.go similarity index 98% rename from ecs/pkg/amazon/backend/convert.go rename to ecs/convert.go index 2056dad4..62eca65a 100644 --- a/ecs/pkg/amazon/backend/convert.go +++ b/ecs/convert.go @@ -1,4 +1,4 @@ -package backend +package ecs import ( "encoding/json" @@ -16,9 +16,8 @@ import ( "github.com/awslabs/goformation/v4/cloudformation/ecs" "github.com/awslabs/goformation/v4/cloudformation/tags" "github.com/compose-spec/compose-go/types" + "github.com/docker/api/ecs/secrets" "github.com/docker/cli/opts" - "github.com/docker/ecs-plugin/pkg/compose" - "github.com/docker/ecs-plugin/secrets" "github.com/joho/godotenv" ) @@ -81,7 +80,7 @@ func Convert(project *types.Project, service types.ServiceConfig) (*ecs.TaskDefi ValueFrom: secretConfig.Name, }) var keys []string - if ext, ok := secretConfig.Extensions[compose.ExtensionKeys]; ok { + if ext, ok := secretConfig.Extensions[ExtensionKeys]; ok { if key, ok := ext.(string); ok { keys = append(keys, key) } else { @@ -456,7 +455,7 @@ func toHostEntryPtr(hosts types.HostsList) []ecs.TaskDefinition_HostEntry { func getRepoCredentials(service types.ServiceConfig) *ecs.TaskDefinition_RepositoryCredentials { // extract registry and namespace string from image name for key, value := range service.Extensions { - if key == compose.ExtensionPullCredentials { + if key == ExtensionPullCredentials { return &ecs.TaskDefinition_RepositoryCredentials{CredentialsParameter: value.(string)} } } diff --git a/ecs/doc.go b/ecs/doc.go deleted file mode 100644 index 2ea49a88..00000000 --- a/ecs/doc.go +++ /dev/null @@ -1,14 +0,0 @@ -/* - Copyright 2020 Docker, Inc. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -package ecs diff --git a/ecs/docs/get-started-linux.md b/ecs/docs/get-started-linux.md deleted file mode 100644 index afada890..00000000 --- a/ecs/docs/get-started-linux.md +++ /dev/null @@ -1,82 +0,0 @@ -Getting Started with Docker AWS ECS Plugin Beta on Linux --------------------------------------------------------- - -The beta release of [AWS ECS](https://aws.amazon.com/ecs/) support for the -Docker CLI is shipped as a CLI plugin. Later releases will be included as part -of the Docker CLI. - -This plugin is included as part of Docker Desktop on Windows and macOS but on -Linux it needs to be installed manually. - -## Prerequisites - -* [Docker 19.03 or later](https://docs.docker.com/get-docker/) - -## Step by step install - -### Download - -You can download the Docker ECS plugin from this repository using the following -command: - -```console -$ curl -LO https://github.com/docker/ecs-plugin/releases/latest/download/docker-ecs-linux-amd64 -``` - -You will then need to make it executable: - -```console -$ chmod +x docker-ecs-linux-amd64 -``` - -### Plugin install - -In order for the Docker CLI to use the downloaded plugin, you will need to move -it to the right place: - -```console -$ mkdir -p /usr/local/lib/docker/cli-plugins - -$ mv docker-ecs-linux-amd64 /usr/local/lib/docker/cli-plugins/docker-ecs -``` - -You can put the CLI plugin into any of the following directories: - -* `/usr/local/lib/docker/cli-plugins` -* `/usr/local/libexec/docker/cli-plugins` -* `/usr/lib/docker/cli-plugins` -* `/usr/libexec/docker/cli-plugins` - -Finally you need to enable the experimental features on the CLI. This can be -done by setting the environment variable `DOCKER_CLI_EXPERIMENTAL=enabled` or by -setting `experimental` to `"enabled"` in your Docker config found at -`~/.docker/config.json`: - -```console -$ export DOCKER_CLI_EXPERIMENTAL=enabled - -$ DOCKER_CLI_EXPERIMENTAL=enabled docker help - -$ cat ~/.docker/config.json -{ - "experimental" : "enabled", - "auths" : { - "https://index.docker.io/v1/" : { - - } - } -} -``` - -To verify the CLI plugin installation, you can check that it appears in the CLI -help output or by outputting the plugin version: - -```console -$ docker help | grep ecs - ecs* Docker ECS (Docker Inc., 0.0.1) - -$ docker ecs version -Docker ECS plugin 0.0.1 -``` - -You are now ready to [start deploying to ECS](https://docs.docker.com/engine/context/ecs-integration/) diff --git a/ecs/docs/requirements.md b/ecs/docs/requirements.md deleted file mode 100644 index d142de4f..00000000 --- a/ecs/docs/requirements.md +++ /dev/null @@ -1,31 +0,0 @@ -## Requirements - -This plugin relies on AWS API credentials, using the same configuration files as -the AWS command line. - -Such credentials can be configured by the `docker ecs setup` command, either by -selecting an existing AWS CLI profile from existing config files, or by creating -one passing an AWS access key ID and secret access key. - -## Permissions - -AWS accounts (or IAM roles) used with the ECS plugin require following permissions: - -- ec2:DescribeSubnets -- ec2:DescribeVpcs -- iam:CreateServiceLinkedRole -- iam:AttachRolePolicy -- cloudformation:* -- ecs:* -- logs:* -- servicediscovery:* -- elasticloadbalancing:* - - -## Okta support - -For those relying on [aws-okta](https://github.com/segmentio/aws-okta) to access a managed AWS account -(as we do at Docker), you can populate your aws config files with temporary access tokens using: -```shell script -aws-okta write-to-credentials ~/.aws/credentials -``` diff --git a/ecs/pkg/amazon/backend/down.go b/ecs/down.go similarity index 52% rename from ecs/pkg/amazon/backend/down.go rename to ecs/down.go index 0d235ad7..849b1c67 100644 --- a/ecs/pkg/amazon/backend/down.go +++ b/ecs/down.go @@ -1,26 +1,25 @@ -package backend +package ecs import ( "context" "github.com/compose-spec/compose-go/cli" - "github.com/docker/ecs-plugin/pkg/compose" ) -func (b *Backend) Down(ctx context.Context, options *cli.ProjectOptions) error { +func (b *ecsAPIService) Down(ctx context.Context, options *cli.ProjectOptions) error { name, err := b.projectName(options) if err != nil { return err } - err = b.api.DeleteStack(ctx, name) + err = b.SDK.DeleteStack(ctx, name) if err != nil { return err } - return b.WaitStackCompletion(ctx, name, compose.StackDelete) + return b.WaitStackCompletion(ctx, name, StackDelete) } -func (b *Backend) projectName(options *cli.ProjectOptions) (string, error) { +func (b *ecsAPIService) projectName(options *cli.ProjectOptions) (string, error) { name := options.Name if name == "" { project, err := cli.ProjectFromOptions(options) diff --git a/ecs/example/Makefile b/ecs/example/Makefile deleted file mode 100644 index deba2b83..00000000 --- a/ecs/example/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -REPO_NAMESPACE ?= ${USER} -FRONTEND_IMG = ${REPO_NAMESPACE}/timestamper -REGISTRY_ID ?= PUT_ECR_REGISTRY_ID_HERE -DOCKER_PUSH_REPOSITORY=dkr.ecr.us-west-2.amazonaws.com - -all: build-image - -create-ecr: - aws ecr create-repository --repository-name ${FRONTEND_IMG} - -build-image: - docker build -t $(REGISTRY_ID).$(DOCKER_PUSH_REPOSITORY)/$(FRONTEND_IMG) ./app - docker build -t $(FRONTEND_IMG) ./app - -push-image-ecr: - aws ecr get-login-password --region us-west-2 | docker login -u AWS --password-stdin $(REGISTRY_ID).$(DOCKER_PUSH_REPOSITORY) - docker push $(REGISTRY_ID).$(DOCKER_PUSH_REPOSITORY)/$(FRONTEND_IMG) - -push-image-hub: - docker push $(FRONTEND_IMG) - -clean: - @docker context use default - @docker context rm aws || true - @docker-compose rm -f || true diff --git a/ecs/example/README.md b/ecs/example/README.md deleted file mode 100644 index e8dbbd73..00000000 --- a/ecs/example/README.md +++ /dev/null @@ -1,181 +0,0 @@ -## Compose sample application - -This sample application was demoed as part of the AWS Cloud Containers -Conference on 2020-07-09. It has been tested on Linux and macOS. - -Note that `$` is used to denote commands in blocks where the command and its -output are included. - -### Python/Flask application - -``` -+--------------------+ +------------------+ -| | | | -| Python Flask | timestamps | Redis | -| Application |------------->| | -| | | | -+--------------------+ +------------------+ -``` - -### Things you'll need to do - -There are a number of places you'll need to fill in information. -You can find them with: - -```console -$ grep -r '<<<' ./* -./docker-compose.yml: x-aws-pull_credentials: <<>> -./docker-compose.yml: image: <<>>/timestamper -## Walk through -``` - -### Setup pull credentials for private Docker Hub repositories - -You should use a Personal Access Token (PAT) rather than your account password. -If you have 2FA enabled on your Hub account you will need to create a PAT. -You can read more about managing access tokens here: -https://docs.docker.com/docker-hub/access-tokens/ - - -You can then create `DockerHubToken` secret on [AWS Secret Manager](https://aws.amazon.com/secrets-manager/) using following command - -```console -docker ecs secret create -d MyKey -u myhubusername -p myhubpat DockerHubToken -``` - -### Create an AWS Docker context and list available contexts - -To initialize the Docker ECS integration, you will need to run the `setup` -command. This will create a Docker context that works with AWS ECS. - -```console -$ docker ecs setup -Enter context name: aws -✔ sandbox.devtools.developer -Enter cluster name: -Enter region: us-west-2 -✗ Enter credentials: -``` - -You can verify that the context was created by listing your Docker contexts: - -```console -$ docker context ls -NAME DESCRIPTION DOCKER ENDPOINT KUBERNETES ENDPOINT ORCHESTRATOR -aws -default * Current DOCKER_HOST based configuration unix:///var/run/docker.sock swarm -``` - -### Test locally - -The first step is to test your application works locally. To do this, you will -need to switch to using the default local context so that you are targeting your -local machine. - -```console -docker context use default -``` - -You can then run the application using `docker-compose`: - -```console -docker-compose up -``` - -Once the application has started, you can navigate to http://localhost:5000 -using your Web browser using the following command: - -```console -open http://localhost:5000 -``` - -### Push images to Docker Hub for ECS (ECS cannot see your local image cache) - -In order to run your application in the cloud, you will need your container -images to be in a registry. You can push them from your local machine using: - -```console -docker-compose push -``` - -You can verify that this command pushed to the Docker Hub by -[logging in](https://hub.docker.com) and looking for the `timestamper` -repository under your user name. - -### Switch to ECS context and launch the app - -Now that you've tested the application works locally and that you've pushed the -container images to the Docker Hub, you can switch to using the `aws` context -you created earlier. - -```console -docker context use aws -``` - -Running the application on ECS is then as simple as doing a `compose up`: - -```console -docker ecs compose up -``` - -### Check out the CLI - -Once the application is running in ECS, you can list the running containers with -the `ps` command. Note that you will need to run this from the directory where -you Compose file is. - -```console -docker ecs compose ps -``` - -You can also read the application logs using `compose logs`: - -```console -docker ecs compose logs -``` - -### Check out the AWS console - -You can see all the AWS components created for your running application in the -AWS console. There you will find: - -- CloudFormation being used to manage all the infrastructure -- CloudWatch for logs -- Security Groups for network policies -- Load balancers (ELB for this example / ALB if your app only uses 80/443) - -### Checkout CloudFormation - -The ECS Docker CLI integration has the ability to output the CloudFormation -template used to create the application in the `compose convert` command. You -can see this by running: - -```console -docker ecs compose convert -``` - -### Stop the meters - -To shut down your application, you simply need to run: - -```console -docker ecs compose down -``` - -## Using Amazon ECR instead of Docker Hub - -If you'd like to use AWS ECR instead of Docker Hub, the [Makefile](Makefile) has -an example setup for creating an ECR repository and pushing to it. -You'll need to have the AWS CLI installed and your AWS credentials available. - -```console -make create-ecr -REGISTRY_ID= make build-image -REGISTRY_ID= make push-image-ecr -``` - -Note that you will need to change the name of the image in the -[Compose file](docker-compose.yml). - -If you want to use this often, you'll likely want to replace -`PUT_ECR_REGISTRY_ID_HERE` with the value from above. diff --git a/ecs/example/app/Dockerfile b/ecs/example/app/Dockerfile deleted file mode 100644 index 64469d28..00000000 --- a/ecs/example/app/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM python:3.7-alpine -WORKDIR /app -COPY requirements.txt /app -RUN pip3 install -r requirements.txt -COPY . /app -ENTRYPOINT ["/app/scripts/entrypoint.sh"] -CMD ["python3", "app.py"] diff --git a/ecs/example/app/app.py b/ecs/example/app/app.py deleted file mode 100644 index e54b19a2..00000000 --- a/ecs/example/app/app.py +++ /dev/null @@ -1,19 +0,0 @@ - -from flask import Flask -from flask import render_template -from redis import StrictRedis -from datetime import datetime - -app = Flask(__name__) -redis = StrictRedis(host='backend', port=6379) - - -@app.route('/') -def home(): - redis.lpush('times', datetime.now().strftime('%Y-%m-%dT%H:%M:%S%z')) - return render_template('index.html', title='Home', - times=redis.lrange('times', 0, -1)) - - -if __name__ == '__main__': - app.run(host='0.0.0.0', debug=True) diff --git a/ecs/example/app/requirements.txt b/ecs/example/app/requirements.txt deleted file mode 100644 index 1a5dc97b..00000000 --- a/ecs/example/app/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -flask -redis diff --git a/ecs/example/app/scripts/entrypoint.sh b/ecs/example/app/scripts/entrypoint.sh deleted file mode 100755 index 19866024..00000000 --- a/ecs/example/app/scripts/entrypoint.sh +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh - -if [ "${LOCALDOMAIN}" != "" ]; then echo "search ${LOCALDOMAIN}" >> /etc/resolv.conf; fi -exec "$@" diff --git a/ecs/example/app/templates/index.html b/ecs/example/app/templates/index.html deleted file mode 100644 index 91efdaef..00000000 --- a/ecs/example/app/templates/index.html +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - Hello, Docker! - - -
- - -
-

Hello, Docker Folks!

-
- -
-
- - - Timestamp! - -
- -
- -
- - - - - - - - {% for t in times %} - - - - {% endfor %} - -
Timestamp
{{ t.decode('utf-8') }}
-
- -
- - - - - - - - diff --git a/ecs/example/docker-compose.yml b/ecs/example/docker-compose.yml deleted file mode 100644 index 9d08d45d..00000000 --- a/ecs/example/docker-compose.yml +++ /dev/null @@ -1,12 +0,0 @@ -version: "3.8" -services: - frontend: - build: app - x-aws-pull_credentials: <<>> - image: <<>>/timestamper - ports: - - "5000:5000" - depends_on: - - backend - backend: - image: redis:alpine diff --git a/ecs/go.mod b/ecs/go.mod deleted file mode 100644 index b6a1f1d2..00000000 --- a/ecs/go.mod +++ /dev/null @@ -1,61 +0,0 @@ -module github.com/docker/ecs-plugin - -require ( - github.com/Microsoft/hcsshim v0.8.7 // indirect - github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect - github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect - github.com/aws/aws-sdk-go v1.33.18 - github.com/awslabs/goformation/v4 v4.14.0 - github.com/bitly/go-hostpool v0.1.0 // indirect - github.com/bitly/go-simplejson v0.5.0 // indirect - github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect - github.com/buger/goterm v0.0.0-20200322175922-2f3e71b85129 - github.com/bugsnag/bugsnag-go v1.5.3 // indirect - github.com/bugsnag/panicwrap v1.2.0 // indirect - github.com/cenkalti/backoff v2.2.1+incompatible // indirect - github.com/cloudflare/cfssl v1.4.1 // indirect - github.com/compose-spec/compose-go v0.0.0-20200811091145-837f8f4de457 - github.com/containerd/console v1.0.0 - github.com/containerd/containerd v1.3.2 // indirect - github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb // indirect - github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492 - github.com/docker/distribution v2.7.1+incompatible // indirect - github.com/docker/docker v1.4.2-0.20200128034134-2ebaeef943cc // indirect - github.com/docker/docker-credential-helpers v0.6.3 // indirect - github.com/docker/go v1.5.1-1 // indirect - github.com/docker/go-metrics v0.0.1 // indirect - github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect - github.com/gofrs/uuid v3.2.0+incompatible // indirect - github.com/gogo/protobuf v1.3.1 // indirect - github.com/gorilla/mux v1.7.3 // indirect - github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect - github.com/jinzhu/gorm v1.9.12 // indirect - github.com/joho/godotenv v1.3.0 - github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect - github.com/lib/pq v1.3.0 // indirect - github.com/manifoldco/promptui v0.7.0 - github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect - github.com/miekg/pkcs11 v1.0.3 // indirect - github.com/mitchellh/mapstructure v1.3.3 - github.com/moby/term v0.0.0-20200611042045-63b9a826fb74 - github.com/morikuni/aec v1.0.0 - github.com/onsi/ginkgo v1.11.0 // indirect - github.com/opencontainers/image-spec v1.0.1 // indirect - github.com/sirupsen/logrus v1.6.0 - github.com/smartystreets/goconvey v1.6.4 // indirect - github.com/spf13/cobra v0.0.5 - github.com/spf13/pflag v1.0.5 - github.com/theupdateframework/notary v0.6.1 // indirect - github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect - golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 - golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect - google.golang.org/grpc v1.27.0 // indirect - gopkg.in/dancannon/gorethink.v3 v3.0.5 // indirect - gopkg.in/fatih/pool.v2 v2.0.0 // indirect - gopkg.in/gorethink/gorethink.v3 v3.0.5 // indirect - gopkg.in/ini.v1 v1.55.0 - gotest.tools/v3 v3.0.2 - vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 // indirect -) - -go 1.14 diff --git a/ecs/go.sum b/ecs/go.sum deleted file mode 100644 index 168b5633..00000000 --- a/ecs/go.sum +++ /dev/null @@ -1,496 +0,0 @@ -bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= -bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c/go.mod h1:hSVuE3qU7grINVSwrmzHfpg9k87ALBk+XaualNyUzI4= -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0= -github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0= -github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 h1:ygIc8M6trr62pF5DucadTWGdEB4mEyvzi0e2nbcmcyA= -github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= -github.com/Microsoft/hcsshim v0.8.7 h1:ptnOoufxGSzauVTsdE+wMYnCWA301PdoN4xg5oRdZpg= -github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= -github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs= -github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= -github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 h1:w1UutsfOrms1J05zt7ISrnJIXKzwaspym5BTKGx93EI= -github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0= -github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/aws/aws-sdk-go v1.33.18 h1:Ccy1SV2SsgJU3rfrD+SOhQ0jvuzfrFuja/oKI86ruPw= -github.com/aws/aws-sdk-go v1.33.18/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/awslabs/goformation/v4 v4.14.0 h1:E2Pet9eIqA4qzt3dzzzE4YN83V4Kyfbcio0VokBC9TA= -github.com/awslabs/goformation/v4 v4.14.0/go.mod h1:GcJULxCJfloT+3pbqCluXftdEK2AD/UqpS3hkaaBntg= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= -github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bitly/go-hostpool v0.1.0 h1:XKmsF6k5el6xHG3WPJ8U0Ku/ye7njX7W81Ng7O2ioR0= -github.com/bitly/go-hostpool v0.1.0/go.mod h1:4gOCgp6+NZnVqlKyZ/iBZFTAJKembaVENUpMkpg42fw= -github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y= -github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= -github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= -github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= -github.com/buger/goterm v0.0.0-20200322175922-2f3e71b85129 h1:gfAMKE626QEuKG3si0pdTRcr/YEbBoxY+3GOH3gWvl4= -github.com/buger/goterm v0.0.0-20200322175922-2f3e71b85129/go.mod h1:u9UyCz2eTrSGy6fbupqJ54eY5c4IC8gREQ1053dK12U= -github.com/bugsnag/bugsnag-go v1.5.3 h1:yeRUT3mUE13jL1tGwvoQsKdVbAsQx9AJ+fqahKveP04= -github.com/bugsnag/bugsnag-go v1.5.3/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= -github.com/bugsnag/panicwrap v1.2.0 h1:OzrKrRvXis8qEvOkfcxNcYbOd2O7xXS2nnKMEMABFQA= -github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= -github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= -github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/certifi/gocertifi v0.0.0-20180118203423-deb3ae2ef261/go.mod h1:GJKEexRPVJrBSOjoqN5VNOIKJ5Q3RViH6eu3puDRwx4= -github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudflare/backoff v0.0.0-20161212185259-647f3cdfc87a/go.mod h1:rzgs2ZOiguV6/NpiDgADjRLPNyZlApIWxKpkT+X8SdY= -github.com/cloudflare/cfssl v1.4.1 h1:vScfU2DrIUI9VPHBVeeAQ0q5A+9yshO1Gz+3QoUQiKw= -github.com/cloudflare/cfssl v1.4.1/go.mod h1:KManx/OJPb5QY+y0+o/898AMcM128sF0bURvoVUSjTo= -github.com/cloudflare/go-metrics v0.0.0-20151117154305-6a9aea36fb41/go.mod h1:eaZPlJWD+G9wseg1BuRXlHnjntPMrywMsyxf+LTOdP4= -github.com/cloudflare/redoctober v0.0.0-20171127175943-746a508df14c/go.mod h1:6Se34jNoqrd8bTxrmJB2Bg2aoZ2CdSXonils9NsiNgo= -github.com/compose-spec/compose-go v0.0.0-20200811091145-837f8f4de457 h1:8ely1LF7H02sIWz6QjgU53YBCiRpYlM9F9u1MeE1ZPk= -github.com/compose-spec/compose-go v0.0.0-20200811091145-837f8f4de457/go.mod h1:cS0vAvM6u9yjJgKWIH2yiqYMWO7WGJb+c0Irw+RefqU= -github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko= -github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1 h1:uict5mhHFTzKLUCufdSLym7z/J0CbBJT59lYbP9wtbg= -github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= -github.com/containerd/console v1.0.0 h1:fU3UuQapBs+zLJu82NhR11Rif1ny2zfMMAyPJzSN5tQ= -github.com/containerd/console v1.0.0/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= -github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.2 h1:ForxmXkA6tPIvffbrDAcPUIB32QgXkt2XFj+F0UxetA= -github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb h1:nXPkFq8X1a9ycY3GYQpFNxHh3j2JgY7zDZfq2EXMIzk= -github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb/go.mod h1:Dq467ZllaHgAtVp4p1xUQWBrFXR9s/wyoTpG8zOJGkY= -github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= -github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= -github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= -github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= -github.com/coreos/etcd v3.3.10+incompatible h1:jFneRYjIvLMLhDLCzuTuU4rSJUjRplcJQ7pD7MnhC04= -github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= -github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= -github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM= -github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= -github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492 h1:FwssHbCDJD025h+BchanCwE1Q8fyMgqDr2mOQAWOLGw= -github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= -github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v1.4.2-0.20200128034134-2ebaeef943cc h1:2xtQXEoAs2hjCs4Ez4/KT2mDaYrXwcUi7TCkfyT+n2k= -github.com/docker/docker v1.4.2-0.20200128034134-2ebaeef943cc/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ= -github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= -github.com/docker/go v1.5.1-1 h1:hr4w35acWBPhGBXlzPoHpmZ/ygPjnmFVxGxxGnMyP7k= -github.com/docker/go v1.5.1-1/go.mod h1:CADgU4DSXK5QUlFslkQu2yW2TKzFZcXq/leZfM0UH5Q= -github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= -github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= -github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8= -github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= -github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= -github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4= -github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= -github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= -github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/getsentry/raven-go v0.0.0-20180121060056-563b81fc02b7/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-sql-driver/mysql v1.3.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= -github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= -github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE= -github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= -github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= -github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/google/certificate-transparency-go v1.0.21 h1:Yf1aXowfZ2nuboBsg7iYGLmwsOARdV86pfH3g95wXmE= -github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw= -github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= -github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= -github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= -github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.10 h1:6q5mVkdH/vYmqngx7kZQTjJ5HRsx+ImorDIEQ+beJgc= -github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jinzhu/gorm v1.9.12 h1:Drgk1clyWT9t9ERbzHza6Mj/8FY/CqMyVzOiHviMo6Q= -github.com/jinzhu/gorm v1.9.12/go.mod h1:vhTjlKSJUTWNtcbQtrMBFCxy7eXTzeCAzfL5fBZT/Qs= -github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= -github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= -github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M= -github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc= -github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= -github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548/go.mod h1:hGT6jSUVzF6no3QaDSMLGLEHtHSBSefs+MgcDWnmhmo= -github.com/jmoiron/sqlx v0.0.0-20180124204410-05cef0741ade/go.mod h1:IiEW3SEiiErVyFdH8NTuWjSifiEQKUoyK3LNqr2kCHU= -github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= -github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a h1:FaWFmfWdAUKbSCtOU2QjDaorUexogfaMgbipgYATUMU= -github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod h1:UJSiEoRfvx3hP73CvoARgeLjaIOjybY9vj8PUPPFGeU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA= -github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= -github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kisielk/sqlstruct v0.0.0-20150923205031-648daed35d49/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE= -github.com/kisom/goutils v1.1.0/go.mod h1:+UBTfd78habUYWFbNWTJNG+jNG/i/lGURakr4A/yNRw= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= -github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28/go.mod h1:T/T7jsxVqf9k/zYOqbgNAsANsjxTd1Yq3htjDhQ1H0c= -github.com/lib/pq v0.0.0-20180201184707-88edab080323/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU= -github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a h1:weJVJJRzAJBFRlAiJQROKQs8oC9vOxvm4rZmBBk0ONw= -github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= -github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= -github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/manifoldco/promptui v0.7.0 h1:3l11YT8tm9MnwGFQ4kETwkzpAwY2Jt9lCrumCUW4+z4= -github.com/manifoldco/promptui v0.7.0/go.mod h1:n4zTdgP0vr0S3w7/O/g98U+e0gwLScEXGwov2nIKuGQ= -github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= -github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-shellwords v1.0.10 h1:Y7Xqm8piKOO3v10Thp7Z36h4FYFjt5xB//6XvOrs2Gw= -github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= -github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U= -github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/miekg/pkcs11 v1.0.3 h1:iMwmD7I5225wv84WxIG/bmxz9AXjWvTWIbM/TYHvWtw= -github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= -github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.3.3 h1:SzB1nHZ2Xi+17FP0zVQBHIZqvwRN9408fJO8h+eeNA8= -github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mjibson/esc v0.2.0/go.mod h1:9Hw9gxxfHulMF5OJKCyhYD7PzlSdhzXyaGEBRPH1OPs= -github.com/moby/term v0.0.0-20200611042045-63b9a826fb74 h1:kvRIeqJNICemq2UFLx8q/Pj+1IRNZS0XPTaMFkuNsvg= -github.com/moby/term v0.0.0-20200611042045-63b9a826fb74/go.mod h1:pJ0Ot5YGdTcMdxnPMyGCfAr6fKXe0g9cDlz16MuFEBE= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= -github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod h1:OQA4XLvDbMgS8P0CevmM4m9Q3Jq4phKUzcocxuGJ5m8= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E= -github.com/onsi/ginkgo v1.5.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo= -github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw= -github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.2.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME= -github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ= -github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI= -github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= -github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.1.0 h1:BQ53HtBmfOitExawJ6LokA4x8ov/z0SYYb0+HxJfRI8= -github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.6.0 h1:kRhiuYSXR3+uv2IbVbZhUxK5zVD/2pp3Gd2PpvPkpEo= -github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE= -github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= -github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8= -github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= -github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b h1:jUK33OXuZP/l6babJtnLo1qsGvq6G9so9KMflGAm4YA= -github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b/go.mod h1:8458kAagoME2+LN5//WxE71ysZ3B7r22fdgb7qVmXSY= -github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522 h1:fOCp11H0yuyAt2wqlbJtbyPzSgaxHTv8uN1pMpkG1t8= -github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522/go.mod h1:tQTYKOQgxoH3v6dEmdHiz4JG+nbxWwM5fgPQUpSZqVQ= -github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= -github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= -github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= -github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= -github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= -github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= -github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M= -github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/theupdateframework/notary v0.6.1 h1:7wshjstgS9x9F5LuB1L5mBI2xNMObWqjz+cjWoom6l0= -github.com/theupdateframework/notary v0.6.1/go.mod h1:MOfgIfmox8s7/7fduvB2xyPPMJCrjRLRizA8OFwpnKY= -github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= -github.com/weppos/publicsuffix-go v0.4.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k= -github.com/weppos/publicsuffix-go v0.5.0 h1:rutRtjBJViU/YjcI5d80t4JAVvDltS6bciJg2K1HrLU= -github.com/weppos/publicsuffix-go v0.5.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k= -github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= -github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= -github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= -github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= -github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= -github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56 h1:yhqBHs09SmmUoNOHc9jgK4a60T3XFRtPAkYxVnqgY50= -github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= -github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= -github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= -github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 h1:j2hhcujLRHAg872RWAV5yaUrEjHEObwDv3aImCaNLek= -github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8= -github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= -github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE= -github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4/go.mod h1:5iU54tB79AMBcySS0R2XIyZBAVmeHranShAFELYx7is= -github.com/zmap/zcrypto v0.0.0-20190729165852-9051775e6a2e h1:mvOa4+/DXStR4ZXOks/UsjeFdn5O5JpLUtzqk9U8xXw= -github.com/zmap/zcrypto v0.0.0-20190729165852-9051775e6a2e/go.mod h1:w7kd3qXHh8FNaczNjslXqvFQiv5mMWRXlL9klTUAHc8= -github.com/zmap/zlint v0.0.0-20190806154020-fd021b4cfbeb h1:vxqkjztXSaPVDc8FQCdHTaejm2x747f6yPbnu1h2xkg= -github.com/zmap/zlint v0.0.0-20190806154020-fd021b4cfbeb/go.mod h1:29UiAJNsiVdvTBFCJW8e3q6dcDbOoPkhMgttOSCIMMY= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd h1:GGJVjV8waZKRHrgwvtH66z9ZGVurTD1MT0n1Bb+q4aM= -golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09 h1:KaQtG+aDELoNmXYas3TVkGNYRuq8JQ1aa7LJt8EXVyo= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 h1:dfGZHvZk057jK2MCeWus/TowKpJ8y4AmooUzdBSR9GU= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3 h1:4y9KwBHBgBNwDbtu44R5o1fdOCQUEXhbk/P4A9WmJq0= -golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3 h1:7TYNF4UdlohbFwpNH04CoPMp1cHUZgO1Ebq5r2hIjfo= -golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e h1:N7DeIrjYszNmSW409R3frPPwglRwMkXSBzwVbkOjLLA= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/dancannon/gorethink.v3 v3.0.5 h1:/g7PWP7zUS6vSNmHSDbjCHQh1Rqn8Jy6zSMQxAsBSMQ= -gopkg.in/dancannon/gorethink.v3 v3.0.5/go.mod h1:GXsi1e3N2OcKhcP6nsYABTiUejbWMFO4GY5a4pEaeEc= -gopkg.in/fatih/pool.v2 v2.0.0 h1:xIFeWtxifuQJGk/IEPKsTduEKcKvPmhoiVDGpC40nKg= -gopkg.in/fatih/pool.v2 v2.0.0/go.mod h1:8xVGeu1/2jr2wm5V9SPuMht2H5AEmf5aFMGSQixtjTY= -gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= -gopkg.in/gorethink/gorethink.v3 v3.0.5 h1:e2Uc/Xe+hpcVQFsj6MuHlYog3r0JYpnTzwDj/y2O4MU= -gopkg.in/gorethink/gorethink.v3 v3.0.5/go.mod h1:+3yIIHJUGMBK+wyPH+iN5TP+88ikFDfZdqTlK3Y9q8I= -gopkg.in/ini.v1 v1.55.0 h1:E8yzL5unfpW3M6fz/eB7Cb5MQAYSZ7GKo4Qth+N2sgQ= -gopkg.in/ini.v1 v1.55.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= -gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E= -gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/kubernetes v1.13.0 h1:qTfB+u5M92k2fCCCVP2iuhgwwSOv1EkAkvQY1tQODD8= -k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 h1:O69FD9pJA4WUZlEwYatBEEkRWKQ5cKodWpdKTrCS/iQ= -vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= diff --git a/ecs/golangci.yaml b/ecs/golangci.yaml deleted file mode 100644 index 39629336..00000000 --- a/ecs/golangci.yaml +++ /dev/null @@ -1,12 +0,0 @@ -run: - deadline: 2m - -linters: - disable-all: true - enable: - - gofmt - - goimports - - golint - - gosimple - - ineffassign - - misspell \ No newline at end of file diff --git a/ecs/pkg/amazon/backend/iam.go b/ecs/iam.go similarity index 98% rename from ecs/pkg/amazon/backend/iam.go rename to ecs/iam.go index 4b282020..3dca431b 100644 --- a/ecs/pkg/amazon/backend/iam.go +++ b/ecs/iam.go @@ -1,4 +1,4 @@ -package backend +package ecs const ( ECSTaskExecutionPolicy = "arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy" diff --git a/ecs/internal/version.go b/ecs/internal/version.go deleted file mode 100644 index b0fc1f6a..00000000 --- a/ecs/internal/version.go +++ /dev/null @@ -1,8 +0,0 @@ -package internal - -var ( - // Version is the git tag that this was built from. - Version = "unknown" - // GitCommit is the commit that this was built from. - GitCommit = "unknown" -) diff --git a/ecs/pkg/amazon/backend/list.go b/ecs/list.go similarity index 71% rename from ecs/pkg/amazon/backend/list.go rename to ecs/list.go index 59150314..7642471b 100644 --- a/ecs/pkg/amazon/backend/list.go +++ b/ecs/list.go @@ -1,26 +1,26 @@ -package backend +package ecs import ( "context" "fmt" + "github.com/docker/api/compose" "strings" "github.com/compose-spec/compose-go/cli" - "github.com/docker/ecs-plugin/pkg/compose" ) -func (b *Backend) Ps(ctx context.Context, options *cli.ProjectOptions) ([]compose.ServiceStatus, error) { +func (b *ecsAPIService) Ps(ctx context.Context, options *cli.ProjectOptions) ([]compose.ServiceStatus, error) { projectName, err := b.projectName(options) if err != nil { return nil, err } - parameters, err := b.api.ListStackParameters(ctx, projectName) + parameters, err := b.SDK.ListStackParameters(ctx, projectName) if err != nil { return nil, err } cluster := parameters[ParameterClusterName] - resources, err := b.api.ListStackResources(ctx, projectName) + resources, err := b.SDK.ListStackResources(ctx, projectName) if err != nil { return nil, err } @@ -37,7 +37,7 @@ func (b *Backend) Ps(ctx context.Context, options *cli.ProjectOptions) ([]compos if len(servicesARN) == 0 { return nil, nil } - status, err := b.api.DescribeServices(ctx, cluster, servicesARN) + status, err := b.SDK.DescribeServices(ctx, cluster, servicesARN) if err != nil { return nil, err } diff --git a/ecs/pkg/amazon/backend/logs.go b/ecs/logs.go similarity index 77% rename from ecs/pkg/amazon/backend/logs.go rename to ecs/logs.go index fac65ba9..ec36985f 100644 --- a/ecs/pkg/amazon/backend/logs.go +++ b/ecs/logs.go @@ -1,4 +1,4 @@ -package backend +package ecs import ( "bytes" @@ -11,11 +11,9 @@ import ( "strings" "github.com/compose-spec/compose-go/cli" - - "github.com/docker/ecs-plugin/pkg/console" ) -func (b *Backend) Logs(ctx context.Context, options *cli.ProjectOptions, writer io.Writer) error { +func (b *ecsAPIService) Logs(ctx context.Context, options *cli.ProjectOptions, writer io.Writer) error { name := options.Name if name == "" { project, err := cli.ProjectFromOptions(options) @@ -25,8 +23,8 @@ func (b *Backend) Logs(ctx context.Context, options *cli.ProjectOptions, writer name = project.Name } - err := b.api.GetLogs(ctx, name, &logConsumer{ - colors: map[string]console.ColorFunc{}, + err := b.SDK.GetLogs(ctx, name, &logConsumer{ + colors: map[string]ColorFunc{}, width: 0, writer: writer, }) @@ -43,7 +41,7 @@ func (b *Backend) Logs(ctx context.Context, options *cli.ProjectOptions, writer func (l *logConsumer) Log(service, container, message string) { cf, ok := l.colors[service] if !ok { - cf = <-console.Rainbow + cf = <-Rainbow l.colors[service] = cf l.computeWidth() } @@ -66,7 +64,7 @@ func (l *logConsumer) computeWidth() { } type logConsumer struct { - colors map[string]console.ColorFunc + colors map[string]ColorFunc width int writer io.Writer } diff --git a/ecs/pkg/amazon/cloudformation/marshall.go b/ecs/marshall.go similarity index 98% rename from ecs/pkg/amazon/cloudformation/marshall.go rename to ecs/marshall.go index 034bf809..41456362 100644 --- a/ecs/pkg/amazon/cloudformation/marshall.go +++ b/ecs/marshall.go @@ -1,4 +1,4 @@ -package cloudformation +package ecs import ( "encoding/json" diff --git a/ecs/pkg/amazon/amazon.go b/ecs/pkg/amazon/amazon.go deleted file mode 100644 index f6c588d1..00000000 --- a/ecs/pkg/amazon/amazon.go +++ /dev/null @@ -1,8 +0,0 @@ -package amazon - -import ( - "github.com/docker/ecs-plugin/pkg/amazon/backend" - "github.com/docker/ecs-plugin/pkg/compose" -) - -var _ compose.API = &backend.Backend{} diff --git a/ecs/pkg/amazon/backend/backend.go b/ecs/pkg/amazon/backend/backend.go deleted file mode 100644 index 2b265f3e..00000000 --- a/ecs/pkg/amazon/backend/backend.go +++ /dev/null @@ -1,30 +0,0 @@ -package backend - -import ( - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/session" - "github.com/docker/ecs-plugin/pkg/amazon/sdk" -) - -func NewBackend(profile string, region string) (*Backend, error) { - sess, err := session.NewSessionWithOptions(session.Options{ - Profile: profile, - SharedConfigState: session.SharedConfigEnable, - Config: aws.Config{ - Region: aws.String(region), - }, - }) - if err != nil { - return nil, err - } - - return &Backend{ - Region: region, - api: sdk.NewAPI(sess), - }, nil -} - -type Backend struct { - Region string - api sdk.API -} diff --git a/ecs/pkg/amazon/backend/context.go b/ecs/pkg/amazon/backend/context.go deleted file mode 100644 index c1865117..00000000 --- a/ecs/pkg/amazon/backend/context.go +++ /dev/null @@ -1,33 +0,0 @@ -package backend - -import ( - "context" - "fmt" - - "github.com/docker/ecs-plugin/pkg/docker" -) - -const ( - ContextParamRegion = "region" - ContextParamProfile = "profile" -) - -func (b *Backend) CreateContextData(ctx context.Context, params map[string]string) (contextData interface{}, description string, err error) { - region, ok := params[ContextParamRegion] - if !ok { - return nil, "", fmt.Errorf("%q parameter is required", ContextParamRegion) - } - profile, ok := params[ContextParamProfile] - if !ok { - return nil, "", fmt.Errorf("%q parameter is required", ContextParamProfile) - } - err = b.api.CheckRequirements(ctx, region) - if err != nil { - return "", "", err - } - - return docker.AwsContext{ - Profile: profile, - Region: region, - }, "Amazon ECS context", nil -} diff --git a/ecs/pkg/amazon/backend/secrets.go b/ecs/pkg/amazon/backend/secrets.go deleted file mode 100644 index 6c86e95d..00000000 --- a/ecs/pkg/amazon/backend/secrets.go +++ /dev/null @@ -1,23 +0,0 @@ -package backend - -import ( - "context" - - "github.com/docker/ecs-plugin/pkg/compose" -) - -func (b Backend) CreateSecret(ctx context.Context, secret compose.Secret) (string, error) { - return b.api.CreateSecret(ctx, secret) -} - -func (b Backend) InspectSecret(ctx context.Context, id string) (compose.Secret, error) { - return b.api.InspectSecret(ctx, id) -} - -func (b Backend) ListSecrets(ctx context.Context) ([]compose.Secret, error) { - return b.api.ListSecrets(ctx) -} - -func (b Backend) DeleteSecret(ctx context.Context, id string, recover bool) error { - return b.api.DeleteSecret(ctx, id, recover) -} diff --git a/ecs/pkg/amazon/sdk/api.go b/ecs/pkg/amazon/sdk/api.go deleted file mode 100644 index af6dfed4..00000000 --- a/ecs/pkg/amazon/sdk/api.go +++ /dev/null @@ -1,42 +0,0 @@ -package sdk - -import ( - "context" - - cf "github.com/aws/aws-sdk-go/service/cloudformation" - "github.com/awslabs/goformation/v4/cloudformation" - "github.com/docker/ecs-plugin/pkg/compose" -) - -type API interface { - CheckRequirements(ctx context.Context, region string) error - - GetDefaultVPC(ctx context.Context) (string, error) - VpcExists(ctx context.Context, vpcID string) (bool, error) - GetSubNets(ctx context.Context, vpcID string) ([]string, error) - - StackExists(ctx context.Context, name string) (bool, error) - CreateStack(ctx context.Context, name string, template *cloudformation.Template, parameters map[string]string) error - DeleteStack(ctx context.Context, name string) error - ListStackParameters(ctx context.Context, name string) (map[string]string, error) - ListStackResources(ctx context.Context, name string) ([]compose.StackResource, error) - GetStackID(ctx context.Context, name string) (string, error) - WaitStackComplete(ctx context.Context, name string, operation int) error - DescribeStackEvents(ctx context.Context, stackID string) ([]*cf.StackEvent, error) - CreateChangeSet(ctx context.Context, name string, template *cloudformation.Template, parameters map[string]string) (string, error) - UpdateStack(ctx context.Context, changeset string) error - - DescribeServices(ctx context.Context, cluster string, arns []string) ([]compose.ServiceStatus, error) - - LoadBalancerExists(ctx context.Context, arn string) (bool, error) - GetLoadBalancerURL(ctx context.Context, arn string) (string, error) - - ClusterExists(ctx context.Context, name string) (bool, error) - - GetLogs(ctx context.Context, name string, consumer compose.LogConsumer) error - - CreateSecret(ctx context.Context, secret compose.Secret) (string, error) - InspectSecret(ctx context.Context, id string) (compose.Secret, error) - ListSecrets(ctx context.Context) ([]compose.Secret, error) - DeleteSecret(ctx context.Context, id string, recover bool) error -} diff --git a/ecs/pkg/compose/api.go b/ecs/pkg/compose/api.go deleted file mode 100644 index 77f17055..00000000 --- a/ecs/pkg/compose/api.go +++ /dev/null @@ -1,26 +0,0 @@ -package compose - -import ( - "context" - "io" - - "github.com/awslabs/goformation/v4/cloudformation" - "github.com/compose-spec/compose-go/cli" - "github.com/compose-spec/compose-go/types" -) - -type API interface { - Up(ctx context.Context, options *cli.ProjectOptions) error - Down(ctx context.Context, options *cli.ProjectOptions) error - - CreateContextData(ctx context.Context, params map[string]string) (contextData interface{}, description string, err error) - - Convert(project *types.Project) (*cloudformation.Template, error) - Logs(ctx context.Context, options *cli.ProjectOptions, writer io.Writer) error - Ps(ctx context.Context, options *cli.ProjectOptions) ([]ServiceStatus, error) - - CreateSecret(ctx context.Context, secret Secret) (string, error) - InspectSecret(ctx context.Context, id string) (Secret, error) - ListSecrets(ctx context.Context) ([]Secret, error) - DeleteSecret(ctx context.Context, id string, recover bool) error -} diff --git a/ecs/pkg/compose/testdata/simple/compose-with-overrides.yaml b/ecs/pkg/compose/testdata/simple/compose-with-overrides.yaml deleted file mode 100644 index 3dc8a0b6..00000000 --- a/ecs/pkg/compose/testdata/simple/compose-with-overrides.yaml +++ /dev/null @@ -1,4 +0,0 @@ -version: "3" -services: - simple: - image: haproxy diff --git a/ecs/pkg/compose/testdata/simple/compose.yaml b/ecs/pkg/compose/testdata/simple/compose.yaml deleted file mode 100644 index 4b3f9af2..00000000 --- a/ecs/pkg/compose/testdata/simple/compose.yaml +++ /dev/null @@ -1,4 +0,0 @@ -version: "3" -services: - simple: - image: nginx \ No newline at end of file diff --git a/ecs/pkg/docker/contextStore.go b/ecs/pkg/docker/contextStore.go deleted file mode 100644 index 30a12de2..00000000 --- a/ecs/pkg/docker/contextStore.go +++ /dev/null @@ -1,76 +0,0 @@ -package docker - -import ( - "fmt" - - "github.com/docker/cli/cli/command" - cliconfig "github.com/docker/cli/cli/config" - "github.com/docker/cli/cli/context/store" - "github.com/mitchellh/mapstructure" -) - -const contextType = "aws" - -type TypeContext struct { - Type string -} - -func getter() interface{} { - return &TypeContext{} -} - -type AwsContext struct { - Profile string - Region string -} - -func NewContext(name string, awsContext interface{}) error { - _, err := NewContextWithStore(name, awsContext.(AwsContext), cliconfig.ContextStoreDir()) - return err -} - -func NewContextWithStore(name string, awsContext AwsContext, contextDirectory string) (store.Store, error) { - contextStore := initContextStore(contextDirectory) - endpoints := map[string]interface{}{ - "aws": awsContext, - "docker": awsContext, - } - - metadata := store.Metadata{ - Name: name, - Endpoints: endpoints, - Metadata: TypeContext{Type: contextType}, - } - return contextStore, contextStore.CreateOrUpdate(metadata) -} - -func initContextStore(contextDir string) store.Store { - config := store.NewConfig(getter) - return store.New(contextDir, config) -} - -func checkAwsContextExists(contextName string) (*AwsContext, error) { - if contextName == command.DefaultContextName { - return nil, fmt.Errorf("can't use \"%s\" with ECS command because it is not an AWS context", contextName) - } - contextStore := initContextStore(cliconfig.ContextStoreDir()) - metadata, err := contextStore.GetMetadata(contextName) - if err != nil { - return nil, err - } - endpoint := metadata.Endpoints["aws"] - awsContext := AwsContext{} - err = mapstructure.Decode(endpoint, &awsContext) - if err != nil { - return nil, err - } - if awsContext == (AwsContext{}) { - return nil, fmt.Errorf("can't use \"%s\" with ECS command because it is not an AWS context", contextName) - } - return &awsContext, nil -} - -func GetAwsContext(dockerCli command.Cli) (*AwsContext, error) { - contextName := dockerCli.CurrentContext() - return checkAwsContextExists(contextName) -} diff --git a/ecs/pkg/progress/plain.go b/ecs/pkg/progress/plain.go deleted file mode 100644 index 8e476807..00000000 --- a/ecs/pkg/progress/plain.go +++ /dev/null @@ -1,29 +0,0 @@ -package progress - -import ( - "context" - "fmt" - "io" -) - -type plainWriter struct { - out io.Writer - done chan bool -} - -func (p *plainWriter) Start(ctx context.Context) error { - select { - case <-ctx.Done(): - return ctx.Err() - case <-p.done: - return nil - } -} - -func (p *plainWriter) Event(e Event) { - fmt.Println(e.ID, e.Text, e.StatusText) -} - -func (p *plainWriter) Stop() { - p.done <- true -} diff --git a/ecs/pkg/progress/spinner.go b/ecs/pkg/progress/spinner.go deleted file mode 100644 index 695a5642..00000000 --- a/ecs/pkg/progress/spinner.go +++ /dev/null @@ -1,50 +0,0 @@ -package progress - -import ( - "runtime" - "time" -) - -type spinner struct { - time time.Time - index int - chars []string - stop bool - done string -} - -func newSpinner() *spinner { - chars := []string{ - "⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏", - } - done := "⠿" - - if runtime.GOOS == "windows" { - chars = []string{"-"} - done = "-" - } - - return &spinner{ - index: 0, - time: time.Now(), - chars: chars, - done: done, - } -} - -func (s *spinner) String() string { - if s.stop { - return s.done - } - - d := time.Since(s.time) - if d.Milliseconds() > 100 { - s.index = (s.index + 1) % len(s.chars) - } - - return s.chars[s.index] -} - -func (s *spinner) Stop() { - s.stop = true -} diff --git a/ecs/pkg/progress/tty.go b/ecs/pkg/progress/tty.go deleted file mode 100644 index 6877e096..00000000 --- a/ecs/pkg/progress/tty.go +++ /dev/null @@ -1,177 +0,0 @@ -package progress - -import ( - "context" - "fmt" - "io" - "runtime" - "strings" - "sync" - "time" - - "github.com/buger/goterm" - "github.com/morikuni/aec" -) - -type ttyWriter struct { - out io.Writer - events map[string]Event - eventIDs []string - repeated bool - numLines int - done chan bool - mtx *sync.RWMutex -} - -func (w *ttyWriter) Start(ctx context.Context) error { - ticker := time.NewTicker(100 * time.Millisecond) - - for { - select { - case <-ctx.Done(): - w.print() - return ctx.Err() - case <-w.done: - w.print() - return nil - case <-ticker.C: - w.print() - } - } -} - -func (w *ttyWriter) Stop() { - w.done <- true -} - -func (w *ttyWriter) Event(e Event) { - w.mtx.Lock() - defer w.mtx.Unlock() - if !StringContains(w.eventIDs, e.ID) { - w.eventIDs = append(w.eventIDs, e.ID) - } - if _, ok := w.events[e.ID]; ok { - last := w.events[e.ID] - switch e.Status { - case Done, Error: - if last.Status != e.Status { - last.stop() - } - } - last.Status = e.Status - last.Text = e.Text - last.StatusText = e.StatusText - w.events[e.ID] = last - } else { - e.startTime = time.Now() - e.spinner = newSpinner() - w.events[e.ID] = e - } -} - -func (w *ttyWriter) print() { - w.mtx.Lock() - defer w.mtx.Unlock() - if len(w.eventIDs) == 0 { - return - } - terminalWidth := goterm.Width() - b := aec.EmptyBuilder - for i := 0; i <= w.numLines; i++ { - b = b.Up(1) - } - if !w.repeated { - b = b.Down(1) - } - w.repeated = true - fmt.Fprint(w.out, b.Column(0).ANSI) - - // Hide the cursor while we are printing - fmt.Fprint(w.out, aec.Hide) - defer fmt.Fprint(w.out, aec.Show) - - firstLine := fmt.Sprintf("[+] Running %d/%d", numDone(w.events), w.numLines) - if w.numLines != 0 && numDone(w.events) == w.numLines { - firstLine = aec.Apply(firstLine, aec.BlueF) - } - fmt.Fprintln(w.out, firstLine) - - var statusPadding int - for _, v := range w.eventIDs { - l := len(fmt.Sprintf("%s %s", w.events[v].ID, w.events[v].Text)) - if statusPadding < l { - statusPadding = l - } - } - - numLines := 0 - for _, v := range w.eventIDs { - line := lineText(w.events[v], terminalWidth, statusPadding, runtime.GOOS != "windows") - // nolint: errcheck - fmt.Fprint(w.out, line) - numLines++ - } - - w.numLines = numLines -} - -func lineText(event Event, terminalWidth, statusPadding int, color bool) string { - endTime := time.Now() - if event.Status != Working { - endTime = event.endTime - } - - elapsed := endTime.Sub(event.startTime).Seconds() - - textLen := len(fmt.Sprintf("%s %s", event.ID, event.Text)) - padding := statusPadding - textLen - if padding < 0 { - padding = 0 - } - text := fmt.Sprintf(" %s %s %s%s %s", - event.spinner.String(), - event.ID, - event.Text, - strings.Repeat(" ", padding), - event.StatusText, - ) - timer := fmt.Sprintf("%.1fs\n", elapsed) - o := align(text, timer, terminalWidth) - - if color { - color := aec.WhiteF - if event.Status == Done { - color = aec.BlueF - } - if event.Status == Error { - color = aec.RedF - } - return aec.Apply(o, color) - } - - return o -} - -func numDone(events map[string]Event) int { - i := 0 - for _, e := range events { - if e.Status == Done { - i++ - } - } - return i -} - -func align(l, r string, w int) string { - return fmt.Sprintf("%-[2]*[1]s %[3]s", l, w-len(r)-1, r) -} - -// StringContains check if an array contains a specific value -func StringContains(array []string, needle string) bool { - for _, val := range array { - if val == needle { - return true - } - } - return false -} diff --git a/ecs/pkg/progress/writer.go b/ecs/pkg/progress/writer.go deleted file mode 100644 index a5b8e1cd..00000000 --- a/ecs/pkg/progress/writer.go +++ /dev/null @@ -1,112 +0,0 @@ -package progress - -import ( - "context" - "os" - "sync" - "time" - - "github.com/containerd/console" - "github.com/moby/term" - "golang.org/x/sync/errgroup" -) - -// EventStatus indicates the status of an action -type EventStatus int - -const ( - // Working means that the current task is working - Working EventStatus = iota - // Done means that the current task is done - Done - // Error means that the current task has errored - Error -) - -// Event reprensents a progress event -type Event struct { - ID string - Text string - Status EventStatus - StatusText string - Done bool - - startTime time.Time - endTime time.Time - spinner *spinner -} - -func (e *Event) stop() { - e.endTime = time.Now() - e.spinner.Stop() -} - -// Writer can write multiple progress events -type Writer interface { - Start(context.Context) error - Stop() - Event(Event) -} - -type writerKey struct{} - -// WithContextWriter adds the writer to the context -func WithContextWriter(ctx context.Context, writer Writer) context.Context { - return context.WithValue(ctx, writerKey{}, writer) -} - -// ContextWriter returns the writer from the context -func ContextWriter(ctx context.Context) Writer { - s, _ := ctx.Value(writerKey{}).(Writer) - return s -} - -type progressFunc func(context.Context) error - -// Run will run a writer and the progress function -// in parallel -func Run(ctx context.Context, pf progressFunc) error { - eg, _ := errgroup.WithContext(ctx) - w, err := NewWriter(os.Stderr) - if err != nil { - return err - } - eg.Go(func() error { - return w.Start(context.Background()) - }) - - ctx = WithContextWriter(ctx, w) - - eg.Go(func() error { - defer w.Stop() - return pf(ctx) - }) - - return eg.Wait() -} - -// NewWriter returns a new multi-progress writer -func NewWriter(out console.File) (Writer, error) { - _, isTerminal := term.GetFdInfo(out) - - if isTerminal { - con, err := console.ConsoleFromFile(out) - if err != nil { - return nil, err - } - - return &ttyWriter{ - out: con, - eventIDs: []string{}, - events: map[string]Event{}, - repeated: false, - done: make(chan bool), - mtx: &sync.RWMutex{}, - }, nil - } - - return &plainWriter{ - out: out, - done: make(chan bool), - }, nil -} diff --git a/ecs/pkg/amazon/sdk/sdk.go b/ecs/sdk.go similarity index 93% rename from ecs/pkg/amazon/sdk/sdk.go rename to ecs/sdk.go index 057e9fff..1bdcbecc 100644 --- a/ecs/pkg/amazon/sdk/sdk.go +++ b/ecs/sdk.go @@ -1,15 +1,13 @@ -package sdk +package ecs import ( "context" "fmt" + "github.com/docker/api/compose" "strings" "time" - cloudformation2 "github.com/docker/ecs-plugin/pkg/amazon/cloudformation" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/cloudformation" "github.com/aws/aws-sdk-go/service/cloudformation/cloudformationiface" @@ -26,8 +24,6 @@ import ( "github.com/aws/aws-sdk-go/service/secretsmanager" "github.com/aws/aws-sdk-go/service/secretsmanager/secretsmanageriface" cf "github.com/awslabs/goformation/v4/cloudformation" - "github.com/docker/ecs-plugin/internal" - "github.com/docker/ecs-plugin/pkg/compose" "github.com/sirupsen/logrus" ) @@ -42,10 +38,7 @@ type sdk struct { SM secretsmanageriface.SecretsManagerAPI } -func NewAPI(sess *session.Session) API { - sess.Handlers.Build.PushBack(func(r *request.Request) { - request.AddToUserAgent(r, fmt.Sprintf("Docker CLI %s", internal.Version)) - }) +func NewSDK(sess *session.Session) sdk { return sdk{ ECS: ecs.New(sess), EC2: ec2.New(sess), @@ -166,7 +159,7 @@ func (s sdk) StackExists(ctx context.Context, name string) (bool, error) { func (s sdk) CreateStack(ctx context.Context, name string, template *cf.Template, parameters map[string]string) error { logrus.Debug("Create CloudFormation stack") - json, err := cloudformation2.Marshall(template) + json, err := Marshall(template) if err != nil { return err } @@ -194,7 +187,7 @@ func (s sdk) CreateStack(ctx context.Context, name string, template *cf.Template func (s sdk) CreateChangeSet(ctx context.Context, name string, template *cf.Template, parameters map[string]string) (string, error) { logrus.Debug("Create CloudFormation Changeset") - json, err := cloudformation2.Marshall(template) + json, err := Marshall(template) if err != nil { return "", err } @@ -251,9 +244,9 @@ func (s sdk) WaitStackComplete(ctx context.Context, name string, operation int) StackName: aws.String(name), } switch operation { - case compose.StackCreate: + case StackCreate: return s.CF.WaitUntilStackCreateCompleteWithContext(ctx, input) - case compose.StackDelete: + case StackDelete: return s.CF.WaitUntilStackDeleteCompleteWithContext(ctx, input) default: return fmt.Errorf("internal error: unexpected stack operation %d", operation) @@ -305,7 +298,7 @@ func (s sdk) ListStackParameters(ctx context.Context, name string) (map[string]s return parameters, nil } -func (s sdk) ListStackResources(ctx context.Context, name string) ([]compose.StackResource, error) { +func (s sdk) ListStackResources(ctx context.Context, name string) ([]StackResource, error) { // FIXME handle pagination res, err := s.CF.ListStackResourcesWithContext(ctx, &cloudformation.ListStackResourcesInput{ StackName: aws.String(name), @@ -314,9 +307,9 @@ func (s sdk) ListStackResources(ctx context.Context, name string) ([]compose.Sta return nil, err } - resources := []compose.StackResource{} + resources := []StackResource{} for _, r := range res.StackResourceSummaries { - resources = append(resources, compose.StackResource{ + resources = append(resources, StackResource{ LogicalID: aws.StringValue(r.LogicalResourceId), Type: aws.StringValue(r.ResourceType), ARN: aws.StringValue(r.PhysicalResourceId), @@ -334,7 +327,7 @@ func (s sdk) DeleteStack(ctx context.Context, name string) error { return err } -func (s sdk) CreateSecret(ctx context.Context, secret compose.Secret) (string, error) { +func (s sdk) CreateSecret(ctx context.Context, secret Secret) (string, error) { logrus.Debug("Create secret " + secret.Name) secretStr, err := secret.GetCredString() if err != nil { @@ -352,17 +345,17 @@ func (s sdk) CreateSecret(ctx context.Context, secret compose.Secret) (string, e return aws.StringValue(response.ARN), nil } -func (s sdk) InspectSecret(ctx context.Context, id string) (compose.Secret, error) { +func (s sdk) InspectSecret(ctx context.Context, id string) (Secret, error) { logrus.Debug("Inspect secret " + id) response, err := s.SM.DescribeSecret(&secretsmanager.DescribeSecretInput{SecretId: &id}) if err != nil { - return compose.Secret{}, err + return Secret{}, err } labels := map[string]string{} for _, tag := range response.Tags { labels[aws.StringValue(tag.Key)] = aws.StringValue(tag.Value) } - secret := compose.Secret{ + secret := Secret{ ID: aws.StringValue(response.ARN), Name: aws.StringValue(response.Name), Labels: labels, @@ -373,13 +366,13 @@ func (s sdk) InspectSecret(ctx context.Context, id string) (compose.Secret, erro return secret, nil } -func (s sdk) ListSecrets(ctx context.Context) ([]compose.Secret, error) { +func (s sdk) ListSecrets(ctx context.Context) ([]Secret, error) { logrus.Debug("List secrets ...") response, err := s.SM.ListSecrets(&secretsmanager.ListSecretsInput{}) if err != nil { - return []compose.Secret{}, err + return []Secret{}, err } - var secrets []compose.Secret + var secrets []Secret for _, sec := range response.SecretList { @@ -391,7 +384,7 @@ func (s sdk) ListSecrets(ctx context.Context) ([]compose.Secret, error) { if sec.Description != nil { description = *sec.Description } - secrets = append(secrets, compose.Secret{ + secrets = append(secrets, Secret{ ID: *sec.ARN, Name: *sec.Name, Labels: labels, @@ -408,7 +401,7 @@ func (s sdk) DeleteSecret(ctx context.Context, id string, recover bool) error { return err } -func (s sdk) GetLogs(ctx context.Context, name string, consumer compose.LogConsumer) error { +func (s sdk) GetLogs(ctx context.Context, name string, consumer LogConsumer) error { logGroup := fmt.Sprintf("/docker-compose/%s", name) var startTime int64 for { diff --git a/ecs/secrets.go b/ecs/secrets.go new file mode 100644 index 00000000..b1a4578e --- /dev/null +++ b/ecs/secrets.go @@ -0,0 +1,21 @@ +package ecs + +import ( + "context" +) + +func (b ecsAPIService) CreateSecret(ctx context.Context, secret Secret) (string, error) { + return b.SDK.CreateSecret(ctx, secret) +} + +func (b ecsAPIService) InspectSecret(ctx context.Context, id string) (Secret, error) { + return b.SDK.InspectSecret(ctx, id) +} + +func (b ecsAPIService) ListSecrets(ctx context.Context) ([]Secret, error) { + return b.SDK.ListSecrets(ctx) +} + +func (b ecsAPIService) DeleteSecret(ctx context.Context, id string, recover bool) error { + return b.SDK.DeleteSecret(ctx, id, recover) +} diff --git a/ecs/secrets/Dockerfile b/ecs/secrets/Dockerfile index 638e113b..238f43dd 100644 --- a/ecs/secrets/Dockerfile +++ b/ecs/secrets/Dockerfile @@ -1,5 +1,5 @@ FROM golang:1.14.4-alpine AS builder -WORKDIR $GOPATH/src/github.com/docker/ecs-plugin/secrets +WORKDIR $GOPATH/src/github.com/docker/api/ecs/secrets COPY . . RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o /go/bin/secrets main/main.go diff --git a/ecs/secrets/main/main.go b/ecs/secrets/main/main.go index 703f88f8..c66c6de3 100644 --- a/ecs/secrets/main/main.go +++ b/ecs/secrets/main/main.go @@ -3,9 +3,8 @@ package main import ( "encoding/json" "fmt" + "github.com/docker/api/ecs/secrets" "os" - - "github.com/docker/ecs-plugin/secrets" ) const secretsFolder = "/run/secrets" diff --git a/ecs/pkg/amazon/backend/testdata/input/envfile b/ecs/testdata/input/envfile similarity index 100% rename from ecs/pkg/amazon/backend/testdata/input/envfile rename to ecs/testdata/input/envfile diff --git a/ecs/pkg/amazon/backend/testdata/input/simple-single-service.yaml b/ecs/testdata/input/simple-single-service.yaml similarity index 100% rename from ecs/pkg/amazon/backend/testdata/input/simple-single-service.yaml rename to ecs/testdata/input/simple-single-service.yaml diff --git a/ecs/pkg/amazon/backend/testdata/invalid_network_mode.yaml b/ecs/testdata/invalid_network_mode.yaml similarity index 100% rename from ecs/pkg/amazon/backend/testdata/invalid_network_mode.yaml rename to ecs/testdata/invalid_network_mode.yaml diff --git a/ecs/pkg/amazon/backend/testdata/simple/simple-cloudformation-conversion.golden b/ecs/testdata/simple/simple-cloudformation-conversion.golden similarity index 100% rename from ecs/pkg/amazon/backend/testdata/simple/simple-cloudformation-conversion.golden rename to ecs/testdata/simple/simple-cloudformation-conversion.golden diff --git a/ecs/tests/e2e_deploy_services_test.go b/ecs/tests/e2e_deploy_services_test.go deleted file mode 100644 index 32b6dab5..00000000 --- a/ecs/tests/e2e_deploy_services_test.go +++ /dev/null @@ -1,65 +0,0 @@ -// +build e2e - -package tests - -import ( - "context" - "testing" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/session" - "github.com/docker/ecs-plugin/pkg/amazon/sdk" - "github.com/docker/ecs-plugin/pkg/docker" - "gotest.tools/v3/assert" - "gotest.tools/v3/fs" - "gotest.tools/v3/golden" - "gotest.tools/v3/icmd" -) - -const ( - composeFileName = "compose.yaml" -) - -func TestE2eDeployServices(t *testing.T) { - cmd, cleanup, awsContext := dockerCli.createTestCmd() - defer cleanup() - - composeUpSimpleService(t, cmd, awsContext) -} - -func composeUpSimpleService(t *testing.T, cmd icmd.Cmd, awsContext docker.AwsContext) { - bgContext := context.Background() - composeYAML := golden.Get(t, "input/simple-single-service.yaml") - tmpDir := fs.NewDir(t, t.Name(), - fs.WithFile(composeFileName, "", fs.WithBytes(composeYAML)), - ) - // We can't use the file added in the tmp directory because it will drop if an assertion fails - defer composeDown(t, cmd, golden.Path("input/simple-single-service.yaml")) - defer tmpDir.Remove() - - cmd.Command = dockerCli.Command("ecs", "compose", "--file="+tmpDir.Join(composeFileName), "--project-name", t.Name(), "up") - icmd.RunCmd(cmd).Assert(t, icmd.Success) - - session, err := session.NewSessionWithOptions(session.Options{ - Profile: awsContext.Profile, - Config: aws.Config{ - Region: aws.String(awsContext.Region), - }, - }) - assert.NilError(t, err) - api := sdk.NewAPI(session) - arns, err := api.ListTasks(bgContext, t.Name(), t.Name()) - assert.NilError(t, err) - tasks, err := api.DescribeTasks(bgContext, t.Name(), arns...) - publicIps, err := api.GetPublicIPs(context.Background(), tasks[0].NetworkInterface) - assert.NilError(t, err) - for _, ip := range publicIps { - icmd.RunCommand("curl", "-I", "http://"+ip).Assert(t, icmd.Success) - } - -} - -func composeDown(t *testing.T, cmd icmd.Cmd, composeFile string) { - cmd.Command = dockerCli.Command("ecs", "compose", "--file="+composeFile, "--project-name", t.Name(), "down") - icmd.RunCmd(cmd).Assert(t, icmd.Success) -} diff --git a/ecs/tests/main_test.go b/ecs/tests/main_test.go deleted file mode 100644 index 5849e406..00000000 --- a/ecs/tests/main_test.go +++ /dev/null @@ -1,126 +0,0 @@ -package tests - -import ( - "encoding/json" - "flag" - "fmt" - "io/ioutil" - "os" - "path/filepath" - "runtime" - "testing" - - dockerConfigFile "github.com/docker/cli/cli/config/configfile" - "github.com/docker/ecs-plugin/pkg/docker" - "gotest.tools/v3/icmd" -) - -var ( - e2ePath = flag.String("e2e-path", ".", "Set path to the e2e directory") - dockerCliPath = os.Getenv("DOCKERCLI_BINARY") - dockerCli dockerCliCommand - testContextName = "testAwsContextToBeRemoved" -) - -type dockerCliCommand struct { - path string - cliPluginDir string -} - -type ConfigFileOperator func(configFile *dockerConfigFile.ConfigFile) - -func (d dockerCliCommand) createTestCmd(ops ...ConfigFileOperator) (icmd.Cmd, func(), docker.AwsContext) { - configDir, err := ioutil.TempDir("", "config") - if err != nil { - panic(err) - } - configFilePath := filepath.Join(configDir, "config.json") - config := dockerConfigFile.ConfigFile{ - CLIPluginsExtraDirs: []string{ - d.cliPluginDir, - }, - Filename: configFilePath, - } - for _, op := range ops { - op(&config) - } - configFile, err := os.Create(configFilePath) - if err != nil { - panic(err) - } - defer configFile.Close() - err = json.NewEncoder(configFile).Encode(config) - if err != nil { - panic(err) - } - - awsContext := docker.AwsContext{ - Profile: "sandbox.devtools.developer", - Region: "eu-west-3", - } - testStore, err := docker.NewContextWithStore(testContextName, awsContext, filepath.Join(configDir, "contexts")) - if err != nil { - panic(err) - } - cleanup := func() { - fmt.Println("cleanup") - testStore.Remove(testContextName) - os.RemoveAll(configDir) - } - env := append(os.Environ(), - "DOCKER_CONFIG="+configDir, - "DOCKER_CLI_EXPERIMENTAL=enabled") // TODO: Remove this once docker ecs plugin is no more experimental - return icmd.Cmd{Env: env}, cleanup, awsContext -} - -func (d dockerCliCommand) Command(args ...string) []string { - return append([]string{d.path, "--context", testContextName}, args...) -} - -func TestMain(m *testing.M) { - flag.Parse() - if err := os.Chdir(*e2ePath); err != nil { - panic(err) - } - cwd, err := os.Getwd() - if err != nil { - panic(err) - } - dockerEcs := os.Getenv("DOCKERECS_BINARY") - if dockerEcs == "" { - dockerEcs = filepath.Join(cwd, "../dist/docker-ecs") - } - dockerEcs, err = filepath.Abs(dockerEcs) - if err != nil { - panic(err) - } - if dockerCliPath == "" { - dockerCliPath = "docker" - } else { - dockerCliPath, err = filepath.Abs(dockerCliPath) - if err != nil { - panic(err) - } - } - // Prepare docker cli to call the docker-ecs plugin binary: - // - Create a symbolic link with the dockerEcs binary to the plugin directory - cliPluginDir, err := ioutil.TempDir("", "configContent") - if err != nil { - panic(err) - } - defer os.RemoveAll(cliPluginDir) - createDockerECSSymLink(dockerEcs, cliPluginDir) - - dockerCli = dockerCliCommand{path: dockerCliPath, cliPluginDir: cliPluginDir} - os.Exit(m.Run()) -} - -func createDockerECSSymLink(dockerEcs, configDir string) { - dockerEcsExecName := "docker-ecs" - if runtime.GOOS == "windows" { - dockerEcsExecName += ".exe" - } - if err := os.Symlink(dockerEcs, filepath.Join(configDir, dockerEcsExecName)); err != nil { - panic(err) - } -} diff --git a/ecs/tests/testdata/input/simple-single-service.yaml b/ecs/tests/testdata/input/simple-single-service.yaml deleted file mode 100644 index 95f30b1d..00000000 --- a/ecs/tests/testdata/input/simple-single-service.yaml +++ /dev/null @@ -1,6 +0,0 @@ -version: "3" -services: - simple: - image: nginx - ports: - - 80:80 \ No newline at end of file diff --git a/ecs/tests/testdata/plugin-usage.golden b/ecs/tests/testdata/plugin-usage.golden deleted file mode 100644 index 8114b6f4..00000000 --- a/ecs/tests/testdata/plugin-usage.golden +++ /dev/null @@ -1,14 +0,0 @@ - -Usage: docker ecs COMMAND - -run multi-container applications on Amazon ECS. - -Management Commands: - compose - secret Manages secrets - -Commands: - setup - version Show version. - -Run 'docker ecs COMMAND --help' for more information on a command. diff --git a/ecs/tests/version_test.go b/ecs/tests/version_test.go deleted file mode 100644 index ad4d6455..00000000 --- a/ecs/tests/version_test.go +++ /dev/null @@ -1,18 +0,0 @@ -package tests - -import ( - "strings" - "testing" - - "gotest.tools/v3/assert" - "gotest.tools/v3/icmd" -) - -func TestVersionIsSet(t *testing.T) { - cmd, cleanup, _ := dockerCli.createTestCmd() - defer cleanup() - - cmd.Command = dockerCli.Command("ecs", "version") - out := icmd.RunCmd(cmd).Assert(t, icmd.Success).Stdout() - assert.Check(t, !strings.Contains(out, "unknown")) -} diff --git a/ecs/pkg/compose/types.go b/ecs/types.go similarity index 78% rename from ecs/pkg/compose/types.go rename to ecs/types.go index 807b9c7a..f1e30073 100644 --- a/ecs/pkg/compose/types.go +++ b/ecs/types.go @@ -1,4 +1,4 @@ -package compose +package ecs import "encoding/json" @@ -9,22 +9,6 @@ type StackResource struct { Status string } -type LoadBalancer struct { - URL string - TargetPort int - PublishedPort int - Protocol string -} - -type ServiceStatus struct { - ID string - Name string - Replicas int - Desired int - Ports []string - LoadBalancers []LoadBalancer -} - const ( StackCreate = iota StackUpdate diff --git a/ecs/pkg/amazon/backend/up.go b/ecs/up.go similarity index 65% rename from ecs/pkg/amazon/backend/up.go rename to ecs/up.go index 098caaac..dc36ecde 100644 --- a/ecs/pkg/amazon/backend/up.go +++ b/ecs/up.go @@ -1,4 +1,4 @@ -package backend +package ecs import ( "context" @@ -9,16 +9,15 @@ import ( "github.com/compose-spec/compose-go/cli" "github.com/compose-spec/compose-go/types" - "github.com/docker/ecs-plugin/pkg/compose" ) -func (b *Backend) Up(ctx context.Context, options *cli.ProjectOptions) error { +func (b *ecsAPIService) Up(ctx context.Context, options *cli.ProjectOptions) error { project, err := cli.ProjectFromOptions(options) if err != nil { return err } - err = b.api.CheckRequirements(ctx, b.Region) + err = b.SDK.CheckRequirements(ctx, b.Region) if err != nil { return err } @@ -38,7 +37,7 @@ func (b *Backend) Up(ctx context.Context, options *cli.ProjectOptions) error { return err } - subNets, err := b.api.GetSubNets(ctx, vpc) + subNets, err := b.SDK.GetSubNets(ctx, vpc) if err != nil { return err } @@ -59,23 +58,23 @@ func (b *Backend) Up(ctx context.Context, options *cli.ProjectOptions) error { ParameterLoadBalancerARN: lb, } - update, err := b.api.StackExists(ctx, project.Name) + update, err := b.SDK.StackExists(ctx, project.Name) if err != nil { return err } - operation := compose.StackCreate + operation := StackCreate if update { - operation = compose.StackUpdate - changeset, err := b.api.CreateChangeSet(ctx, project.Name, template, parameters) + operation = StackUpdate + changeset, err := b.SDK.CreateChangeSet(ctx, project.Name, template, parameters) if err != nil { return err } - err = b.api.UpdateStack(ctx, changeset) + err = b.SDK.UpdateStack(ctx, changeset) if err != nil { return err } } else { - err = b.api.CreateStack(ctx, project.Name, template, parameters) + err = b.SDK.CreateStack(ctx, project.Name, template, parameters) if err != nil { return err } @@ -93,11 +92,11 @@ func (b *Backend) Up(ctx context.Context, options *cli.ProjectOptions) error { return err } -func (b Backend) GetVPC(ctx context.Context, project *types.Project) (string, error) { +func (b ecsAPIService) GetVPC(ctx context.Context, project *types.Project) (string, error) { //check compose file for custom VPC selected - if vpc, ok := project.Extensions[compose.ExtensionVPC]; ok { + if vpc, ok := project.Extensions[ExtensionVPC]; ok { vpcID := vpc.(string) - ok, err := b.api.VpcExists(ctx, vpcID) + ok, err := b.SDK.VpcExists(ctx, vpcID) if err != nil { return "", err } @@ -106,18 +105,18 @@ func (b Backend) GetVPC(ctx context.Context, project *types.Project) (string, er } return vpcID, nil } - defaultVPC, err := b.api.GetDefaultVPC(ctx) + defaultVPC, err := b.SDK.GetDefaultVPC(ctx) if err != nil { return "", err } return defaultVPC, nil } -func (b Backend) GetLoadBalancer(ctx context.Context, project *types.Project) (string, error) { +func (b ecsAPIService) GetLoadBalancer(ctx context.Context, project *types.Project) (string, error) { //check compose file for custom VPC selected - if ext, ok := project.Extensions[compose.ExtensionLB]; ok { + if ext, ok := project.Extensions[ExtensionLB]; ok { lb := ext.(string) - ok, err := b.api.LoadBalancerExists(ctx, lb) + ok, err := b.SDK.LoadBalancerExists(ctx, lb) if err != nil { return "", err } @@ -129,11 +128,11 @@ func (b Backend) GetLoadBalancer(ctx context.Context, project *types.Project) (s return "", nil } -func (b Backend) GetCluster(ctx context.Context, project *types.Project) (string, error) { +func (b ecsAPIService) GetCluster(ctx context.Context, project *types.Project) (string, error) { //check compose file for custom VPC selected - if ext, ok := project.Extensions[compose.ExtensionCluster]; ok { + if ext, ok := project.Extensions[ExtensionCluster]; ok { cluster := ext.(string) - ok, err := b.api.ClusterExists(ctx, cluster) + ok, err := b.SDK.ClusterExists(ctx, cluster) if err != nil { return "", err } diff --git a/ecs/pkg/amazon/backend/wait.go b/ecs/wait.go similarity index 75% rename from ecs/pkg/amazon/backend/wait.go rename to ecs/wait.go index dcc26772..4ca41d85 100644 --- a/ecs/pkg/amazon/backend/wait.go +++ b/ecs/wait.go @@ -1,23 +1,22 @@ -package backend +package ecs import ( "context" "fmt" + "github.com/docker/api/progress" "sort" "strings" "time" "github.com/aws/aws-sdk-go/aws" - "github.com/docker/ecs-plugin/pkg/compose" - "github.com/docker/ecs-plugin/pkg/progress" ) -func (b *Backend) WaitStackCompletion(ctx context.Context, name string, operation int) error { +func (b *ecsAPIService) WaitStackCompletion(ctx context.Context, name string, operation int) error { knownEvents := map[string]struct{}{} // progress writer w := progress.ContextWriter(ctx) // Get the unique Stack ID so we can collect events without getting some from previous deployments with same name - stackID, err := b.api.GetStackID(ctx, name) + stackID, err := b.SDK.GetStackID(ctx, name) if err != nil { return err } @@ -25,7 +24,7 @@ func (b *Backend) WaitStackCompletion(ctx context.Context, name string, operatio ticker := time.NewTicker(1 * time.Second) done := make(chan bool) go func() { - b.api.WaitStackComplete(ctx, stackID, operation) //nolint:errcheck + b.SDK.WaitStackComplete(ctx, stackID, operation) //nolint:errcheck ticker.Stop() done <- true }() @@ -38,7 +37,7 @@ func (b *Backend) WaitStackCompletion(ctx context.Context, name string, operatio completed = true case <-ticker.C: } - events, err := b.api.DescribeStackEvents(ctx, stackID) + events, err := b.SDK.DescribeStackEvents(ctx, stackID) if err != nil { return err } @@ -60,23 +59,23 @@ func (b *Backend) WaitStackCompletion(ctx context.Context, name string, operatio switch status { case "CREATE_COMPLETE": - if operation == compose.StackCreate { + if operation == StackCreate { progressStatus = progress.Done } case "UPDATE_COMPLETE": - if operation == compose.StackUpdate { + if operation == StackUpdate { progressStatus = progress.Done } case "DELETE_COMPLETE": - if operation == compose.StackDelete { + if operation == StackDelete { progressStatus = progress.Done } default: if strings.HasSuffix(status, "_FAILED") { progressStatus = progress.Error if stackErr == nil { - operation = compose.StackDelete + operation = StackDelete stackErr = fmt.Errorf(reason) } } diff --git a/ecs/pkg/compose/x.go b/ecs/x.go similarity index 97% rename from ecs/pkg/compose/x.go rename to ecs/x.go index 3a4ffdb6..9dee6a36 100644 --- a/ecs/pkg/compose/x.go +++ b/ecs/x.go @@ -1,4 +1,4 @@ -package compose +package ecs const ( ExtensionSecurityGroup = "x-aws-securitygroup" diff --git a/example/backend.go b/example/backend.go index 9cb54004..c9a10c62 100644 --- a/example/backend.go +++ b/example/backend.go @@ -22,9 +22,9 @@ import ( "context" "errors" "fmt" + "io" "github.com/compose-spec/compose-go/cli" - ecstypes "github.com/docker/ecs-plugin/pkg/compose" "github.com/docker/api/backend" "github.com/docker/api/compose" @@ -117,8 +117,8 @@ func (cs *containerService) Delete(ctx context.Context, id string, request conta type composeService struct{} -func (cs *composeService) Up(ctx context.Context, opts cli.ProjectOptions) error { - prj, err := cli.ProjectFromOptions(&opts) +func (cs *composeService) Up(ctx context.Context, opts *cli.ProjectOptions) error { + prj, err := cli.ProjectFromOptions(opts) if err != nil { return err } @@ -126,8 +126,8 @@ func (cs *composeService) Up(ctx context.Context, opts cli.ProjectOptions) error return nil } -func (cs *composeService) Down(ctx context.Context, opts cli.ProjectOptions) error { - prj, err := cli.ProjectFromOptions(&opts) +func (cs *composeService) Down(ctx context.Context, opts *cli.ProjectOptions) error { + prj, err := cli.ProjectFromOptions(opts) if err != nil { return err } @@ -135,10 +135,10 @@ func (cs *composeService) Down(ctx context.Context, opts cli.ProjectOptions) err return nil } -func (cs *composeService) Ps(ctx context.Context, opts cli.ProjectOptions) ([]ecstypes.ServiceStatus, error) { +func (cs *composeService) Ps(ctx context.Context, opts *cli.ProjectOptions) ([]compose.ServiceStatus, error) { return nil, errdefs.ErrNotImplemented } -func (cs *composeService) Logs(ctx context.Context, opts cli.ProjectOptions) error { +func (cs *composeService) Logs(ctx context.Context, opts *cli.ProjectOptions, w io.Writer) error { return errdefs.ErrNotImplemented } diff --git a/go.mod b/go.mod index f58ea079..5dd55cc5 100644 --- a/go.mod +++ b/go.mod @@ -20,25 +20,26 @@ require ( github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 github.com/Microsoft/hcsshim v0.8.9 // indirect github.com/aws/aws-sdk-go v1.34.2 + github.com/awslabs/goformation/v4 v4.14.0 github.com/buger/goterm v0.0.0-20200322175922-2f3e71b85129 github.com/compose-spec/compose-go v0.0.0-20200710075715-6fcc35384ee1 github.com/containerd/console v1.0.0 github.com/containerd/containerd v1.3.5 // indirect github.com/docker/cli v0.0.0-20200528204125-dd360c7c0de8 + github.com/docker/distribution v0.0.0-00010101000000-000000000000 // indirect github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible - github.com/docker/ecs-plugin v1.0.0-beta.4 + github.com/docker/docker-credential-helpers v0.6.3 // indirect github.com/docker/go-connections v0.4.0 github.com/docker/go-units v0.4.0 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee // indirect github.com/gobwas/pool v0.2.0 // indirect github.com/gobwas/ws v1.0.3 - github.com/gogo/googleapis v1.4.0 // indirect github.com/golang/protobuf v1.4.2 github.com/google/go-cmp v0.5.1 github.com/google/uuid v1.1.1 github.com/gorilla/mux v1.7.4 // indirect github.com/hashicorp/go-multierror v1.1.0 - github.com/hashicorp/go-version v1.2.1 // indirect + github.com/joho/godotenv v1.3.0 github.com/moby/term v0.0.0-20200611042045-63b9a826fb74 github.com/morikuni/aec v1.0.0 github.com/onsi/gomega v1.10.1 // indirect @@ -46,6 +47,7 @@ require ( github.com/opencontainers/runc v0.1.1 // indirect github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.6.0 + github.com/smartystreets/goconvey v1.6.4 // indirect github.com/spf13/cobra v1.0.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.6.1 diff --git a/go.sum b/go.sum index 37a78fae..56d3d87b 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,5 @@ -bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= -bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c/go.mod h1:hSVuE3qU7grINVSwrmzHfpg9k87ALBk+XaualNyUzI4= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/AlecAivazis/survey/v2 v2.1.0 h1:AT4+23hOFopXYZaNGugbk7MWItkz0SfTmH/Hk92KeeE= -github.com/AlecAivazis/survey/v2 v2.1.0/go.mod h1:9FJRdMdDm8rnT+zHVbvQT2RTSTLq0Ttd6q3Vl2fahjk= github.com/AlecAivazis/survey/v2 v2.1.1 h1:LEMbHE0pLj75faaVEKClEX1TM4AJmmnOh9eimREzLWI= github.com/AlecAivazis/survey/v2 v2.1.1/go.mod h1:9FJRdMdDm8rnT+zHVbvQT2RTSTLq0Ttd6q3Vl2fahjk= github.com/Azure/azure-pipeline-go v0.2.1 h1:OLBdZJ3yvOn2MezlWvbrBMTEUQC72zAftRZOMdj5HYo= @@ -26,12 +22,8 @@ github.com/Azure/go-autorest/autorest v0.11.3/go.mod h1:JFgpikqFJ/MleTTxwepExTKn github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= github.com/Azure/go-autorest/autorest/adal v0.9.0 h1:SigMbuFNuKgc1xcGhaeapbh+8fgsu+GxgDRFyg7f5lM= github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= -github.com/Azure/go-autorest/autorest/adal v0.9.1 h1:xjPqigMQe2+0DAJ5A6MLUPp5D2r2Io8qHCuCMMI/yJU= -github.com/Azure/go-autorest/autorest/adal v0.9.1/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= github.com/Azure/go-autorest/autorest/adal v0.9.2 h1:Aze/GQeAN1RRbGmnUJvUj+tFGBzFdIg3293/A9rbxC4= github.com/Azure/go-autorest/autorest/adal v0.9.2/go.mod h1:/3SMAM86bP6wC9Ev35peQDUeqFZBMH07vvUOmg4z/fE= -github.com/Azure/go-autorest/autorest/azure/auth v0.5.0 h1:nSMjYIe24eBYasAIxt859TxyXef/IqoH+8/g4+LmcVs= -github.com/Azure/go-autorest/autorest/azure/auth v0.5.0/go.mod h1:QRTvSZQpxqm8mSErhnbI+tANIBAKP7B+UIE2z4ypUO0= github.com/Azure/go-autorest/autorest/azure/auth v0.5.1 h1:bvUhZciHydpBxBmCheUgxxbSwJy7xcfjkUsjUcqSojc= github.com/Azure/go-autorest/autorest/azure/auth v0.5.1/go.mod h1:ea90/jvmnAwDrSooLH4sRIehEPtG/EPUXavDh31MnA4= github.com/Azure/go-autorest/autorest/azure/cli v0.4.0 h1:Ml+UCrnlKD+cJmSzrZ/RDcDw86NjkRUpnFh7V5JUhzU= @@ -43,6 +35,7 @@ github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxB github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= github.com/Azure/go-autorest/autorest/mocks v0.4.0 h1:z20OWOSG5aCye0HEkDp6TPmP17ZcfeMxPi6HnSALa8c= github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/autorest/mocks v0.4.1 h1:K0laFcLE6VLTOwNgSxaGbUcLPuGXlNkbVvq4cW4nIHk= github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+XA683u8EctwboHk= github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= @@ -58,11 +51,8 @@ github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUM github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0= -github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0= github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 h1:ygIc8M6trr62pF5DucadTWGdEB4mEyvzi0e2nbcmcyA= github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= -github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= github.com/Microsoft/hcsshim v0.8.9 h1:VrfodqvztU8YSOvygU+DN1BGaSGxmrNfqOv5oOuX2Bk= github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8= github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8 h1:xzYJEypr/85nBpB11F9br+3HUrpgb+fcm5iADzXXYEw= @@ -70,59 +60,32 @@ github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= -github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 h1:w1UutsfOrms1J05zt7ISrnJIXKzwaspym5BTKGx93EI= -github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0= -github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= -github.com/aws/aws-sdk-go v1.30.22/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.33.21 h1:ziUemjajvLABlnJFe+8sM3fpqlg/DNA4944rUZ05PhY= -github.com/aws/aws-sdk-go v1.33.21/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.34.2 h1:9vCknCdTAmmV4ht7lPuda7aJXzllXwEQyCMZKJHjBrM= github.com/aws/aws-sdk-go v1.34.2/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/awslabs/goformation/v4 v4.8.0 h1:UiUhyokRy3suEqBXTnipvY8klqY3Eyl4GCH17brraEc= -github.com/awslabs/goformation/v4 v4.8.0/go.mod h1:GcJULxCJfloT+3pbqCluXftdEK2AD/UqpS3hkaaBntg= +github.com/awslabs/goformation/v4 v4.14.0 h1:E2Pet9eIqA4qzt3dzzzE4YN83V4Kyfbcio0VokBC9TA= +github.com/awslabs/goformation/v4 v4.14.0/go.mod h1:GcJULxCJfloT+3pbqCluXftdEK2AD/UqpS3hkaaBntg= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bitly/go-hostpool v0.1.0 h1:XKmsF6k5el6xHG3WPJ8U0Ku/ye7njX7W81Ng7O2ioR0= -github.com/bitly/go-hostpool v0.1.0/go.mod h1:4gOCgp6+NZnVqlKyZ/iBZFTAJKembaVENUpMkpg42fw= github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y= github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= -github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/buger/goterm v0.0.0-20200322175922-2f3e71b85129 h1:gfAMKE626QEuKG3si0pdTRcr/YEbBoxY+3GOH3gWvl4= github.com/buger/goterm v0.0.0-20200322175922-2f3e71b85129/go.mod h1:u9UyCz2eTrSGy6fbupqJ54eY5c4IC8gREQ1053dK12U= github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= -github.com/bugsnag/bugsnag-go v1.5.3 h1:yeRUT3mUE13jL1tGwvoQsKdVbAsQx9AJ+fqahKveP04= -github.com/bugsnag/bugsnag-go v1.5.3/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= -github.com/bugsnag/panicwrap v1.2.0 h1:OzrKrRvXis8qEvOkfcxNcYbOd2O7xXS2nnKMEMABFQA= -github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= -github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= -github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/certifi/gocertifi v0.0.0-20180118203423-deb3ae2ef261/go.mod h1:GJKEexRPVJrBSOjoqN5VNOIKJ5Q3RViH6eu3puDRwx4= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudflare/backoff v0.0.0-20161212185259-647f3cdfc87a/go.mod h1:rzgs2ZOiguV6/NpiDgADjRLPNyZlApIWxKpkT+X8SdY= -github.com/cloudflare/cfssl v1.4.1 h1:vScfU2DrIUI9VPHBVeeAQ0q5A+9yshO1Gz+3QoUQiKw= -github.com/cloudflare/cfssl v1.4.1/go.mod h1:KManx/OJPb5QY+y0+o/898AMcM128sF0bURvoVUSjTo= -github.com/cloudflare/go-metrics v0.0.0-20151117154305-6a9aea36fb41/go.mod h1:eaZPlJWD+G9wseg1BuRXlHnjntPMrywMsyxf+LTOdP4= -github.com/cloudflare/redoctober v0.0.0-20171127175943-746a508df14c/go.mod h1:6Se34jNoqrd8bTxrmJB2Bg2aoZ2CdSXonils9NsiNgo= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/compose-spec/compose-go v0.0.0-20200710075715-6fcc35384ee1 h1:F+YIkKDMHdgZBacawhFY1P9RAIgO+6uv2te6hjsjzF0= github.com/compose-spec/compose-go v0.0.0-20200710075715-6fcc35384ee1/go.mod h1:ArodJ6gsEB7iWKrbV3fSHZ08LlBvSVB0Oqg04fX86t4= @@ -131,14 +94,11 @@ github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqh github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= github.com/containerd/console v1.0.0 h1:fU3UuQapBs+zLJu82NhR11Rif1ny2zfMMAyPJzSN5tQ= github.com/containerd/console v1.0.0/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= -github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.3.5 h1:l0iDHQtFwcOUmOvdepI6BB67q7beT6sRp2JYsfHS08c= github.com/containerd/containerd v1.3.5/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc h1:TP+534wVlf61smEIq1nwLLAjQVEK2EADoW3CX9AuT+8= github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb h1:nXPkFq8X1a9ycY3GYQpFNxHh3j2JgY7zDZfq2EXMIzk= -github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb/go.mod h1:Dq467ZllaHgAtVp4p1xUQWBrFXR9s/wyoTpG8zOJGkY= github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448 h1:PUD50EuOMkXVcpBIA/R95d56duJR9VxhwncsFbNnxW4= github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= @@ -148,21 +108,16 @@ github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd h1:JNn81o/xG+8N github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM= -github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= @@ -171,20 +126,14 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8 github.com/dimchansky/utfbom v1.1.0 h1:FcM3g+nofKgUteL8dm/UpdRXNC9KmADgTpLKsu0TRo4= github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= -github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v0.0.0-20200528204125-dd360c7c0de8 h1:JRquW4uqIU+eSilDhuo9X9QFX4NEmGj5B1x97ZA8djM= github.com/docker/cli v0.0.0-20200528204125-dd360c7c0de8/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20200708230824-53e18a9d9bfe h1:pni13lAFm1g4cjHU6c3n4qGvvJGZQK4VvKRKMseQ42E= github.com/docker/distribution v0.0.0-20200708230824-53e18a9d9bfe/go.mod h1:Oqz4IonmMNc2N7GqfTL2xkhCQx0yS6nR+HrOZJnmKIk= -github.com/docker/docker v1.4.2-0.20200128034134-2ebaeef943cc/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible h1:G2hY8RD7jB9QaSmcb8mYEIg8QbEvVAB7se8+lXHZHfg= github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= -github.com/docker/ecs-plugin v1.0.0-beta.4 h1:hZKojW0tqsdhJjfMKPw6piMw/GJgfX6CVXd1YUuXLg4= -github.com/docker/ecs-plugin v1.0.0-beta.4/go.mod h1:1YaNZwrNr0dFjTP3v7zwepluaZgVNV94s0M6fL+i/iA= -github.com/docker/go v1.5.1-1 h1:hr4w35acWBPhGBXlzPoHpmZ/ygPjnmFVxGxxGnMyP7k= -github.com/docker/go v1.5.1-1/go.mod h1:CADgU4DSXK5QUlFslkQu2yW2TKzFZcXq/leZfM0UH5Q= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8= @@ -194,26 +143,18 @@ github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHz github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= -github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4= -github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= -github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= -github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= -github.com/getsentry/raven-go v0.0.0-20180121060056-563b81fc02b7/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-sql-driver/mysql v1.3.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= @@ -225,16 +166,10 @@ github.com/gobwas/ws v1.0.3 h1:ZOigqf7iBxkA4jdQ3am7ATzdlOFp9YzA6NmuvEEZc9g= github.com/gobwas/ws v1.0.3/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e h1:BWhy2j3IXJhjCbC68FptL43tDKIq8FladmaTs3Xs7Z8= github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= -github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE= -github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/googleapis v1.4.0 h1:zgVt4UpGxcqVOw97aRGxT4svlcmdK35fynLNctY32zI= -github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= -github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -251,8 +186,6 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/certificate-transparency-go v1.0.21 h1:Yf1aXowfZ2nuboBsg7iYGLmwsOARdV86pfH3g95wXmE= -github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -269,7 +202,6 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGa github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc= github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= @@ -277,16 +209,10 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmg github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= -github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= -github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= -github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= -github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -300,19 +226,10 @@ github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jinzhu/gorm v1.9.12 h1:Drgk1clyWT9t9ERbzHza6Mj/8FY/CqMyVzOiHviMo6Q= -github.com/jinzhu/gorm v1.9.12/go.mod h1:vhTjlKSJUTWNtcbQtrMBFCxy7eXTzeCAzfL5fBZT/Qs= -github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= -github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= -github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M= -github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= -github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548/go.mod h1:hGT6jSUVzF6no3QaDSMLGLEHtHSBSefs+MgcDWnmhmo= -github.com/jmoiron/sqlx v0.0.0-20180124204410-05cef0741ade/go.mod h1:IiEW3SEiiErVyFdH8NTuWjSifiEQKUoyK3LNqr2kCHU= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= @@ -320,18 +237,12 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a h1:FaWFmfWdAUKbSCtOU2QjDaorUexogfaMgbipgYATUMU= -github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod h1:UJSiEoRfvx3hP73CvoARgeLjaIOjybY9vj8PUPPFGeU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA= -github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kisielk/sqlstruct v0.0.0-20150923205031-648daed35d49/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE= -github.com/kisom/goutils v1.1.0/go.mod h1:+UBTfd78habUYWFbNWTJNG+jNG/i/lGURakr4A/yNRw= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -344,38 +255,21 @@ github.com/kr/pty v1.1.5 h1:hyz3dwM5QLc1Rfoz4FuWJQG5BN7tc6K1MndAUnGpQr4= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28/go.mod h1:T/T7jsxVqf9k/zYOqbgNAsANsjxTd1Yq3htjDhQ1H0c= -github.com/lib/pq v0.0.0-20180201184707-88edab080323/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU= -github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a h1:weJVJJRzAJBFRlAiJQROKQs8oC9vOxvm4rZmBBk0ONw= -github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/manifoldco/promptui v0.7.0 h1:3l11YT8tm9MnwGFQ4kETwkzpAwY2Jt9lCrumCUW4+z4= -github.com/manifoldco/promptui v0.7.0/go.mod h1:n4zTdgP0vr0S3w7/O/g98U+e0gwLScEXGwov2nIKuGQ= github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149 h1:HfxbT6/JcvIljmERptWhwa8XzP7H3T+Z2N26gTsaDaA= github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= -github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-shellwords v1.0.10 h1:Y7Xqm8piKOO3v10Thp7Z36h4FYFjt5xB//6XvOrs2Gw= github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= -github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U= -github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= -github.com/miekg/pkcs11 v1.0.3 h1:iMwmD7I5225wv84WxIG/bmxz9AXjWvTWIbM/TYHvWtw= -github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -390,26 +284,19 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod h1:OQA4XLvDbMgS8P0CevmM4m9Q3Jq4phKUzcocxuGJ5m8= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= -github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.5.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo= -github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1 h1:mFwc4LvZ0xpSvDZ3E+k8Yte0hLOMxXUlP+yXtJqkYfQ= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/gomega v1.2.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -421,11 +308,9 @@ github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJ github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700 h1:eNUVfm/RFLIi1G7flU5/ZRTHvd4kcVuzfRnL6OFlzCI= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -450,11 +335,8 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= -github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8= -github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b h1:jUK33OXuZP/l6babJtnLo1qsGvq6G9so9KMflGAm4YA= github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b/go.mod h1:8458kAagoME2+LN5//WxE71ysZ3B7r22fdgb7qVmXSY= @@ -462,9 +344,7 @@ github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522 h1:fOCp11H0yuyAt2wql github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522/go.mod h1:tQTYKOQgxoH3v6dEmdHiz4JG+nbxWwM5fgPQUpSZqVQ= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= @@ -480,18 +360,14 @@ github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -504,43 +380,23 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8 h1:zLV6q4e8Jv9EHjNg/iHfzwDkCve6Ua5jCygptrtXHvI= -github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/theupdateframework/notary v0.6.1 h1:7wshjstgS9x9F5LuB1L5mBI2xNMObWqjz+cjWoom6l0= -github.com/theupdateframework/notary v0.6.1/go.mod h1:MOfgIfmox8s7/7fduvB2xyPPMJCrjRLRizA8OFwpnKY= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= -github.com/weppos/publicsuffix-go v0.4.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k= -github.com/weppos/publicsuffix-go v0.5.0 h1:rutRtjBJViU/YjcI5d80t4JAVvDltS6bciJg2K1HrLU= -github.com/weppos/publicsuffix-go v0.5.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= -github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 h1:j2hhcujLRHAg872RWAV5yaUrEjHEObwDv3aImCaNLek= -github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= -github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= -github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE= -github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4/go.mod h1:5iU54tB79AMBcySS0R2XIyZBAVmeHranShAFELYx7is= -github.com/zmap/zcrypto v0.0.0-20190729165852-9051775e6a2e h1:mvOa4+/DXStR4ZXOks/UsjeFdn5O5JpLUtzqk9U8xXw= -github.com/zmap/zcrypto v0.0.0-20190729165852-9051775e6a2e/go.mod h1:w7kd3qXHh8FNaczNjslXqvFQiv5mMWRXlL9klTUAHc8= -github.com/zmap/zlint v0.0.0-20190806154020-fd021b4cfbeb h1:vxqkjztXSaPVDc8FQCdHTaejm2x747f6yPbnu1h2xkg= -github.com/zmap/zlint v0.0.0-20190806154020-fd021b4cfbeb/go.mod h1:29UiAJNsiVdvTBFCJW8e3q6dcDbOoPkhMgttOSCIMMY= go.etcd.io/bbolt v1.3.2 h1:Z/90sZLPOeCy2PwprqkFa25PdkusRzaj9P8zm/KNyvk= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4= @@ -548,14 +404,9 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -563,7 +414,6 @@ golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -598,8 +448,6 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -611,7 +459,6 @@ golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4= @@ -621,8 +468,6 @@ golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -665,25 +510,14 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/dancannon/gorethink.v3 v3.0.5 h1:/g7PWP7zUS6vSNmHSDbjCHQh1Rqn8Jy6zSMQxAsBSMQ= -gopkg.in/dancannon/gorethink.v3 v3.0.5/go.mod h1:GXsi1e3N2OcKhcP6nsYABTiUejbWMFO4GY5a4pEaeEc= -gopkg.in/fatih/pool.v2 v2.0.0 h1:xIFeWtxifuQJGk/IEPKsTduEKcKvPmhoiVDGpC40nKg= -gopkg.in/fatih/pool.v2 v2.0.0/go.mod h1:8xVGeu1/2jr2wm5V9SPuMht2H5AEmf5aFMGSQixtjTY= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= -gopkg.in/gorethink/gorethink.v3 v3.0.5 h1:e2Uc/Xe+hpcVQFsj6MuHlYog3r0JYpnTzwDj/y2O4MU= -gopkg.in/gorethink/gorethink.v3 v3.0.5/go.mod h1:+3yIIHJUGMBK+wyPH+iN5TP+88ikFDfZdqTlK3Y9q8I= -gopkg.in/ini.v1 v1.55.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.57.0 h1:9unxIsFcTt4I55uWluz+UmL95q4kdJ0buvQ1ZIqVQww= -gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.58.0 h1:VdDvTzv/005R8vEFyQ56bpEnOKTNPbpJhL0VCohxlQw= gopkg.in/ini.v1 v1.58.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= @@ -705,6 +539,3 @@ gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 h1:O69FD9pJA4WUZlEwYatBEEkRWKQ5cKodWpdKTrCS/iQ= -vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI=